svn merge ^/nixpkgs/trunk backups/glib-2.30-take2@33502

- 1 conflict (gnome-doc-utils)
- final merge before --reintegrate

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500

40 files changed, 277 insertions, 269 deletions

diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index 8127fa23115cc..20ded9486f772 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "mupdf-0.7";
 
   src = fetchurl {
-    url = "http://mupdf.com/download/${name}.tar.gz";
+    url = "http://mupdf.com/download/archive/${name}.tar.gz";
     sha256 = "e7f6307fa472575d27fe893e787ddb3fc927f03ba4ae23105f917189e81960a6";
   };
 
diff --git a/pkgs/applications/misc/nut/2.6.3.nix b/pkgs/applications/misc/nut/2.6.3.nix
new file mode 100644
index 0000000000000..471529675dbf6
--- /dev/null
+++ b/pkgs/applications/misc/nut/2.6.3.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi }:
+
+stdenv.mkDerivation {
+  name = "nut-2.6.3";
+  src = fetchurl {
+    url = http://www.networkupstools.org/source/2.6/nut-2.6.3.tar.gz;
+    sha256 = "0fk3bcivv26kw1psxb6sykqp9n5w02j01s1idypzlci0kmr3p49l";
+  };
+
+  buildInputs = [ neon libusb openssl udev avahi freeipmi ];
+  buildNativeInputs = [ pkgconfig ];
+
+  configureFlags = [
+    "--with-all"
+    "--with-ssl"
+    "--without-snmp" # Until we have it ...
+    "--without-powerman" # Until we have it ...
+    "--without-cgi"
+    "--without-hal"
+  ];
+
+  meta = {
+    description = "Network UPS Tools";
+    longDescription = ''
+      Network UPS Tools is a collection of programs which provide a common
+      interface for monitoring and administering UPS, PDU and SCD hardware.
+      It uses a layered approach to connect all of the parts.
+    '';
+    homepage = http://www.networkupstools.org/;
+    platforms = with stdenv.lib.platforms; linux;
+    maintainers = with stdenv.lib.maintainers; [ pierron ];
+    priority = 10;
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
new file mode 100644
index 0000000000000..27d41140be0cd
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, dbus_glib, libxml2, sqlite, telepathy_glib, pkgconfig
+, intltool, libxslt }:
+
+stdenv.mkDerivation rec {
+  project = "telepathy-logger";
+  name = "${project}-0.2.12";
+
+  src = fetchurl {
+    url = "http://telepathy.freedesktop.org/releases/${project}/${name}.tar.bz2";
+    sha256 = "1681m1j6vqzy089fnbfpz9i8jsg64fq6x6kf25b9p2090dnqrkj3";
+  };
+
+  buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool ];
+
+  buildNativeInputs = [ libxslt ];
+
+  configureFlags = "--enable-call";
+
+  meta = {
+    description = "Logger service for Telepathy framework";
+    homepage = http://telepathy.freedesktop.org/wiki/Logger ;
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    platforms = stdenv.lib.platforms.gnu; # Arbitrary choice
+  };
+}
diff --git a/pkgs/applications/office/openoffice/libreoffice.nix b/pkgs/applications/office/openoffice/libreoffice.nix
index 0febf2dcbad87..fb577be039074 100644
--- a/pkgs/applications/office/openoffice/libreoffice.nix
+++ b/pkgs/applications/office/openoffice/libreoffice.nix
@@ -7,7 +7,7 @@
 , librsvg, gnome_vfs, gstreamer, gst_plugins_base, mesa
 , autoconf, automake, openldap, bash
 , fontsConf
