Synchronized stdenv-updates branch with trunk.

There were conflicting patches of pkgs/os-specific/linux/module-init-tools.
Apparently, the expression was updated independently in both branches. I've
resolved the conflict by preferring the patches from stdenv-updates, because
those patches appeared to be more sophisticated, i.e. they build the manual,
etc.

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

doc/release-notes.xml

@@ -80,7 +80,7 @@ worth listing:
   <listitem><para>Support for building derivations in a virtual
   machine, including RPM and Debian builds in automatically generated
   VM images.  See
-  <filename>pkgs/build-support/vm.default.nix</filename> for
+  <filename>pkgs/build-support/vm/default.nix</filename> for
   details.</para></listitem>
 
   <listitem><para>Improved support for building Haskell

pkgs/applications/editors/kile/2.0.nix

@@ -17,5 +17,6 @@ stdenv.mkDerivation {
     description = "An integrated LaTeX editor for KDE";
     homepage = http://kile.sourceforge.net;
     license = "GPLv2";
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/applications/editors/kile/2.1.nix

@@ -0,0 +1,21 @@
+{stdenv, fetchurl, kdelibs, cmake, gettext }:
+
+stdenv.mkDerivation rec {
+  name = "kile-2.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/kile/${name}.tar.bz2";
+    sha256 = "0ag6ya0625w34hpk0bpkjyi0ydw699zbkf86vwc19mh9cb0n0aic";
+  };
+
+  buildNativeInputs = [ cmake gettext ];
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "An integrated LaTeX editor for KDE";
+    homepage = http://kile.sourceforge.net;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    license = stdenv.lib.licenses.gpl2Plus;
+    inherit (kdelibs.meta) platforms;
+  };
+}

pkgs/applications/misc/calibre/default.nix

