svn merge https://nixos.org/repos/nix/nixpkgs/trunk

No conflicts

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

maintainers/scripts/gnu/gnupdate

@@ -1065,7 +1065,10 @@ pairs.  Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\").
 
     (case selection
       ((stdenv)
-       gnu)
+       (filter (lambda (p)
+                 (member (package-source-output-path p)
+                         (force stdenv)))
+               gnu))
       ((non-stdenv)
        (filter (lambda (p)
                  (not (member (package-source-output-path p)

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

@@ -1,28 +1,32 @@
 { stdenv, fetchurl, emacs, texinfo, texLive, perl, which, automake }:
 
 stdenv.mkDerivation (rec {
-  name = "ProofGeneral-4.0";
+  name = "ProofGeneral-4.1";
 
   src = fetchurl {
-    url = http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.0.tgz;
+    url = http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.1.tgz;
-    sha256 = "1ang2lsc97vl70fkgypfsr1ivdzsdliq3bkvympj30wnc7ayzbmq";
+    sha256 = "1ivxx8c6j7cfdfj2pj0gzdqac7hpb679bjmwdqdcz1c1ni34s9ia";
   };
 
   sourceRoot = name;
 
   buildInputs = [ emacs texinfo texLive perl which ];
 
-  patches = [ ./emacs-23.3.patch ];
+  prePatch =
-
-  postPatch =
     '' sed -i "Makefile" \
            -e "s|^\(\(DEST_\)\?PREFIX\)=.*$|\1=$out|g ; \
                s|/sbin/install-info|install-info|g"
 
        sed -i "bin/proofgeneral" -e's/which/type -p/g'
+
+       # @image{ProofGeneral} fails, so remove it.
+       sed -i '94d' doc/PG-adapting.texi
+       sed -i '101d' doc/ProofGeneral.texi
     '';
 
-  preBuild = "make clean";
+  preBuild = ''
+    make clean;
+  '';
 
   installPhase =
     # Copy `texinfo.tex' in the right place so that `texi2pdf' works.

pkgs/applications/editors/emacs-modes/proofgeneral/emacs-23.3.patch

@@ -1,45 +0,0 @@
-diff -Nuar ProofGeneral-4.0/contrib/mmm/mmm-mode.el ProofGeneral-4.0-nix/contrib/mmm/mmm-mode.el
---- ProofGeneral-4.0/contrib/mmm/mmm-mode.el	2010-10-11 00:56:57.000000000 +0200
-+++ ProofGeneral-4.0-nix/contrib/mmm/mmm-mode.el	2011-05-14 21:55:12.000000000 +0200
-@@ -160,9 +160,9 @@
-      (mmm-add-hooks)
-      (mmm-fixup-skeleton)
-      (make-local-variable 'font-lock-fontify-region-function)
--     (make-local-variable 'font-lock-beginning-of-syntax-function)
-+     (make-local-variable 'syntax-begin-function)
-      (setq font-lock-fontify-region-function 'mmm-fontify-region
--	   font-lock-beginning-of-syntax-function 'mmm-beginning-of-syntax)
-+	   syntax-begin-function 'mmm-beginning-of-syntax)
-      (setq mmm-mode t)
-      (condition-case err
- 	 (mmm-apply-all)
-@@ -190,7 +190,7 @@
-     (mmm-update-submode-region)
-     (setq font-lock-fontify-region-function
- 	  (get mmm-primary-mode 'mmm-fontify-region-function)
--	  font-lock-beginning-of-syntax-function
-+	  syntax-begin-function
- 	  (get mmm-primary-mode 'mmm-beginning-of-syntax-function))
-     (mmm-update-font-lock-buffer)
-     (mmm-refontify-maybe)
-diff -Nuar ProofGeneral-4.0/contrib/mmm/mmm-region.el ProofGeneral-4.0-nix/contrib/mmm/mmm-region.el
---- ProofGeneral-4.0/contrib/mmm/mmm-region.el	2010-10-11 00:56:57.000000000 +0200
-+++ ProofGeneral-4.0-nix/contrib/mmm/mmm-region.el	2011-05-14 21:58:01.000000000 +0200
-@@ -548,7 +548,7 @@
- 	    (put mode 'mmm-fontify-region-function
- 		 font-lock-fontify-region-function))
- 	  (put mode 'mmm-beginning-of-syntax-function
--	       font-lock-beginning-of-syntax-function))
-+	       syntax-begin-function))
- 	;; Get variables
- 	(setq global-vars (mmm-get-locals 'global)
- 	      buffer-vars (mmm-get-locals 'buffer)
-@@ -768,7 +768,7 @@
-   ;; For some reason `font-lock-fontify-block' binds this to nil, thus
-   ;; preventing `mmm-beginning-of-syntax' from doing The Right Thing.
-   ;; I don't know why it does this, but let's undo it here.
--  (let ((font-lock-beginning-of-syntax-function 'mmm-beginning-of-syntax))
-+  (let ((syntax-begin-function 'mmm-beginning-of-syntax))
-     (mapc #'(lambda (elt)
- 		(when (get (car elt) 'mmm-font-lock-mode)
- 		  (mmm-fontify-region-list (car elt) (cdr elt))))

pkgs/applications/graphics/xournal/default.nix

@@ -15,11 +15,22 @@ stdenv.mkDerivation rec {
     ghostscript atk gtk glib fontconfig freetype
     libgnomecanvas libgnomeprint libgnomeprintui
     pango libX11 xproto zlib poppler poppler_data
-    autoconf automake libtool pkgconfig
   ];
 
+  buildNativeInputs = [ autoconf automake libtool pkgconfig ];
+
+  # Build with poppler-0.18.x
+  patchFlags = "-p0";
+
+  patches = [ (fetchurl {
+      url = "https://api.opensuse.org/public/source/X11:Utilities/xournal/xournal-poppler-0.18.patch?rev=eca1c0b24f5bc78111147ab8f4688455";
+      sha256 = "1q565kqb4bklncriq4dlhp1prhidv88wmxr9k3laykiia0qjmfyj";
+    })];
+
   NIX_LDFLAGS="-lX11 -lz";
+
   meta = {
+    homepage = http://xournal.sourceforge.net/;
     description = "note-taking application (supposes stylus)";
     maintainers = [ stdenv.lib.maintainers.guibert ];
   };

pkgs/applications/misc/calibre/default.nix

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

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

@@ -1,4 +1,4 @@
-{ stdenv, browser, makeDesktopItem, makeWrapper, plugins
+{ stdenv, browser, makeDesktopItem, makeWrapper, plugins, libs
 , browserName, desktopName, nameSuffix, icon
 }:
 
@@ -27,6 +27,7 @@ stdenv.mkDerivation {
     makeWrapper "${browser}/bin/${browserName}" \
         "$out/bin/${browserName}${nameSuffix}" \
         --suffix-each MOZ_PLUGIN_PATH ':' "$plugins" \
+        --suffix-each LD_LIBRARY_PATH ':' "$libs" \
         --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))"
 
     ensureDir $out/share/applications
@@ -36,6 +37,7 @@ stdenv.mkDerivation {
   # Let each plugin tell us (through its `mozillaPlugin') attribute
   # where to find the plugin in its tree.
   plugins = map (x: x + x.mozillaPlugin) plugins;
+  libs = map (x: x + "/lib") libs ++ map (x: x + "/lib64") libs;
 
   meta = {
     description =

pkgs/applications/science/misc/golly/default.nix

@@ -17,7 +17,7 @@ rec {
   inherit buildInputs;
 
   /* doConfigure should be removed if not needed */
-  phaseNames = ["setVars" "doMake" "doDeploy"];
+  phaseNames = ["setVars" "doConfigure" "doMakeInstall"];
   setVars = a.noDepEntry ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -lperl -L$(echo "${perl}"/lib/perl5/5*/*/CORE)"
     pythonLib="$(echo "${python}"/lib/libpython*.so)"
@@ -26,14 +26,6 @@ rec {
     export NIX_LDFLAGS="$NIX_LDFLAGS -l$pythonLib"
     echo "Flags: $NIX_LDFLAGS"
   '';
-  goSrcDir = ''cd */'';
-  makeFlags = [
-    "-f makefile-gtk"
-    ];
-  doDeploy = a.fullDepEntry ''
-    cat < ${./make-install.make}  >> makefile-gtk
-    make -f makefile-gtk out="$out" install
-  '' ["minInit" "doMake" "defEnsureDir"];
       
   meta = {
     description = "Cellular automata simulation program";

pkgs/applications/science/misc/golly/make-install.make

@@ -1,9 +0,0 @@
-
-install_file = echo "\#! /bin/sh" > "$(out)/bin/$(binfile)"; echo "$(out)/share/golly/$(binfile)" >> "$(out)/bin/$(binfile)"; chmod a+x "$(out)/bin/$(binfile)";
-
-install:
-	mkdir -p "$(out)/share/golly"
-	mkdir -p "$(out)/bin"
-	cp -r $(BINFILES) $(SHAREDFILES) "$(out)/share/golly"
-	$(foreach binfile,$(BINFILES),$(install_file))
-

pkgs/applications/science/misc/golly/src-for-default.nix

@@ -1,9 +1,9 @@
 rec {
-   version="2.1-src";
+   version="2.3-src";
-   name="golly-2.1-src";
+   name="golly-2.3-src";
-   hash="0m9sz0b7pwsxpgvscdvab2q8qnncr337gg3anzgzw83z5zyn3rdz";
+   hash="12r1lrrn4c1kafzvz5mmfq3750smqv5dwl1xpj3753h0rl9a9gx1";
-   url="http://downloads.sourceforge.net/project/golly/golly/golly-2.1/golly-2.1-src.tar.gz";
+   url="http://downloads.sourceforge.net/project/golly/golly/golly-2.3/golly-2.3-src.tar.gz";
-   advertisedUrl="http://downloads.sourceforge.net/project/golly/golly/golly-2.1/golly-2.1-src.tar.gz";
+   advertisedUrl="http://downloads.sourceforge.net/project/golly/golly/golly-2.3/golly-2.3-src.tar.gz";
   
   
 }

pkgs/applications/science/misc/golly/src-info-for-default.nix

@@ -1,4 +1,5 @@
 {
-  downloadPage = "http://sourceforge.net/projects/golly/files/";
+  downloadPage = "http://sourceforge.net/projects/golly/files/golly";
-  method="fetchSF";
+  method="fetchSFdirs";
+  fileSuffix="-src.tar.gz";
 }

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

@@ -1,16 +1,11 @@
 {stdenv, fetchurl, zlib, openssl, tcl, readline, sqlite}:
 
-let
-  version = "1.20";
-  filedate = "20111021125253";
-in
-
 stdenv.mkDerivation {
-  name = "fossil-${version}";
+  name = "fossil-1.21";
 
   src = fetchurl {
-    url = "http://www.fossil-scm.org/download/fossil-src-${filedate}.tar.gz";
+    url = http://www.fossil-scm.org/download/fossil-src-20111213135356.tar.gz;
-    sha256 = "0m75kw77iray3kbjm1xfn8hr116fn11yv1wr7adcwy314cgj0vv3";
+    sha256 = "07g78sf26v7zr4qzcwky4h4zzaaz8apy33d35bhc5ax63z6md1f9";
   };
 
   buildInputs = [ zlib openssl readline sqlite ];

pkgs/build-support/upstream-updater/update-upstream-data.sh

@@ -36,6 +36,42 @@ baseName="$(getAttr baseName 'unnamed-package')"
 commonPrefetchVars=" version name hash"
 
 prefetchClause=""
+[ fetchSFdirs = "$method" ] && {
+    if [ -z "$forcedUrl" ]; then 
+	freshUrl="$("$own_dir"/urls-from-page.sh "$(getAttr downloadPage)" |
+          eval "egrep '$(getAttr sourceRegexp '[-][0-9.]+/$')'" | 
+	  eval "egrep -v '$(getAttr blacklistRegexp '^$')'" |
+	  eval "$(getAttr choiceCommand 'head -n 1')" |
+	  eval "$(getAttr versionToFileCommand "sed -re 's@/([^/]*-[0-9.]+)/@/\1/\1$(getAttr fileSuffix .tar.gz)@'")" 
+	)"
+
+	if ! egrep ':' <<< "$freshUrl" ; then 
+		freshUrl="$(dirname "$(getAttr downloadPage).")/$freshUrl"
+	fi
+
+	echo "Found download link: $freshUrl" >&2
+    else
+        freshUrl="$forcedUrl"
+    fi
+
+    freshUrl="$(echo "$freshUrl" | sed -re "$skipRedirectSF")"
+    echo "Sourceforge-corrected URL: $freshUrl" >&2
+    
+    version="$(echo "$freshUrl" | 
+      sed -re "$(getAttr versionExtractorSedScript "$extractVersionSF")")"
+    baseName="$(getAttr baseName "$(echo "$freshUrl" | sed -re 's@.*/project/([^/]+)/.*@\1@')")"
+    url="$freshUrl"
+    name="$baseName-$version"
+    advertisedUrl="$freshUrl"
+
+    if [ x"$freshUrl" = x"$(cat "$src_defs_dir"/advertisedUrl)" ]; then
+        echo "Source link not changed" >&2
+        exit
+    fi
+    hash=$(nix-prefetch-url "$freshUrl")
+
+    prefetchVars="url advertisedUrl";
+}
 [ fetchSF = "$method" ] && {
     if [ -z "$forcedUrl" ]; then 
 	freshUrl="$("$own_dir"/urls-from-page.sh "$(getAttr downloadPage)" |

pkgs/development/interpreters/spidermonkey/185-1.0.0.nix

@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, autoconf213, nspr, perl, python, readline, zip }:
+
+stdenv.mkDerivation rec {
+  version = "185-1.0.0";
+  name = "spidermonkey-${version}";
+
+  src = fetchurl {
+    url = "http://ftp.mozilla.org/pub/mozilla.org/js/js${version}.tar.gz";
+    sha256 = "5d12f7e1f5b4a99436685d97b9b7b75f094d33580227aa998c406bbae6f2a687";
+  };
+
+  buildInputs = [ autoconf213 nspr perl python readline zip ];
+
+  postUnpack = "sourceRoot=\${sourceRoot}/js/src";
+
+  preConfigure = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr"
+    export LIBXUL_DIST=$out
+    autoconf
+  '';
+
+  meta = with stdenv.lib; {
+      description = "Mozilla's JavaScript engine written in C/C++";
+      homepage = https://developer.mozilla.org/en/SpiderMonkey;
+      # TODO: MPL/GPL/LGPL tri-license.
+      maintainers = [ maintainers.goibhniu ];
+  };
+
+}

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "attoparsec";
-  version = "0.10.0.3";
+  version = "0.10.1.0";
-  sha256 = "0qlmjv8fhbx0xk8vkhlm01qmqlbk7xl98vfhcnlcjjrc5wkj0pjc";
+  sha256 = "1wlil4zxnyrygvkgmap8kcqf4f6rc08ais20alyy4ggzmx73sl9q";
   buildDepends = [ deepseq text ];
   meta = {
     homepage = "https://github.com/bos/attoparsec";

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

@@ -0,0 +1,23 @@
+{ cabal, binary, compactStringFix, cryptohash, dataBinaryIeee754
+, mtl, network, time
+}:
+
+cabal.mkDerivation (self: {
+  pname = "bson";
+  version = "0.1.6";
+  sha256 = "0w9dab8x6b3dwk2afy0gnmrvcvx2dshwhjvlr2k69nchid4wh823";
+  buildDepends = [
+    binary compactStringFix cryptohash dataBinaryIeee754 mtl network
+    time
+  ];
+  meta = {
+    homepage = "http://github.com/TonyGen/bson-haskell";
+    description = "BSON documents are JSON-like objects with a standard binary encoding";
+    license = "unknown";
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "case-insensitive";
-  version = "0.4";
+  version = "0.4.0.1";
-  sha256 = "0la9gzf563x03xy120n8h5f6kmn425c5chbm42ksx1g7ag1ppmd6";
+  sha256 = "15wcpzmj1ppl27p8hph9y8nxkjkd4yrvamxi3gk0ahfnb47chaq7";
   buildDepends = [ hashable text ];
   meta = {
     homepage = "https://github.com/basvandijk/case-insensitive";

pkgs/development/libraries/haskell/compact-string-fix/default.nix

@@ -0,0 +1,17 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "compact-string-fix";
+  version = "0.3.2";
+  sha256 = "161z0lmrrqvy77ppdgz7m6nazcmlmy1azxa8rx0cgpqmyxzkf87n";
+  meta = {
+    homepage = "http://twan.home.fmf.nl/compact-string/";
+    description = "Same as compact-string except with a small fix so it builds on ghc-6.12";
+    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-binary-ieee754/default.nix

@@ -0,0 +1,20 @@
+{ cabal, binary }:
+
+cabal.mkDerivation (self: {
+  pname = "data-binary-ieee754";
+  version = "0.4.2.1";
+  sha256 = "0i0nclq8858flpp2sl3czwz6rfaykjrlzpvlfr6vlxzf8zvah9kz";
+  isLibrary = true;
+  isExecutable = true;
+  buildDepends = [ binary ];
+  meta = {
+    homepage = "http://john-millikin.com/software/data-binary-ieee754/";
+    description = "Parser/Serialiser for IEEE-754 floating-point values";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

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

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hashtables";
-  version = "1.0.1.1";
+  version = "1.0.1.2";
-  sha256 = "1s5p2gsi7wv6xmf6ax3s9mqmbvcispn2y9miksay3p4acc6b3lpa";
+  sha256 = "09lviwxwlhvhrgm7v66w0vd7j02s0191w1izsvwh1a3dj2vc7vw7";
   buildDepends = [ hashable primitive vector ];
   meta = {
     homepage = "http://github.com/gregorycollins/hashtables";

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

@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "iteratee";
-  version = "0.8.7.4";
+  version = "0.8.7.5";
-  sha256 = "08smgb4xad8zpjzjrpjpv3vindhwgbcsf4rgipnrpyvz6mrg4w9i";
+  sha256 = "182bxdnj7k4dkmrbnkzy93axq8hwpq3xdbkyf93hbzzp4vhdvjnl";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

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

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

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

@@ -0,0 +1,23 @@
+{ cabal, binary, bson, cryptohash, monadControl, mtl, network
+, parsec, random, randomShuffle
+}:
+
+cabal.mkDerivation (self: {
+  pname = "mongoDB";
+  version = "1.1.1";
+  sha256 = "0hy47kvswm4g85c3lb75fvdrcnrcbmjrhk15r1jjriwzqicgiimz";
+  buildDepends = [
+    binary bson cryptohash monadControl mtl network parsec random
+    randomShuffle
+  ];
+  meta = {
+    homepage = "http://github.com/TonyGen/mongoDB-haskell";
+    description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
+    license = "unknown";
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

pkgs/development/libraries/haskell/murmur-hash/default.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "murmur-hash";
-  version = "0.1.0.4";
+  version = "0.1.0.5";
-  sha256 = "08nvdv3r5scqpdcivwp0d77dl4vpkgq58rzxv1xpb8r1krqy588d";
+  sha256 = "1m7rm57bxkrl4i9fbvmx5m29axyxddrs4ss7plbd19pw3wsvgmr0";
   meta = {
     homepage = "http://github.com/nominolo/murmur-hash";
     description = "MurmurHash2 implementation for Haskell";

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

@@ -0,0 +1,18 @@
+{ cabal, parsec }:
+
+cabal.mkDerivation (self: {
+  pname = "network";
+  version = "2.3.0.8";
+  sha256 = "10y7spi1qwjmq7mz7h09ijrzq0jl4r02jrgxiqavsiw6j35r4yfv";
+  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/syb/0.3.6.nix

@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "syb";
-  version = "0.3.3";
+  version = "0.3.6";
-  sha256 = "0jskxbnzariq2ahcymvjrp4bhl9cpflc1nh51whdl9axcrd5c901";
+  sha256 = "1khb5h4gw1f9l9zhb7x1y9rf2qpypbvm9kmpf0b6xgggd2800s25";
   meta = {
     homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
     description = "Scrap Your Boilerplate";

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

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

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

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

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

@@ -7,8 +7,8 @@
 
 cabal.mkDerivation (self: {
   pname = "yesod-auth";
-  version = "0.7.7.1";
+  version = "0.7.7.2";
-  sha256 = "12gzcrh8siziqd3jgimlgl7rgch8f6jl0fb96krnqpsa682003kc";
+  sha256 = "1zqxg13hpd45i2nyhh1bvaly1cwaygmjpz46cm7knp553bdhy8c8";
   buildDepends = [
     aeson authenticate blazeHtml controlMonadAttempt hamlet
     httpEnumerator mimeMail persistent persistentTemplate pureMD5

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

@@ -0,0 +1,18 @@
+{ cabal, zeromq }:
+
+cabal.mkDerivation (self: {
+  pname = "zeromq-haskell";
+  version = "0.8.1";
+  sha256 = "19fl3nd548yj6d6c3jqr6lxk6y033qa68jgnc5aq5w8kmlpn70mc";
+  extraLibraries = [ zeromq ];
+  meta = {
+    homepage = "http://github.com/twittner/zeromq-haskell/";
+    description = "bindings to zeromq";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [
+      self.stdenv.lib.maintainers.andres
+      self.stdenv.lib.maintainers.simons
+    ];
+  };
+})

pkgs/development/libraries/poppler/default.nix

@@ -6,11 +6,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "poppler-0.16.7";
+  name = "poppler-0.18.2";
 
   src = fetchurl {
     url = "${meta.homepage}${name}.tar.gz";
-    sha256 = "1k9by922qkn9pkkf03jjxxqhp4s0gmsgs6c8f4m19m1l5npyid7s";
+    sha256 = "0ljvr6l1lfwbkl0v4vw9dybski7d4sx52iz6k37mkfnj3x36npxi";
   };
 
   propagatedBuildInputs =
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optionals gtkSupport [ glib gtk ]
     ++ stdenv.lib.optional qt4Support qt4;
 
-  buildInputs = [ pkgconfig cmake ];
+  buildNativeInputs = [ pkgconfig cmake ];
 
   cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON";
 

pkgs/development/libraries/zeromq/default.nix

@@ -0,0 +1,17 @@
+{stdenv, fetchurl, libuuid}:
+
+stdenv.mkDerivation rec {
+  name = "zeromq-2.1.10";
+
+  src = fetchurl {
+    url = "http://download.zeromq.org/${name}.tar.gz";
+    sha256 = "0yabbbgx9ajpq0hjzqjm6rmj7pkcj95d5zn7d59b4wmm6kipwwn6";
+  };
+
+  buildInputs = [ libuuid ];
+
+  meta = {
+    homepage = "http://www.zeromq.org";
+    description = "The Intelligent Transport Layer";
+  };
+}

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

@@ -1,13 +1,19 @@
-{stdenv, fetchurl, libuuid, popt, devicemapper, libgcrypt }:
+{stdenv, fetchurl, libuuid, popt, devicemapper, udev }:
 
 stdenv.mkDerivation {
-  name = "cryptsetup-1.4.1";
+  name = "cryptsetup-1.0.6";
   src = fetchurl {
-    url = http://cryptsetup.googlecode.com/files/cryptsetup-1.4.1.tar.bz2;
+    url = http://cryptsetup.googlecode.com/files/cryptsetup-1.0.6.tar.bz2;
-    sha256 = "82b143328c2b427ef2b89fb76c701d311c95b54093c21bbf22342f7b393bddcb";
+    sha256 = "df7fda80cfa01f063caf39140287a47d018dfe056fc71a3ba605e690ff0183fd";
   };
 
-  buildInputs = [ libuuid popt devicemapper libgcrypt ];
+  configureFlags = [ "--enable-libdevmapper" ];
+
+  patchPhase = ''
+    sed -i -e 's@/sbin/udevsettle@${udev}/sbin/udevadm settle@' lib/libdevmapper.c
+  '';
+
+  buildInputs = [ libuuid popt devicemapper ];
 
   meta = {
     homepage = http://code.google.com/p/cryptsetup/;

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

@@ -215,7 +215,7 @@ in
 import ./generic.nix (
 
   rec {
-    version = "3.1.4";
+    version = "3.1.5";
 
     preConfigure = ''
       substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
@@ -223,7 +223,7 @@ import ./generic.nix (
   
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2";
-      sha256 = "0wd43q1m11d4s5ab2kwnga4jvi5racqwlg4pmcp4fqim0q8jl9g6";
+      sha256 = "0wdcpfjv56r5cc67ddhprc9vhjxj2qibhp0bl96p3hbqjjpwfpl6";
     };
 
     config = configWithPlatform stdenv.platform;

pkgs/servers/http/couchdb/default.nix

@@ -1,4 +1,4 @@
-args @ {stdenv, fetchurl, erlang, spidermonkey, 
+args @ {stdenv, fetchurl, erlang, spidermonkey,
 	icu, getopt, curl, ...}:
 
 let s = import ./src-for-default.nix; in
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     sed -i -e "s|\`getopt|\`${getopt}/bin/getopt|" $out/bin/couchdb
   '';
- 
+
-  configureFlags = "--with-erlang=${erlang}/lib/erlang/usr/include"; 
+  configureFlags = "--with-erlang=${erlang}/lib/erlang/usr/include --with-js-include=${spidermonkey}/include --with-js-lib=${spidermonkey}/lib";
 
 }

pkgs/servers/http/couchdb/src-for-default.nix

@@ -1,9 +1,9 @@
 rec {
-   version="1.0.1";
+   version="1.1.1";
-   name="couchdb-1.0.1";
+   name="couchdb-1.1.1";
-   hash="07wb21qi471qbb6nqlmdmmvg4z8f7m9wn2bm22c7fig32gz5njmp";
+   hash="9d6592aacd4bc139f8c1ccb0ed80f30021cee50eb7f8a1feddf46b6eb963891c";
-   url="mirror://apache/couchdb/1.0.1/apache-couchdb-${version}.tar.gz";
+   url="mirror://apache/couchdb/${version}/apache-couchdb-${version}.tar.gz";
-   advertisedUrl="http://www.apache.org/dist/couchdb/1.0.1/apache-couchdb-1.0.1.tar.gz";
+   advertisedUrl="http://www.apache.org/dist/couchdb/${version}/apache-couchdb-${version}.tar.gz";
-  
+
-  
+
 }

pkgs/servers/sql/virtuoso/default.nix

@@ -1,25 +1,15 @@
 { stdenv, fetchurl, libxml2, openssl, readline, gawk }:
 
 stdenv.mkDerivation rec {
-  name = "virtuoso-opensource-6.1.3";
+  name = "virtuoso-opensource-6.1.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/virtuoso/${name}.tar.gz";
-    sha256 = "0rj629qjsibpllazngbhzhsh90x6nidpn292qz1xdvirwvb2h3s2";
+    sha256 = "0khm81hvjh6p4l0ca4zj00fk41ixjv998k6y9g7mvq1338hr4gqm";
   };
 
   buildInputs = [ libxml2 openssl readline gawk ];
 
-  patchFlags = "-p0";
-
-  patches =
-    [ (fetchurl {
-        url = "http://bugsfiles.kde.org/attachment.cgi?id=63510";
-        name = "virtuoso-charset-fix.diff";
-        sha256 = "09kxjhsy3rbys0bcxpmgga4sa6qjyy79dyl4n8b0gp1hnzjskvkz";
-      })
-    ];
-
   CPP = "${stdenv.gcc}/bin/gcc -E";
 
   configureFlags = "
@@ -32,6 +22,7 @@ stdenv.mkDerivation rec {
     echo Moving documentation
     mkdir -pv $out/share/doc
     mv -v $out/share/virtuoso/doc $out/share/doc/${name}
+    echo Removing jars and empty directories
     find $out -name "*.a" -delete -o -name "*.jar" -delete -o -type d -empty -delete
     '';
   

pkgs/servers/xinetd/default.nix

@@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Secure replacement for inetd";
+    platforms = stdenv.lib.platforms.linux;
     homepage = http://xinetd.org;
     license = "free";
   };

pkgs/tools/filesystems/btrfsprogs/default.nix

@@ -1,27 +1,35 @@
 a :
 let
   fetchurl = a.fetchurl;
+  fetchgit = a.fetchgit;
 
   version = a.lib.attrByPath ["version"] "0.19" a;
   buildInputs = with a; [
-    zlib libuuid acl
+    zlib libuuid acl attr
   ];
 in
 
 assert a.libuuid != null;
 
 rec {
-  src = fetchurl {
+  srcDrv = fetchgit {
-    url = "http://www.kernel.org/pub/linux/kernel/people/mason/btrfs/btrfs-progs-${version}.tar.bz2";
+    url="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git" ;
-    sha256 = "1z3hmfgv7h489gnh55abm0gzyf2cgjkybhfc2rnm0cvsx01xv8zq";
+    rev="fdb6c0402337d9607c7a39155088eaf033742752" ;
+    sha256="de7f9e04401bd747a831c48d312106e188adb32f32b6d64078ae6d2aab45b1f8" ;
   };
 
+  src = srcDrv + "/";
+
   inherit buildInputs;
   configureFlags = [];
   makeFlags = ["prefix=$out CFLAGS=-Os"];
 
-  patches = [ ./glibc212.patch ];
+  patches = [];
-  phaseNames = ["doPatch" "doEnsureBtrfsImage" "doMakeInstall"];
+  phaseNames = ["fixMakefile" "doEnsureBtrfsImage" "doMakeInstall"];
+
+  fixMakefile = a.fullDepEntry ''
+    sed -e 's@^progs = @progs=@g' -i Makefile
+  '' ["minInit" "doUnpack"];
 
   doEnsureBtrfsImage = a.fullDepEntry (''
     if ! grep 'progs = ' Makefile | grep btrfs-image; then

pkgs/tools/filesystems/btrfsprogs/glibc212.patch

@@ -1,12 +0,0 @@
-diff --git a/btrfsck.c b/btrfsck.c
-index 73f1836..c1f47a1 100644
---- a/btrfsck.c
-+++ b/btrfsck.c
-@@ -21,6 +21,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <fcntl.h>
-+#include <sys/stat.h>
- #include "kerncompat.h"
- #include "ctree.h"
- #include "disk-io.h"

pkgs/tools/networking/wicd/wpa2-ttls

@@ -2,6 +2,7 @@ name = WPA2-TTLS
 author = various contributors
 version = 1
 require identity *Identity anonymous_identity *Anonymous_identity password *Password ca_cert *Path_to_CA_Cert
+protected password *Password
 -----
 ctrl_interface=/var/run/wpa_supplicant
 network={

pkgs/tools/typesetting/pdf2djvu/default.nix

@@ -1,12 +1,12 @@
 {stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.7";
+  version = "0.7.11";
   name = "pdf2djvu-${version}";
 
   src = fetchurl {
     url = "http://pdf2djvu.googlecode.com/files/pdf2djvu_${version}.tar.gz";
-    sha256 = "17fi5yq936hgjby5jp2hsb1inqqxab4mh58lkxvf1jkrrz658za5";
+    sha256 = "00gscd7l02jyr132vlj08ks0pgmh5ja785n3fdxa795cib45rbgq";
   };
 
   buildInputs = [ pkgconfig djvulibre poppler fontconfig libjpeg ];
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Creates djvu files from PDF files";
     homepage = http://code.google.com/p/pdf2djvu/;
-    license = "GPLv2";
+    license = stdenv.lib.licenses.gpl2;
   };
 }

pkgs/top-level/all-packages.nix

@@ -419,7 +419,7 @@ let
   bootchart = callPackage ../tools/system/bootchart { };
 
   btrfsProgs = builderDefsPackage (import ../tools/filesystems/btrfsprogs) {
-    inherit libuuid zlib acl;
+    inherit libuuid zlib acl attr fetchgit;
   };
 
   catdoc = callPackage ../tools/text/catdoc { };
@@ -2418,7 +2418,7 @@ let
   ocamlPackages_3_11_1 = mkOcamlPackages ocaml_3_11_1 pkgs.ocamlPackages_3_11_1;
   ocamlPackages_3_12_0 = mkOcamlPackages ocaml_3_12_0 pkgs.ocamlPackages_3_12_0;
 
-  opa = let callPackage = newScope pkgs.ocamlPackages_3_12_0; in callPackage ../development/compilers/opa { }; 
+  opa = let callPackage = newScope pkgs.ocamlPackages_3_12_0; in callPackage ../development/compilers/opa { };
 
   opencxx = callPackage ../development/compilers/opencxx {
     gcc = gcc33;
@@ -2710,6 +2710,7 @@ let
 
   spidermonkey = callPackage ../development/interpreters/spidermonkey { };
   spidermonkey_1_8_0rc1 = callPackage ../development/interpreters/spidermonkey/1.8.0-rc1.nix { };
+  spidermonkey_185 = callPackage ../development/interpreters/spidermonkey/185-1.0.0.nix { };
 
   sysPerl = callPackage ../development/interpreters/sys-perl { };
 
@@ -4733,6 +4734,8 @@ let
     static = true;
   }));
 
+  zeromq = callPackage ../development/libraries/zeromq {};
+
   zvbi = callPackage ../development/libraries/zvbi {
     pngSupport = true;
   };
@@ -4936,7 +4939,9 @@ let
     erlang = erlangR13B ;
   };
 
-  couchdb = callPackage ../servers/http/couchdb { };
+  couchdb = callPackage ../servers/http/couchdb {
+    spidermonkey = spidermonkey_185;
+  };
 
   felix = callPackage ../servers/felix { };
 
@@ -7552,6 +7557,10 @@ let
           ++ lib.optional (supportsJDK && getConfig [browserName "jre"] false && jrePlugin ? mozillaPlugin) jrePlugin
           ++ lib.optional (getConfig [browserName "enableGoogleTalkPlugin"] false) google_talk_plugin
          );
+      libs =
+        if getConfig [ browserName "enableQuakeLive" ] false
+        then with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]
+        else [ ];
     };
 
   x11vnc = callPackage ../tools/X11/x11vnc { };

pkgs/top-level/haskell-packages.nix

@@ -140,7 +140,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     haskellSrc   = self.haskellSrc_1_0_1_5; # 7.2 fails, 7.3 fails
     html         = self.html_1_0_1_2; # 7.2 ok, 7.3 ok
     HUnit        = self.HUnit_1_2_2_3; # 7.2 ok, 7.3 ok
-    network      = self.network_2_3_0_7; # 7.2 ok, 7.3 ok
+    network      = self.network_2_3_0_8; # 7.2 ok, 7.3 ok
     OpenGL       = self.OpenGL_2_2_3_0; # 7.2 ok, 7.3 ok
     parallel     = self.parallel_3_1_0_1; # 7.2 ok, 7.3 ok
     parsec       = self.parsec_3_1_2; # 7.2 ok, 7.3 ok
@@ -149,7 +149,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     regexCompat  = self.regexCompat_0_93_1; # 7.2 ok, 7.3 ok
     regexPosix   = self.regexPosix_0_94_4; # 7.2 ok, 7.3 ok
     stm          = self.stm_2_2_0_1; # 7.2 ok, 7.3 ok
-    syb          = self.syb_0_3_5; # 7.2 ok, 7.3 ok
+    syb          = self.syb_0_3_6; # 7.2 ok, 7.3 ok
     xhtml        = self.xhtml_3000_2_0_1; # 7.2 ok, 7.3 ok
     zlib         = self.zlib_0_5_3_1; # 7.2 ok, 7.3 ok
     HTTP         = self.HTTP_4000_2_1; # 7.2 ok, 7.3 ok
@@ -433,6 +433,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   Boolean = callPackage ../development/libraries/haskell/Boolean {};
 
+  bson = callPackage ../development/libraries/haskell/bson {};
+
   bytestringNums = callPackage ../development/libraries/haskell/bytestring-nums {};
 
   bytestringLexing = callPackage ../development/libraries/haskell/bytestring-lexing {};
@@ -477,6 +479,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   colour = callPackage ../development/libraries/haskell/colour {};
 
+  compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {};
+
   ConfigFile = callPackage ../development/libraries/haskell/ConfigFile {};
 
   controlMonadAttempt = callPackage ../development/libraries/haskell/control-monad-attempt {};
@@ -517,6 +521,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   dataAccessorTemplate = callPackage ../development/libraries/haskell/data-accessor/data-accessor-template.nix {};
 
+  dataBinaryIeee754 = callPackage ../development/libraries/haskell/data-binary-ieee754 {};
+
   dataDefault = callPackage ../development/libraries/haskell/data-default {};
 
   dataenc = callPackage ../development/libraries/haskell/dataenc {};
@@ -864,6 +870,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   MonadCatchIOTransformers = callPackage ../development/libraries/haskell/MonadCatchIO-transformers {};
 
   monadControl_OBSOLETE = callPackage ../development/libraries/haskell/monad-control/0.2.0.3.nix {};
+  monadControl2 = self.monadControl_OBSOLETE;
   monadControl = callPackage ../development/libraries/haskell/monad-control {};
 
   monadLoops = callPackage ../development/libraries/haskell/monad-loops {};
@@ -876,6 +883,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   MonadRandom = callPackage ../development/libraries/haskell/MonadRandom {};
 
+  mongoDB = callPackage ../development/libraries/haskell/mongoDB {
+    monadControl = self.monadControl2;
+  };
+
   mpppc = callPackage ../development/libraries/haskell/mpppc {};
 
   mtl_1_1_0_2 = callPackage ../development/libraries/haskell/mtl/1.1.0.2.nix {};
@@ -906,8 +917,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   network_2_2_1_4 = callPackage ../development/libraries/haskell/network/2.2.1.4.nix {};
   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_7 = callPackage ../development/libraries/haskell/network/2.3.0.7.nix {};
+  network_2_3_0_8 = callPackage ../development/libraries/haskell/network/2.3.0.8.nix {};
-  network = self.network_2_3_0_7;
+  network = self.network_2_3_0_8;
 
   nixosTypes = callPackage ../development/libraries/haskell/nixos-types {};
 
@@ -1102,9 +1113,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   syb_0_2_2 = callPackage ../development/libraries/haskell/syb/0.2.2.nix {};
   syb_0_3   = callPackage ../development/libraries/haskell/syb/0.3.nix {};
-  syb_0_3_5 = callPackage ../development/libraries/haskell/syb/0.3.5.nix {};
+  syb_0_3_6 = callPackage ../development/libraries/haskell/syb/0.3.6.nix {};
-  syb02     = self.syb_0_2_2;
-  syb03     = self.syb_0_3;
   syb       = null; # by default, we assume that syb ships with GHC, which is
                     # true for the older GHC versions
 
@@ -1349,6 +1358,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   yst = callPackage ../development/libraries/haskell/yst {};
 
+  zeromqHaskell = callPackage ../development/libraries/haskell/zeromq-haskell {};
+
   zipArchive = callPackage ../development/libraries/haskell/zip-archive {};
 
   zipper = callPackage ../development/libraries/haskell/zipper {
@@ -1385,7 +1396,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   idris = callPackage ../development/compilers/idris {};
 
   pakcs = callPackage ../development/compilers/pakcs {
-    syb = self.syb02;
+    syb = self.syb_0_2_2;
   };
 
   # Development tools.