-, langs ? [ "en-GB" "ca" "ru" "eo" "fr" "nl" "de" ]
+, langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" ]
 }:
 
 let
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 9fa26eba4ab0b..350b73e339f59 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -13,6 +13,8 @@ let version = "4.1.10"; in
 stdenv.mkDerivation {
   name = "virtualbox-${version}-${kernel.version}";
 
+  NIX_CFLAGS_COMPILE="-I${kernel}/lib/modules/${kernel.modDirVersion}/build/include/generated";
+
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
     sha256 = "1gsp3arp79x6gmh403sayh4lzr3l8fc3anp664fyl1dl0ykgmqs7";
diff --git a/pkgs/build-support/usernixos/activation.nix b/pkgs/build-support/usernixos/activation.nix
deleted file mode 100644
index 2e3f0af2bf778..0000000000000
--- a/pkgs/build-support/usernixos/activation.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ pkgs, config, ... }:
-
-let
-  script = pkgs.writeScriptBin "usernixos" (''
-    #!${pkgs.bash}/bin/bash
-  '' + config.activationContents);
-in
-with pkgs.lib;
-{
-  options = {
-    activation = mkOption {
-      default = {};
-    };
-
-    activationContents = mkOption {
-      default = "";
-      internal = true;
-      merge = concatStringsSep "\n";
-      description = ''
-        Commands to run at activation
-      '';
-    };
-  };
-
-  config.activation.toplevel = script;
-}
diff --git a/pkgs/build-support/usernixos/bashrc.nix b/pkgs/build-support/usernixos/bashrc.nix
deleted file mode 100644
index 1860f4b2e89cb..0000000000000
--- a/pkgs/build-support/usernixos/bashrc.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-# Generator for .bashrc
-{pkgs, config, ...}:
-
-with pkgs.lib;
-
-let
-  bashrcFile = pkgs.writeScript "bashrc" config.bashrc.contents;
-  cfg = config.bashrc;
-in
-{
-  options = {
-    environment.editor = mkOption {
-      default = "${pkgs.vim}/bin/vim";
-      type = types.string;
-      description = ''
-        Editor
-      '';
-    };
-
-    bashrc = {
-      enable = mkOption {
-        default = false;
-        type = types.bool;
-        description = ''
-          Enable of .bashrc generation on activation
-        '';
-      };
-
-      destination = mkOption {
-        default = "~/.bashrc";
-        type = types.string;
-        description = ''
-          The symlink that will point to the generated bashrc at activation time
-        '';
-      };
-
-      contents = mkOption {
-        default = "";
-        type = types.string;
-        merge = concatStringsSep "\n";
-        description = ''
-          Enable of .bashrc generation on activation
-        '';
-      };
-    };
-  };
-
-  config.bashrc.contents = ''
-    export EDITOR="${config.environment.editor}"
-  '';
-
-  config.activationContents = mkIf cfg.enable ''
-    if [ -e "${cfg.destination}" ]; then
-      echo Cannot set "${cfg.destination}", it exists
-      exit 1
-    fi
-    ln -sf ${bashrcFile} "${cfg.destination}"
-  '';
-}
diff --git a/pkgs/build-support/usernixos/eval-config.nix b/pkgs/build-support/usernixos/eval-config.nix
deleted file mode 100644
index 300ddd2444e52..0000000000000
--- a/pkgs/build-support/usernixos/eval-config.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ system ? builtins.currentSystem
-, pkgs ? null
-, baseModules ? import ./module-list.nix
-, extraArgs ? {}
-, modules
-}:
-
-let extraArgs_ = extraArgs; pkgs_ = pkgs; system_ = system; in
-
-rec {
-
-  # These are the NixOS modules that constitute the system configuration.
-  configComponents = modules ++ baseModules;
-
-  # Merge the option definitions in all modules, forming the full
-  # system configuration.  It's not checked for undeclared options.
-  systemModule =
-    pkgs.lib.fixMergeModules configComponents extraArgs;
-
-  optionDefinitions = systemModule.config;
-  optionDeclarations = systemModule.options;
-  inherit (systemModule) options;
-
-  # These are the extra arguments passed to every module.  In
-  # particular, Nixpkgs is passed through the "pkgs" argument.
-  extraArgs = extraArgs_ // {
-    inherit pkgs modules baseModules;
-  };
-
-  config = systemModule.config;
-}
diff --git a/pkgs/build-support/usernixos/module-list.nix b/pkgs/build-support/usernixos/module-list.nix
deleted file mode 100644
index 2aa5329940bd4..0000000000000
--- a/pkgs/build-support/usernixos/module-list.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-[
-  ./activation.nix
-  ./bashrc.nix
-]
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index 2e732e1acdbc0..71c41ccba612e 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "man-pages-3.35";
+  name = "man-pages-3.38";
   
   src = fetchurl {
-    url = "mirror://kernel/linux/docs/man-pages/Archive/${name}.tar.bz2";
-    sha256 = "186zn80k10jg1m4jp5x5x73f7cczydsjcw5zxc5d9lls5wvafp66";
+    url = "mirror://kernel/linux/docs/man-pages/Archive/${name}.tar.xz";
+    sha256 = "10ha41yj5v3rjy73x8kpn65srbcy0iz399vv149bh12lvyv67kvy";
   };
 
   preBuild =
diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix
index 7ca767170a3e6..fe9ce209191e8 100644
--- a/pkgs/development/compilers/idris/default.nix
+++ b/pkgs/development/compilers/idris/default.nix
@@ -4,15 +4,14 @@
 
 cabal.mkDerivation (self: {
   pname = "idris";
-  version = "0.9.2";
-  sha256 = "0n4dh3vxkjvw8rb5iqm8lvi21q2ljw2pzn453wfcisdadkpv4fh5";
+  version = "0.9.2.1";
+  sha256 = "16jbmyza57066s3wmkvgwn11kqn0nzkjrrvsinh9xd69a79h2iiy";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [
     binary Cabal epic filepath haskeline mtl parsec transformers
   ];
   buildTools = [ happy ];
-  noHaddock = true;
   meta = {
     homepage = "http://www.idris-lang.org/";
     description = "Functional Programming Language with Dependent Types";
diff --git a/pkgs/development/compilers/jdk/jdk6-linux.nix b/pkgs/development/compilers/jdk/jdk6-linux.nix
index 3f9fa139a9003..224f77a135703 100644
--- a/pkgs/development/compilers/jdk/jdk6-linux.nix
+++ b/pkgs/development/compilers/jdk/jdk6-linux.nix
@@ -28,18 +28,18 @@ in
 
 stdenv.mkDerivation {
   name =
-    if installjdk then "jdk-1.6.0_24" else "jre-1.6.0_24";
+    if installjdk then "jdk-1.6.0_32b03" else "jre-1.6.0_32b03";
 
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
-        url = http://download.java.net/dlj/binaries/jdk-6u24-dlj-linux-i586.bin;
-        sha256 = "003vf5dhizwd1pcvv6jazx59d1dwws1m87fjbjagbnnra7bka89p";
+        url = http://www.java.net/download/jdk6/6u32/promoted/b03/binaries/jdk-6u32-ea-bin-b03-linux-i586-29_feb_2012.bin;
+        md5 = "7c009afa399476c7d2791386235b8e3b";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url = http://download.java.net/dlj/binaries/jdk-6u24-dlj-linux-amd64.bin;
-        sha256 = "17r1rv82q2zlhkillkgkxsirnkzpbsi6f2qg4sjrg0154sk6iflq";
+        url = http://www.java.net/download/jdk6/6u32/promoted/b03/binaries/jdk-6u32-ea-bin-b03-linux-amd64-29_feb_2012.bin;
+        md5 = "7f1a45531a04c372e5660a55c2dfdad8";
       }
     else
       abort "jdk requires i686-linux or x86_64 linux";
diff --git a/pkgs/development/libraries/haskell/RSA/default.nix b/pkgs/development/libraries/haskell/RSA/default.nix
index dd8e607f3b72e..173ddc3149525 100644
--- a/pkgs/development/libraries/haskell/RSA/default.nix
+++ b/pkgs/development/libraries/haskell/RSA/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "RSA";
-  version = "1.0.6.2";
-  sha256 = "0sabvwzgjg6nv5m3x9cjpk5q62r8vhi3kn858ask15frsi7lzhwk";
+  version = "1.0.6.3";
+  sha256 = "0lk3nsh6nvacv1xzrg2pxxhd5gglmy40dkb8a47c9r9px0q6yjpj";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ binary pureMD5 random SHA ];
diff --git a/pkgs/development/libraries/haskell/SHA/default.nix b/pkgs/development/libraries/haskell/SHA/default.nix
index 7aaf6c51321a5..d1eff38c0d705 100644
--- a/pkgs/development/libraries/haskell/SHA/default.nix
+++ b/pkgs/development/libraries/haskell/SHA/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "SHA";
-  version = "1.5.0.0";
-  sha256 = "12sz1dblmpiy8bg45fwndp1g9gf7494vqqbvbd1hwr5qzyfwyqck";
+  version = "1.5.0.1";
+  sha256 = "1nyj50hyka2fnk9nnidygl8d52xgvmj9m8aywjzbzdaxxrmdab8g";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ binary ];
diff --git a/pkgs/development/libraries/haskell/attempt/0.3.1.1.nix b/pkgs/development/libraries/haskell/attempt/0.3.1.1.nix
deleted file mode 100644
index a08f09b550340..0000000000000
--- a/pkgs/development/libraries/haskell/attempt/0.3.1.1.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ cabal, failure }:
-
-cabal.mkDerivation (self: {
-  pname = "attempt";
-  version = "0.3.1.1";
-  sha256 = "0yfn8mh7gy6nh689ic6sygf9d7lk44kpj2wahnljl53k6vw7smv5";
-  buildDepends = [ failure ];
-  meta = {
-    homepage = "http://github.com/snoyberg/attempt/tree/master";
-    description = "Concrete data type for handling extensible exceptions as failures";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/attempt/0.4.0.nix b/pkgs/development/libraries/haskell/attempt/default.nix
index c000002d4998b..c000002d4998b 100644
--- a/pkgs/development/libraries/haskell/attempt/0.4.0.nix
+++ b/pkgs/development/libraries/haskell/attempt/default.nix
diff --git a/pkgs/development/libraries/haskell/blaze-html/default.nix b/pkgs/development/libraries/haskell/blaze-html/default.nix
index 7820566e42d68..e4772a1f51cf6 100644
--- a/pkgs/development/libraries/haskell/blaze-html/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-html/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-html";
-  version = "0.4.3.2";
-  sha256 = "1mqfvkmjfqy777h4skvgm9nxjgyi12k8alg7mvsk0aj1i80gvkki";
+  version = "0.4.3.3";
+  sha256 = "0a3g4s4k85h2qvs2kcalv83ma4z5arqdydla64q5d1qlk9c99mzg";
   buildDepends = [ blazeBuilder text ];
   meta = {
     homepage = "http://jaspervdj.be/blaze";
diff --git a/pkgs/development/libraries/haskell/bmp/default.nix b/pkgs/development/libraries/haskell/bmp/default.nix
index a4590926272b7..705b462a6d52b 100644
--- a/pkgs/development/libraries/haskell/bmp/default.nix
+++ b/pkgs/development/libraries/haskell/bmp/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bmp";
-  version = "1.2.0.2";
-  sha256 = "0y1fjbhk73dj260wd1jhcf12fkh4maba4iwkzdg2087s9saxvljk";
+  version = "1.2.1.1";
+  sha256 = "0s5srqkaccrwh9gsxn9kmyh4jf0qf40ix8ipi0b70fbbffr97hmk";
   buildDepends = [ binary ];
   meta = {
     homepage = "http://code.ouroborus.net/bmp";
diff --git a/pkgs/development/libraries/haskell/convertible-text/default.nix b/pkgs/development/libraries/haskell/convertible-text/default.nix
deleted file mode 100644
index 7d8b40654eca5..0000000000000
--- a/pkgs/development/libraries/haskell/convertible-text/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ cabal, attempt, text, time }:
-
-cabal.mkDerivation (self: {
-  pname = "convertible-text";
-  version = "0.4.0.2";
-  sha256 = "1wqpl9dms1rsd24d00f18l9sm601nm6kr7h4ig8y70jdzy8w73fz";
-  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 (deprecated)";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/derive/default.nix b/pkgs/development/libraries/haskell/derive/default.nix
index b6c560f70acb5..bbaa68fdcf74f 100644
--- a/pkgs/development/libraries/haskell/derive/default.nix
+++ b/pkgs/development/libraries/haskell/derive/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "derive";
-  version = "2.5.6";
-  sha256 = "1ckxm6s2y9dvlj1785b27a2zvah4radypxjpq7sxn970r6m5dv0h";
+  version = "2.5.7";
+  sha256 = "1a6nz0a7axgdghljcb87h4bhisjfsnpxpdbqlrxymw4zqislg9p3";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
diff --git a/pkgs/development/libraries/haskell/failure/0.1.2.nix b/pkgs/development/libraries/haskell/failure/0.1.2.nix
deleted file mode 100644
index 51212385922ae..0000000000000
--- a/pkgs/development/libraries/haskell/failure/0.1.2.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ cabal }:
-
-cabal.mkDerivation (self: {
-  pname = "failure";
-  version = "0.1.2";
-  sha256 = "14pwj0zb5kk2wadpddanxv3kr0hzklxhzbprmkh40yn1dbwgdas4";
-  meta = {
-    homepage = "http://www.haskell.org/haskellwiki/Failure";
-    description = "A simple type class for success/failure computations";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/failure/0.2.0.nix b/pkgs/development/libraries/haskell/failure/default.nix
index 3ed3ad704ada3..bc2821e3e8c58 100644
--- a/pkgs/development/libraries/haskell/failure/0.2.0.nix
+++ b/pkgs/development/libraries/haskell/failure/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "failure";
-  version = "0.2.0";
-  sha256 = "1z7q2ldgfm0khar3vx7paz0jigzd720xjq2s0x02qf2m3iv0ilcv";
+  version = "0.2.0.1";
+  sha256 = "05k62sb2xj4ddjwsbfldxkap7v5kmv04qzic4sszx5i3ykbf20fd";
   buildDepends = [ transformers ];
   meta = {
     homepage = "http://www.haskell.org/haskellwiki/Failure";
diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index 31b2c4fdafb86..1d75a0e00e017 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hakyll";
-  version = "3.2.6.2";
-  sha256 = "07l2igpmr4kd47zk88hz2salzzc92dh7wpny6xr5pw5xf95lpx7p";
+  version = "3.2.7.0";
+  sha256 = "1jx4csfdr7icjrg9hvlw5pyi29qf3yyx0sjaw7nchz8jk43ikr2b";
   buildDepends = [
     binary blazeHtml citeprocHs cryptohash filepath hamlet mtl pandoc
     parsec regexBase regexTdfa snapCore snapServer tagsoup time
diff --git a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
index 28a4459f3b003..089905fd620a8 100644
--- a/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
+++ b/pkgs/development/libraries/haskell/happstack/happstack-hamlet.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "happstack-hamlet";
-  version = "6.2.4";
-  sha256 = "1m03r1wk34lx9b2bmcrakcaaq701vcdkw2shxmqwk6fsbgh7qjp0";
+  version = "7.0.0";
+  sha256 = "15r6xpyg193iwqin96mn7c9x5w7l8q9m3vbgiwv7bxvhdrl1dp7j";
   buildDepends = [ hamlet happstackServer text ];
   meta = {
     homepage = "http://www.happstack.com/";
diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix
index 0525ee78e36f6..a01055f47c57f 100644
--- a/pkgs/development/libraries/haskell/resourcet/default.nix
+++ b/pkgs/development/libraries/haskell/resourcet/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "resourcet";
-  version = "0.3.1";
-  sha256 = "0nz1rz0nrs693hfav687rci3rhrhsmnjb93949mxgyd0ka5pw90l";
+  version = "0.3.2";
+  sha256 = "0vaygw17cfx2y2lv32lmr7x0vch58dh19jmh8j7mcj11qy5v0nz8";
   buildDepends = [
     liftedBase monadControl transformers transformersBase
   ];
diff --git a/pkgs/development/libraries/haskell/zlib-bindings/0.1.0.nix b/pkgs/development/libraries/haskell/zlib-bindings/0.1.0.1.nix
index a396a3eaa4da3..d5557eae3906b 100644
--- a/pkgs/development/libraries/haskell/zlib-bindings/0.1.0.nix
+++ b/pkgs/development/libraries/haskell/zlib-bindings/0.1.0.1.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "zlib-bindings";
-  version = "0.1.0";
-  sha256 = "0jjkrn72hkakdq4n300fk5422sy1q46p019554lvplqmyqr8bkac";
+  version = "0.1.0.1";
+  sha256 = "0r1hjmmxb9kz5fvfrjvzjd0pnhb87vyldqvb73yjq35s16bj4vlc";
   buildDepends = [ zlib ];
   meta = {
     homepage = "http://github.com/snoyberg/zlib-bindings";
diff --git a/pkgs/development/libraries/libicns/default.nix b/pkgs/development/libraries/libicns/default.nix
new file mode 100644
index 0000000000000..0e582c903c594
--- /dev/null
+++ b/pkgs/development/libraries/libicns/default.nix
@@ -0,0 +1,12 @@
+{ stdenv, fetchurl, libpng, jasper }:
+
+stdenv.mkDerivation {
+  name = "libicns-0.8.0";
+
+  src = fetchurl {
+    url = mirror://sourceforge/icns/libicns-0.8.0.tar.gz;
+    sha256 = "0jh67nm07jr1nfkfjid3jjw7fyw5hvj6a2fqan1bhg6gyr2hswla";
+  };
+
+  buildInputs = [ libpng jasper ];
+}
diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix
index f4c6d7367f62e..575d580faf650 100644
--- a/pkgs/development/libraries/openjpeg/default.nix
+++ b/pkgs/development/libraries/openjpeg/default.nix
@@ -1,21 +1,13 @@
 { stdenv, fetchurl }: 
 
 stdenv.mkDerivation {
-  name = "openjpeg-1.2";
+  name = "openjpeg-1.5.0";
   
   src = fetchurl {
-    url = http://www.openjpeg.org/openjpeg_v1_2.tar.gz;
-    sha256 = "1i72i0hhssgg6vfkaw3gpwf5ld65g9s77ay8pxd4any1xy54qa90";
+    url = http://openjpeg.googlecode.com/files/openjpeg-1.5.0.tar.gz;
+    sha256 = "1kja6s9dk0hh7p9064kg69y6vninwyvpqi8cap92waj38jmqz469";
   };
 
-  patchPhase = ''
-    sed -i -e 's/-o root -g [^ ]\+//' Makefile Makefile.osx
-  '';
-
-  preInstall = ''
-    export installFlags="PREFIX=$out"
-  '';
-  
   meta = {
     homepage = http://www.openjpeg.org/;
     description = "Open-source JPEG 2000 codec written in C language";
diff --git a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
index 545cd298f8c18..ad1be72657829 100644
--- a/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
+++ b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation {
 
   configureFlags = "--disable-scrollkeeper";
   buildInputs = [ python libxml2Python libxslt ];
+  pythonPath = [ libxml2Python ];
   postInstall = "wrapPythonPrograms";
 
   buildNativeInputs = [ pkgconfig intltool pythonPackages.wrapPython ];
diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index d4c08515545ac..e95d6a7ad0e6c 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -10,7 +10,9 @@
   bjg = "Brian Gough <bjg@gnu.org>";
   bluescreen303 = "Mathijs Kwik <mathijs@bluescreen303.nl>";
   chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
+  coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
   eelco = "Eelco Dolstra <e.dolstra@tudelft.nl>";
+  garbas = "Rok Garbas <rok@garbas.si>";
   goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
   guibert = "David Guibert <david.guibert@gmail.com>";
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
diff --git a/pkgs/lib/strings.nix b/pkgs/lib/strings.nix
index 5f2670913e247..071bb2c995b34 100644
--- a/pkgs/lib/strings.nix
+++ b/pkgs/lib/strings.nix
@@ -17,7 +17,7 @@ rec {
   # Map a function over a list and concatenate the resulting strings.
   concatMapStrings = f: list: concatStrings (map f list);
   concatImapStrings = f: list: concatStrings (lib.imap f list);
-  
+
 
   # Place an element between each element of a list, e.g.,
   # `intersperse "," ["a" "b" "c"]' returns ["a" "," "b" "," "c"].
@@ -37,7 +37,7 @@ rec {
   # Construct a Unix-style search path consisting of each `subDir"
   # directory of the given list of packages.  For example,
   # `makeSearchPath "bin" ["x" "y" "z"]' returns "x/bin:y/bin:z/bin".
-  makeSearchPath = subDir: packages: 
+  makeSearchPath = subDir: packages:
     concatStringsSep ":" (map (path: path + "/" + subDir) packages);
 
 
@@ -48,13 +48,13 @@ rec {
 
   # Idem for Perl search paths.
   makePerlPath = makeSearchPath "lib/perl5/site_perl";
-  
+
 
   # Dependening on the boolean `cond', return either the given string
   # or the empty string.
   optionalString = cond: string: if cond then string else "";
 
-  
+
   # Determine whether a filename ends in the given suffix.
   hasSuffix = ext: fileName:
     let lenFileName = stringLength fileName;
@@ -74,7 +74,7 @@ rec {
     then []
     else map (p: substring p 1 s) (lib.range 0 (sub l 1));
 
-    
+
   # Manipulate a string charcater by character and replace them by strings
   # before concatenating the results.
   stringAsChars = f: s:
@@ -82,18 +82,18 @@ rec {
       map f (stringToCharacters s)
     );
 
-    
+
   # same as vim escape function.
   # Each character contained in list is prefixed by "\"
   escape = list : string :
     stringAsChars (c: if lib.elem c list then "\\${c}" else c) string;
 
-    
+
   # still ugly slow. But more correct now
   # [] for zsh
   escapeShellArg = lib.escape (stringToCharacters "\\ ';$`()|<>\t*[]");
 
-  
+
   # replace characters by their substitutes.  This function is equivalent to
   # the `tr' command except that one character can be replace by multiple
   # ones.  e.g.,
@@ -108,12 +108,12 @@ rec {
     in
       stringAsChars subst s;
 
-      
+
   # Compares strings not requiring context equality
   # Obviously, a workaround but works on all Nix versions
   eqStrings = a: b: (a+(substring 0 0 b)) == ((substring 0 0 a)+b);
 
-  
+
   # Cut a string with a separator and produces a list of strings which were
   # separated by this separator. e.g.,
   # `splitString "." "foo.bar.baz"' returns ["foo" "bar" "baz"].
@@ -138,7 +138,7 @@ rec {
     in
       recurse 0 0;
 
-      
+
   # return the suffix of the second argument if the first argument match its
   # prefix. e.g.,
   # `removePrefix "foo." "foo.bar.baz"' returns "bar.baz".
@@ -152,9 +152,7 @@ rec {
       else
         s;
 
-        
   # Return true iff string v1 denotes a version older than v2.
   versionOlder = v1: v2: builtins.compareVersions v2 v1 == 1;
 
-
 }
diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/pkgs/os-specific/linux/pam_usb/default.nix
index d26617d8e661a..b5672728b536c 100644
--- a/pkgs/os-specific/linux/pam_usb/default.nix
+++ b/pkgs/os-specific/linux/pam_usb/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, makeWrapper, useSetUID, dbus, libxml2, pam, hal, pkgconfig, pmount, python, pythonDBus}:
+{stdenv, fetchurl, makeWrapper, useSetUID, dbus, libxml2, pam, pkgconfig, pmount, python, pythonDBus}:
 
 let
   pmountBin = useSetUID pmount "/bin/pmount";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     makeWrapper
     # pam_usb dependencies
-    dbus libxml2 pam hal pmount pkgconfig
+    dbus libxml2 pam pmount pkgconfig
     # pam_usb's tools dependencies
     python
     # cElementTree is included with python 2.5 and later.
diff --git a/pkgs/os-specific/linux/tp_smapi/default.nix b/pkgs/os-specific/linux/tp_smapi/default.nix
new file mode 100644
index 0000000000000..224b808721bfd
--- /dev/null
+++ b/pkgs/os-specific/linux/tp_smapi/default.nix
@@ -0,0 +1,36 @@
+{stdenv, fetchurl, kernel}:
+
+stdenv.mkDerivation {
+  name = "tp_smapi-0.41-${kernel.version}";
+
+  src = fetchurl {
+    url = "https://github.com/downloads/evgeni/tp_smapi/tp_smapi-0.41.tar.gz";
+    sha256 = "6aef02b92d10360ac9be0db29ae390636be55017990063a092a285c70b54e666";
+  };
+
+  buildInputs = [ kernel ];
+
+  makeFlags = [
+    "KBASE=${kernel}/lib/modules/${kernel.modDirVersion}"
+    "SHELL=/bin/sh"
+  ];
+
+  installPhase = ''
+    install -v -D -m 644 thinkpad_ec.ko "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/firmware/thinkpad_ec.ko"
+    install -v -D -m 644 tp_smapi.ko "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/firmware/tp_smapi.ko"
+  '';
+
+  dontStrip = true;
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "IBM ThinkPad hardware functions driver";
+    homepage = "https://github.com/evgeni/tp_smapi/tree/tp-smapi/0.41";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.garbas ];
+    # driver is only ment for linux thinkpads i think  bellow platforms should cover it.
+    platforms = [ "x86_64-linux" "i686-linux" ];
+  };
+}
+
diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix
new file mode 100644
index 0000000000000..36ce54b53ef91
--- /dev/null
+++ b/pkgs/servers/memcached/default.nix
@@ -0,0 +1,20 @@
+{stdenv, fetchurl, cyrus_sasl, libevent}:
+
+stdenv.mkDerivation {
+  name = "memcached-1.4.13";
+
+  src = fetchurl {
+    url = http://memcached.googlecode.com/files/memcached-1.4.13.tar.gz;
+    sha256 = "0abyy9agjinac56bb1881j3qs6xny7r12slh4wihv2apma3qn2yb";
+  };
+
+  buildInputs = [cyrus_sasl libevent];
+
+  meta = {
+    description = "A distributed memory object caching system";
+    homepage = http://memcached.org/;
+    license = "bsd";
+    maintainers = [ stdenv.lib.maintainers.coconnor ];
+  };
+}
+
diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix
index 68139f416ebb4..75f155fd0ddfd 100644
--- a/pkgs/tools/filesystems/btrfsprogs/default.nix
+++ b/pkgs/tools/filesystems/btrfsprogs/default.nix
@@ -3,9 +3,9 @@ let
   fetchurl = a.fetchurl;
   fetchgit = a.fetchgit;
 
-  version = a.lib.attrByPath ["version"] "0.19" a;
+  version = a.lib.attrByPath ["version"] "0.19-20120328" a;
   buildInputs = with a; [
-    zlib libuuid acl attr
+    zlib libuuid acl attr e2fsprogs
   ];
 in
 
@@ -14,8 +14,8 @@ assert a.libuuid != null;
 rec {
   srcDrv = fetchgit {
     url="git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git" ;
-    rev="fdb6c0402337d9607c7a39155088eaf033742752" ;
-    sha256="de7f9e04401bd747a831c48d312106e188adb32f32b6d64078ae6d2aab45b1f8" ;
+    rev="1957076ab4fefa47b6efed3da541bc974c83eed7";
+    sha256="566d863c5500652e999d0d6b823365fb06f2f8f9523e65e69eaa3e993e9b26e1";
   };
 
   src = srcDrv + "/";
diff --git a/pkgs/tools/misc/fortune/default.nix b/pkgs/tools/misc/fortune/default.nix
new file mode 100644
index 0000000000000..8e44b0998a2bf
--- /dev/null
+++ b/pkgs/tools/misc/fortune/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, recode }:
+
+stdenv.mkDerivation {
+  name = "fortune-mod_1.99.1";
+  src = fetchurl {
+    url = http://ftp.de.debian.org/debian/pool/main/f/fortune-mod/fortune-mod_1.99.1.orig.tar.gz;
+    sha256 = "1kpa2hgbglj5dbfasvl9wc1q3xpl91mqn3sfby46r4rwyzhswlgw";
+  };
+  buildInputs = [recode];
+  preConfigure = ''
+    sed -i "s|/usr/|$out/|" Makefile 
+  '';
+  postInstall = ''
+    ln -s $out/games/fortune $out/bin/fortune
+  '';
+
+  meta = {
+    description = "fortune is a simple program that displays a pseudorandom message from a database of quotations that first appeared in Version 7 Unix.";
+  };
+}
diff --git a/pkgs/tools/misc/refind/default.nix b/pkgs/tools/misc/refind/default.nix
new file mode 100644
index 0000000000000..bd0a7040adff7
--- /dev/null
+++ b/pkgs/tools/misc/refind/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, gnu_efi, unzip }:
+
+let version = "0.2.3"; in
+
+stdenv.mkDerivation {
+  name = "refind-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/refind/refind-src-${version}.zip";
+    sha256 = "0q3p4mczr6wchk4vbgsb0cq7829vk3b3kg9qaizrb02pdak3s2nf";
+  };
+
+  buildInputs = [ unzip ];
+
+  buildFlags = [ "prefix=" "EFIINC=${gnu_efi}/include/efi" "GNUEFILIB=${gnu_efi}/lib" "EFILIB=${gnu_efi}/lib" "EFICRT0=${gnu_efi}/lib" ];
+
+  installPhase = ''
+    mkdir -pv $out
+    install -v -m644 refind/refind.efi refind.conf-sample $out
+    mv -v icons $out
+  '';
+
+  meta = {
+    description = "An EFI boot manager";
+
+    homepage = http://www.rodsbooks.com/refind/;
+
+    license = "GPLv3+";
+
+    maintainers = with stdenv.lib.maintainers; [ shlevy ];
+
+    platforms = [ "i686-linux" "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index f3ef69dd03d93..d32917c3bb774 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,20 +5,19 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.0pre2614_005d1e4";
+  name = "nix-1.0pre2632_b8fb0ce";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/2230618/download/4/${name}.tar.bz2";
-    sha256 = "47a4ff811f0d23d1c0176bc1fbb828edf16906568b0cbf5942b912ed2d2c1b44";
+    url = "http://hydra.nixos.org/build/2337744/download/4/${name}.tar.bz2";
+    sha256 = "5f965a54ac4ef949b1531d21c3bc1c920552ea3103a39669a3b8a4f3187bd6da";
   };
 
   buildNativeInputs = [ perl pkgconfig ];
-  buildInputs = [ curl openssl boehmgc ];
+  buildInputs = [ curl openssl boehmgc bzip2 sqlite ];
 
   configureFlags =
     ''
       --with-store-dir=${storeDir} --localstatedir=${stateDir}
-      --with-bzip2=${bzip2} --with-sqlite=${sqlite}
       --with-dbi=${perlPackages.DBI}/lib/perl5/site_perl
       --with-dbd-sqlite=${perlPackages.DBDSQLite}/lib/perl5/site_perl
       --disable-init-state
@@ -30,11 +29,10 @@ stdenv.mkDerivation rec {
     configureFlags =
       ''
         --with-store-dir=${storeDir} --localstatedir=${stateDir}
-        --with-bzip2=${bzip2.hostDrv} --with-sqlite=${sqlite.hostDrv}
-        --enable-gc
         --with-dbi=${perlPackages.DBI}/lib/perl5/site_perl
         --with-dbd-sqlite=${perlPackages.DBDSQLite}/lib/perl5/site_perl
         --disable-init-state
+        --enable-gc
         CFLAGS=-O3 CXXFLAGS=-O3
       '' + stdenv.lib.optionalString (
           stdenv.cross ? nix && stdenv.cross.nix ? system
@@ -44,11 +42,9 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  doCheck = true;
+  installCheckPhase = "make installcheck";
 
-  # Hack to get the check to succeed on Darwin.
-  phases = stdenv.lib.optionalString stdenv.isDarwin
-    "$prePhases unpackPhase patchPhase $preConfigurePhases configurePhase $preBuildPhases buildPhase $preInstallPhases installPhase checkPhase fixupPhase $preDistPhases distPhase $postPhases";
+  postPhases = [ "installCheckPhase" ];
 
   meta = {
     description = "The Nix Deployment System";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 523913142fa4b..abf3c9e7302d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -353,16 +353,6 @@ let
     inherit pkgs lib;
   };
 
-  usernixos = let
-      configmodule = getConfig [ "usernixos" ] null;
-      eval = (import ../build-support/usernixos/eval-config.nix) {
-        inherit pkgs system;
-        modules = [ configmodule ];
-      };
-    in
-      assert configmodule != null;
-      eval.config.activation.toplevel;
-
   platforms = import ./platforms.nix;
 
 
@@ -442,7 +432,7 @@ let
   bootchart = callPackage ../tools/system/bootchart { };
 
   btrfsProgs = builderDefsPackage (import ../tools/filesystems/btrfsprogs) {
-    inherit libuuid zlib acl attr fetchgit;
+    inherit (pkgs) libuuid zlib acl attr fetchgit e2fsprogs;
   };
 
   catdoc = callPackage ../tools/text/catdoc { };
@@ -704,6 +694,8 @@ let
     withX11 = true;
   };
 
+  fortune = callPackage ../tools/misc/fortune { };
+
   freeipmi = callPackage ../tools/system/freeipmi {};
 
   freetalk = callPackage ../applications/networking/instant-messengers/freetalk {
@@ -1288,6 +1280,8 @@ let
 
   recutils = callPackage ../tools/misc/recutils { };
 
+  refind = callPackage ../tools/misc/refind { };
+
   reiser4progs = callPackage ../tools/filesystems/reiser4progs { };
 
   reiserfsprogs = callPackage ../tools/filesystems/reiserfsprogs { };
@@ -1950,17 +1944,26 @@ let
   })));
 
   gccApple =
-    wrapGCC ( (if stdenv.system == "i686-darwin" then import ../development/compilers/gcc/4.2-apple32 else import ../development/compilers/gcc/4.2-apple64) {
-      inherit fetchurl stdenv noSysDirs;
-      profiledCompiler = true;
-    });
+    wrapGCC (makeOverridable
+      (if stdenv.system == "i686-darwin"
+       then import ../development/compilers/gcc/4.2-apple32
+       else import ../development/compilers/gcc/4.2-apple64) {
+         inherit fetchurl stdenv noSysDirs;
+         profiledCompiler = true;
+       });
 
   gccupc40 = wrapGCCUPC (import ../development/compilers/gcc-upc-4.0 {
     inherit fetchurl stdenv bison autoconf gnum4 noSysDirs;
     texinfo = texinfo49;
   });
 
-  gfortran = gfortran46;
+  gfortran =
+    if stdenv.isDarwin
+    then wrapGCC (gccApple.gcc.override {
+      langF77 = true;
+      inherit gmp mpfr bison flex;
+    })
+    else gfortran46;
 
   gfortran40 = wrapGCC (gcc40.gcc.override {
     langFortran = true;
@@ -4047,6 +4050,8 @@ let
 
   libical = callPackage ../development/libraries/libical { };
 
+  libicns = callPackage ../development/libraries/libicns { };
+
   libimobiledevice = callPackage ../development/libraries/libimobiledevice { };
 
   libiodbc = callPackage ../development/libraries/libiodbc {
@@ -5145,6 +5150,8 @@ let
     ffmpeg = ffmpeg_0_6_90;
   };
 
+  memcached = callPackage ../servers/memcached {};
+
   mod_python = callPackage ../servers/http/apache-modules/mod_python { };
 
   mod_fastcgi = callPackage ../servers/http/apache-modules/mod_fastcgi { };
@@ -5798,6 +5805,8 @@ let
       inherit (gnome) libglademm;
     };
 
+    tp_smapi = callPackage ../os-specific/linux/tp_smapi { };
+
     v86d = callPackage ../os-specific/linux/v86d { };
 
     virtualbox = callPackage ../applications/virtualization/virtualbox {
@@ -7433,6 +7442,8 @@ let
     inherit (pkgs.gnome) libsoup;
   };
 
+  telepathy_logger = callPackage ../applications/networking/instant-messengers/telepathy/logger {};
+
   telepathy_mission_control = callPackage ../applications/networking/instant-messengers/telepathy/mission-control { };
 
   telepathy_rakia = callPackage ../applications/networking/instant-messengers/telepathy/rakia { };
@@ -8452,6 +8463,8 @@ let
 
   nut = callPackage ../applications/misc/nut { };
 
+  nut_2_6_3 = callPackage ../applications/misc/nut/2.6.3.nix { };
+
   disnix = callPackage ../tools/package-management/disnix { };
 
   disnix_activation_scripts = callPackage ../tools/package-management/disnix/activation-scripts {
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a183e43f134da..b9d39873f9c6b 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -442,11 +442,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   async = callPackage ../development/libraries/haskell/async {};
 
-  attempt_0_3_1_1 = callPackage ../development/libraries/haskell/attempt/0.3.1.1.nix {
-    failure = self.failure_0_1_2;
-  };
-  attempt_0_4_0 = callPackage ../development/libraries/haskell/attempt/0.4.0.nix {};
-  attempt = self.attempt_0_4_0;
+  attempt = callPackage ../development/libraries/haskell/attempt {};
 
   attoparsec = callPackage ../development/libraries/haskell/attoparsec {};
 
@@ -558,10 +554,6 @@ 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 {
-    attempt = self.attempt_0_3_1_1;
-  };
-
   continuedFractions = callPackage ../development/libraries/haskell/continued-fractions {};
 
   converge = callPackage ../development/libraries/haskell/converge {};
@@ -664,9 +656,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   extensibleExceptions_0_1_1_4 = callPackage ../development/libraries/haskell/extensible-exceptions/0.1.1.4.nix {};
   extensibleExceptions = null; # a core package in recent GHCs
 
-  failure_0_1_2 = callPackage ../development/libraries/haskell/failure/0.1.2.nix {};
-  failure_0_2_0 = callPackage ../development/libraries/haskell/failure/0.2.0.nix {};
-  failure = self.failure_0_2_0;
+  failure = callPackage ../development/libraries/haskell/failure {};
 
   fastLogger = callPackage ../development/libraries/haskell/fast-logger {};
 
@@ -1536,7 +1526,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   zlib = self.zlib_0_5_3_3;
 
   zlibBindings_0_0_3_2 = callPackage ../development/libraries/haskell/zlib-bindings/0.0.3.2.nix {};
-  zlibBindings_0_1_0 = callPackage ../development/libraries/haskell/zlib-bindings/0.1.0.nix {};
+  zlibBindings_0_1_0_1 = callPackage ../development/libraries/haskell/zlib-bindings/0.1.0.1.nix {};
   zlibBindings = self.zlibBindings_0_0_3_2;
 
   zlibConduit = callPackage ../development/libraries/haskell/zlib-conduit {};