@@ -1,21 +1,21 @@
 { stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng
-, imagemagick, libjpeg, fontconfig, podofo, qt4
+, imagemagick, libjpeg, fontconfig, podofo, qt4, icu
 , pil, makeWrapper, unrar, chmlib, pythonPackages
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-0.7.14";
+  name = "calibre-0.8.21";
 
   src = fetchurl {
     url = "mirror://sourceforge/calibre/${name}.tar.gz";
-    sha256 = "07vnmxxpg77pmd7fhcrlnark02bn6zj62hbsybdqz8fp1yp99wkn";
+    sha256 = "173is8qlsm1gbsx5a411c2226kakwyv200wcw97yfs613k7cz256";
   };
 
   inherit python;
 
   buildInputs =
     [ python pyqt4 sip popplerQt4 pkgconfig libpng imagemagick libjpeg
-      fontconfig podofo qt4 pil makeWrapper chmlib 
+      fontconfig podofo qt4 pil makeWrapper chmlib icu
       pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
       pythonPackages.cssutils pythonPackages.beautifulsoap pythonPackages.sqlite3
     ];

pkgs/applications/misc/k3b/1.0.nix

@@ -15,5 +15,6 @@ stdenv.mkDerivation {
   meta = {
     description = "A CD and DVD authoring application for KDE";
     homepage = http://www.k3b.org/;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/applications/virtualization/virtualbox/default.nix

@@ -4,14 +4,14 @@
 , xorriso, makeself, perl, jdk
 }:
 
-let version = "4.1.0"; in
+let version = "4.1.2"; in
 
 stdenv.mkDerivation {
   name = "virtualbox-${version}-${kernel.version}";
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "1pi066xnjgr3fl42i1vc1pbwic9l4m1k6mzs4ip41fz99w59xfzp";
+    sha256 = "1g3nqlxk4bxkq5yqwk0mrn50mz5y0kxpcn0hq5f81bbb9niglc5h";
   };
 
   buildInputs = [iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL hal libcap glib kernel python alsaLib curl pam xorriso makeself perl jdk ];

pkgs/build-support/kernel/modules-closure.sh

@@ -18,7 +18,10 @@ for module in $rootModules; do
         | sed 's/^insmod //') \
         || if test -z "$allowMissing"; then exit 1; fi
     #for i in $deps; do echo $i; done
+    if [[ "$deps" != builtin* ]]
+    then
         closure="$closure $deps"
+    fi
 done
 
 echo "closure:"

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

@@ -52,4 +52,6 @@ stdenv.mkDerivation {
 
   # Work around some inexplicable build failure starting in kdebase 3.5.9.
   LDFLAGS = "-L${kdelibs}/lib";
+
+  meta.platforms = stdenv.lib.platforms.linux;
 }

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

@@ -49,4 +49,6 @@ stdenv.mkDerivation {
     --x-includes=${xlibs.libX11}/include
     --x-libraries=${xlibs.libX11}/lib
   '';
+
+  meta.platforms = stdenv.lib.platforms.linux;
 }

pkgs/development/compilers/bigloo/default.nix

@@ -1,20 +1,25 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "bigloo3.2a";
+  name = "bigloo3.7a";
 
   src = fetchurl {
-    url = "ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/${name}.tar.gz";
+    url = "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/${name}.tar.gz";
-    sha256 = "131jnn17rcccbijpji7v5xlx4z2jldhbn46gkysf6axdcwxwqgg4";
+    sha256 = "0y8i87c2bpqzap8rhzgpyfgdzq21py5xq6mgp0w6xv4rjcj9d0v1";
   };
 
+  preConfigure =
+    # Help libgc's configure.
+    '' export CXXCPP="g++ -E"
+    '';
+
   patchPhase = ''
     # Fix absolute paths.
     sed -e 's=/bin/mv=mv=g' -e 's=/bin/rm=rm=g'			\
         -e 's=/tmp=$TMPDIR=g' -i configure autoconf/*		\
 	[Mm]akefile*   */[Mm]akefile*   */*/[Mm]akefile*	\
 	*/*/*/[Mm]akefile*   */*/*/*/[Mm]akefile*		\
-	comptime/Cc/cc.scm gc/install-gc-*
+	comptime/Cc/cc.scm gc/install-*
 
     # Make sure we don't change string lengths in the generated
     # C files.
@@ -39,7 +44,7 @@ stdenv.mkDerivation rec {
       between Scheme and C# programs.
     '';
 
-    homepage = http://www-sop.inria.fr/mimosa/fp/Bigloo/;
+    homepage = http://www-sop.inria.fr/indes/fp/Bigloo/;
     license = "GPLv2+";
 
     maintainers = [ stdenv.lib.maintainers.ludo ];

pkgs/development/interpreters/ruby/default.nix

@@ -1,52 +1 @@
-{ stdenv, fetchurl
+import ./ruby-19.nix
-, zlib, zlibSupport ? true
-, openssl, opensslSupport ? true
-, gdbm, gdbmSupport ? true
-, ncurses, readline, cursesSupport ? false
-, groff, docSupport ? false
-}:
-
-let
-  op = stdenv.lib.optional;
-  ops = stdenv.lib.optionals;
-in
-
-stdenv.mkDerivation rec {
-  version = with passthru; "${majorVersion}.${minorVersion}-p${patchLevel}";
-  
-  name = "ruby-${version}";
-  
-  src = fetchurl {
-    url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/${name}.tar.gz";
-    sha256 = "0zmxdqzprbdc5mvmba1i94mpqnqxxlh460jri7bx6i29bibigj0w";
-  };
-
-  # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
-  NROFF = "${groff}/bin/nroff";
-
-  buildInputs = (ops cursesSupport [ ncurses readline ] )
-    ++ (op docSupport groff )
-    ++ (op zlibSupport zlib)
-    ++ (op opensslSupport openssl)
-    ++ (op gdbmSupport gdbm);
-    
-  configureFlags = ["--enable-shared" "--enable-pthread"];
-
-  installFlags = stdenv.lib.optionalString docSupport "install-doc";
-  # Bundler tries to create this directory
-  postInstall = "mkdir -pv $out/${passthru.gemPath}";
-
-  meta = {
-    license = "Ruby";
-    homepage = "http://www.ruby-lang.org/en/";
-    description = "The Ruby language";
-  };
-
-  passthru = rec {
-    majorVersion = "1.9";
-    minorVersion = "2";
-    patchLevel = "290";
-    libPath = "lib/ruby/${majorVersion}";
-    gemPath = "lib/ruby/gems/${majorVersion}";
-  };
-}

pkgs/development/interpreters/ruby/ruby-19.nix

@@ -0,0 +1,52 @@
+{ stdenv, fetchurl
+, zlib, zlibSupport ? true
+, openssl, opensslSupport ? true
+, gdbm, gdbmSupport ? true
+, ncurses, readline, cursesSupport ? false
+, groff, docSupport ? false
+}:
+
+let
+  op = stdenv.lib.optional;
+  ops = stdenv.lib.optionals;
+in
+
+stdenv.mkDerivation rec {
+  version = with passthru; "${majorVersion}.${minorVersion}-p${patchLevel}";
+  
+  name = "ruby-${version}";
+  
+  src = fetchurl {
+    url = "ftp://ftp.ruby-lang.org/pub/ruby/1.9/${name}.tar.gz";
+    sha256 = "0zmxdqzprbdc5mvmba1i94mpqnqxxlh460jri7bx6i29bibigj0w";
+  };
+
+  # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds.
+  NROFF = "${groff}/bin/nroff";
+
+  buildInputs = (ops cursesSupport [ ncurses readline ] )
+    ++ (op docSupport groff )
+    ++ (op zlibSupport zlib)
+    ++ (op opensslSupport openssl)
+    ++ (op gdbmSupport gdbm);
+    
+  configureFlags = ["--enable-shared" "--enable-pthread"];
+
+  installFlags = stdenv.lib.optionalString docSupport "install-doc";
+  # Bundler tries to create this directory
+  postInstall = "mkdir -pv $out/${passthru.gemPath}";
+
+  meta = {
+    license = "Ruby";
+    homepage = "http://www.ruby-lang.org/en/";
+    description = "The Ruby language";
+  };
+
+  passthru = rec {
+    majorVersion = "1.9";
+    minorVersion = "2";
+    patchLevel = "290";
+    libPath = "lib/ruby/${majorVersion}";
+    gemPath = "lib/ruby/gems/${majorVersion}";
+  };
+}

pkgs/development/libraries/babl/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
-  name = "babl-0.0.22";
+  name = "babl-0.1.4";
 
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/babl/0.0/babl-0.0.22.tar.bz2;
+    url = "ftp://ftp.gimp.org/pub/babl/0.1/${name}.tar.bz2";
-    sha256 = "0v8gbf9si4sd06199f8lfmrsbvi6i0hxphd34kyvsj6g2kkkg10s";
+    sha256 = "0cz7zw206bb87c0n0h54h4wlkaa3hx3wsia30mgq316y50jk2djv";
   };
 
   meta = { 

pkgs/development/libraries/boolstuff/default.nix

@@ -1,18 +1,20 @@
 { stdenv, fetchurl, pkgconfig }:
 
-stdenv.mkDerivation {
+let baseurl = "http://perso.b2b2c.ca/sarrazip/dev"; in
-  name = "boolstuff-0.1.12";
+
+stdenv.mkDerivation rec {
+  name = "boolstuff-0.1.13";
 
   src = fetchurl {
-    url = http://perso.b2b2c.ca/sarrazip/dev/boolstuff-0.1.12.tar.gz;
+    url = "${baseurl}/${name}.tar.gz";
-    sha256 = "0h39civar6fjswaf3bn1r2ddj589rya0prd6gzsyv3qzr9srprq9";
+    sha256 = "0akwb57lnzq1ak32k6mdxbma2gj0pqhj8y9m6hq79djb9s3mxvmn";
   };
 
-  buildInputs = [ pkgconfig ];
+  buildNativeInputs = [ pkgconfig ];
 
   meta = { 
     description = "Library for operations on boolean expression binary trees";
-    homepage = http://perso.b2b2c.ca/sarrazip/dev/boolstuff.html;
+    homepage = "${baseurl}/boolstuff.html";
     license = "GPL";
     maintainers = [ stdenv.lib.maintainers.marcweber ];
     platforms = stdenv.lib.platforms.linux;

pkgs/development/libraries/dbus/1.5.6.nix

@@ -49,7 +49,7 @@ in rec {
 
     preConfigure =
       ''
-        sed -i 's@ $(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in
+        sed -i 's@$(top_builddir)/dbus/libdbus-1.la@@' tools/Makefile.in
         substituteInPlace tools/Makefile.in --replace 'install-localstatelibDATA:' 'disabled:'
       '';
 

pkgs/development/libraries/dotnetfx40/default.nix

@@ -0,0 +1,23 @@
+{stdenv}:
+
+let
+  windir = "/cygdrive/c/WINDOWS";
+in
+{
+  pkg = stdenv.mkDerivation {
+    name = "dotnetfx-4.0";
+    src = "${windir}/Microsoft.NET/Framework/v4.0.30319";
+    buildCommand = ''
+      ensureDir $out/bin
+      ln -s $src/MSBuild.exe $out/bin
+    '';
+  };
+  
+  assembly20Path = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v2.0.50727";
+  
+  wcfPath = "/cygdrive/c/WINDOWS/Microsoft.NET/Framework/v3.0/WINDOW~1";
+  
+  referenceAssembly30Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.0";
+  
+  referenceAssembly35Path = "/cygdrive/c/PROGRA~1/REFERE~1/Microsoft/Framework/v3.5";
+}

pkgs/development/libraries/gegl/default.nix

@@ -1,17 +1,20 @@
 { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg
-, librsvg, pango, gtk }:
+, librsvg, pango, gtk, bzip2 }:
         
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
-  name = "gegl-0.0.22";
+  name = "gegl-0.1.6";
 
   src = fetchurl {
-    url = ftp://ftp.gimp.org/pub/gegl/0.0/gegl-0.0.22.tar.bz2;
+    url = "ftp://ftp.gimp.org/pub/gegl/0.1/${name}.tar.bz2";
-    sha256 = "0nx6r9amzhw5d2ghlw3z8qnry18rwz1ymvl2cm31b8p49z436wl5";
+    sha256 = "1l966ygss2zkksyw62nm139v2abfzbqqrj0psizvbgzf4mb24rm1";
   };
 
-  configureFlags = "--disable-docs"; # needs fonts otherwise  don't know how to pass them
+  # needs fonts otherwise  don't know how to pass them
+  configureFlags = "--disable-docs";
 
-  buildInputs = [ pkgconfig glib babl libpng cairo libjpeg librsvg pango gtk ];
+  buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 ];
+
+  buildNativeInputs = [ pkgconfig ];
 
   meta = { 
     description = "Graph-based image processing framework";

pkgs/development/libraries/haskell/X11-xft/default.nix

@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "X11-xft";
-  version = "0.3";
+  version = "0.3.1";
-  sha256 = "48892d0d0a90d5b47658877facabf277bf8466b7388eaf6ce163b843432a567d";
+  sha256 = "1lgqb0s2qfwwgbvwxhjbi23rbwamzdi0l0slfr20c3jpcbp3zfjf";
   buildDepends = [ utf8String X11 ];
   extraLibraries = [ fontconfig freetype pkgconfig ];
   pkgconfigDepends = [ libXft ];

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-html";
-  version = "0.4.1.7";
+  version = "0.4.2.0";
-  sha256 = "0hfnfwbw8gshcv15i8jb6636rh3dl4zwwp6l21yjbrblh3825k0y";
+  sha256 = "098y9mzq6jr73lavv7ky58bl3aajvdg72y12varpf3v3rr4l0lb2";
   buildDepends = [ blazeBuilder text ];
   meta = {
     homepage = "http://jaspervdj.be/blaze";

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

@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "clientsession";
-  version = "0.7.3";
+  version = "0.7.3.1";
-  sha256 = "1f5ri7h8l3v60bj6ywhn2v3kih5lclk76qx7y6jc7nyf9499aja5";
+  sha256 = "0q16brla4m5g7dmgln3awx964ms7pi1s2r21idmc0mk4rnw2rpi7";
   buildDepends = [
     base64Bytestring cereal cryptoApi cryptocipher skein
   ];

pkgs/development/libraries/haskell/convertible-text/default.nix

@@ -0,0 +1,20 @@
+{ cabal, attempt, text, time }:
+
+cabal.mkDerivation (self: {
+  pname = "convertible-text";
+  version = "0.3.0.10";
+  sha256 = "1hi7rqijay37b5msyzqqgvkvrsdpj9p96ajxmyk4vm7nnk5dfhbp";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ attempt text time ];
+  meta = {
+    homepage = "http://github.com/snoyberg/convertible/tree/text";
+    description = "Typeclasses and instances for converting between types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

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

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

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

@@ -0,0 +1,18 @@
+{ cabal, failure, text, time }:
+
+cabal.mkDerivation (self: {
+  pname = "data-object";
+  version = "0.3.1.7";
+  sha256 = "0b4jai09nx3h2vfj5f2q1wp0wldvkjygyzkgrrc6hnsfx2qv8qf7";
+  buildDepends = [ failure text time ];
+  meta = {
+    homepage = "http://github.com/snoyberg/data-object/tree/master";
+    description = "Represent hierachichal structures, called objects in JSON";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

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

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hakyll";
-  version = "3.2.0.7";
+  version = "3.2.0.9";
-  sha256 = "1p06596yfsa0lk5ipdxm1b8j81aph2k30pm2g6ghw6k7fglklyl5";
+  sha256 = "1gb10bvzlm8qn6ap7cxykscbhbs2jsfqgsw53r8vd8k5bfgm5jv6";
   buildDepends = [
     binary blazeHtml cryptohash hamlet mtl pandoc parsec regexBase
     regexPcre snapCore snapServer tagsoup time

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

@@ -1,18 +0,0 @@
-{ cabal, blazeBuilder, blazeHtml, failure, parsec, text }:
-
-cabal.mkDerivation (self: {
-  pname = "hamlet";
-  version = "0.8.2.1";
-  sha256 = "0798ic6qap4npw2rx42xcgmi1fcbwqvyic5x6vyyf6abvxv16925";
-  buildDepends = [ blazeBuilder blazeHtml failure parsec text ];
-  meta = {
-    homepage = "http://www.yesodweb.com/";
-    description = "Haml-like template files that are compile-time checked";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})

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

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hamlet";
-  version = "0.10.1";
+  version = "0.10.3";
-  sha256 = "1n68nz2s61j8yfwjpgp9bjl0mc7gcpc5ysmx0vgggqxz2r3gayf6";
+  sha256 = "1xkk8hcmfnn9y14fsrab3cv8xknhf8j6hkv668yshg8bjzz1smva";
   buildDepends = [
     blazeBuilder blazeHtml failure parsec shakespeare text
   ];

pkgs/development/libraries/haskell/hledger-chart/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hledger-chart";
-  version = "0.15.2";
+  version = "0.16.1";
-  sha256 = "1cs4m6lhpqib2rhpvyrw5319mjqw8cwlin7734m7yndjj8li8rcx";
+  sha256 = "1yk563032ir98gqdvxazjjl1alg6q1pflzawh11pr3zrdnriracn";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

pkgs/development/libraries/haskell/hledger-lib/default.nix

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hledger-lib";
-  version = "0.15.2";
+  version = "0.16.1";
-  sha256 = "1if20197nyg1as6v1c4a0js694zg213nf7rhfhv2a46af58n0bgq";
+  sha256 = "15imhdkzfnxr72lsghrbsfisc7c2al4jkzcp72yf4hhra4zym1sd";
   buildDepends = [
     cmdargs HUnit mtl parsec regexpr safe split time utf8String
   ];

pkgs/development/libraries/haskell/hledger-vty/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hledger-vty";
-  version = "0.15.2";
+  version = "0.16.1";
-  sha256 = "0sii9psh1mm5f8w782bv2m5rxn29q23v17avhw0x5ssm9zy9yxqd";
+  sha256 = "10aq9apxz6nrzvvynha0wkhy34dn8dybizr8assni6rns8ylh188";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ cmdargs hledger hledgerLib HUnit safe time vty ];

pkgs/development/libraries/haskell/hledger-web/default.nix

@@ -1,19 +1,23 @@
-{ cabal, aeson, cmdargs, failure, fileEmbed, hamlet, hledger
+{ cabal, aesonNative, blazeHtml, clientsession, cmdargs, dataObject
-, hledgerLib, HUnit, ioStorage, parsec, regexpr, safe, text, time
+, dataObjectYaml, failure, fileEmbed, hamlet, hledger, hledgerLib
-, transformers, wai, waiExtra, warp, yesodCore, yesodForm
+, HUnit, ioStorage, parsec, regexpr, safe, shakespeareCss
-, yesodJson, yesodStatic
+, shakespeareJs, shakespeareText, text, time, transformers, wai
+, waiExtra, warp, yesod, yesodCore, yesodForm, yesodJson
+, yesodStatic
 }:
 
 cabal.mkDerivation (self: {
   pname = "hledger-web";
-  version = "0.15.3";
+  version = "0.16.3";
-  sha256 = "1z2pimxz2ykfb89qwp6cil4nljn8pcz8n7pjhvk948zsd96n2i6f";
+  sha256 = "0jciah0k6i4aa21hgpl1nqfyjkmm5kg5zmzmxwynvwckncy17ihg";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    aeson cmdargs failure fileEmbed hamlet hledger hledgerLib HUnit
+    aesonNative blazeHtml clientsession cmdargs dataObject
-    ioStorage parsec regexpr safe text time transformers wai waiExtra
+    dataObjectYaml failure fileEmbed hamlet hledger hledgerLib HUnit
-    warp yesodCore yesodForm yesodJson yesodStatic
+    ioStorage parsec regexpr safe shakespeareCss shakespeareJs
+    shakespeareText text time transformers wai waiExtra warp yesod
+    yesodCore yesodForm yesodJson yesodStatic
   ];
   meta = {
     homepage = "http://hledger.org";

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

@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hledger";
-  version = "0.15.2";
+  version = "0.16.1";
-  sha256 = "0gja0jvr8v9s1608w45rg1dwhj48yls59shqcs4z936xdg69l42w";
+  sha256 = "182a5qlcxbh9q8hzrmgm99hcgvxjq8j5xq202iff14p1yqv0irs2";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

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

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

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "persistent-template";
-  version = "0.6.2";
+  version = "0.6.3";
-  sha256 = "1gnqryn701b97fwzjhkk4x4k7p1w5w8cdn5x9hz8sb68vkgrplfx";
+  sha256 = "1vcjvfjxmv9c0wg7pbx0lw73128f5y0r4sfdsyq3jrkkiq1bgsxa";
   buildDepends = [ monadControl persistent text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/persistent";

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

@@ -1,14 +1,14 @@
-{ cabal, blazeHtml, enumerator, monadControl, mtl, pathPieces, pool
+{ cabal, blazeHtml, dataObject, enumerator, monadControl, mtl
-, sqlite, text, time, transformers
+, pathPieces, pool, sqlite, text, time, transformers
 }:
 
 cabal.mkDerivation (self: {
   pname = "persistent";
-  version = "0.6.2";
+  version = "0.6.3";
-  sha256 = "1bzv3wqqy32z20xbda8kr4m1fybnziv0gp6m8v3w0brrvmns20g2";
+  sha256 = "0m50z9k941bhh05jjz1268sn1bi7w8i6jzccldgnbjjvsw2xaisx";
   buildDepends = [
-    blazeHtml enumerator monadControl mtl pathPieces pool text time
+    blazeHtml dataObject enumerator monadControl mtl pathPieces pool
-    transformers
+    text time transformers
   ];
   extraLibraries = [ sqlite ];
   meta = {

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-css";
-  version = "0.10.1";
+  version = "0.10.2";
-  sha256 = "1qdql6qcm7jzb5r1fvrmpyighn1ykrjgs9za1n9m2r47y0n03hsg";
+  sha256 = "181bknfws2s7jygy527w93v07i04xf1pwyfmylva59p0z45adlb4";
   buildDepends = [ parsec shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/templates";

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-js";
-  version = "0.10.1";
+  version = "0.10.2";
-  sha256 = "0j9jzrnvarwkab9zynz8k60ilgj5kyqdm56lricpii27qlkqnmf3";
+  sha256 = "1yyqfp2lj8vq7x2a74wrgm7kx6zp1djp67bls9ip74kxi24dbznv";
   buildDepends = [ shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/templates";

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "shakespeare-text";
-  version = "0.10.1";
+  version = "0.10.2";
-  sha256 = "1p05nsfmlibhpik6dd40m0djk5yckl4i2ylx9lwyi68lx0izbm5j";
+  sha256 = "04n1aflg4b5byfsg494d4dskx25nyy0a654wl4cxz8920sl7qpha";
   buildDepends = [ shakespeare text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/templates";

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

@@ -1,10 +1,10 @@
-{ cabal, blazeBuilder, blazeHtml, failure, parsec, text }:
+{ cabal, parsec, text }:
 
 cabal.mkDerivation (self: {
   pname = "shakespeare";
-  version = "0.10.1";
+  version = "0.10.1.1";
-  sha256 = "1ckzfxrs65n8cx0hm64c3jd4hbw48x1vi0cvnkz39k500jpq874f";
+  sha256 = "1qd5wrcr4ss5zigbb7s6c7y7qbvrnbvgdpwq985yyy71i5hwxv0a";
-  buildDepends = [ blazeBuilder blazeHtml failure parsec text ];
+  buildDepends = [ parsec text ];
   meta = {
     homepage = "http://www.yesodweb.com/book/templates";
     description = "A toolkit for making compile-time interpolated templates";

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "skein";
-  version = "0.1";
+  version = "0.1.0.1";
-  sha256 = "10fnhbjdq4vrpl17b27pmxg943wsxv27js6p5nrgyzx9ybmdrmdi";
+  sha256 = "1i05ajmnsm0ac9cqnf1lmdaa6sxkirxv5r2h8phpapzvzwislpr8";
   buildDepends = [ cereal cryptoApi tagged ];
   meta = {
     description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";

pkgs/development/libraries/haskell/wai-app-static/default.nix

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-app-static";
-  version = "0.3.3";
+  version = "0.3.4";
-  sha256 = "04b4cw93agw136xjh9rssiw96vz3kxji7zh209brwfnwh13bra17";
+  sha256 = "0jxlm0qfv59c3q6ngvr94rzrn01byfn3wak208ws18xhk14cv058";
   buildDepends = [
     base64Bytestring blazeBuilder blazeHtml cryptohash fileEmbed
     httpDate httpTypes text time transformers unixCompat wai

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

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "wai-extra";
-  version = "0.4.2";
+  version = "0.4.3";
-  sha256 = "1k2dsjramy14rfd1j8k7zgirdfl2zybd0z0pxkvxdrgr9s2pk51y";
+  sha256 = "07m86khgfyyadjgq8yp9kj3ljlpkvf209b1cfz2x7n5wdq8k2wm9";
   buildDepends = [
     blazeBuilder blazeBuilderEnumerator caseInsensitive enumerator
     httpTypes network text time transformers wai zlibBindings

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

@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "xml-enumerator";
-  version = "0.4.1";
+  version = "0.4.2.1";
-  sha256 = "081avccvkakcbf2m22xdda63jhwykqxxclmlhj6msawkyyqniadj";
+  sha256 = "0xz0a4dk94zg0sm0gy90ymmhzrsdvmqvl3qw2xycys6pzmg51im7";
   buildDepends = [
     attoparsecText attoparsecTextEnumerator blazeBuilder
     blazeBuilderEnumerator dataDefault enumerator failure text

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

@@ -0,0 +1,20 @@
+{ cabal, enumerator, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "yaml";
+  version = "0.4.1.1";
+  sha256 = "0qm7kfvi99m80m2lsmn98ssr2sfsw1rbbmzyjlg7bmvbaxsyw0b9";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ enumerator transformers ];
+  meta = {
+    homepage = "http://github.com/snoyberg/yaml/";
+    description = "Low-level binding to the libyaml C library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

pkgs/development/libraries/libcaca/default.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl, ncurses}:
 
 stdenv.mkDerivation rec {
-  name = "libcaca-0.99.beta16";
+  name = "libcaca-0.99.beta17";
   
   src = fetchurl {
-    url = "http://caca.zoy.org/raw-attachment/wiki/libcaca/${name}.tar.gz";
+    url = "http://caca.zoy.org/files/libcaca/${name}.tar.gz";
-    sha256 = "1k2anqc9jxvlyar6ximf9l55xzzhgwdbjbclpj64vg6lpqf96k6a";
+    sha256 = "1mpicj3xf4d0mf8papb1zbks5yzi4lnj6yh5cvpq7sb176gawmb3";
   };
   
   configureFlags = "--disable-x11 --disable-imlib2 --disable-doc";

pkgs/development/libraries/liblastfm/default.nix

@@ -1,18 +1,25 @@
 { stdenv, fetchurl, ruby, qt4, pkgconfig, libsamplerate, fftwSinglePrec }:
 
-stdenv.mkDerivation rec {
+let version = "0.3.3"; in
-  name = "liblastfm-0.3.0";
 
+stdenv.mkDerivation rec {
+  name = "liblastfm-${version}";
+
+  # Upstream does not package git tags as tarballs. Get tarball from github.
   src = fetchurl {
-    url = "http://cdn.last.fm/src/${name}.tar.bz2";
+    url = "https://github.com/mxcl/liblastfm/tarball/${version}";
-    sha256 = "0vgpkbqmynm975nlcw3caxpz30wvvz35c7a9kfr2wjqizvxrfwnx";
+    name = "${name}.tar.gz";
+    sha256 = "0v33vzj89mgx2pc5fmiywlz51i553ckydw9xz70fiflm2inbl1r6";
   };
 
   prefixKey = "--prefix ";
   propagatedBuildInputs = [ qt4 libsamplerate fftwSinglePrec ];
-  buildInputs = [ ruby pkgconfig ];
+  buildNativeInputs = [ ruby pkgconfig ];
 
-  patchPhase = "patchShebangs .";
+  configureFlags = "--release";
+
+  patches = [ ./ruby-1.9.patch ];
+  postPatch = "patchShebangs .";
 
   meta = {
     homepage = http://github.com/mxcl/liblastfm;

pkgs/development/libraries/liblastfm/ruby-1.9.patch

@@ -0,0 +1,45 @@
+From: Yury G. Kudryashov <urkud.urkud@gmail.com>
+Subject: [PATCH] Fix compilation with ruby-1.9
+
+__FILE__ is a relative path in ruby-1.9
+
+---
+ admin/Makefile.rb |    4 ++--
+ admin/qpp         |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/admin/Makefile.rb b/admin/Makefile.rb
+index 592f5a5..33fe688 100755
+--- a/admin/Makefile.rb
++++ b/admin/Makefile.rb
+@@ -6,7 +6,7 @@
+ 
+ cwd = File.dirname( __FILE__ )
+ require 'find'
+-require "#{cwd}/platform.rb"
++require_relative 'platform'
+ 
+ 
+ ######################################################################### defs
+@@ -158,4 +158,4 @@ puts <<-EOS
+ .PHONY: dist
+ dist:
+ 	git archive --prefix=#{BASENAME}/ HEAD | bzip2 > #{BASENAME}.tar.bz2
+-EOS
+\ No newline at end of file
++EOS
+diff --git a/admin/qpp b/admin/qpp
+index 36b2d05..ee840fd 100755
+--- a/admin/qpp
++++ b/admin/qpp
+@@ -4,7 +4,7 @@
+ 
+ cwd=File.dirname __FILE__
+ require 'find'
+-require "#{cwd}/findsrc"
++require_relative 'findsrc'
+ 
+ sources = Array.new
+ headers = Array.new
+-- 
+tg: (f0b3239..) t/ruby19 (depends on: master)

pkgs/development/libraries/policykit/default.nix

@@ -30,5 +30,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.freedesktop.org/wiki/Software/PolicyKit;
     description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes (obsolete)";
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/development/libraries/qt-4.x/4.7/default.nix

@@ -9,7 +9,7 @@
 }:
 
 let
-  v = "4.7.3";
+  v = "4.7.4";
 in
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "ftp://ftp.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${v}.tar.gz";
-    sha256 = "0zlk0lcrkhi8wdb5j2lqz3nclk07blbiial7lzs03708kpb6yayh";
+    sha256 = "07i283si8rckdsg3h9a4sp213l16hgjrl7cpzclrjvx4x2y5w6cp";
   };
 
   preConfigure =

pkgs/development/tools/analysis/valgrind/default.nix

@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, perl, gdb, autoconf, automake }:
+{ stdenv, fetchurl, perl, gdb }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (rec {
   name = "valgrind-3.6.1";
 
   src = fetchurl {
@@ -10,11 +10,13 @@ stdenv.mkDerivation rec {
 
   # Perl is needed for `cg_annotate'.
   # GDB is needed to provide a sane default for `--db-command'.
-  buildNativeInputs = [ perl autoconf automake ];
+  buildNativeInputs = [ perl ];
   buildInputs = stdenv.lib.optional (!stdenv.isDarwin) gdb;
 
   configureFlags =
-    if stdenv.system == "x86_64-linux" then ["--enable-only64bit"] else [];
+    if (stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin")
+    then [ "--enable-only64bit" ]
+    else [];
 
   postInstall = ''
     for i in $out/lib/valgrind/*.supp; do
@@ -39,8 +41,39 @@ stdenv.mkDerivation rec {
 
     license = "GPLv2+";
 
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+    maintainers = with stdenv.lib.maintainers; [ eelco ludo ];
-    
     platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
   };
 }
+
+//
+
+(if stdenv.isDarwin
+ then {
+   patchPhase =
+     # Apple's GCC doesn't recognize `-arch' (as of version 4.2.1, build 5666).
+     '' echo "getting rid of the \`-arch' GCC option..."
+        find -name Makefile\* -exec \
+          sed -i {} -e's/DARWIN\(.*\)-arch [^ ]\+/DARWIN\1/g' \;
+
+        sed -i coregrind/link_tool_exe_darwin.in \
+            -e 's/^my \$archstr = .*/my $archstr = "x86_64";/g'
+     '';
+
+   preConfigure =
+     # Shamelessly drag in MIG.
+     '' mkdir -p "$TMPDIR/impure-deps/bin"
+
+        # MIG assumes the standard Darwin core utilities (e.g., `rm -d'), so
+        # let it see the impure directories.
+        cat > "$TMPDIR/impure-deps/bin/mig" <<EOF
+#!/bin/sh
+export PATH="/usr/bin:/bin:\$PATH"
+exec /usr/bin/mig "\$@"
+EOF
+        chmod +x "$TMPDIR/impure-deps/bin/mig"
+
+        export PATH="$TMPDIR/impure-deps/bin:$PATH"
+     '';
+ }
+ else {}))

pkgs/development/tools/documentation/haddock/2.4.2.nix

@@ -1,4 +1,4 @@
-{ cabal, ghcPaths }:
+{ cabal, alex, ghcPaths, happy }:
 
 cabal.mkDerivation (self: {
   pname = "haddock";
@@ -7,6 +7,7 @@ cabal.mkDerivation (self: {
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ ghcPaths ];
+  buildTools = [ alex happy ];
   meta = {
     homepage = "http://www.haskell.org/haddock/";
     description = "A documentation-generation tool for Haskell libraries";

pkgs/development/tools/documentation/haddock/2.9.4.nix

@@ -0,0 +1,21 @@
+{ cabal, alex, ghcPaths, happy, xhtml }:
+
+cabal.mkDerivation (self: {
+  pname = "haddock";
+  version = "2.9.4";
+  sha256 = "18w5pa1zpjy9mmdzjh0hs8jybmky8j87vzry54nni6a3517c5x86";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ ghcPaths xhtml ];
+  buildTools = [ alex happy ];
+  meta = {
+    homepage = "http://www.haskell.org/haddock/";
+    description = "A documentation-generation tool for Haskell libraries";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

pkgs/development/tools/haskell/cabal-ghci/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal-ghci";
-  version = "0.1.1";
+  version = "0.2.0";
-  sha256 = "09r66fv8ncsdj90zrhg4srxhmbhmf7q61kvfc39x4jbyskgciqms";
+  sha256 = "0920q103g626f8syvn73bwqnix8x6q58xyazys6yinhr7dgi2x6m";
   isLibrary = true;
   isExecutable = true;
   meta = {

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hlint";
-  version = "1.8.16";
+  version = "1.8.17";
-  sha256 = "0crahq7fvhf0qvjcpjnmv5yh29l52cv7rgfwrc6ka4q0dm9r49vb";
+  sha256 = "0p2sd24zi4a9fynib03dll8jbcc7izbmknfxv80v9j3lb2p8qj5h";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

pkgs/development/tools/ocaml/camlidl/default.nix

@@ -0,0 +1,32 @@
+{stdenv, fetchurl, makeWrapper, ocaml, ncurses}:
+let
+  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+  pname = "camlidl";
+  version = "1.05";
+  webpage = "http://caml.inria.fr/pub/old_caml_site/camlidl/";
+in
+stdenv.mkDerivation {
+
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "http://caml.inria.fr/pub/old_caml_site/distrib/bazar-ocaml/${pname}-${version}.tar.gz";
+    sha256 = "0483cs66zsxsavcllpw1qqvyhxb39ddil3h72clcd69g7fyxazl5";
+  };
+
+  buildInputs = [ ocaml ];
+
+  preBuild = ''
+    mv config/Makefile.unix config/Makefile
+    substituteInPlace config/Makefile --replace BINDIR=/usr/local/bin BINDIR=$out
+    substituteInPlace config/Makefile --replace OCAMLLIB=/usr/local/lib/ocaml OCAMLLIB=$out/lib/ocaml/${ocaml_version}/site-lib/camlidl
+    ensureDir $out/lib/ocaml/${ocaml_version}/site-lib/camlidl/caml
+  '';
+
+  meta = {
+    description = "CamlIDL is a stub code generator and COM binding for Objective Caml";
+    homepage = "${webpage}";
+    license = "LGPL";
+    maintainers = [ stdenv.lib.maintainers.roconnor ];
+  };
+}

pkgs/games/liquidwar/src-for-default.nix

@@ -1,9 +1,9 @@
 rec {
-   version="0.0.10beta";
+   version="0.0.11beta";
-   name="liquidwar-0.0.10beta";
+   name="liquidwar-0.0.11beta";
-   hash="1fc1qfl7p3669dj6dy1wxvf85hhwgbazm3rc365ahsikdgz1c5m0";
+   hash="1zahxxmnx74xc3d2vk119r25d794vblmz22j1z5ajnnvc42dqc4f";
    url="http://download.savannah.gnu.org/releases/liquidwar6/${version}/liquidwar6-${version}.tar.gz";
-   advertisedUrl="http://download.savannah.gnu.org/releases/liquidwar6/0.0.10beta/liquidwar6-0.0.10beta.tar.gz";
+   advertisedUrl="http://download.savannah.gnu.org/releases/liquidwar6/0.0.11beta/liquidwar6-0.0.11beta.tar.gz";
   
   
 }

pkgs/misc/emulators/wine/default.nix

@@ -6,21 +6,17 @@
 assert stdenv.isLinux;
 assert stdenv.gcc.gcc != null;
 
-let
-  s = import ./src-for-default.nix;
-in
-
 stdenv.mkDerivation rec {
-  name = "wine-${s.version}";
+  name = "wine-1.3.29";
 
   src = fetchurl {
-    url = s.url;
+    url = "mirror://sourceforge/wine/${name}.tar.bz2";
-    sha256 = s.hash;
+    sha256 = "1mi4xzbpqmian9q5bs6df8b1mfgnnd4mlh0kb2ynbpk7kmx0zyj1";
   };
 
   gecko = fetchurl {
-    url = "http://downloads.sourceforge.net/wine/wine_gecko-1.1.0-x86.cab";
+    url = "mirror://sourceforge/wine/wine_gecko-1.3-x86.msi";
-    sha256 = "0a8bpqqhx146innrdwhn4c0jqi90mkmp8kw6aqwildm073yy31hp";
+    sha256 = "1bmm826dhq82jzxdld4x9cyg8mgzg8llkki59n9fvxggi7l5jxab";
   };
 
   buildInputs = [
@@ -45,7 +41,7 @@ stdenv.mkDerivation rec {
   # elements specified above.
   dontPatchELF = true;
 
-  postInstall = "install -D ${gecko} $out/share/wine/gecko/wine_gecko-1.1.0-x86.cab";
+  postInstall = "install -D ${gecko} $out/share/wine/gecko/${gecko.name}";
 
   enableParallelBuilding = true;
 

pkgs/misc/emulators/wine/src-for-default.nix

@@ -1,9 +0,0 @@
-rec {
-   version="1.3.27";
-   name="wine-1.3.27";
-   hash="1vdyxlsl2zlhlcl5npq59axlkvjmkp7yz5p9rvwkqia79xrs8qv1";
-   url="http://prdownloads.sourceforge.net/wine/wine-${version}.tar.bz2";
-   advertisedUrl="http://prdownloads.sourceforge.net/wine/wine-1.3.27.tar.bz2";
-  
-  
-}

pkgs/misc/emulators/wine/src-info-for-default.nix

@@ -1,6 +0,0 @@
-{
-  downloadPage = "http://www.winehq.org/";
-  baseName = "wine";
-  versionExtractorSedScript = ''s/[^-]*-(.+)[.]tar[.].*/\1/'';
-  versionReferenceCreator = ''$(replaceAllVersionOccurences)'';
-}

pkgs/os-specific/linux/kernel/generic.nix

@@ -38,7 +38,6 @@
 , extraMeta ? {}
 , ubootChooser ? null
 , postInstall ? ""
-, setModuleDir ? true
 
 , # After the builder did a 'make all' (kernel + modules)
   # we force building the target asked: bzImage/zImage/uImage/...
@@ -78,16 +77,7 @@ stdenv.mkDerivation {
 
   generateConfig = ./generate-config.pl;
 
-  inherit preConfigure src module_init_tools localVersion postInstall;
+  inherit preConfigure src module_init_tools localVersion postInstall postBuild;
-
-  #Currently, the builder sets $MODULE_DIR during installPhase. This causes
-  #problems with at least linux 3.0, so we need to conditionally avoid
-  #setting $MODULE_DIR. This prepend to postBuild accomplishes this with a
-  #sed/eval trick thanks to MarcWeber
-
-  postBuild = (if setModuleDir then "" else '' 
-    eval "$(type installPhase | sed -e '1d' -e '/export MODULE_DIR/d')";
-  '') + postBuild;
 
   patches = map (p: p.patch) kernelPatches;
 

pkgs/os-specific/linux/kernel/linux-3.0.nix

@@ -202,6 +202,10 @@ import ./generic.nix (
   rec {
     version = "3.0.4";
   
+    preConfigure = ''
+      substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
+    '';
+
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2";
       sha256 = "1vypjcdii75h5f4zsw9lm8wzxd5ix0mk5p94c96hxv828mqqkmhk";
@@ -210,8 +214,6 @@ import ./generic.nix (
     config = configWithPlatform stdenv.platform;
     configCross = configWithPlatform stdenv.cross.platform;
 
-    setModuleDir = false;
-
     features.iwlwifi = true;
   }
 

pkgs/os-specific/linux/kernel/linux-3.1.nix

@@ -204,6 +204,10 @@ import ./generic.nix (
 
     modDirVersion = "3.1.0-rc8";
 
+    preConfigure = ''
+      substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
+    '';
+  
     src = fetchurl {
       url = "https://github.com/torvalds/linux/tarball/v${version}";
       sha256 = "1sz6snv2wavzasrswaprkjpzpll4247v4br0x2i6sndl2nqa6jz7";
@@ -213,8 +217,6 @@ import ./generic.nix (
     config = configWithPlatform stdenv.platform;
     configCross = configWithPlatform stdenv.cross.platform;
 
-    setModuleDir = false;
-
     features.iwlwifi = true;
   }
 

pkgs/os-specific/linux/kernel/patches.nix

@@ -415,4 +415,13 @@ rec {
       name = "glibc-getline";
       patch = ./getline.patch;
     };
+
+  efi_stub = 
+    {
+      # Patch to enable making the kernel a bootable efi image to avoid
+      # needing a bootloader on efi systems
+      # From the x86/efi-stub branch of git://github.com/mfleming/linux-2.6.git
+      name = "efi-stub";
+      patch = ./efi-stub.patch;
+    };
 }

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

@@ -1,15 +1,20 @@
 {stdenv, fetchurl, pam, yacc, flex}:
 
 stdenv.mkDerivation rec {
-  name = "libcgroup-0.36.2";
+  name = "libcgroup-0.37.1";
+
   src = fetchurl {
     url = "mirror://sourceforge/libcg/${name}.tar.bz2";
-    sha256 = "1qvkd976485vyshaq1cwjzg6w54c3djsaic024yx3sfp14f1gnvz";
+    sha256 = "03awrn49bb84a9vaha1kjdbpwdnrfwmd08mlajjilr6kwlnn620b";
   };
-  buildInputs = [ pam yacc flex ];
+
+  buildInputs = [ pam ];
+
+  buildNativeInputs = [ yacc flex ];
   meta = {
     description = "library that abstracts the control group file system in Linux";
     homepage = "http://libcg.sourceforge.net";
     license = "LGPL";
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/os-specific/linux/module-init-tools/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, docbook2x}:
 
 stdenv.mkDerivation {
   name = "module-init-tools-3.16";
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
     })
   ];
 
-  patches = [./module-dir.patch];
+  patches = [ ./module-dir.patch ./docbook2man.patch ];
 
   postInstall = "rm $out/sbin/insmod.static"; # don't need it
 

pkgs/os-specific/linux/module-init-tools/docbook2man.patch

@@ -0,0 +1,12 @@
+diff -Naur module-init-tools-3.16-orig/Makefile.in module-init-tools-3.16/Makefile.in
+--- module-init-tools-3.16-orig/Makefile.in	2011-06-02 13:56:45.000000000 -0400
++++ module-init-tools-3.16/Makefile.in	2011-10-01 23:59:30.584443193 -0400
+@@ -174,7 +174,7 @@
+ CYGPATH_W = @CYGPATH_W@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+-DOCBOOKTOMAN = @DOCBOOKTOMAN@
++DOCBOOKTOMAN = @DOCBOOKTOMAN@ --sgml
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@

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

@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "shadow-4.1.4.2";
    
   src = fetchurl {
-    url = "ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/${name}.tar.bz2";
+    url = "http://pkg-shadow.alioth.debian.org/releases/${name}.tar.bz2";
     sha256 = "1449ny7pdnwkavg92wvibapnkgdq5pas38nvl1m5xa37g5m7z64p";
   };
 

pkgs/top-level/all-packages.nix

@@ -241,7 +241,7 @@ let
 
   dotnetenv = import ../build-support/dotnetenv {
     inherit stdenv;
-    dotnetfx = dotnetfx35;
+    dotnetfx = dotnetfx40;
   };
 
   vsenv = callPackage ../build-support/vsenv {
@@ -592,6 +592,8 @@ let
 
   dotnetfx35 = callPackage ../development/libraries/dotnetfx35 { };
 
+  dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { };
+
   dropbear = callPackage ../tools/networking/dropbear {
     enableStatic = true;
     zlib = zlibStatic;
@@ -2299,6 +2301,8 @@ let
   mkOcamlPackages = ocaml: self: let callPackage = newScope self; in rec {
     inherit ocaml;
 
+    camlidl = callPackage ../development/tools/ocaml/camlidl { };
+
     camlp5_strict = callPackage ../development/tools/ocaml/camlp5 { };
 
     camlp5_transitional = callPackage ../development/tools/ocaml/camlp5 {
@@ -2611,8 +2615,8 @@ let
   regina = callPackage ../development/interpreters/regina {};
 
   ruby18 = callPackage ../development/interpreters/ruby/ruby-18.nix { };
-  ruby19 = callPackage ../development/interpreters/ruby { };
+  ruby19 = callPackage ../development/interpreters/ruby/ruby-19.nix { };
-  ruby = ruby19;
+  ruby = callPackage ../development/interpreters/ruby { };
 
   rubyLibs = recurseIntoAttrs (callPackage ../development/interpreters/ruby/libs.nix { });
 
@@ -5006,7 +5010,7 @@ let
   xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix {
     inherit fetchurl fetchsvn stdenv pkgconfig freetype fontconfig
       libxslt expat libdrm libpng zlib perl mesa
-      xkeyboard_config dbus hal libuuid openssl gperf m4
+      xkeyboard_config dbus libuuid openssl gperf m4
       autoconf libtool xmlto asciidoc udev flex bison python;
     automake = automake110x;
   });
@@ -5580,6 +5584,7 @@ let
     kernelPatches =
       [ #kernelPatches.fbcondecor_2_6_38
         kernelPatches.sec_perm_2_6_24
+        kernelPatches.efi_stub
         #kernelPatches.aufs2_1_2_6_38
         #kernelPatches.mips_restart_2_6_36
       ];
@@ -7914,7 +7919,7 @@ let
       inherit (kde3) kdelibs;
     };
 
-    kile = callPackage ../applications/editors/kile {
+    kile = callPackage ../applications/editors/kile/2.0.nix {
       inherit (kde3) arts kdelibs;
       qt = qt3;
     };
@@ -7981,6 +7986,8 @@ let
 
       kdiff3 = callPackage ../tools/text/kdiff3 { };
 
+      kile = callPackage ../applications/editors/kile/2.1.nix { };
+
       kmplayer = callPackage ../applications/video/kmplayer {
         inherit (pkgs.gtkLibs) pango;
       };

pkgs/top-level/haskell-packages.nix

@@ -474,6 +474,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     time = self.time_1_1_3;
   };
 
+  convertibleText = callPackage ../development/libraries/haskell/convertible-text {};
+
   continuedFractions = callPackage ../development/libraries/haskell/continued-fractions {};
 
   converge = callPackage ../development/libraries/haskell/converge {};
@@ -504,6 +506,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   dataenc = callPackage ../development/libraries/haskell/dataenc {};
 
+  dataObject = callPackage ../development/libraries/haskell/data-object {};
+
+  dataObjectYaml = callPackage ../development/libraries/haskell/data-object-yaml {};
+
   dataReify = callPackage ../development/libraries/haskell/data-reify {};
 
   datetime = callPackage ../development/libraries/haskell/datetime {};
@@ -640,13 +646,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     fgl = self.fgl_5_4_2_4;
   };
 
-  hakyll = callPackage ../development/libraries/haskell/hakyll {
+  hakyll = callPackage ../development/libraries/haskell/hakyll {};
-    hamlet = self.hamlet_0_8_2_1;
-  };
 
-  hamlet_0_8_2_1 = callPackage ../development/libraries/haskell/hamlet/0.8.2.1.nix {};
+  hamlet = callPackage ../development/libraries/haskell/hamlet {};
-  hamlet_0_10_1 = callPackage ../development/libraries/haskell/hamlet/0.10.1.nix {};
-  hamlet = self.hamlet_0_10_1;
 
   happstackData = callPackage ../development/libraries/haskell/happstack/happstack-data.nix {};
 
@@ -878,7 +880,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   network_2_2_1_7 = callPackage ../development/libraries/haskell/network/2.2.1.7.nix {};
   network_2_3_0_2 = callPackage ../development/libraries/haskell/network/2.3.0.2.nix {};
   network_2_3_0_5 = callPackage ../development/libraries/haskell/network/2.3.0.5.nix {};
-  network = self.network_2_2_1_4;
+  network_2_3_0_6 = callPackage ../development/libraries/haskell/network/2.3.0.6.nix {};
+  network = self.network_2_3_0_6;
 
   nixosTypes = callPackage ../development/libraries/haskell/nixos-types {};
 
@@ -1292,6 +1295,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   xssSanitize = callPackage ../development/libraries/haskell/xss-sanitize {};
 
+  yaml = callPackage ../development/libraries/haskell/yaml {};
+
   yap = callPackage ../development/libraries/haskell/yap {};
 
   yesod = callPackage ../development/libraries/haskell/yesod {};
@@ -1369,6 +1374,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   haddock_2_4_2 = callPackage ../development/tools/documentation/haddock/2.4.2.nix {};
   haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/2.7.2.nix {};
   haddock_2_9_2 = callPackage ../development/tools/documentation/haddock/2.9.2.nix {};
+  haddock_2_9_4 = callPackage ../development/tools/documentation/haddock/2.9.4.nix {};
   haddock = self.haddock_2_7_2;
 
   happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {};

pkgs/top-level/release.nix

@@ -240,7 +240,6 @@ with (import ./release-lib.nix);
   pkgconfig = all;
   pltScheme = linux;
   pmccabe = linux;
-  policykit = linux;
   portmap = linux;
   postgresql = all;
   postfix = linux;
@@ -437,13 +436,6 @@ with (import ./release-lib.nix);
   };
   */
 
-  kde3 = {
-    kdebase = linux;
-    kdelibs = linux;
-    k3b = linux;
-    kile = linux;
-  };
-
   linuxPackages_2_6_25 = {
     aufs = linux;
     kernel = linux;