From d7dc9cd0d28ce73f2e49a8a13c594babe63dd35c Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Wed, 31 Jul 2013 18:15:53 +0000
Subject: [PATCH 01/95] fixed a patch which was rejected, i wonder why it was
 still there...

---
 .../kde-4.10/kdebindings/smokegen-nix.patch   | 55 ++++---------------
 1 file changed, 11 insertions(+), 44 deletions(-)

diff --git a/pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch b/pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch
index 03df484b63e..53257e836e0 100644
--- a/pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch
+++ b/pkgs/desktops/kde-4.10/kdebindings/smokegen-nix.patch
@@ -1,46 +1,13 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 79945c4..a244d0f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -32,10 +32,6 @@ set(generator_SRC
-     type.cpp
- )
+diff -urN smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in smokegen-4.10.5/cmake/SmokeConfig.cmake.in
+--- smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in	2013-06-28 17:14:50.000000000 +0000
++++ smokegen-4.10.5/cmake/SmokeConfig.cmake.in	2013-07-30 21:26:33.000000000 +0000
+@@ -80,8 +80,7 @@
+ set(SMOKE_API_BIN "@SMOKE_API_BIN@")
  
--# force RPATH so that the binary is usable from within the build tree
--set (CMAKE_SKIP_BUILD_RPATH FALSE)
--set (CMAKE_SKIP_RPATH FALSE)
--
- configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY )
+ find_library(SMOKE_BASE_LIBRARY smokebase 
+-              PATHS "@SMOKE_LIBRARY_PREFIX@"
+-              NO_DEFAULT_PATH)
++              PATHS "@SMOKE_LIBRARY_PREFIX@")
  
- add_executable(smokegen ${generator_SRC})
-diff --git a/cmake/SmokeConfig.cmake.in b/cmake/SmokeConfig.cmake.in
-index 947315c..de8d66c 100644
---- a/cmake/SmokeConfig.cmake.in
-+++ b/cmake/SmokeConfig.cmake.in
-@@ -44,21 +44,19 @@ macro (find_smoke_component name)
-         set (SMOKE_${uppercase}_FOUND FALSE CACHE INTERNAL "")
- 
-         find_path(SMOKE_${uppercase}_INCLUDE_DIR 
--            ${lowercase}_smoke.h 
--            PATH ${SMOKE_INCLUDE_DIR}
--            NO_DEFAULT_PATH
-+            ${lowercase}_smoke.h
-+            HINTS ${SMOKE_INCLUDE_DIR}
-+            PATH_SUFFIXES smoke
-             )
-         if(WIN32)
- 		    # DLLs are in the bin directory.
-             find_library(SMOKE_${uppercase}_LIBRARY
-                 smoke${lowercase}
--                PATHS "@CMAKE_INSTALL_PREFIX@/bin"
--                NO_DEFAULT_PATH)
-+                PATHS "@CMAKE_INSTALL_PREFIX@/bin")
-         else(WIN32)
-             find_library(SMOKE_${uppercase}_LIBRARY
-                 smoke${lowercase}
--                PATHS "@SMOKE_LIBRARY_PREFIX@"
--                NO_DEFAULT_PATH)
-+                PATHS "@SMOKE_LIBRARY_PREFIX@")
-         endif(WIN32)
- 
-         if (NOT SMOKE_${uppercase}_INCLUDE_DIR OR NOT SMOKE_${uppercase}_LIBRARY)
+ if (NOT SMOKE_BASE_LIBRARY)
+     if (Smoke_FIND_REQUIRED)

From 2208c360ac3ed2633b568520803d2887e18d9133 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Mon, 5 Aug 2013 02:29:04 +0000
Subject: [PATCH 02/95] linux: Update to 3.2.50

---
 pkgs/os-specific/linux/kernel/linux-3.2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix
index 9b1d1bcf6c1..7597a9c695e 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.2.49";
+  version = "3.2.50";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "06xiwcgk6hbcp6g1dpmxb95dzx94s29vzmh1pz4lsglcj1yfrkry";
+    sha256 = "0yg936syhay9x0qxqxdqrgi6ijdqklhqdrd8zk7l4zvgxaayaj68";
   };
 
   features.iwlwifi = true;

From 97056a0620f117d793e1a093ba36ec37456bf5e4 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Mon, 5 Aug 2013 17:59:43 +0000
Subject: [PATCH 03/95] linux: properly parse config choice when it's new

---
 pkgs/os-specific/linux/kernel/generate-config.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl
index 05b6867bc55..78663098fb3 100644
--- a/pkgs/os-specific/linux/kernel/generate-config.pl
+++ b/pkgs/os-specific/linux/kernel/generate-config.pl
@@ -54,8 +54,8 @@ sub runConfig {
         if ($s eq "\n") {
             print STDERR "GOT: $line" if $debug;
 
-            # Remember choice alternatives ("> 1. bla (FOO)" or " 2. bla (BAR)").
-            if ($line =~ /^\s*>?\s*(\d+)\.\s+.*\(([A-Za-z0-9_]+)\)$/) {
+            # Remember choice alternatives ("> 1. bla (FOO)" or " 2. bla (BAR) (NEW)").
+            if ($line =~ /^\s*>?\s*(\d+)\.\s+.*?\(([A-Za-z0-9_]+)\)(?:\s+\(NEW\))?\s*$/) {
                 $choices{$2} = $1;
             }
 

From 36c2711f8b09ee76b58ed2e6067655776dc981d5 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Mon, 5 Aug 2013 18:08:48 +0000
Subject: [PATCH 04/95] linux: update grsecurity patch

---
 pkgs/os-specific/linux/kernel/patches.nix | 8 ++++----
 pkgs/top-level/all-packages.nix           | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index c77785167cc..561cdc8f957 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -131,11 +131,11 @@ rec {
       patch = ./mips-ext3-n32.patch;
     };
 
-  grsecurity_2_9_1_3_2_48 =
-    { name = "grsecurity-2.9.1-3.2.48";
+  grsecurity_2_9_1_3_2_50 =
+    { name = "grsecurity-2.9.1-3.2.50";
       patch = fetchurl {
-        url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.48-201307212241.patch;
-        sha256 = "1llgrcd7ynxx60dn05bcbysd6a1091wwxkck4d15gvp71s9r6scm";
+        url = http://grsecurity.net/stable/grsecurity-2.9.1-3.2.50-201308052151.patch;
+        sha256 = "178y68bx4h4r9gq1p4izbjah8vhjmb3yvr3sfjglz8blxxahgd6n";
       };
     };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index effaf77680c..6701d2ba1b9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6388,7 +6388,7 @@ let
   };
 
   linux_3_2_grsecurity = lowPrio (lib.overrideDerivation (linux_3_2.override (args: {
-    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_2_9_1_3_2_48 ];
+    kernelPatches = args.kernelPatches ++ [ kernelPatches.grsecurity_2_9_1_3_2_50 ];
   })) (args: { makeFlags = "DISABLE_PAX_PLUGINS=y";}));
 
   linux_3_2_apparmor = lowPrio (linux_3_2.override {

From 02707296e88a1548155d34a2ff240dfe15f804d7 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Fri, 9 Aug 2013 17:30:10 +0200
Subject: [PATCH 05/95] Update leiningen to 2.3.0.

Unfortunately, leiningen will now pull in some dependencies via maven (via http) on `lein version' so the test at the end of builder.sh failed. This is okay because leiningen is used only as a interactive tool and no other package in Nixpkgs depends on it.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
---
 .../tools/build-managers/leiningen/builder.sh      |  4 ----
 .../tools/build-managers/leiningen/default.nix     | 14 +++++++-------
 .../{lein_2.1.2.patch => lein_2.3.0.patch}         |  0
 3 files changed, 7 insertions(+), 11 deletions(-)
 rename pkgs/development/tools/build-managers/leiningen/{lein_2.1.2.patch => lein_2.3.0.patch} (100%)

diff --git a/pkgs/development/tools/build-managers/leiningen/builder.sh b/pkgs/development/tools/build-managers/leiningen/builder.sh
index c4b7002a718..f5489a4a76f 100644
--- a/pkgs/development/tools/build-managers/leiningen/builder.sh
+++ b/pkgs/development/tools/build-managers/leiningen/builder.sh
@@ -21,7 +21,3 @@ chmod -v 755 $out_bin
 patchShebangs $out
 
 wrapProgram $out_bin --prefix PATH ":" ${rlwrap}/bin
-
-echo "Testing out \"lein version\"..."
-$out_bin version
-echo "Success."
diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix
index bf1a275046e..d7f819c45f6 100644
--- a/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -1,21 +1,21 @@
-{stdenv, fetchurl, makeWrapper, openjdk, rlwrap, clojure }:
+{ stdenv, fetchurl, makeWrapper, jdk, rlwrap, clojure }:
 
 stdenv.mkDerivation rec {
   pname = "leiningen";
-  version = "2.1.2";
+  version = "2.3.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg";
-    sha256 = "10s4xpwrhd8wz3h2vj8ay4rf2hw8vzswfkr8ckckk3fhjcn130dy";
+    sha256 = "18rk1rr9il5jc3103cnmii6hyc1j3k12d975sqrcqyg97h7f0jkb";
   };
 
   jarsrc = fetchurl {
     url = "https://leiningen.s3.amazonaws.com/downloads/${pname}-${version}-standalone.jar";
-    sha256 = "08jq21zpsgwsmsz7lpfxidj2s3mv8i23fjwyl9qc6dngskkx45sa";
+    sha256 = "1higd309b43lly7fv1pd5lfd3lyrij95nrzklqmk8vf9llw6974p";
   };
 
-  patches = ./lein_2.1.2.patch;
+  patches = ./lein_2.3.0.patch;
 
   inherit rlwrap clojure;
 
@@ -23,13 +23,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ makeWrapper ];
 
-  propagatedBuildInputs = [ openjdk clojure ];
+  propagatedBuildInputs = [ jdk clojure ];
 
   meta = {
     homepage = https://github.com/technomancy/leiningen;
     description = "Project automation for Clojure";
     license = "EPL";
     platforms = stdenv.lib.platforms.unix;
-    maintainer = with stdenv.lib.maintainers; [the-kenny];
+    maintainer = with stdenv.lib.maintainers; [ the-kenny ];
   };
 }
diff --git a/pkgs/development/tools/build-managers/leiningen/lein_2.1.2.patch b/pkgs/development/tools/build-managers/leiningen/lein_2.3.0.patch
similarity index 100%
rename from pkgs/development/tools/build-managers/leiningen/lein_2.1.2.patch
rename to pkgs/development/tools/build-managers/leiningen/lein_2.3.0.patch

From d9a4706f73430169bf1d49ea76ea0c15a1bb909b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 9 Aug 2013 17:39:23 +0200
Subject: [PATCH 06/95] linux: Use kmod instead of module-init-tools

---
 pkgs/os-specific/linux/kernel/builder.sh  | 11 ++---------
 pkgs/os-specific/linux/kernel/generic.nix |  4 ++--
 pkgs/top-level/all-packages.nix           | 12 ++++++------
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/builder.sh b/pkgs/os-specific/linux/kernel/builder.sh
index 621237fa9a3..8fb5e9f91eb 100644
--- a/pkgs/os-specific/linux/kernel/builder.sh
+++ b/pkgs/os-specific/linux/kernel/builder.sh
@@ -23,8 +23,6 @@ configurePhase() {
     export INSTALL_PATH=$out
     export INSTALL_MOD_PATH=$out
 
-    substituteInPlace scripts/depmod.sh --replace '-b "$INSTALL_MOD_PATH"' ""
-
     # Set our own localversion, if specified.
     rm -f localversion*
     if test -n "$localVersion"; then
@@ -70,14 +68,9 @@ installPhase() {
     cp vmlinux $out
 
     if grep -q "CONFIG_MODULES=y" .config; then
-        # Install the modules in $out/lib/modules with matching paths
-        # in modules.dep (i.e., refererring to $out/lib/modules, not
-        # /lib/modules).  The depmod_opts= is to prevent the kernel
-        # from passing `-b PATH' to depmod.
-        export MODULE_DIR=$out/lib/modules/
-        substituteInPlace Makefile --replace '-b $(INSTALL_MOD_PATH)' ''
+        # Install the modules in $out/lib/modules.
         make modules_install \
-            DEPMOD=$module_init_tools/sbin/depmod depmod_opts= \
+            DEPMOD=$kmod/sbin/depmod \
             $makeFlags "${makeFlagsArray[@]}" \
             $installFlags "${installFlagsArray[@]}"
 
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index ad243ae5b7c..1ade2473627 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, mktemp, module_init_tools, bc
+{ stdenv, fetchurl, perl, mktemp, kmod, bc
 
 , # The kernel source tarball.
   src
@@ -78,7 +78,7 @@ stdenv.mkDerivation {
 
   generateConfig = ./generate-config.pl;
 
-  inherit preConfigure src module_init_tools localVersion postInstall postBuild;
+  inherit preConfigure src kmod localVersion postInstall postBuild;
 
   patches = map (p: p.patch) kernelPatches;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8b36b2f1595..cdd240d89b8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6377,7 +6377,7 @@ let
   kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
 
   linux_3_0 = makeOverridable (import ../os-specific/linux/kernel/linux-3.0.nix) {
-    inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
+    inherit fetchurl stdenv perl mktemp bc kmod ubootChooser;
     kernelPatches =
       [ kernelPatches.sec_perm_2_6_24
         # kernelPatches.aufs3_0
@@ -6385,7 +6385,7 @@ let
   };
 
   linux_3_2 = makeOverridable (import ../os-specific/linux/kernel/linux-3.2.nix) {
-    inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
+    inherit fetchurl stdenv perl mktemp bc kmod ubootChooser;
     kernelPatches =
       [ kernelPatches.sec_perm_2_6_24
         # kernelPatches.aufs3_2
@@ -6411,7 +6411,7 @@ let
   });
 
   linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) {
-    inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
+    inherit fetchurl stdenv perl mktemp bc kmod ubootChooser;
     kernelPatches =
       [ kernelPatches.sec_perm_2_6_24
         # kernelPatches.aufs3_4
@@ -6430,11 +6430,11 @@ let
   });
 
   linux_3_6_rpi = makeOverridable (import ../os-specific/linux/kernel/linux-rpi-3.6.nix) {
-    inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
+    inherit fetchurl stdenv perl mktemp bc kmod ubootChooser;
   };
 
   linux_3_9 = makeOverridable (import ../os-specific/linux/kernel/linux-3.9.nix) {
-    inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
+    inherit fetchurl stdenv perl mktemp bc kmod ubootChooser;
     kernelPatches =
       [
         kernelPatches.sec_perm_2_6_24
@@ -6446,7 +6446,7 @@ let
   };
 
   linux_3_10 = makeOverridable (import ../os-specific/linux/kernel/linux-3.10.nix) {
-    inherit fetchurl stdenv perl mktemp bc module_init_tools ubootChooser;
+    inherit fetchurl stdenv perl mktemp bc kmod ubootChooser;
     kernelPatches =
       [
         kernelPatches.sec_perm_2_6_24

From 9845e6ec5c9dd9dbc3d692e4c62f6c86a0b4dad7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 9 Aug 2013 17:55:45 +0200
Subject: [PATCH 07/95] Kernel module aggregator: Use kmod instead of
 module-init-tools

---
 .../linux/{module-init-tools => kmod}/aggregator.nix      | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename pkgs/os-specific/linux/{module-init-tools => kmod}/aggregator.nix (80%)

diff --git a/pkgs/os-specific/linux/module-init-tools/aggregator.nix b/pkgs/os-specific/linux/kmod/aggregator.nix
similarity index 80%
rename from pkgs/os-specific/linux/module-init-tools/aggregator.nix
rename to pkgs/os-specific/linux/kmod/aggregator.nix
index cc4e6ab3552..161af38ff60 100644
--- a/pkgs/os-specific/linux/module-init-tools/aggregator.nix
+++ b/pkgs/os-specific/linux/kmod/aggregator.nix
@@ -1,4 +1,4 @@
-{stdenv, module_init_tools, modules, buildEnv}:
+{ stdenv, kmod, modules, buildEnv }:
 
 buildEnv {
   name = "kernel-modules";
@@ -8,20 +8,20 @@ buildEnv {
   postBuild =
     ''
       source ${stdenv}/setup
-    
+
       kernelVersion=$(cd $out/lib/modules && ls -d *)
       if test "$(echo $kernelVersion | wc -w)" != 1; then
          echo "inconsistent kernel versions: $kernelVersion"
          exit 1
       fi
-    
+
       echo "kernel version is $kernelVersion"
 
       # Regenerate the depmod map files.  Be sure to pass an explicit
       # kernel version number, otherwise depmod will use `uname -r'.
       if test -w $out/lib/modules/$kernelVersion; then
           rm -f $out/lib/modules/$kernelVersion/modules.*
-          MODULE_DIR=$out/lib/modules/ ${module_init_tools}/sbin/depmod -a $kernelVersion
+          ${kmod}/sbin/depmod -b $out -a $kernelVersion
       fi
     '';
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cdd240d89b8..9c747079670 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6647,8 +6647,8 @@ let
   mountall = callPackage ../os-specific/linux/mountall { };
 
   aggregateModules = modules:
-    import ../os-specific/linux/module-init-tools/aggregator.nix {
-      inherit stdenv module_init_tools modules buildEnv;
+    callPackage ../os-specific/linux/kmod/aggregator.nix {
+      inherit modules;
     };
 
   multipath_tools = callPackage ../os-specific/linux/multipath-tools { };

From f4681d8e08092353a58c36e6ae79509719b1e25c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 9 Aug 2013 18:47:09 +0200
Subject: [PATCH 08/95] virtualbox: Update to 4.2.16

---
 pkgs/applications/virtualization/virtualbox/default.nix   | 8 ++++----
 .../virtualization/virtualbox/guest-additions/default.nix | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 264f1259fe5..724dc6ca16e 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -11,7 +11,7 @@ with stdenv.lib;
 
 let
 
-  version = "4.2.14"; # changes ./guest-additions as well
+  version = "4.2.16"; # changes ./guest-additions as well
 
   forEachModule = action: ''
     for mod in \
@@ -31,11 +31,11 @@ let
   '';
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
-  extpackRevision = "86644";
+  extpackRevision = "86992";
   extensionPack = requireFile rec {
     name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack";
     # Has to be base16 because it's used as an input to VBoxExtPackHelperApp!
-    sha256 = "5813cae72790de4893cadb839ffbd148290a44ec6913d901d84c9b3740ab1b1e";
+    sha256 = "03gsl0548hrcspl5mi7snng08phwd3vfn6qmx41h2xwvwvmv324g";
     message = ''
       In order to use the extension pack, you need to comply with the VirtualBox Personal Use
       and Evaluation License (PUEL) by downloading the related binaries from:
@@ -54,7 +54,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "038k65cdvr80da5nfan5r3rjrnxqab2fbf2pr2jq8g1gc4cxrxpq";
+    sha256 = "0nnl8qh8j4sk5zn78hrp6ccidmk332p7qg6pv5a0a4irs0b8j3zz";
   };
 
   buildInputs =
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index e7843b07fc3..cca133685f6 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "9f08f13bbd818fb3ef9916658542ad0999c35e11afc1f6e8ff0b944405486e8a";
+    sha256 = "1id0rb2sdnn34rvjl2v3hp3z9g9c4s4f4kl1lx0myjlqv8i0fayg";
   };
 
   KERN_DIR = "${kernelDev}/lib/modules/*/build";

From 67a46ce928c9190c9b11982120000df711ef1945 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Fri, 9 Aug 2013 21:52:58 +0200
Subject: [PATCH 09/95] Add taskjuggler ruby gem

Unfortunately, this changes lots of unrelated gems.
---
 .../interpreters/ruby/generated.nix           | 195 +++++++++---------
 1 file changed, 97 insertions(+), 98 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix
index 7446e52704c..ff0bcf235ae 100644
--- a/pkgs/development/interpreters/ruby/generated.nix
+++ b/pkgs/development/interpreters/ruby/generated.nix
@@ -12,10 +12,10 @@ g: # Get dependencies from patched gems
     activesupport = g.activesupport_4_0_0;
     addressable = g.addressable_2_3_5;
     arel = g.arel_4_0_0;
-    atomic = g.atomic_1_1_10;
+    atomic = g.atomic_1_1_12;
     atoulme_Antwrap = g.atoulme_Antwrap_0_7_4;
     autotest_rails = g.autotest_rails_4_1_2;
-    aws_sdk = g.aws_sdk_1_12_0;
+    aws_sdk = g.aws_sdk_1_14_1;
     bitbucket_backup = g.bitbucket_backup_0_2_2;
     builder = g.builder_3_2_2;
     buildr = g.buildr_1_4_12;
@@ -31,9 +31,8 @@ g: # Get dependencies from patched gems
     erubis = g.erubis_2_7_0;
     eventmachine = g.eventmachine_1_0_3;
     eventmachine_tail = g.eventmachine_tail_0_6_4;
-    execjs = g.execjs_1_4_0;
     fakes3 = g.fakes3_0_1_5;
-    faraday = g.faraday_0_8_7;
+    faraday = g.faraday_0_8_8;
     faraday_middleware = g.faraday_middleware_0_8_8;
     ffi = g.ffi_1_9_0;
     file_tail = g.file_tail_1_0_12;
@@ -46,10 +45,9 @@ g: # Get dependencies from patched gems
     i18n = g.i18n_0_6_4;
     iconv = g.iconv_1_0_3;
     jruby_pageant = g.jruby_pageant_1_1_1;
-    jsduck = g.jsduck_4_10_4;
+    jsduck = g.jsduck_5_0_1;
     json = g.json_1_8_0;
     json_pure = g.json_pure_1_8_0;
-    libv8 = g.libv8_3_11_8_17_x86_64_linux;
     locale = g.locale_2_0_8;
     lockfile = g.lockfile_2_1_0;
     macaddr = g.macaddr_1_6_1;
@@ -59,10 +57,10 @@ g: # Get dependencies from patched gems
     mini_portile = g.mini_portile_0_5_1;
     minitar = g.minitar_0_5_3;
     minitest = g.minitest_4_7_5;
-    multi_json = g.multi_json_1_7_7;
+    multi_json = g.multi_json_1_7_8;
     multipart_post = g.multipart_post_1_2_0;
-    net_http_digest_auth = g.net_http_digest_auth_1_3;
-    net_http_persistent = g.net_http_persistent_2_8;
+    net_http_digest_auth = g.net_http_digest_auth_1_4;
+    net_http_persistent = g.net_http_persistent_2_9;
     net_sftp = g.net_sftp_2_0_5;
     net_ssh = g.net_ssh_2_6_8;
     nix = g.nix_0_1_1;
@@ -80,11 +78,11 @@ g: # Get dependencies from patched gems
     rake = g.rake_10_1_0;
     rb_fsevent = g.rb_fsevent_0_9_3;
     rdiscount = g.rdiscount_2_1_6;
-    ref = g.ref_1_0_5;
     remote_syslog = g.remote_syslog_1_6_14;
     right_aws = g.right_aws_3_1_0;
     right_http_connection = g.right_http_connection_1_4_0;
     rjb = g.rjb_1_4_8;
+    rkelly_remix = g.rkelly_remix_0_0_4;
     rmail = g.rmail_1_0_0;
     rspec = g.rspec_2_11_0;
     rspec_core = g.rspec_core_2_11_1;
@@ -92,19 +90,20 @@ g: # Get dependencies from patched gems
     rspec_mocks = g.rspec_mocks_2_11_3;
     rubyforge = g.rubyforge_2_0_4;
     rubyzip = g.rubyzip_0_9_9;
-    sass = g.sass_3_2_9;
-    selenium_webdriver = g.selenium_webdriver_2_33_0;
+    sass = g.sass_3_2_10;
+    selenium_webdriver = g.selenium_webdriver_2_34_0;
     servolux = g.servolux_0_10_0;
     sinatra = g.sinatra_1_3_2;
     sprockets = g.sprockets_2_10_0;
     sprockets_rails = g.sprockets_rails_2_0_0;
     syslog_protocol = g.syslog_protocol_0_9_2;
     systemu = g.systemu_2_5_2;
+    taskjuggler = g.taskjuggler_3_5_0;
+    term_ansicolor = g.term_ansicolor_1_2_2;
     text = g.text_1_2_1;
-    therubyracer = g.therubyracer_0_11_4;
     thin = g.thin_1_5_1;
     thor = g.thor_0_18_1;
-    thread_safe = g.thread_safe_0_1_0;
+    thread_safe = g.thread_safe_0_1_2;
     tilt = g.tilt_1_4_1;
     tins = g.tins_0_8_3;
     treetop = g.treetop_1_4_14;
@@ -121,7 +120,7 @@ g: # Get dependencies from patched gems
     xml_simple = g.xml_simple_1_1_1;
     yajl_ruby = g.yajl_ruby_1_1_0;
   };
-  gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''gettext'' ''iconv'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''trollop'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ];
+  gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''gettext'' ''iconv'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''thin'' ''trollop'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ];
   gems = {
     ZenTest_4_9_2 = {
       basename = ''ZenTest'';
@@ -217,7 +216,7 @@ installed versions.'';
         longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.'';
       };
       name = ''activesupport-4.0.0'';
-      requiredGems = [ g.i18n_0_6_4 g.multi_json_1_7_7 g.tzinfo_0_3_37 g.minitest_4_7_5 g.thread_safe_0_1_0 ];
+      requiredGems = [ g.i18n_0_6_4 g.multi_json_1_7_8 g.tzinfo_0_3_37 g.minitest_4_7_5 g.thread_safe_0_1_2 ];
       sha256 = ''0agxkvjhhv6r9rpm0lcgjny4sn1ihhvhlgs46rgi3fz0y1d93ids'';
     };
     addressable_2_3_5 = {
@@ -252,16 +251,16 @@ database compatibility and query generation.'';
       requiredGems = [  ];
       sha256 = ''19xzg8jhp4p18xlf6sp4yhf6vdpc3hl8lm23n6glikclm7rvgick'';
     };
-    atomic_1_1_10 = {
+    atomic_1_1_12 = {
       basename = ''atomic'';
       meta = {
         description = ''An atomic reference implementation for JRuby, Rubinius, and MRI'';
         homepage = ''http://github.com/headius/ruby-atomic'';
         longDescription = ''An atomic reference implementation for JRuby, Rubinius, and MRI'';
       };
-      name = ''atomic-1.1.10'';
+      name = ''atomic-1.1.12'';
       requiredGems = [  ];
-      sha256 = ''0ms6b2f9hij6bap901ra2wx7lk4y2bsasifcqr7m3z8l5my372jh'';
+      sha256 = ''038kihswmzlzsc96r3qg5g0khdg5lywjk2nz32i7l6j85lpg233v'';
     };
     atoulme_Antwrap_0_7_4 = {
       basename = ''atoulme_Antwrap'';
@@ -297,16 +296,16 @@ rails support and extra plugins for migrations and fixtures.'';
       requiredGems = [ g.ZenTest_4_9_2 ];
       sha256 = ''1wkb5jayb39yx0i8ly7sibygf9f9c3w24jg2z1qgm135zlb070v4'';
     };
-    aws_sdk_1_12_0 = {
+    aws_sdk_1_14_1 = {
       basename = ''aws_sdk'';
       meta = {
         description = ''AWS SDK for Ruby'';
         homepage = ''http://aws.amazon.com/sdkforruby'';
         longDescription = ''AWS SDK for Ruby'';
       };
-      name = ''aws-sdk-1.12.0'';
+      name = ''aws-sdk-1.14.1'';
       requiredGems = [ g.uuidtools_2_1_4 g.nokogiri_1_5_10 g.json_1_8_0 ];
-      sha256 = ''0ijz5ch7ch5kj19j5caf5h3hdfmmny9v9clkdh664cr46ylvkv3n'';
+      sha256 = ''18lvxnkb7xb2q7z5ifz9j2b9v17r6fd04s83pac7598s3zj6k4na'';
     };
     bitbucket_backup_0_2_2 = {
       basename = ''bitbucket_backup'';
@@ -553,17 +552,6 @@ using TCP/IP, especially if custom protocols are required.'';
       requiredGems = [ g.eventmachine_1_0_3 ];
       sha256 = ''1pvlb34vdzd81kf9f3xyibb4f55xjqm7lqqy28dgyci5cyv50y61'';
     };
-    execjs_1_4_0 = {
-      basename = ''execjs'';
-      meta = {
-        description = ''Run JavaScript code from Ruby'';
-        homepage = ''https://github.com/sstephenson/execjs'';
-        longDescription = ''ExecJS lets you run JavaScript code from Ruby.'';
-      };
-      name = ''execjs-1.4.0'';
-      requiredGems = [ g.multi_json_1_7_7 ];
-      sha256 = ''0b69ci2afbcdqsri3i89a7s7j7palxsxdb65x6h2wx79kzlc5xcs'';
-    };
     fakes3_0_1_5 = {
       basename = ''fakes3'';
       meta = {
@@ -574,15 +562,15 @@ using TCP/IP, especially if custom protocols are required.'';
       requiredGems = [ g.thor_0_18_1 g.builder_3_2_2 ];
       sha256 = ''1na5wrbarla6s414svqmr5spbpv6vmcgpswal444x4clcpmadhib'';
     };
-    faraday_0_8_7 = {
+    faraday_0_8_8 = {
       basename = ''faraday'';
       meta = {
         description = ''HTTP/REST API client library.'';
         homepage = ''https://github.com/lostisland/faraday'';
       };
-      name = ''faraday-0.8.7'';
+      name = ''faraday-0.8.8'';
       requiredGems = [ g.multipart_post_1_2_0 ];
-      sha256 = ''186a9md3ixanl2crdlw37kspw5wiyw16z9mj3aw8rd1yd5q56ddi'';
+      sha256 = ''no hash'';
     };
     faraday_middleware_0_8_8 = {
       basename = ''faraday_middleware'';
@@ -592,7 +580,7 @@ using TCP/IP, especially if custom protocols are required.'';
         longDescription = ''Various middleware for Faraday'';
       };
       name = ''faraday_middleware-0.8.8'';
-      requiredGems = [ g.faraday_0_8_7 ];
+      requiredGems = [ g.faraday_0_8_8 ];
       sha256 = ''1n0g8pm7ynx6ffyqhscc1cqw97zhvd8isr31yfyj15335j1jsncz'';
     };
     ffi_1_9_0 = {
@@ -747,16 +735,16 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       requiredGems = [  ];
       sha256 = ''1kgqsn0bagr41gf5kbqaxbs38a7s5bm85m0pdx4qz7d70v9nc9cl'';
     };
-    jsduck_4_10_4 = {
+    jsduck_5_0_1 = {
       basename = ''jsduck'';
       meta = {
         description = ''Simple JavaScript Duckumentation generator'';
         homepage = ''https://github.com/senchalabs/jsduck'';
         longDescription = ''Documentation generator for Sencha JS frameworks'';
       };
-      name = ''jsduck-4.10.4'';
-      requiredGems = [ g.rdiscount_2_1_6 g.json_1_8_0 g.parallel_0_7_1 g.execjs_1_4_0 g.therubyracer_0_11_4 g.dimensions_1_2_0 ];
-      sha256 = ''1xnad96wmszz0m66wrwciihba6whpg8bglwkbazrifxh9kcw7wih'';
+      name = ''jsduck-5.0.1'';
+      requiredGems = [ g.rdiscount_2_1_6 g.json_1_8_0 g.parallel_0_7_1 g.rkelly_remix_0_0_4 g.dimensions_1_2_0 ];
+      sha256 = ''0py1ik9jri5f230ifqxv0y0p4w0dp5jp8a9hfzgzaz4xvpzqyf7h'';
     };
     json_1_8_0 = {
       basename = ''json'';
@@ -791,17 +779,6 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       requiredGems = [  ];
       sha256 = ''0kkn5zhiffav2cffj43wwvzj07825r4j463ilfjgik034vnbjs83'';
     };
-    libv8_3_11_8_17_x86_64_linux = {
-      basename = ''libv8'';
-      meta = {
-        description = ''Distribution of the V8 JavaScript engine'';
-        homepage = ''http://github.com/cowboyd/libv8'';
-        longDescription = ''Distributes the V8 JavaScript engine in binary and source forms in order to support fast builds of The Ruby Racer'';
-      };
-      name = ''libv8-3.11.8.17-x86_64-linux'';
-      requiredGems = [  ];
-      sha256 = ''1s2j79rm2idny701l6rsnig6451w2wfipgmfvxf05d1syn14cmg9'';
-    };
     locale_2_0_8 = {
       basename = ''locale'';
       meta = {
@@ -859,7 +836,7 @@ submitted.  Mechanize also keeps track of the sites that you have visited as
 a history.'';
       };
       name = ''mechanize-2.7.1'';
-      requiredGems = [ g.net_http_digest_auth_1_3 g.net_http_persistent_2_8 g.mime_types_1_23 g.http_cookie_1_0_1 g.nokogiri_1_6_0 g.ntlm_http_0_1_1 g.webrobots_0_1_1 g.domain_name_0_5_12 ];
+      requiredGems = [ g.net_http_digest_auth_1_4 g.net_http_persistent_2_9 g.mime_types_1_23 g.http_cookie_1_0_1 g.nokogiri_1_6_0 g.ntlm_http_0_1_1 g.webrobots_0_1_1 g.domain_name_0_5_12 ];
       sha256 = ''0abcrabsjamp4fjbizp4dv8nkz7jv03r9n0lpn9yypb48ij876vh'';
     };
     mime_types_1_23 = {
@@ -979,16 +956,16 @@ extract-method refactorings still apply.'';
       requiredGems = [  ];
       sha256 = ''03p6iban9gcpcflzp4z901s1hgj9369p6515h967ny6hlqhcf2iy'';
     };
-    multi_json_1_7_7 = {
+    multi_json_1_7_8 = {
       basename = ''multi_json'';
       meta = {
         description = ''A common interface to multiple JSON libraries.'';
         homepage = ''http://github.com/intridea/multi_json'';
         longDescription = ''A common interface to multiple JSON libraries, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, NSJSONSerialization, gson.rb, JrJackson, and OkJson.'';
       };
-      name = ''multi_json-1.7.7'';
+      name = ''multi_json-1.7.8'';
       requiredGems = [  ];
-      sha256 = ''1w3fpi52h4a7r0a670xzrwa40l5irh69r45cbvxw24bsp19sfxzr'';
+      sha256 = ''no hash'';
     };
     multipart_post_1_2_0 = {
       basename = ''multipart_post'';
@@ -1001,7 +978,7 @@ extract-method refactorings still apply.'';
       requiredGems = [  ];
       sha256 = ''12p7lnmc52di1r4h73h6xrpppplzyyhani9p7wm8l4kgf1hnmwnc'';
     };
-    net_http_digest_auth_1_3 = {
+    net_http_digest_auth_1_4 = {
       basename = ''net_http_digest_auth'';
       meta = {
         description = ''An implementation of RFC 2617 - Digest Access Authentication'';
@@ -1014,11 +991,11 @@ In order to use net-http-digest_auth you'll need to perform some request
 wrangling on your own.  See the class documentation at Net::HTTP::DigestAuth
 for an example.'';
       };
-      name = ''net-http-digest_auth-1.3'';
+      name = ''net-http-digest_auth-1.4'';
       requiredGems = [  ];
-      sha256 = ''11hn4fb02rx799ck1gghmz7b32977zbi9sz2jpfyz43igwz2dvzy'';
+      sha256 = ''14801gr34g0rmqz9pv4rkfa3crfdbyfk6r48vpg5a5407v0sixqi'';
     };
-    net_http_persistent_2_8 = {
+    net_http_persistent_2_9 = {
       basename = ''net_http_persistent'';
       meta = {
         description = ''Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8'';
@@ -1034,9 +1011,9 @@ Net::HTTP supports persistent connections with some API methods but does not
 handle reconnection gracefully.  Net::HTTP::Persistent supports reconnection
 and retry according to RFC 2616.'';
       };
-      name = ''net-http-persistent-2.8'';
+      name = ''net-http-persistent-2.9'';
       requiredGems = [  ];
-      sha256 = ''1y50ssi8lcxfady4wwy242sgsr1424g5rg3wpav6kqc9rba74v9l'';
+      sha256 = ''0k9bp7q5fsh908jnkwfj71ky04i4ih0ky6sqi5vl6zcpjsczgfcb'';
     };
     net_sftp_2_0_5 = {
       basename = ''net_sftp'';
@@ -1110,7 +1087,7 @@ enough of it.'';
       };
       name = ''nokogiri-1.6.0'';
       requiredGems = [ g.mini_portile_0_5_1 ];
-      sha256 = ''1icrny9w2hd0pm7cyq5wqdkbzr57dkma1lbyrr0x14lsnangkidb'';
+      sha256 = ''no hash'';
     };
     ntlm_http_0_1_1 = {
       basename = ''ntlm_http'';
@@ -1131,7 +1108,7 @@ enough of it.'';
         longDescription = ''Command-line client for Papertrail hosted log management service. Tails and searches app server logs and system syslog. Supports Boolean search and works with grep and pipe output (Unix).'';
       };
       name = ''papertrail-0.9.7'';
-      requiredGems = [ g.addressable_2_3_5 g.yajl_ruby_1_1_0 g.chronic_0_9_1 g.faraday_0_8_7 g.faraday_middleware_0_8_8 ];
+      requiredGems = [ g.addressable_2_3_5 g.yajl_ruby_1_1_0 g.chronic_0_9_1 g.faraday_0_8_8 g.faraday_middleware_0_8_8 ];
       sha256 = ''0v0m1v0qabbr9pmyl77znz39qy1m7p0xwvf3lf9hyq6n524f2dwr'';
     };
     papertrail_cli_0_9_3 = {
@@ -1288,17 +1265,6 @@ request helpers feature.'';
       requiredGems = [  ];
       sha256 = ''180ln9gwxn0cyflg0i1viv7jyalmjqvqr34cb65xsmmsz1nz55q2'';
     };
-    ref_1_0_5 = {
-      basename = ''ref'';
-      meta = {
-        description = ''Library that implements weak, soft, and strong references in Ruby.'';
-        homepage = ''http://github.com/bdurand/ref'';
-        longDescription = ''Library that implements weak, soft, and strong references in Ruby that work across multiple runtimes (MRI, REE, YARV, Jruby, Rubinius, and IronRuby). Also includes implementation of maps/hashes that use references and a reference queue.'';
-      };
-      name = ''ref-1.0.5'';
-      requiredGems = [  ];
-      sha256 = ''19qgpsfszwc2sfh6wixgky5agn831qq8ap854i1jqqhy1zsci3la'';
-    };
     remote_syslog_1_6_14 = {
       basename = ''remote_syslog'';
       meta = {
@@ -1401,6 +1367,19 @@ algorithm for low-level network errors.
       requiredGems = [  ];
       sha256 = ''06ps4ssaxb8jwja53h7v7kb31hsdr997b8na89d1yasm5zyraliw'';
     };
+    rkelly_remix_0_0_4 = {
+      basename = ''rkelly_remix'';
+      meta = {
+        description = ''Fork of the RKelly library to make it suitable as the JavaScript parser in JSDuck'';
+        longDescription = ''Fork of the RKelly library to make it suitable as the JavaScript parser
+in JSDuck.
+
+* http://rkelly.rubyforge.org/'';
+      };
+      name = ''rkelly-remix-0.0.4'';
+      requiredGems = [  ];
+      sha256 = ''1w6yr5n3b8yd0rsba9q3zyxr0n2hbpkz4v2k1qx6j1ywvl9rc2c1'';
+    };
     rmail_1_0_0 = {
       basename = ''rmail'';
       meta = {
@@ -1484,7 +1463,7 @@ algorithm for low-level network errors.
       requiredGems = [  ];
       sha256 = ''1khf6d903agnwd8965f5f8b353rzmfvygxp53z1199rqzw8h46q2'';
     };
-    sass_3_2_9 = {
+    sass_3_2_10 = {
       basename = ''sass'';
       meta = {
         description = ''A powerful but elegant CSS compiler that makes CSS fun again.'';
@@ -1495,20 +1474,20 @@ algorithm for low-level network errors.
       command line tool or a web-framework plugin.
 '';
       };
-      name = ''sass-3.2.9'';
+      name = ''sass-3.2.10'';
       requiredGems = [  ];
-      sha256 = ''08lvbi4siavvci0g4m65576axcagw23i0iamdqv33kwdimik717q'';
+      sha256 = ''0anfff4hz8fz1wbimmp9vv4mjfl1swg7ww74j549788x41l4x283'';
     };
-    selenium_webdriver_2_33_0 = {
+    selenium_webdriver_2_34_0 = {
       basename = ''selenium_webdriver'';
       meta = {
         description = ''The next generation developer focused tool for automated testing of webapps'';
         homepage = ''http://selenium.googlecode.com'';
         longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.'';
       };
-      name = ''selenium-webdriver-2.33.0'';
-      requiredGems = [ g.multi_json_1_7_7 g.rubyzip_0_9_9 g.childprocess_0_3_9 g.websocket_1_0_7 ];
-      sha256 = ''000fpc5vaf268g96vmqq9vlg8fgyh78290agayrk9qkds8i8cr5d'';
+      name = ''selenium-webdriver-2.34.0'';
+      requiredGems = [ g.multi_json_1_7_8 g.rubyzip_0_9_9 g.childprocess_0_3_9 g.websocket_1_0_7 ];
+      sha256 = ''02wh008b03ixhpp853rmviq6xfk8100ka1g66wb2vsghajs6l1hx'';
     };
     servolux_0_10_0 = {
       basename = ''servolux'';
@@ -1543,7 +1522,7 @@ interpreters.'';
         longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.'';
       };
       name = ''sprockets-2.10.0'';
-      requiredGems = [ g.hike_1_2_3 g.multi_json_1_7_7 g.rack_1_5_2 g.tilt_1_4_1 ];
+      requiredGems = [ g.hike_1_2_3 g.multi_json_1_7_8 g.rack_1_5_2 g.tilt_1_4_1 ];
       sha256 = ''1z0kiaymvqm07wqqy479vd8a60ggr3f3520b4splljbn2055fn3s'';
     };
     sprockets_rails_2_0_0 = {
@@ -1578,6 +1557,37 @@ interpreters.'';
       requiredGems = [  ];
       sha256 = ''0h834ajdg9w4xrijp31fn98pjfj08gi08xjvp5xh3i6hz9a25fhr'';
     };
+    taskjuggler_3_5_0 = {
+      basename = ''taskjuggler'';
+      meta = {
+        description = ''A Project Management Software'';
+        homepage = ''http://www.taskjuggler.org'';
+        longDescription = ''TaskJuggler is a modern and powerful, Free and Open Source Software project
+management tool. Its new approach to project planing and tracking is more
+flexible and superior to the commonly used Gantt chart editing tools.
+
+TaskJuggler is project management software for serious project managers. It
+covers the complete spectrum of project management tasks from the first idea
+to the completion of the project. It assists you during project scoping,
+resource assignment, cost and revenue planing, risk and communication
+management.
+'';
+      };
+      name = ''taskjuggler-3.5.0'';
+      requiredGems = [ g.mail_2_5_4 g.term_ansicolor_1_2_2 ];
+      sha256 = ''0r84rlc7a6w7p9nc9mgycbs5h0hq0kzscjq7zj3296xyf0afiwj2'';
+    };
+    term_ansicolor_1_2_2 = {
+      basename = ''term_ansicolor'';
+      meta = {
+        description = ''Ruby library that colors strings using ANSI escape sequences'';
+        homepage = ''http://flori.github.com/term-ansicolor'';
+        longDescription = ''This library uses ANSI escape sequences to control the attributes of terminal output'';
+      };
+      name = ''term-ansicolor-1.2.2'';
+      requiredGems = [ g.tins_0_8_3 ];
+      sha256 = ''1b41q1q6mqcgzq9fhzhmjvfg5sfs5v7gkb8z57r4hajcp89lflxr'';
+    };
     text_1_2_1 = {
       basename = ''text'';
       meta = {
@@ -1589,17 +1599,6 @@ interpreters.'';
       requiredGems = [  ];
       sha256 = ''0s186kh125imdr7dahr10payc1gmxgk6wjy1v3agdyvl53yn5z3z'';
     };
-    therubyracer_0_11_4 = {
-      basename = ''therubyracer'';
-      meta = {
-        description = ''Embed the V8 JavaScript interpreter into Ruby'';
-        homepage = ''http://github.com/cowboyd/therubyracer'';
-        longDescription = ''Call JavaScript code and manipulate JavaScript objects from Ruby. Call Ruby code and manipulate Ruby objects from JavaScript.'';
-      };
-      name = ''therubyracer-0.11.4'';
-      requiredGems = [ g.ref_1_0_5 g.libv8_3_11_8_17_x86_64_linux ];
-      sha256 = ''15n9zi9jzb5k34id9xfkxx39y0nap7a4h02z8r00msjjajxag3iq'';
-    };
     thin_1_5_1 = {
       basename = ''thin'';
       meta = {
@@ -1622,16 +1621,16 @@ interpreters.'';
       requiredGems = [  ];
       sha256 = ''0d1g37j6sc7fkidf8rqlm3wh9zgyg3g7y8h2x1y34hmil5ywa8c3'';
     };
-    thread_safe_0_1_0 = {
+    thread_safe_0_1_2 = {
       basename = ''thread_safe'';
       meta = {
         description = ''A collection of data structures and utilities to make thread-safe programming in Ruby easier'';
         homepage = ''https://github.com/headius/thread_safe'';
         longDescription = ''Thread-safe collections and utilities for Ruby'';
       };
-      name = ''thread_safe-0.1.0'';
-      requiredGems = [ g.atomic_1_1_10 ];
-      sha256 = ''0fhx4110il4iiij5wdfq3afn0wvsz7pdvmx5v2zv24gah1861rsf'';
+      name = ''thread_safe-0.1.2'';
+      requiredGems = [ g.atomic_1_1_12 ];
+      sha256 = ''1bxyh5l11inadbk7pjyz5s98g24qj8xavh55bc56nrzj51y9aavy'';
     };
     tilt_1_4_1 = {
       basename = ''tilt'';

From 14c5f6bd746440b3dedbc778463f6d0c8260e0d4 Mon Sep 17 00:00:00 2001
From: Bodil Stokke <bodil@bodil.org>
Date: Sat, 10 Aug 2013 01:21:25 +0200
Subject: [PATCH 10/95] Adding ponysay.

---
 pkgs/tools/misc/ponysay/default.nix   | 30 +++++++++++++++++++++++++++
 pkgs/tools/misc/ponysay/pathfix.patch | 24 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 3 files changed, 56 insertions(+)
 create mode 100644 pkgs/tools/misc/ponysay/default.nix
 create mode 100644 pkgs/tools/misc/ponysay/pathfix.patch

diff --git a/pkgs/tools/misc/ponysay/default.nix b/pkgs/tools/misc/ponysay/default.nix
new file mode 100644
index 00000000000..1f281a71301
--- /dev/null
+++ b/pkgs/tools/misc/ponysay/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, python3, texinfo, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "ponysay-3.0.1";
+
+  src = fetchurl {
+    url = "https://github.com/erkin/ponysay/archive/3.0.1.tar.gz";
+    sha256 = "ab281f43510263b2f42a1b0a9097ee7831b3e33a9034778ecb12ccb51f6915ee";
+  };
+
+  buildInputs = [ python3 texinfo makeWrapper ];
+
+  phases = "unpackPhase patchPhase installPhase";
+
+  patches = [ ./pathfix.patch ];
+
+  installPhase = ''
+    python3 setup.py --prefix=$out --freedom=partial install --with-shared-cache=$out/share/ponysay
+    for i in $(cd $out/bin && ls); do
+        wrapProgram $out/bin/$i \
+            --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH"
+    done
+  '';
+
+  meta = {
+    description = "cowsay reimplemention for ponies.";
+    homepage = http://terse.tk/ponysay/;
+    license = "GPLv3";
+  };
+}
diff --git a/pkgs/tools/misc/ponysay/pathfix.patch b/pkgs/tools/misc/ponysay/pathfix.patch
new file mode 100644
index 00000000000..ad50f653024
--- /dev/null
+++ b/pkgs/tools/misc/ponysay/pathfix.patch
@@ -0,0 +1,24 @@
+diff -urN ponysay-3.0.1/setup.py ponysay.p/setup.py
+--- ponysay-3.0.1/setup.py	2013-04-05 14:28:18.000000000 +0200
++++ ponysay.p/setup.py	2013-08-10 01:09:30.181043877 +0200
+@@ -514,7 +514,7 @@
+                 for command in commands:
+                     sourceed = 'completion/ponysay.%s' % (command)
+                     generated = 'completion/%s-completion.%s' % (shell, command)
+-                    generatorcmd = './completion/auto-auto-complete.py %s --output %s --source %s' % (shell, generated, sourceed)
++                    generatorcmd = 'python3 completion/auto-auto-complete.py %s --output %s --source %s' % (shell, generated, sourceed)
+                     Popen(generatorcmd.split(' ')).communicate()
+                     if conf[command] is not None:
+                         dest = generated + '.install'
+@@ -559,9 +559,9 @@
+                 for toolcommand in ('--dimensions', '--metadata'):
+                     if not self.free:
+                         print('%s, %s, %s' % ('./src/ponysaytool.py', toolcommand, sharedir))
+-                        Popen(['./src/ponysaytool.py', toolcommand, sharedir], stdin=PIPE, stdout=PIPE, stderr=PIPE).communicate()
++                        Popen(['python3', './src/ponysaytool.py', toolcommand, sharedir], stdin=PIPE, stdout=PIPE, stderr=PIPE).communicate()
+                     else:
+-                        params = ['./src/ponysaytool.py', toolcommand, sharedir, '--']
++                        params = ['python3', './src/ponysaytool.py', toolcommand, sharedir, '--']
+                         for sharefile in os.listdir(sharedir):
+                             if sharefile.endswith('.pony') and (sharefile != '.pony'):
+                                 if not Setup.validateFreedom(sharedir + '/' + sharefile):
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c747079670..249be7cb90d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1526,6 +1526,8 @@ let
 
   polkit_gnome = callPackage ../tools/security/polkit-gnome { };
 
+  ponysay = callPackage ../tools/misc/ponysay { };
+
   povray = callPackage ../tools/graphics/povray { };
 
   ppl = callPackage ../development/libraries/ppl { };

From 3c6b2f7501529603b0e9588e1292208154711eb2 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sat, 10 Aug 2013 02:32:21 +0200
Subject: [PATCH 11/95] vifm: update to 0.7.5 and enabling new options

---
 pkgs/applications/misc/vifm/default.nix | 53 +++++++++----------------
 pkgs/top-level/all-packages.nix         |  4 +-
 2 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix
index 6f270f5c7cf..7230e84601e 100644
--- a/pkgs/applications/misc/vifm/default.nix
+++ b/pkgs/applications/misc/vifm/default.nix
@@ -1,48 +1,31 @@
-x@{builderDefsPackage
-  , ncurses
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ pkgs, fetchurl, stdenv, ncurses, utillinux, file, libX11 }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="vifm";
-    version="0.6.3";
-    name="${baseName}-${version}";
-    url="mirror://sourceforge/project/${baseName}/${baseName}/${name}.tar.bz2";
-    hash="1v5kiifjk7iyqrzjd94wn6a5dz4j3krl06pbp1ps9g3zdq2w2skv";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+let
+  name = "vifm-${version}";
+  version = "0.7.5";
+
+in stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchurl {
+    url="mirror://sourceforge/project/vifm/vifm/${name}.tar.bz2";
+    sha256 ="1r1d92zrff94rfx011dw2qsgdwd2ksqlz15la74d6h7sfcsnyd01";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  #phaseNames = ["doConfigure" "doMakeInstall"];
+  buildInputs = [ utillinux ncurses file libX11 ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
   meta = {
     description = "A vi-like file manager";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
-    license = a.lib.licenses.gpl2;
+    maintainers = with pkgs.lib.maintainers; [ raskin garbas ];
+    platforms = pkgs.lib.platforms.linux;
+    license = pkgs.lib.licenses.gpl2;
   };
+
   passthru = {
     updateInfo = {
       downloadPage = "http://vifm.sf.net";
     };
   };
-}) x
+}
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 249be7cb90d..f13b150bd17 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1830,7 +1830,9 @@ let
 
   vfdecrypt = callPackage ../tools/misc/vfdecrypt { };
 
-  vifm = callPackage ../applications/misc/vifm {};
+  vifm = callPackage ../applications/misc/vifm {
+    inherit (xlibs) libX11;
+  };
 
   viking = callPackage ../applications/misc/viking {
     inherit (gnome) scrollkeeper;

From 3cd37b550b80adee64e68065c835743651407ecb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Sat, 8 Dec 2012 11:52:54 +0100
Subject: [PATCH 12/95] Steam: first attempt at adding the beta client.

The script installed with this expression only copies a boostrapper and another
script to the user's home folder. Those also need to be patched to get on with
the installation.
---
 pkgs/games/steam/default.nix    | 37 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/games/steam/default.nix

diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
new file mode 100644
index 00000000000..3dbeed83885
--- /dev/null
+++ b/pkgs/games/steam/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, dpkg, makeWrapper, xz }:
+
+assert stdenv.system == "i686-linux";
+
+let version = "1.0.0.16"; in
+
+stdenv.mkDerivation rec {
+  name = "steam-${version}";
+
+  src = fetchurl {
+    url = "http://media.steampowered.com/client/installer/steam.deb";
+    sha256 = "0mx92f9hjjpg3blgmgp8sz0f3jg7m9hssdscipwybks258k8926m";
+  };
+
+  buildInputs = [ dpkg makeWrapper xz ];
+
+  phases = "installPhase";
+
+  installPhase = ''
+    mkdir -p $out
+    dpkg-deb -x $src $out
+    mv $out/usr/* $out/
+    rmdir $out/usr
+    substituteInPlace "$out/bin/steam" --replace "/bin/bash" "/bin/sh"
+    substituteInPlace "$out/bin/steam" --replace "/usr/" "$out/"
+    substituteInPlace "$out/bin/steam" --replace "\`basename \$0\`" "steam"
+    sed -i '/jockey-common/d' $out/bin/steam
+    wrapProgram "$out/bin/steam" --prefix PATH ":" \
+      "${xz}/bin"
+  '';
+
+  meta = {
+    description = "A digital distribution platform";
+    homepage = http://store.steampowered.com/;
+    license = "unfree";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 249be7cb90d..5c1eaf6e4f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9032,6 +9032,8 @@ let
 
   stardust = callPackage ../games/stardust {};
 
+  steam = callPackage_i686 ../games/steam {};
+
   stuntrally = callPackage ../games/stuntrally { };
 
   superTux = callPackage ../games/super-tux { };

From 12a0d83855bdc7129163d6926da245141c4d9866 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Sun, 9 Dec 2012 10:24:50 +0100
Subject: [PATCH 13/95] Steam: add patch for user stuff and lib paths to
 wrapProgram.

The binaries that get copied to $HOME need patchelf to run, and after that I
need all the runtime libs in the library path. Still not working as I need
glibc2.15.
---
 pkgs/games/steam/default.nix | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index 3dbeed83885..08bd9a14896 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, dpkg, makeWrapper, xz }:
+{ stdenv, fetchurl, dpkg, makeWrapper, xz, libX11, gcc
+,patchelf }:
 
 assert stdenv.system == "i686-linux";
 
@@ -12,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "0mx92f9hjjpg3blgmgp8sz0f3jg7m9hssdscipwybks258k8926m";
   };
 
-  buildInputs = [ dpkg makeWrapper xz ];
+  buildInputs = [ dpkg makeWrapper ];
 
   phases = "installPhase";
 
@@ -25,8 +26,22 @@ stdenv.mkDerivation rec {
     substituteInPlace "$out/bin/steam" --replace "/usr/" "$out/"
     substituteInPlace "$out/bin/steam" --replace "\`basename \$0\`" "steam"
     sed -i '/jockey-common/d' $out/bin/steam
-    wrapProgram "$out/bin/steam" --prefix PATH ":" \
-      "${xz}/bin"
+    wrapProgram "$out/bin/steam" \
+      --prefix PATH ":" "${xz}/bin" \
+      --prefix LD_LIBRARY_PATH : ${libX11}/lib:${gcc.gcc}/lib
+
+    mkdir -p $out/patches
+    cat > $out/patches/post-install.sh << EOF
+    #!${stdenv.shell}
+
+    # post-install script to patch stuff at \$HOME
+    PATH=\$PATH:${patchelf}/bin
+    sed -i 's/bash/sh/' \$HOME/.local/share/Steam/steam.sh
+    patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
+        \$HOME/.local/share/Steam/ubuntu12_32/steam
+    EOF
+
+    chmod +x $out/patches/post-install.sh
   '';
 
   meta = {

From ee6129350e2b16caa3ba514b7f1b941886dd296f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Mon, 10 Dec 2012 23:31:57 +0100
Subject: [PATCH 14/95] steam: add glibc215 to the wrapper.

---
 pkgs/games/steam/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index 08bd9a14896..2a54d2d53ff 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, dpkg, makeWrapper, xz, libX11, gcc
+{ stdenv, fetchurl, dpkg, makeWrapper, xz, libX11, gcc, glibc215
 ,patchelf }:
 
 assert stdenv.system == "i686-linux";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     sed -i '/jockey-common/d' $out/bin/steam
     wrapProgram "$out/bin/steam" \
       --prefix PATH ":" "${xz}/bin" \
-      --prefix LD_LIBRARY_PATH : ${libX11}/lib:${gcc.gcc}/lib
+      --prefix LD_LIBRARY_PATH : ${libX11}/lib:${gcc.gcc}/lib:${glibc215}/lib
 
     mkdir -p $out/patches
     cat > $out/patches/post-install.sh << EOF

From dad0ed4eaaac01a0d374a3b854c99145d9815e3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Wed, 12 Dec 2012 18:12:13 +0100
Subject: [PATCH 15/95] steam: add all the missing dependancies.

Calling their steam script still segfaults, but I managed to run it from the
shell with all these deps in the lib path.
---
 pkgs/games/steam/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index 2a54d2d53ff..63f820bbe00 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -1,5 +1,8 @@
 { stdenv, fetchurl, dpkg, makeWrapper, xz, libX11, gcc, glibc215
-,patchelf }:
+, libselinux, libXrandr, pango, freetype, fontconfig, glib, gtk
+, gdk_pixbuf, cairo, libXi, alsaLib, libXrender, nss, nspr, zlib
+, dbus, libpng12, libXfixes, cups, libgcrypt, openal, pulseaudio
+, patchelf }:
 
 assert stdenv.system == "i686-linux";
 
@@ -28,7 +31,7 @@ stdenv.mkDerivation rec {
     sed -i '/jockey-common/d' $out/bin/steam
     wrapProgram "$out/bin/steam" \
       --prefix PATH ":" "${xz}/bin" \
-      --prefix LD_LIBRARY_PATH : ${libX11}/lib:${gcc.gcc}/lib:${glibc215}/lib
+      --prefix LD_LIBRARY_PATH : ${libX11}/lib:${gcc.gcc}/lib:${glibc215}/lib:${libselinux}/lib:${libXrandr}/lib:${pango}/lib:${freetype}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${libXi}/lib:${alsaLib}/lib:${libXrender}/lib:${nss}/lib:${nspr}/lib:${zlib}/lib:${dbus}/lib:${libpng12}/lib:${libXfixes}/lib:${cups}/lib:${libgcrypt}/lib:${openal}/lib:${pulseaudio}/lib
 
     mkdir -p $out/patches
     cat > $out/patches/post-install.sh << EOF

From b07300f2ef3cee6b8718fa2fd0360a60d32e5924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Thu, 27 Dec 2012 12:01:07 +0100
Subject: [PATCH 16/95] steam: bypass valve's bootstrapper.

Since there is no way to modify either steam.sh or the steam binary as they are
hash checked, I took the approach of bypassing steam.sh and create a script
that does its job.

For now it segfaults, but when I try to run under strace, it works perfectly.
Need to check this.
---
 pkgs/games/steam/default.nix | 42 +++++++++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index 63f820bbe00..b003fc8eb47 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -2,6 +2,9 @@
 , libselinux, libXrandr, pango, freetype, fontconfig, glib, gtk
 , gdk_pixbuf, cairo, libXi, alsaLib, libXrender, nss, nspr, zlib
 , dbus, libpng12, libXfixes, cups, libgcrypt, openal, pulseaudio
+, SDL # World of Goo
+, libvorbis # Osmos
+, curl # Superbrothers: S&S EP
 , patchelf }:
 
 assert stdenv.system == "i686-linux";
@@ -13,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://media.steampowered.com/client/installer/steam.deb";
-    sha256 = "0mx92f9hjjpg3blgmgp8sz0f3jg7m9hssdscipwybks258k8926m";
+    sha256 = "1gzfyh3wfdb4h7cxibx61c31l8pjz5zcp5d9d5w9jyja463lv49c";
   };
 
   buildInputs = [ dpkg makeWrapper ];
@@ -29,22 +32,37 @@ stdenv.mkDerivation rec {
     substituteInPlace "$out/bin/steam" --replace "/usr/" "$out/"
     substituteInPlace "$out/bin/steam" --replace "\`basename \$0\`" "steam"
     sed -i '/jockey-common/d' $out/bin/steam
-    wrapProgram "$out/bin/steam" \
-      --prefix PATH ":" "${xz}/bin" \
-      --prefix LD_LIBRARY_PATH : ${libX11}/lib:${gcc.gcc}/lib:${glibc215}/lib:${libselinux}/lib:${libXrandr}/lib:${pango}/lib:${freetype}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${libXi}/lib:${alsaLib}/lib:${libXrender}/lib:${nss}/lib:${nspr}/lib:${zlib}/lib:${dbus}/lib:${libpng12}/lib:${libXfixes}/lib:${cups}/lib:${libgcrypt}/lib:${openal}/lib:${pulseaudio}/lib
 
-    mkdir -p $out/patches
-    cat > $out/patches/post-install.sh << EOF
+    mv $out/bin/steam $out/bin/.steam-wrapped
+    cat > $out/bin/steam << EOF
     #!${stdenv.shell}
 
-    # post-install script to patch stuff at \$HOME
-    PATH=\$PATH:${patchelf}/bin
-    sed -i 's/bash/sh/' \$HOME/.local/share/Steam/steam.sh
-    patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
-        \$HOME/.local/share/Steam/ubuntu12_32/steam
+    export PATH=${xz}/bin:\$PATH
+    export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib:${gcc.gcc}/lib:${glibc215}/lib:${libselinux}/lib:${libXrandr}/lib:${pango}/lib:${freetype}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${libXi}/lib:${alsaLib}/lib:${libXrender}/lib:${nss}/lib:${nspr}/lib:${zlib}/lib:${dbus}/lib:${libpng12}/lib:${libXfixes}/lib:${cups}/lib:${libgcrypt}/lib:${openal}/lib:${pulseaudio}/lib:${SDL}/lib:${libvorbis}/lib:${curl}/lib
+    STEAMBOOTSTRAP=\$HOME/.steam/steam/steam.sh
+    if [ -f \$STEAMBOOTSTRAP ]; then
+      STEAMCONFIG=~/.steam
+      STEAMROOT="\$STEAMCONFIG/steam"
+      STEAMBINDIR="\$STEAMROOT/ubuntu12_32"
+      PIDFILE="\$STEAMCONFIG/steam.pid"
+      STEAMRUNCMD="\$STEAMCONFIG/runcmd"
+      STEAMBIN32LINK="\$STEAMCONFIG/bin32"
+      STEAMBIN64LINK="\$STEAMCONFIG/bin64"
+      STEAMROOTLINK="\$STEAMCONFIG/root"
+      STEAMSTARTING="\$STEAMCONFIG/starting"
+      export LD_LIBRARY_PATH="\$STEAMBINDIR:\$LD_LIBRARY_PATH"
+      export SDL_VIDEO_X11_DGAMOUSE=0
+      cd "\$STEAMROOT"
+      cp ${glibc215}/lib/ld-linux.so.2 "\$STEAMBINDIR"
+      chmod u+w "\$STEAMBINDIR/ld-linux.so.2"
+      echo \$\$ > "\$PIDFILE" # pid of the shell will become pid of steam
+      exec "\$STEAMBINDIR/ld-linux.so.2" "\$STEAMBINDIR/steam"
+    else
+      exec $out/bin/.steam-wrapped
+    fi
     EOF
 
-    chmod +x $out/patches/post-install.sh
+    chmod +x $out/bin/steam
   '';
 
   meta = {

From c75cccc469173da08d7b8f9d4993bc3cc22d6d45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Thu, 27 Dec 2012 12:10:28 +0100
Subject: [PATCH 17/95] steam: update to 1.0.0.18.

I forgot in the previous commit to update the version as I had changed the
tarball hash.

I also modified a bit the launcher script, since xz should only be needed by
the installer.
---
 pkgs/games/steam/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index b003fc8eb47..7e7cc2d8f6d 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -9,7 +9,7 @@
 
 assert stdenv.system == "i686-linux";
 
-let version = "1.0.0.16"; in
+let version = "1.0.0.18"; in
 
 stdenv.mkDerivation rec {
   name = "steam-${version}";
@@ -37,7 +37,6 @@ stdenv.mkDerivation rec {
     cat > $out/bin/steam << EOF
     #!${stdenv.shell}
 
-    export PATH=${xz}/bin:\$PATH
     export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib:${gcc.gcc}/lib:${glibc215}/lib:${libselinux}/lib:${libXrandr}/lib:${pango}/lib:${freetype}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${libXi}/lib:${alsaLib}/lib:${libXrender}/lib:${nss}/lib:${nspr}/lib:${zlib}/lib:${dbus}/lib:${libpng12}/lib:${libXfixes}/lib:${cups}/lib:${libgcrypt}/lib:${openal}/lib:${pulseaudio}/lib:${SDL}/lib:${libvorbis}/lib:${curl}/lib
     STEAMBOOTSTRAP=\$HOME/.steam/steam/steam.sh
     if [ -f \$STEAMBOOTSTRAP ]; then
@@ -58,6 +57,7 @@ stdenv.mkDerivation rec {
       echo \$\$ > "\$PIDFILE" # pid of the shell will become pid of steam
       exec "\$STEAMBINDIR/ld-linux.so.2" "\$STEAMBINDIR/steam"
     else
+      export PATH=${xz}/bin:\$PATH
       exec $out/bin/.steam-wrapped
     fi
     EOF

From 10f722dc04ac572ae28538a9db09e472e0cc0f50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Thu, 27 Dec 2012 12:53:02 +0100
Subject: [PATCH 18/95] steam: workaround segfault at startup.

I don't know why, if I call ld-linux.so.2 to launch the game, it segfaults, so
I renamed it to ld.so.
---
 pkgs/games/steam/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index 7e7cc2d8f6d..e0d337bd7c0 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -52,10 +52,11 @@ stdenv.mkDerivation rec {
       export LD_LIBRARY_PATH="\$STEAMBINDIR:\$LD_LIBRARY_PATH"
       export SDL_VIDEO_X11_DGAMOUSE=0
       cd "\$STEAMROOT"
-      cp ${glibc215}/lib/ld-linux.so.2 "\$STEAMBINDIR"
-      chmod u+w "\$STEAMBINDIR/ld-linux.so.2"
+      LDSO="\$STEAMBINDIR\ld.so"
+      cp ${glibc215}/lib/ld-linux.so.2 "\$LDSO"
+      chmod u+w "\$LDSO"
       echo \$\$ > "\$PIDFILE" # pid of the shell will become pid of steam
-      exec "\$STEAMBINDIR/ld-linux.so.2" "\$STEAMBINDIR/steam"
+      exec "\$LDSO" "\$STEAMBINDIR/steam"
     else
       export PATH=${xz}/bin:\$PATH
       exec $out/bin/.steam-wrapped

From 094c0662e879157656b6cfb73268e1041d791af7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Thu, 27 Dec 2012 12:57:48 +0100
Subject: [PATCH 19/95] steam: add mesa to library path.

Mesa is needed for Superbrothers: S&S EP, which links to libGLU.
---
 pkgs/games/steam/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index e0d337bd7c0..f00dd29a234 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -4,7 +4,7 @@
 , dbus, libpng12, libXfixes, cups, libgcrypt, openal, pulseaudio
 , SDL # World of Goo
 , libvorbis # Osmos
-, curl # Superbrothers: S&S EP
+, curl, mesa # Superbrothers: S&S EP
 , patchelf }:
 
 assert stdenv.system == "i686-linux";
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
       STEAMBIN64LINK="\$STEAMCONFIG/bin64"
       STEAMROOTLINK="\$STEAMCONFIG/root"
       STEAMSTARTING="\$STEAMCONFIG/starting"
-      export LD_LIBRARY_PATH="\$STEAMBINDIR:\$LD_LIBRARY_PATH"
+      export LD_LIBRARY_PATH="\$STEAMBINDIR:\$LD_LIBRARY_PATH:${mesa}/lib"
       export SDL_VIDEO_X11_DGAMOUSE=0
       cd "\$STEAMROOT"
       LDSO="\$STEAMBINDIR\ld.so"

From f42cece8f52e8624994bcb68df01308594dbc039 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Wed, 16 Jan 2013 23:53:45 +0100
Subject: [PATCH 20/95] steam: update to 1.0.0.21.

I also updated the patches for the bootsrapper script and fixed a typo, but
didn't test anything.
---
 pkgs/games/steam/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index f00dd29a234..48466ef1663 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -9,14 +9,14 @@
 
 assert stdenv.system == "i686-linux";
 
-let version = "1.0.0.18"; in
+let version = "1.0.0.21"; in
 
 stdenv.mkDerivation rec {
   name = "steam-${version}";
 
   src = fetchurl {
     url = "http://media.steampowered.com/client/installer/steam.deb";
-    sha256 = "1gzfyh3wfdb4h7cxibx61c31l8pjz5zcp5d9d5w9jyja463lv49c";
+    sha256 = "03p3mvrdkkq9x7ssi9wl5zzyi4xvw5zvap7w72rpjsz8145l3vsj";
   };
 
   buildInputs = [ dpkg makeWrapper ];
@@ -30,8 +30,6 @@ stdenv.mkDerivation rec {
     rmdir $out/usr
     substituteInPlace "$out/bin/steam" --replace "/bin/bash" "/bin/sh"
     substituteInPlace "$out/bin/steam" --replace "/usr/" "$out/"
-    substituteInPlace "$out/bin/steam" --replace "\`basename \$0\`" "steam"
-    sed -i '/jockey-common/d' $out/bin/steam
 
     mv $out/bin/steam $out/bin/.steam-wrapped
     cat > $out/bin/steam << EOF
@@ -52,7 +50,7 @@ stdenv.mkDerivation rec {
       export LD_LIBRARY_PATH="\$STEAMBINDIR:\$LD_LIBRARY_PATH:${mesa}/lib"
       export SDL_VIDEO_X11_DGAMOUSE=0
       cd "\$STEAMROOT"
-      LDSO="\$STEAMBINDIR\ld.so"
+      LDSO="\$STEAMBINDIR/ld.so"
       cp ${glibc215}/lib/ld-linux.so.2 "\$LDSO"
       chmod u+w "\$LDSO"
       echo \$\$ > "\$PIDFILE" # pid of the shell will become pid of steam

From dc10fabb2f7a41e79747c4c6597f1930950e7aa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Fri, 15 Feb 2013 19:27:37 +0100
Subject: [PATCH 21/95] steam: update to 1.0.0.27

It needed some more sed'ing and more deps. It's still not working as I seem to
need libXdmcp which is not in nixpkgs.
---
 pkgs/games/steam/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index 48466ef1663..18da72c05a7 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -2,6 +2,7 @@
 , libselinux, libXrandr, pango, freetype, fontconfig, glib, gtk
 , gdk_pixbuf, cairo, libXi, alsaLib, libXrender, nss, nspr, zlib
 , dbus, libpng12, libXfixes, cups, libgcrypt, openal, pulseaudio
+, libxcb, libXau
 , SDL # World of Goo
 , libvorbis # Osmos
 , curl, mesa # Superbrothers: S&S EP
@@ -9,14 +10,14 @@
 
 assert stdenv.system == "i686-linux";
 
-let version = "1.0.0.21"; in
+let version = "1.0.0.27"; in
 
 stdenv.mkDerivation rec {
   name = "steam-${version}";
 
   src = fetchurl {
     url = "http://media.steampowered.com/client/installer/steam.deb";
-    sha256 = "03p3mvrdkkq9x7ssi9wl5zzyi4xvw5zvap7w72rpjsz8145l3vsj";
+    sha256 = "1hlmqxd0yv92aag3wbykwvri54lbmq9s6krrxfnrp1rbpli9r2jx";
   };
 
   buildInputs = [ dpkg makeWrapper ];
@@ -30,12 +31,14 @@ stdenv.mkDerivation rec {
     rmdir $out/usr
     substituteInPlace "$out/bin/steam" --replace "/bin/bash" "/bin/sh"
     substituteInPlace "$out/bin/steam" --replace "/usr/" "$out/"
+    sed -i 's,STEAMPACKAGE=.*,STEAMPACKAGE=steam,' $out/bin/steam
+    sed -i '/STEAMSCRIPT/d' $out/bin/steam
 
     mv $out/bin/steam $out/bin/.steam-wrapped
     cat > $out/bin/steam << EOF
     #!${stdenv.shell}
 
-    export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib:${gcc.gcc}/lib:${glibc215}/lib:${libselinux}/lib:${libXrandr}/lib:${pango}/lib:${freetype}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${libXi}/lib:${alsaLib}/lib:${libXrender}/lib:${nss}/lib:${nspr}/lib:${zlib}/lib:${dbus}/lib:${libpng12}/lib:${libXfixes}/lib:${cups}/lib:${libgcrypt}/lib:${openal}/lib:${pulseaudio}/lib:${SDL}/lib:${libvorbis}/lib:${curl}/lib
+    export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib:${gcc.gcc}/lib:${glibc215}/lib:${libselinux}/lib:${libXrandr}/lib:${pango}/lib:${freetype}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${libXi}/lib:${alsaLib}/lib:${libXrender}/lib:${nss}/lib:${nspr}/lib:${zlib}/lib:${dbus}/lib:${libpng12}/lib:${libXfixes}/lib:${cups}/lib:${libgcrypt}/lib:${openal}/lib:${pulseaudio}/lib:${libxcb}/lib:${libXau}/lib:${SDL}/lib:${libvorbis}/lib:${curl}/lib
     STEAMBOOTSTRAP=\$HOME/.steam/steam/steam.sh
     if [ -f \$STEAMBOOTSTRAP ]; then
       STEAMCONFIG=~/.steam

From a249fa67d95fae8f57917fa71bafad8dcc259f18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Fri, 15 Feb 2013 19:42:13 +0100
Subject: [PATCH 22/95] steam: add libXdmcp to dependencies.

I must have been blind. libXdmcp is in nixpkgs, contrary to what I said.
---
 pkgs/games/steam/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index 18da72c05a7..ab98c099d9f 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -2,7 +2,7 @@
 , libselinux, libXrandr, pango, freetype, fontconfig, glib, gtk
 , gdk_pixbuf, cairo, libXi, alsaLib, libXrender, nss, nspr, zlib
 , dbus, libpng12, libXfixes, cups, libgcrypt, openal, pulseaudio
-, libxcb, libXau
+, libxcb, libXau, libXdmcp
 , SDL # World of Goo
 , libvorbis # Osmos
 , curl, mesa # Superbrothers: S&S EP
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     cat > $out/bin/steam << EOF
     #!${stdenv.shell}
 
-    export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib:${gcc.gcc}/lib:${glibc215}/lib:${libselinux}/lib:${libXrandr}/lib:${pango}/lib:${freetype}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${libXi}/lib:${alsaLib}/lib:${libXrender}/lib:${nss}/lib:${nspr}/lib:${zlib}/lib:${dbus}/lib:${libpng12}/lib:${libXfixes}/lib:${cups}/lib:${libgcrypt}/lib:${openal}/lib:${pulseaudio}/lib:${libxcb}/lib:${libXau}/lib:${SDL}/lib:${libvorbis}/lib:${curl}/lib
+    export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib:${gcc.gcc}/lib:${glibc215}/lib:${libselinux}/lib:${libXrandr}/lib:${pango}/lib:${freetype}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${libXi}/lib:${alsaLib}/lib:${libXrender}/lib:${nss}/lib:${nspr}/lib:${zlib}/lib:${dbus}/lib:${libpng12}/lib:${libXfixes}/lib:${cups}/lib:${libgcrypt}/lib:${openal}/lib:${pulseaudio}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${SDL}/lib:${libvorbis}/lib:${curl}/lib
     STEAMBOOTSTRAP=\$HOME/.steam/steam/steam.sh
     if [ -f \$STEAMBOOTSTRAP ]; then
       STEAMCONFIG=~/.steam

From 87c5a418ec7debed28cc4766ac730b9a13bdfb40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Fri, 15 Feb 2013 23:16:01 +0100
Subject: [PATCH 23/95] steam: create proper symlinks in $HOME/.steam

---
 pkgs/games/steam/default.nix | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index ab98c099d9f..46031063e08 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -41,23 +41,40 @@ stdenv.mkDerivation rec {
     export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib:${gcc.gcc}/lib:${glibc215}/lib:${libselinux}/lib:${libXrandr}/lib:${pango}/lib:${freetype}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${libXi}/lib:${alsaLib}/lib:${libXrender}/lib:${nss}/lib:${nspr}/lib:${zlib}/lib:${dbus}/lib:${libpng12}/lib:${libXfixes}/lib:${cups}/lib:${libgcrypt}/lib:${openal}/lib:${pulseaudio}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${SDL}/lib:${libvorbis}/lib:${curl}/lib
     STEAMBOOTSTRAP=\$HOME/.steam/steam/steam.sh
     if [ -f \$STEAMBOOTSTRAP ]; then
+      PLATFORM32=ubuntu12_32
       STEAMCONFIG=~/.steam
-      STEAMROOT="\$STEAMCONFIG/steam"
-      STEAMBINDIR="\$STEAMROOT/ubuntu12_32"
+      STEAMROOT=~/.local/share/Steam
+      STEAMDATA="\$STEAMROOT"
       PIDFILE="\$STEAMCONFIG/steam.pid"
-      STEAMRUNCMD="\$STEAMCONFIG/runcmd"
       STEAMBIN32LINK="\$STEAMCONFIG/bin32"
       STEAMBIN64LINK="\$STEAMCONFIG/bin64"
+      STEAMSDK32LINK="\$STEAMCONFIG/sdk32"
+      STEAMSDK64LINK="\$STEAMCONFIG/sdk64"
       STEAMROOTLINK="\$STEAMCONFIG/root"
+      STEAMDATALINK="\$STEAMCONFIG/steam"
       STEAMSTARTING="\$STEAMCONFIG/starting"
-      export LD_LIBRARY_PATH="\$STEAMBINDIR:\$LD_LIBRARY_PATH:${mesa}/lib"
+      # Create symbolic links for the Steam API
+      if [ ! -e "\$STEAMCONFIG" ]; then
+          mkdir "\$STEAMCONFIG"
+      fi
+      #if [ "\$STEAMROOT" != "\$STEAMROOTLINK" -a "\$STEAMROOT" != "\$STEAMDATALINK" ]; then
+          rm -f "\$STEAMBIN32LINK" && ln -s "\$STEAMROOT/\$PLATFORM32" "\$STEAMBIN32LINK"
+          rm -f "\$STEAMBIN64LINK" && ln -s "\$STEAMROOT/\$PLATFORM64" "\$STEAMBIN64LINK"
+          rm -f "\$STEAMSDK32LINK" && ln -s "\$STEAMROOT/linux32" "\$STEAMSDK32LINK"
+          rm -f "\$STEAMSDK64LINK" && ln -s "\$STEAMROOT/linux64" "\$STEAMSDK64LINK"
+          rm -f "\$STEAMROOTLINK" && ln -s "\$STEAMROOT" "\$STEAMROOTLINK"
+          if [ "\$STEAMDATALINK" ]; then
+              rm -f "\$STEAMDATALINK" && ln -s "\$STEAMDATA" "\$STEAMDATALINK"
+          fi
+      #fi
+      export LD_LIBRARY_PATH="\$STEAMBIN32LINK:\$LD_LIBRARY_PATH:${mesa}/lib"
       export SDL_VIDEO_X11_DGAMOUSE=0
       cd "\$STEAMROOT"
-      LDSO="\$STEAMBINDIR/ld.so"
+      LDSO="\$STEAMBIN32LINK/ld.so"
       cp ${glibc215}/lib/ld-linux.so.2 "\$LDSO"
       chmod u+w "\$LDSO"
       echo \$\$ > "\$PIDFILE" # pid of the shell will become pid of steam
-      exec "\$LDSO" "\$STEAMBINDIR/steam"
+      exec "\$LDSO" "\$STEAMBIN32LINK/steam"
     else
       export PATH=${xz}/bin:\$PATH
       exec $out/bin/.steam-wrapped

From 2725cbef42329025dacab6ceddc9ab8ae33fa4e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Thu, 13 Dec 2012 10:57:52 +0100
Subject: [PATCH 24/95] Add libtxc_dxtn-1.0.1.

I thought this was needed by Steam, but it only applies when not using
propietary drivers, and even then it doesn't look like well supported.
---
 .../libraries/libtxc_dxtn/default.nix         | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/libraries/libtxc_dxtn/default.nix

diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix
new file mode 100644
index 00000000000..9cf8decf4c8
--- /dev/null
+++ b/pkgs/development/libraries/libtxc_dxtn/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, autoconf, automake, libtool, mesa }:
+
+let version = "1.0.1"; in
+
+stdenv.mkDerivation rec {
+  name = "libtxc_dxtn-${version}";
+
+  src = fetchurl {
+    url = "http://cgit.freedesktop.org/~mareko/${name}.tar.gz";
+    sha256 = "0g6lymik9cs7nbzigwzaf49fnhhfsvjanhg92wykw7rfq9zvkhvv";
+  };
+
+  buildInputs = [ autoconf automake libtool mesa ];
+
+  preConfigure = "autoreconf -vfi";
+
+  meta = {
+    homepage = http://dri.freedesktop.org/wiki/S3TC;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5c1eaf6e4f0..179bba1ce76 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4846,6 +4846,8 @@ let
 
   libtunepimp = callPackage ../development/libraries/libtunepimp { };
 
+  libtxc_dxtn = callPackage ../development/libraries/libtxc_dxtn { };
+
   libgeotiff = callPackage ../development/libraries/libgeotiff { };
 
   libunistring = callPackage ../development/libraries/libunistring { };

From bd44348bafe991f7ddb11ce96968903e702b9be1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Mon, 18 Feb 2013 23:46:00 +0100
Subject: [PATCH 25/95] steam: create some missing symlinks in the script.

In the original script it says they are temporary, but without those simlinks
Osmos and others fail to start with SteamAPI_Init() failed.
---
 pkgs/games/steam/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index 46031063e08..1d087fa8f31 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     #!${stdenv.shell}
 
     export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib:${gcc.gcc}/lib:${glibc215}/lib:${libselinux}/lib:${libXrandr}/lib:${pango}/lib:${freetype}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${libXi}/lib:${alsaLib}/lib:${libXrender}/lib:${nss}/lib:${nspr}/lib:${zlib}/lib:${dbus}/lib:${libpng12}/lib:${libXfixes}/lib:${cups}/lib:${libgcrypt}/lib:${openal}/lib:${pulseaudio}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${SDL}/lib:${libvorbis}/lib:${curl}/lib
-    STEAMBOOTSTRAP=\$HOME/.steam/steam/steam.sh
+    STEAMBOOTSTRAP=~/.steam/steam/steam.sh
     if [ -f \$STEAMBOOTSTRAP ]; then
       PLATFORM32=ubuntu12_32
       STEAMCONFIG=~/.steam
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
       if [ ! -e "\$STEAMCONFIG" ]; then
           mkdir "\$STEAMCONFIG"
       fi
-      #if [ "\$STEAMROOT" != "\$STEAMROOTLINK" -a "\$STEAMROOT" != "\$STEAMDATALINK" ]; then
+      if [ "\$STEAMROOT" != "\$STEAMROOTLINK" -a "\$STEAMROOT" != "\$STEAMDATALINK" ]; then
           rm -f "\$STEAMBIN32LINK" && ln -s "\$STEAMROOT/\$PLATFORM32" "\$STEAMBIN32LINK"
           rm -f "\$STEAMBIN64LINK" && ln -s "\$STEAMROOT/\$PLATFORM64" "\$STEAMBIN64LINK"
           rm -f "\$STEAMSDK32LINK" && ln -s "\$STEAMROOT/linux32" "\$STEAMSDK32LINK"
@@ -66,7 +66,11 @@ stdenv.mkDerivation rec {
           if [ "\$STEAMDATALINK" ]; then
               rm -f "\$STEAMDATALINK" && ln -s "\$STEAMDATA" "\$STEAMDATALINK"
           fi
-      #fi
+      fi
+      # Temporary bandaid until everyone has the new libsteam_api.so
+      rm -f ~/.steampath && ln -s "\$STEAMCONFIG/bin32/steam" ~/.steampath
+      rm -f ~/.steampid && ln -s "\$PIDFILE" ~/.steampid
+      rm -f ~/.steam/bin && ln -s "\$STEAMBIN32LINK" ~/.steam/bin
       export LD_LIBRARY_PATH="\$STEAMBIN32LINK:\$LD_LIBRARY_PATH:${mesa}/lib"
       export SDL_VIDEO_X11_DGAMOUSE=0
       cd "\$STEAMROOT"

From 3f4557b0ebd3254cdf274fc24ad9e7e234805231 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Tue, 19 Feb 2013 00:01:11 +0100
Subject: [PATCH 26/95] steam: update to 1.0.0.28

---
 pkgs/games/steam/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index 1d087fa8f31..95fcdc0252a 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -10,14 +10,14 @@
 
 assert stdenv.system == "i686-linux";
 
-let version = "1.0.0.27"; in
+let version = "1.0.0.28"; in
 
 stdenv.mkDerivation rec {
   name = "steam-${version}";
 
   src = fetchurl {
     url = "http://media.steampowered.com/client/installer/steam.deb";
-    sha256 = "1hlmqxd0yv92aag3wbykwvri54lbmq9s6krrxfnrp1rbpli9r2jx";
+    sha256 = "0c0n1v9rnn6jj2wrvbmi77j9v93f3ndw039z9db6092yqls1amqk";
   };
 
   buildInputs = [ dpkg makeWrapper ];

From 97ea8d61e6673cdfd85a8aa8e0ec42ee91c93e1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Tue, 19 Feb 2013 20:34:54 +0100
Subject: [PATCH 27/95] steam: add amd64 version and point url to fix version
 (as suggested by aristid).

Valve has a repository with fixed version packages, so use that instead of the
steam.deb I was using. They also have amd64 packages there.
---
 pkgs/games/steam/default.nix    | 18 +++++++++++++-----
 pkgs/top-level/all-packages.nix |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index 95fcdc0252a..dd8c5e883a5 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -8,17 +8,25 @@
 , curl, mesa # Superbrothers: S&S EP
 , patchelf }:
 
-assert stdenv.system == "i686-linux";
+assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 
 let version = "1.0.0.28"; in
 
 stdenv.mkDerivation rec {
   name = "steam-${version}";
 
-  src = fetchurl {
-    url = "http://media.steampowered.com/client/installer/steam.deb";
-    sha256 = "0c0n1v9rnn6jj2wrvbmi77j9v93f3ndw039z9db6092yqls1amqk";
-  };
+  src =
+    if stdenv.system == "i686-linux" then 
+      fetchurl {
+        url = "http://repo.steampowered.com/steam/archive/precise/steam_${version}_i386.deb";
+        sha256 = "0c0n1v9rnn6jj2wrvbmi77j9v93f3ndw039z9db6092yqls1amqk";
+      }
+    else if stdenv.system == "x86_64-linux" then 
+      fetchurl {
+        url = "http://repo.steampowered.com/steam/archive/precise/steam64_${version}_amd64.deb";
+        sha256 = "1dr2b9s036w8r46az1f9cjddrjaf8a9k564g65j288y6w9pcdb2w";
+      }
+    else throw "Steam not supported on this platform.";
 
   buildInputs = [ dpkg makeWrapper ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 179bba1ce76..aabb57b2db0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9034,7 +9034,7 @@ let
 
   stardust = callPackage ../games/stardust {};
 
-  steam = callPackage_i686 ../games/steam {};
+  steam = callPackage ../games/steam {};
 
   stuntrally = callPackage ../games/stuntrally { };
 

From 4d853ae94fe74437b54eb1146c228c9a55175f61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Tue, 19 Feb 2013 20:52:19 +0100
Subject: [PATCH 28/95] steam: revert adding amd64 version.

It turns out that the .deb only contains the changelog and some other docs.
Revert back to using the i686 version, but keep the double url for the future.
---
 pkgs/games/steam/default.nix    | 2 +-
 pkgs/top-level/all-packages.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index dd8c5e883a5..122d301e5ba 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -8,7 +8,7 @@
 , curl, mesa # Superbrothers: S&S EP
 , patchelf }:
 
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
+assert stdenv.system == "i686-linux";
 
 let version = "1.0.0.28"; in
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aabb57b2db0..179bba1ce76 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9034,7 +9034,7 @@ let
 
   stardust = callPackage ../games/stardust {};
 
-  steam = callPackage ../games/steam {};
+  steam = callPackage_i686 ../games/steam {};
 
   stuntrally = callPackage ../games/stuntrally { };
 

From 5885cf1286fc2cfdf2b24811be872a00d421e183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Wed, 20 Feb 2013 19:30:31 +0100
Subject: [PATCH 29/95] steam: add flashplayer plugin support.

The videos work, but there is a problem with sound:
ALSA lib dlmisc.c:236:(snd1_dlobj_cache_get) Cannot open shared library
/nix/store/9z51hr9l19vdhgmqd60jwwrg6ny5md2d-alsa-plugins-1.0.26/lib/alsa-lib/libasound_module_pcm_pulse.so

It tries to open a 64bit plugin, which obviously fails. I think this depends on
/etc/asound.conf, but I'm not sure how to fix it.

Regardless of the problem, in one computer I tried the sound works but other
apps cannot output sound. In another, the sound doesn't work and other apps
continue working as normal.
---
 pkgs/games/steam/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index 122d301e5ba..0bb73d5f6c9 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -2,7 +2,7 @@
 , libselinux, libXrandr, pango, freetype, fontconfig, glib, gtk
 , gdk_pixbuf, cairo, libXi, alsaLib, libXrender, nss, nspr, zlib
 , dbus, libpng12, libXfixes, cups, libgcrypt, openal, pulseaudio
-, libxcb, libXau, libXdmcp
+, libxcb, libXau, libXdmcp, flashplayer
 , SDL # World of Goo
 , libvorbis # Osmos
 , curl, mesa # Superbrothers: S&S EP
@@ -82,6 +82,8 @@ stdenv.mkDerivation rec {
       export LD_LIBRARY_PATH="\$STEAMBIN32LINK:\$LD_LIBRARY_PATH:${mesa}/lib"
       export SDL_VIDEO_X11_DGAMOUSE=0
       cd "\$STEAMROOT"
+      FLASHLINK="\$STEAMCONFIG/bin32/plugins"
+      rm -f "\$FLASHLINK" && ln -s "${flashplayer}/lib/mozilla/plugins" "\$FLASHLINK"
       LDSO="\$STEAMBIN32LINK/ld.so"
       cp ${glibc215}/lib/ld-linux.so.2 "\$LDSO"
       chmod u+w "\$LDSO"

From 37996253e6492003c4ec23c833461e44f2fc1f23 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 10 Aug 2013 05:46:34 +0300
Subject: [PATCH 30/95] Steam: fix and update to 1.0.0.39

---
 pkgs/games/steam/default.nix | 37 +++++++++++++++---------------------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index 0bb73d5f6c9..1e8c0db9045 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -1,32 +1,25 @@
-{ stdenv, fetchurl, dpkg, makeWrapper, xz, libX11, gcc, glibc215
+{ stdenv, fetchurl, dpkg, makeWrapper, xz, libX11, gcc, glibc
 , libselinux, libXrandr, pango, freetype, fontconfig, glib, gtk
 , gdk_pixbuf, cairo, libXi, alsaLib, libXrender, nss, nspr, zlib
 , dbus, libpng12, libXfixes, cups, libgcrypt, openal, pulseaudio
-, libxcb, libXau, libXdmcp, flashplayer
+, libxcb, libXau, libXdmcp, flashplayer, libSM, libICE, libXext
+, dbus_glib, libusb1, networkmanager
 , SDL # World of Goo
 , libvorbis # Osmos
 , curl, mesa # Superbrothers: S&S EP
 , patchelf }:
 
-assert stdenv.system == "i686-linux";
+assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 
-let version = "1.0.0.28"; in
+let version = "1.0.0.39"; in
 
 stdenv.mkDerivation rec {
   name = "steam-${version}";
 
-  src =
-    if stdenv.system == "i686-linux" then 
-      fetchurl {
-        url = "http://repo.steampowered.com/steam/archive/precise/steam_${version}_i386.deb";
-        sha256 = "0c0n1v9rnn6jj2wrvbmi77j9v93f3ndw039z9db6092yqls1amqk";
-      }
-    else if stdenv.system == "x86_64-linux" then 
-      fetchurl {
-        url = "http://repo.steampowered.com/steam/archive/precise/steam64_${version}_amd64.deb";
-        sha256 = "1dr2b9s036w8r46az1f9cjddrjaf8a9k564g65j288y6w9pcdb2w";
-      }
-    else throw "Steam not supported on this platform.";
+  src = fetchurl {
+    url = "http://repo.steampowered.com/steam/archive/precise/steam-launcher_${version}_all.deb";
+    sha256 = "1z1cnlr2qw2ndnqsfwjck9617m2p0f3p9q9409vczj909h2a9wyk";
+  };
 
   buildInputs = [ dpkg makeWrapper ];
 
@@ -35,18 +28,17 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out
     dpkg-deb -x $src $out
-    mv $out/usr/* $out/
-    rmdir $out/usr
-    substituteInPlace "$out/bin/steam" --replace "/bin/bash" "/bin/sh"
+    cp -r $out/usr/* $out/
+    rm -rf $out/usr
+    substituteInPlace "$out/bin/steam" --replace "/usr/bin/env bash" "/bin/sh"
     substituteInPlace "$out/bin/steam" --replace "/usr/" "$out/"
     sed -i 's,STEAMPACKAGE=.*,STEAMPACKAGE=steam,' $out/bin/steam
     sed -i '/STEAMSCRIPT/d' $out/bin/steam
 
     mv $out/bin/steam $out/bin/.steam-wrapped
     cat > $out/bin/steam << EOF
-    #!${stdenv.shell}
 
-    export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib:${gcc.gcc}/lib:${glibc215}/lib:${libselinux}/lib:${libXrandr}/lib:${pango}/lib:${freetype}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${libXi}/lib:${alsaLib}/lib:${libXrender}/lib:${nss}/lib:${nspr}/lib:${zlib}/lib:${dbus}/lib:${libpng12}/lib:${libXfixes}/lib:${cups}/lib:${libgcrypt}/lib:${openal}/lib:${pulseaudio}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${SDL}/lib:${libvorbis}/lib:${curl}/lib
+    export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${libX11}/lib:${gcc.gcc}/lib:${libselinux}/lib:${libXrandr}/lib:${pango}/lib:${freetype}/lib:${fontconfig}/lib:${glib}/lib:${gtk}/lib:${gdk_pixbuf}/lib:${cairo}/lib:${libXi}/lib:${alsaLib}/lib:${libXrender}/lib:${nss}/lib:${nspr}/lib:${zlib}/lib:${dbus}/lib:${libpng12}/lib:${libXfixes}/lib:${cups}/lib:${libgcrypt}/lib:${openal}/lib:${pulseaudio}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${SDL}/lib:${libvorbis}/lib:${curl}/lib:${libSM}/lib:${libICE}/lib:${dbus_glib}/lib:${networkmanager}/lib:${libXext}/lib:${libusb1}/lib
     STEAMBOOTSTRAP=~/.steam/steam/steam.sh
     if [ -f \$STEAMBOOTSTRAP ]; then
       PLATFORM32=ubuntu12_32
@@ -85,9 +77,10 @@ stdenv.mkDerivation rec {
       FLASHLINK="\$STEAMCONFIG/bin32/plugins"
       rm -f "\$FLASHLINK" && ln -s "${flashplayer}/lib/mozilla/plugins" "\$FLASHLINK"
       LDSO="\$STEAMBIN32LINK/ld.so"
-      cp ${glibc215}/lib/ld-linux.so.2 "\$LDSO"
+      cp ${glibc}/lib/ld-linux.so.2 "\$LDSO"
       chmod u+w "\$LDSO"
       echo \$\$ > "\$PIDFILE" # pid of the shell will become pid of steam
+      export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${glibc}/lib
       exec "\$LDSO" "\$STEAMBIN32LINK/steam"
     else
       export PATH=${xz}/bin:\$PATH

From 24a0e6ad5fe16d525f06fd6045fcc3f5da8e4ed3 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Sat, 10 Aug 2013 13:00:43 +0200
Subject: [PATCH 31/95] callPackage automatically inherits from xlibs

---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f13b150bd17..0268790832e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1830,9 +1830,7 @@ let
 
   vfdecrypt = callPackage ../tools/misc/vfdecrypt { };
 
-  vifm = callPackage ../applications/misc/vifm {
-    inherit (xlibs) libX11;
-  };
+  vifm = callPackage ../applications/misc/vifm { };
 
   viking = callPackage ../applications/misc/viking {
     inherit (gnome) scrollkeeper;

From 31648f889dd9685e4a6268c49fc6aefc37405fe0 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 7 Aug 2013 06:24:44 +0200
Subject: [PATCH 32/95] btrfsprogs: upgrade to current git master

---
 pkgs/tools/filesystems/btrfsprogs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix
index a091142db24..9c8d18231f0 100644
--- a/pkgs/tools/filesystems/btrfsprogs/default.nix
+++ b/pkgs/tools/filesystems/btrfsprogs/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchgit, zlib, libuuid, acl, attr, e2fsprogs, lzo }:
 
-let version = "0.20pre20130509"; in
+let version = "0.20pre20130705"; in
 
 stdenv.mkDerivation {
   name = "btrfs-progs-${version}";
 
   src = fetchgit {
     url = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git";
-    rev = "650e656a8b9c1fbe4ec5cd8c48ae285b8abd3b69";
-    sha256 = "e50e8ce9d24505711ed855f69a73d639dc5e401692a7d1c300753de3472abb21";
+    rev = "194aa4a1bd6447bb545286d0bcb0b0be8204d79f";
+    sha256 = "07c6762c9873cdcc1b9b3be0b412ba14b83457d8f5608d3dd945953b5e06f0f2";
   };
 
   buildInputs = [ zlib libuuid acl attr e2fsprogs lzo ];

From 59025453e71f88196eaff142ff3443f99cda8f44 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Wed, 7 Aug 2013 06:30:54 +0200
Subject: [PATCH 33/95] linux-3.10: backport a fix for "btrfs send"

It has been submitted for inclusion in mainline, so it will probably
make it into 3.11 (or 3.12 as 3.11 is fairly close to release).

It is very local, only affecting people who use the "send" feature.
Without it, send is unstable/unsafe to use incrementally.

It can probably be applied to 3.9 and 3.8 as well, but as I only
tested it against 3.10, so I didn't bother.
---
 pkgs/os-specific/linux/kernel/patches.nix | 11 +++++++++++
 pkgs/top-level/all-packages.nix           |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index c77785167cc..e1ec4a55718 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -139,4 +139,15 @@ rec {
       };
     };
 
+  # this patch will probably make it into 3.11 or 3.12
+  # it only touches 1 file (fs/btrfs/send.c) so it only affects people that use
+  # the btrfs send feature.
+  btrfs_send_backport =
+    { name = "btrfs-send-check-parent-dir-when-doing-a-compare-send";
+      patch = fetchurl {
+        url = https://patchwork.kernel.org/patch/2839612/mbox;
+        sha256 = "0qv5mxpfrzj2dibac64n4b3d6pg7gzsafd11548bihwmsa3dlbhg";
+      };
+    };
+
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a366b24193..53c3ba9ec73 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6454,6 +6454,7 @@ let
     kernelPatches =
       [
         kernelPatches.sec_perm_2_6_24
+        kernelPatches.btrfs_send_backport
       ] ++ lib.optionals (platform.kernelArch == "mips")
       [ kernelPatches.mips_fpureg_emu
         kernelPatches.mips_fpu_sigill

From 5a1593ed22dc6f0c451a9a37870be66aad601032 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 10 Aug 2013 14:15:20 +0200
Subject: [PATCH 34/95] Revert "Add taskjuggler ruby gem"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 67a46ce928c9190c9b11982120000df711ef1945.

It seems this commit is the reason for this hydra breakage:

  building /nix/store/hwdyx4mf5638mxkka64cxjcj75vw3hmz-nixpkgs-tarball-1.0pre28245_67a46ce
  unpacking sources
  [...snip lots of stuff...]
  'manual.pdf' successfully built
  make: Leaving directory `/tmp/nix-build-nixpkgs-tarball-1.0pre28245_67a46ce.drv-0/git-export/doc'
  running tests
  checking pkgs/top-level/all-packages.nix on i686-linux
  error: while evaluating the attribute `drvPath' at `/nix/store/l7ny7f17aii5qfgmadr2wcp3wan54wlp-nix-1.5.3/share/nix/corepkgs/derivation.nix:19:9':
  while evaluating the builtin function `derivationStrict':
  while instantiating the derivation named `ruby-actionmailer-4.0.0' at `/tmp/nix-build-nixpkgs-tarball-1.0pre28245_67a46ce.drv-0/git-export/pkgs/development/interpreters/ruby/gem.nix:16:5':
  while evaluating the derivation attribute `propagatedNativeBuildInputs' at `/tmp/nix-build-nixpkgs-tarball-1.0pre28245_67a46ce.drv-0/git-export/pkgs/stdenv/generic/default.nix:78:17':
  while evaluating the attribute `outPath' at `/nix/store/l7ny7f17aii5qfgmadr2wcp3wan54wlp-nix-1.5.3/share/nix/corepkgs/derivation.nix:18:9':
  while evaluating the builtin function `getAttr':
  while evaluating the builtin function `derivationStrict':
  while instantiating the derivation named `ruby-actionpack-4.0.0' at `/tmp/nix-build-nixpkgs-tarball-1.0pre28245_67a46ce.drv-0/git-export/pkgs/development/interpreters/ruby/gem.nix:16:5':
  while evaluating the derivation attribute `propagatedNativeBuildInputs' at `/tmp/nix-build-nixpkgs-tarball-1.0pre28245_67a46ce.drv-0/git-export/pkgs/stdenv/generic/default.nix:78:17':
  while evaluating the attribute `outPath' at `/nix/store/l7ny7f17aii5qfgmadr2wcp3wan54wlp-nix-1.5.3/share/nix/corepkgs/derivation.nix:18:9':
  while evaluating the builtin function `getAttr':
  while evaluating the builtin function `derivationStrict':
  while instantiating the derivation named `ruby-activesupport-4.0.0' at `/tmp/nix-build-nixpkgs-tarball-1.0pre28245_67a46ce.drv-0/git-export/pkgs/development/interpreters/ruby/gem.nix:16:5':
  while evaluating the derivation attribute `propagatedNativeBuildInputs' at `/tmp/nix-build-nixpkgs-tarball-1.0pre28245_67a46ce.drv-0/git-export/pkgs/stdenv/generic/default.nix:78:17':
  while evaluating the attribute `outPath' at `/nix/store/l7ny7f17aii5qfgmadr2wcp3wan54wlp-nix-1.5.3/share/nix/corepkgs/derivation.nix:18:9':
  while evaluating the builtin function `getAttr':
  while evaluating the builtin function `derivationStrict':
  while instantiating the derivation named `ruby-multi_json-1.7.8' at `/tmp/nix-build-nixpkgs-tarball-1.0pre28245_67a46ce.drv-0/git-export/pkgs/development/interpreters/ruby/gem.nix:16:5':
  while evaluating the derivation attribute `src' at `/tmp/nix-build-nixpkgs-tarball-1.0pre28245_67a46ce.drv-0/git-export/pkgs/development/interpreters/ruby/gem.nix:11:5':
  while evaluating the attribute `outPath' at `/nix/store/l7ny7f17aii5qfgmadr2wcp3wan54wlp-nix-1.5.3/share/nix/corepkgs/derivation.nix:18:9':
  while evaluating the builtin function `getAttr':
  while evaluating the builtin function `derivationStrict':
  hash `no hash' has wrong length for hash type `sha256'
  build time elapsed:  0m0.038s 0m0.023s 0m20.586s 0m2.004s
  builder for `/nix/store/lxmyqg7z1l71ji5vdar2m5w66dx45v20-nixpkgs-tarball-1.0pre28245_67a46ce.drv' failed with exit code 1
  error: build of `/nix/store/lxmyqg7z1l71ji5vdar2m5w66dx45v20-nixpkgs-tarball-1.0pre28245_67a46ce.drv' failed
---
 .../interpreters/ruby/generated.nix           | 195 +++++++++---------
 1 file changed, 98 insertions(+), 97 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix
index ff0bcf235ae..7446e52704c 100644
--- a/pkgs/development/interpreters/ruby/generated.nix
+++ b/pkgs/development/interpreters/ruby/generated.nix
@@ -12,10 +12,10 @@ g: # Get dependencies from patched gems
     activesupport = g.activesupport_4_0_0;
     addressable = g.addressable_2_3_5;
     arel = g.arel_4_0_0;
-    atomic = g.atomic_1_1_12;
+    atomic = g.atomic_1_1_10;
     atoulme_Antwrap = g.atoulme_Antwrap_0_7_4;
     autotest_rails = g.autotest_rails_4_1_2;
-    aws_sdk = g.aws_sdk_1_14_1;
+    aws_sdk = g.aws_sdk_1_12_0;
     bitbucket_backup = g.bitbucket_backup_0_2_2;
     builder = g.builder_3_2_2;
     buildr = g.buildr_1_4_12;
@@ -31,8 +31,9 @@ g: # Get dependencies from patched gems
     erubis = g.erubis_2_7_0;
     eventmachine = g.eventmachine_1_0_3;
     eventmachine_tail = g.eventmachine_tail_0_6_4;
+    execjs = g.execjs_1_4_0;
     fakes3 = g.fakes3_0_1_5;
-    faraday = g.faraday_0_8_8;
+    faraday = g.faraday_0_8_7;
     faraday_middleware = g.faraday_middleware_0_8_8;
     ffi = g.ffi_1_9_0;
     file_tail = g.file_tail_1_0_12;
@@ -45,9 +46,10 @@ g: # Get dependencies from patched gems
     i18n = g.i18n_0_6_4;
     iconv = g.iconv_1_0_3;
     jruby_pageant = g.jruby_pageant_1_1_1;
-    jsduck = g.jsduck_5_0_1;
+    jsduck = g.jsduck_4_10_4;
     json = g.json_1_8_0;
     json_pure = g.json_pure_1_8_0;
+    libv8 = g.libv8_3_11_8_17_x86_64_linux;
     locale = g.locale_2_0_8;
     lockfile = g.lockfile_2_1_0;
     macaddr = g.macaddr_1_6_1;
@@ -57,10 +59,10 @@ g: # Get dependencies from patched gems
     mini_portile = g.mini_portile_0_5_1;
     minitar = g.minitar_0_5_3;
     minitest = g.minitest_4_7_5;
-    multi_json = g.multi_json_1_7_8;
+    multi_json = g.multi_json_1_7_7;
     multipart_post = g.multipart_post_1_2_0;
-    net_http_digest_auth = g.net_http_digest_auth_1_4;
-    net_http_persistent = g.net_http_persistent_2_9;
+    net_http_digest_auth = g.net_http_digest_auth_1_3;
+    net_http_persistent = g.net_http_persistent_2_8;
     net_sftp = g.net_sftp_2_0_5;
     net_ssh = g.net_ssh_2_6_8;
     nix = g.nix_0_1_1;
@@ -78,11 +80,11 @@ g: # Get dependencies from patched gems
     rake = g.rake_10_1_0;
     rb_fsevent = g.rb_fsevent_0_9_3;
     rdiscount = g.rdiscount_2_1_6;
+    ref = g.ref_1_0_5;
     remote_syslog = g.remote_syslog_1_6_14;
     right_aws = g.right_aws_3_1_0;
     right_http_connection = g.right_http_connection_1_4_0;
     rjb = g.rjb_1_4_8;
-    rkelly_remix = g.rkelly_remix_0_0_4;
     rmail = g.rmail_1_0_0;
     rspec = g.rspec_2_11_0;
     rspec_core = g.rspec_core_2_11_1;
@@ -90,20 +92,19 @@ g: # Get dependencies from patched gems
     rspec_mocks = g.rspec_mocks_2_11_3;
     rubyforge = g.rubyforge_2_0_4;
     rubyzip = g.rubyzip_0_9_9;
-    sass = g.sass_3_2_10;
-    selenium_webdriver = g.selenium_webdriver_2_34_0;
+    sass = g.sass_3_2_9;
+    selenium_webdriver = g.selenium_webdriver_2_33_0;
     servolux = g.servolux_0_10_0;
     sinatra = g.sinatra_1_3_2;
     sprockets = g.sprockets_2_10_0;
     sprockets_rails = g.sprockets_rails_2_0_0;
     syslog_protocol = g.syslog_protocol_0_9_2;
     systemu = g.systemu_2_5_2;
-    taskjuggler = g.taskjuggler_3_5_0;
-    term_ansicolor = g.term_ansicolor_1_2_2;
     text = g.text_1_2_1;
+    therubyracer = g.therubyracer_0_11_4;
     thin = g.thin_1_5_1;
     thor = g.thor_0_18_1;
-    thread_safe = g.thread_safe_0_1_2;
+    thread_safe = g.thread_safe_0_1_0;
     tilt = g.tilt_1_4_1;
     tins = g.tins_0_8_3;
     treetop = g.treetop_1_4_14;
@@ -120,7 +121,7 @@ g: # Get dependencies from patched gems
     xml_simple = g.xml_simple_1_1_1;
     yajl_ruby = g.yajl_ruby_1_1_0;
   };
-  gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''gettext'' ''iconv'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''thin'' ''trollop'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ];
+  gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''fakes3'' ''foreman'' ''gettext'' ''iconv'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''thin'' ''trollop'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ];
   gems = {
     ZenTest_4_9_2 = {
       basename = ''ZenTest'';
@@ -216,7 +217,7 @@ installed versions.'';
         longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.'';
       };
       name = ''activesupport-4.0.0'';
-      requiredGems = [ g.i18n_0_6_4 g.multi_json_1_7_8 g.tzinfo_0_3_37 g.minitest_4_7_5 g.thread_safe_0_1_2 ];
+      requiredGems = [ g.i18n_0_6_4 g.multi_json_1_7_7 g.tzinfo_0_3_37 g.minitest_4_7_5 g.thread_safe_0_1_0 ];
       sha256 = ''0agxkvjhhv6r9rpm0lcgjny4sn1ihhvhlgs46rgi3fz0y1d93ids'';
     };
     addressable_2_3_5 = {
@@ -251,16 +252,16 @@ database compatibility and query generation.'';
       requiredGems = [  ];
       sha256 = ''19xzg8jhp4p18xlf6sp4yhf6vdpc3hl8lm23n6glikclm7rvgick'';
     };
-    atomic_1_1_12 = {
+    atomic_1_1_10 = {
       basename = ''atomic'';
       meta = {
         description = ''An atomic reference implementation for JRuby, Rubinius, and MRI'';
         homepage = ''http://github.com/headius/ruby-atomic'';
         longDescription = ''An atomic reference implementation for JRuby, Rubinius, and MRI'';
       };
-      name = ''atomic-1.1.12'';
+      name = ''atomic-1.1.10'';
       requiredGems = [  ];
-      sha256 = ''038kihswmzlzsc96r3qg5g0khdg5lywjk2nz32i7l6j85lpg233v'';
+      sha256 = ''0ms6b2f9hij6bap901ra2wx7lk4y2bsasifcqr7m3z8l5my372jh'';
     };
     atoulme_Antwrap_0_7_4 = {
       basename = ''atoulme_Antwrap'';
@@ -296,16 +297,16 @@ rails support and extra plugins for migrations and fixtures.'';
       requiredGems = [ g.ZenTest_4_9_2 ];
       sha256 = ''1wkb5jayb39yx0i8ly7sibygf9f9c3w24jg2z1qgm135zlb070v4'';
     };
-    aws_sdk_1_14_1 = {
+    aws_sdk_1_12_0 = {
       basename = ''aws_sdk'';
       meta = {
         description = ''AWS SDK for Ruby'';
         homepage = ''http://aws.amazon.com/sdkforruby'';
         longDescription = ''AWS SDK for Ruby'';
       };
-      name = ''aws-sdk-1.14.1'';
+      name = ''aws-sdk-1.12.0'';
       requiredGems = [ g.uuidtools_2_1_4 g.nokogiri_1_5_10 g.json_1_8_0 ];
-      sha256 = ''18lvxnkb7xb2q7z5ifz9j2b9v17r6fd04s83pac7598s3zj6k4na'';
+      sha256 = ''0ijz5ch7ch5kj19j5caf5h3hdfmmny9v9clkdh664cr46ylvkv3n'';
     };
     bitbucket_backup_0_2_2 = {
       basename = ''bitbucket_backup'';
@@ -552,6 +553,17 @@ using TCP/IP, especially if custom protocols are required.'';
       requiredGems = [ g.eventmachine_1_0_3 ];
       sha256 = ''1pvlb34vdzd81kf9f3xyibb4f55xjqm7lqqy28dgyci5cyv50y61'';
     };
+    execjs_1_4_0 = {
+      basename = ''execjs'';
+      meta = {
+        description = ''Run JavaScript code from Ruby'';
+        homepage = ''https://github.com/sstephenson/execjs'';
+        longDescription = ''ExecJS lets you run JavaScript code from Ruby.'';
+      };
+      name = ''execjs-1.4.0'';
+      requiredGems = [ g.multi_json_1_7_7 ];
+      sha256 = ''0b69ci2afbcdqsri3i89a7s7j7palxsxdb65x6h2wx79kzlc5xcs'';
+    };
     fakes3_0_1_5 = {
       basename = ''fakes3'';
       meta = {
@@ -562,15 +574,15 @@ using TCP/IP, especially if custom protocols are required.'';
       requiredGems = [ g.thor_0_18_1 g.builder_3_2_2 ];
       sha256 = ''1na5wrbarla6s414svqmr5spbpv6vmcgpswal444x4clcpmadhib'';
     };
-    faraday_0_8_8 = {
+    faraday_0_8_7 = {
       basename = ''faraday'';
       meta = {
         description = ''HTTP/REST API client library.'';
         homepage = ''https://github.com/lostisland/faraday'';
       };
-      name = ''faraday-0.8.8'';
+      name = ''faraday-0.8.7'';
       requiredGems = [ g.multipart_post_1_2_0 ];
-      sha256 = ''no hash'';
+      sha256 = ''186a9md3ixanl2crdlw37kspw5wiyw16z9mj3aw8rd1yd5q56ddi'';
     };
     faraday_middleware_0_8_8 = {
       basename = ''faraday_middleware'';
@@ -580,7 +592,7 @@ using TCP/IP, especially if custom protocols are required.'';
         longDescription = ''Various middleware for Faraday'';
       };
       name = ''faraday_middleware-0.8.8'';
-      requiredGems = [ g.faraday_0_8_8 ];
+      requiredGems = [ g.faraday_0_8_7 ];
       sha256 = ''1n0g8pm7ynx6ffyqhscc1cqw97zhvd8isr31yfyj15335j1jsncz'';
     };
     ffi_1_9_0 = {
@@ -735,16 +747,16 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       requiredGems = [  ];
       sha256 = ''1kgqsn0bagr41gf5kbqaxbs38a7s5bm85m0pdx4qz7d70v9nc9cl'';
     };
-    jsduck_5_0_1 = {
+    jsduck_4_10_4 = {
       basename = ''jsduck'';
       meta = {
         description = ''Simple JavaScript Duckumentation generator'';
         homepage = ''https://github.com/senchalabs/jsduck'';
         longDescription = ''Documentation generator for Sencha JS frameworks'';
       };
-      name = ''jsduck-5.0.1'';
-      requiredGems = [ g.rdiscount_2_1_6 g.json_1_8_0 g.parallel_0_7_1 g.rkelly_remix_0_0_4 g.dimensions_1_2_0 ];
-      sha256 = ''0py1ik9jri5f230ifqxv0y0p4w0dp5jp8a9hfzgzaz4xvpzqyf7h'';
+      name = ''jsduck-4.10.4'';
+      requiredGems = [ g.rdiscount_2_1_6 g.json_1_8_0 g.parallel_0_7_1 g.execjs_1_4_0 g.therubyracer_0_11_4 g.dimensions_1_2_0 ];
+      sha256 = ''1xnad96wmszz0m66wrwciihba6whpg8bglwkbazrifxh9kcw7wih'';
     };
     json_1_8_0 = {
       basename = ''json'';
@@ -779,6 +791,17 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf'';
       requiredGems = [  ];
       sha256 = ''0kkn5zhiffav2cffj43wwvzj07825r4j463ilfjgik034vnbjs83'';
     };
+    libv8_3_11_8_17_x86_64_linux = {
+      basename = ''libv8'';
+      meta = {
+        description = ''Distribution of the V8 JavaScript engine'';
+        homepage = ''http://github.com/cowboyd/libv8'';
+        longDescription = ''Distributes the V8 JavaScript engine in binary and source forms in order to support fast builds of The Ruby Racer'';
+      };
+      name = ''libv8-3.11.8.17-x86_64-linux'';
+      requiredGems = [  ];
+      sha256 = ''1s2j79rm2idny701l6rsnig6451w2wfipgmfvxf05d1syn14cmg9'';
+    };
     locale_2_0_8 = {
       basename = ''locale'';
       meta = {
@@ -836,7 +859,7 @@ submitted.  Mechanize also keeps track of the sites that you have visited as
 a history.'';
       };
       name = ''mechanize-2.7.1'';
-      requiredGems = [ g.net_http_digest_auth_1_4 g.net_http_persistent_2_9 g.mime_types_1_23 g.http_cookie_1_0_1 g.nokogiri_1_6_0 g.ntlm_http_0_1_1 g.webrobots_0_1_1 g.domain_name_0_5_12 ];
+      requiredGems = [ g.net_http_digest_auth_1_3 g.net_http_persistent_2_8 g.mime_types_1_23 g.http_cookie_1_0_1 g.nokogiri_1_6_0 g.ntlm_http_0_1_1 g.webrobots_0_1_1 g.domain_name_0_5_12 ];
       sha256 = ''0abcrabsjamp4fjbizp4dv8nkz7jv03r9n0lpn9yypb48ij876vh'';
     };
     mime_types_1_23 = {
@@ -956,16 +979,16 @@ extract-method refactorings still apply.'';
       requiredGems = [  ];
       sha256 = ''03p6iban9gcpcflzp4z901s1hgj9369p6515h967ny6hlqhcf2iy'';
     };
-    multi_json_1_7_8 = {
+    multi_json_1_7_7 = {
       basename = ''multi_json'';
       meta = {
         description = ''A common interface to multiple JSON libraries.'';
         homepage = ''http://github.com/intridea/multi_json'';
         longDescription = ''A common interface to multiple JSON libraries, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, NSJSONSerialization, gson.rb, JrJackson, and OkJson.'';
       };
-      name = ''multi_json-1.7.8'';
+      name = ''multi_json-1.7.7'';
       requiredGems = [  ];
-      sha256 = ''no hash'';
+      sha256 = ''1w3fpi52h4a7r0a670xzrwa40l5irh69r45cbvxw24bsp19sfxzr'';
     };
     multipart_post_1_2_0 = {
       basename = ''multipart_post'';
@@ -978,7 +1001,7 @@ extract-method refactorings still apply.'';
       requiredGems = [  ];
       sha256 = ''12p7lnmc52di1r4h73h6xrpppplzyyhani9p7wm8l4kgf1hnmwnc'';
     };
-    net_http_digest_auth_1_4 = {
+    net_http_digest_auth_1_3 = {
       basename = ''net_http_digest_auth'';
       meta = {
         description = ''An implementation of RFC 2617 - Digest Access Authentication'';
@@ -991,11 +1014,11 @@ In order to use net-http-digest_auth you'll need to perform some request
 wrangling on your own.  See the class documentation at Net::HTTP::DigestAuth
 for an example.'';
       };
-      name = ''net-http-digest_auth-1.4'';
+      name = ''net-http-digest_auth-1.3'';
       requiredGems = [  ];
-      sha256 = ''14801gr34g0rmqz9pv4rkfa3crfdbyfk6r48vpg5a5407v0sixqi'';
+      sha256 = ''11hn4fb02rx799ck1gghmz7b32977zbi9sz2jpfyz43igwz2dvzy'';
     };
-    net_http_persistent_2_9 = {
+    net_http_persistent_2_8 = {
       basename = ''net_http_persistent'';
       meta = {
         description = ''Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8'';
@@ -1011,9 +1034,9 @@ Net::HTTP supports persistent connections with some API methods but does not
 handle reconnection gracefully.  Net::HTTP::Persistent supports reconnection
 and retry according to RFC 2616.'';
       };
-      name = ''net-http-persistent-2.9'';
+      name = ''net-http-persistent-2.8'';
       requiredGems = [  ];
-      sha256 = ''0k9bp7q5fsh908jnkwfj71ky04i4ih0ky6sqi5vl6zcpjsczgfcb'';
+      sha256 = ''1y50ssi8lcxfady4wwy242sgsr1424g5rg3wpav6kqc9rba74v9l'';
     };
     net_sftp_2_0_5 = {
       basename = ''net_sftp'';
@@ -1087,7 +1110,7 @@ enough of it.'';
       };
       name = ''nokogiri-1.6.0'';
       requiredGems = [ g.mini_portile_0_5_1 ];
-      sha256 = ''no hash'';
+      sha256 = ''1icrny9w2hd0pm7cyq5wqdkbzr57dkma1lbyrr0x14lsnangkidb'';
     };
     ntlm_http_0_1_1 = {
       basename = ''ntlm_http'';
@@ -1108,7 +1131,7 @@ enough of it.'';
         longDescription = ''Command-line client for Papertrail hosted log management service. Tails and searches app server logs and system syslog. Supports Boolean search and works with grep and pipe output (Unix).'';
       };
       name = ''papertrail-0.9.7'';
-      requiredGems = [ g.addressable_2_3_5 g.yajl_ruby_1_1_0 g.chronic_0_9_1 g.faraday_0_8_8 g.faraday_middleware_0_8_8 ];
+      requiredGems = [ g.addressable_2_3_5 g.yajl_ruby_1_1_0 g.chronic_0_9_1 g.faraday_0_8_7 g.faraday_middleware_0_8_8 ];
       sha256 = ''0v0m1v0qabbr9pmyl77znz39qy1m7p0xwvf3lf9hyq6n524f2dwr'';
     };
     papertrail_cli_0_9_3 = {
@@ -1265,6 +1288,17 @@ request helpers feature.'';
       requiredGems = [  ];
       sha256 = ''180ln9gwxn0cyflg0i1viv7jyalmjqvqr34cb65xsmmsz1nz55q2'';
     };
+    ref_1_0_5 = {
+      basename = ''ref'';
+      meta = {
+        description = ''Library that implements weak, soft, and strong references in Ruby.'';
+        homepage = ''http://github.com/bdurand/ref'';
+        longDescription = ''Library that implements weak, soft, and strong references in Ruby that work across multiple runtimes (MRI, REE, YARV, Jruby, Rubinius, and IronRuby). Also includes implementation of maps/hashes that use references and a reference queue.'';
+      };
+      name = ''ref-1.0.5'';
+      requiredGems = [  ];
+      sha256 = ''19qgpsfszwc2sfh6wixgky5agn831qq8ap854i1jqqhy1zsci3la'';
+    };
     remote_syslog_1_6_14 = {
       basename = ''remote_syslog'';
       meta = {
@@ -1367,19 +1401,6 @@ algorithm for low-level network errors.
       requiredGems = [  ];
       sha256 = ''06ps4ssaxb8jwja53h7v7kb31hsdr997b8na89d1yasm5zyraliw'';
     };
-    rkelly_remix_0_0_4 = {
-      basename = ''rkelly_remix'';
-      meta = {
-        description = ''Fork of the RKelly library to make it suitable as the JavaScript parser in JSDuck'';
-        longDescription = ''Fork of the RKelly library to make it suitable as the JavaScript parser
-in JSDuck.
-
-* http://rkelly.rubyforge.org/'';
-      };
-      name = ''rkelly-remix-0.0.4'';
-      requiredGems = [  ];
-      sha256 = ''1w6yr5n3b8yd0rsba9q3zyxr0n2hbpkz4v2k1qx6j1ywvl9rc2c1'';
-    };
     rmail_1_0_0 = {
       basename = ''rmail'';
       meta = {
@@ -1463,7 +1484,7 @@ in JSDuck.
       requiredGems = [  ];
       sha256 = ''1khf6d903agnwd8965f5f8b353rzmfvygxp53z1199rqzw8h46q2'';
     };
-    sass_3_2_10 = {
+    sass_3_2_9 = {
       basename = ''sass'';
       meta = {
         description = ''A powerful but elegant CSS compiler that makes CSS fun again.'';
@@ -1474,20 +1495,20 @@ in JSDuck.
       command line tool or a web-framework plugin.
 '';
       };
-      name = ''sass-3.2.10'';
+      name = ''sass-3.2.9'';
       requiredGems = [  ];
-      sha256 = ''0anfff4hz8fz1wbimmp9vv4mjfl1swg7ww74j549788x41l4x283'';
+      sha256 = ''08lvbi4siavvci0g4m65576axcagw23i0iamdqv33kwdimik717q'';
     };
-    selenium_webdriver_2_34_0 = {
+    selenium_webdriver_2_33_0 = {
       basename = ''selenium_webdriver'';
       meta = {
         description = ''The next generation developer focused tool for automated testing of webapps'';
         homepage = ''http://selenium.googlecode.com'';
         longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.'';
       };
-      name = ''selenium-webdriver-2.34.0'';
-      requiredGems = [ g.multi_json_1_7_8 g.rubyzip_0_9_9 g.childprocess_0_3_9 g.websocket_1_0_7 ];
-      sha256 = ''02wh008b03ixhpp853rmviq6xfk8100ka1g66wb2vsghajs6l1hx'';
+      name = ''selenium-webdriver-2.33.0'';
+      requiredGems = [ g.multi_json_1_7_7 g.rubyzip_0_9_9 g.childprocess_0_3_9 g.websocket_1_0_7 ];
+      sha256 = ''000fpc5vaf268g96vmqq9vlg8fgyh78290agayrk9qkds8i8cr5d'';
     };
     servolux_0_10_0 = {
       basename = ''servolux'';
@@ -1522,7 +1543,7 @@ interpreters.'';
         longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.'';
       };
       name = ''sprockets-2.10.0'';
-      requiredGems = [ g.hike_1_2_3 g.multi_json_1_7_8 g.rack_1_5_2 g.tilt_1_4_1 ];
+      requiredGems = [ g.hike_1_2_3 g.multi_json_1_7_7 g.rack_1_5_2 g.tilt_1_4_1 ];
       sha256 = ''1z0kiaymvqm07wqqy479vd8a60ggr3f3520b4splljbn2055fn3s'';
     };
     sprockets_rails_2_0_0 = {
@@ -1557,37 +1578,6 @@ interpreters.'';
       requiredGems = [  ];
       sha256 = ''0h834ajdg9w4xrijp31fn98pjfj08gi08xjvp5xh3i6hz9a25fhr'';
     };
-    taskjuggler_3_5_0 = {
-      basename = ''taskjuggler'';
-      meta = {
-        description = ''A Project Management Software'';
-        homepage = ''http://www.taskjuggler.org'';
-        longDescription = ''TaskJuggler is a modern and powerful, Free and Open Source Software project
-management tool. Its new approach to project planing and tracking is more
-flexible and superior to the commonly used Gantt chart editing tools.
-
-TaskJuggler is project management software for serious project managers. It
-covers the complete spectrum of project management tasks from the first idea
-to the completion of the project. It assists you during project scoping,
-resource assignment, cost and revenue planing, risk and communication
-management.
-'';
-      };
-      name = ''taskjuggler-3.5.0'';
-      requiredGems = [ g.mail_2_5_4 g.term_ansicolor_1_2_2 ];
-      sha256 = ''0r84rlc7a6w7p9nc9mgycbs5h0hq0kzscjq7zj3296xyf0afiwj2'';
-    };
-    term_ansicolor_1_2_2 = {
-      basename = ''term_ansicolor'';
-      meta = {
-        description = ''Ruby library that colors strings using ANSI escape sequences'';
-        homepage = ''http://flori.github.com/term-ansicolor'';
-        longDescription = ''This library uses ANSI escape sequences to control the attributes of terminal output'';
-      };
-      name = ''term-ansicolor-1.2.2'';
-      requiredGems = [ g.tins_0_8_3 ];
-      sha256 = ''1b41q1q6mqcgzq9fhzhmjvfg5sfs5v7gkb8z57r4hajcp89lflxr'';
-    };
     text_1_2_1 = {
       basename = ''text'';
       meta = {
@@ -1599,6 +1589,17 @@ management.
       requiredGems = [  ];
       sha256 = ''0s186kh125imdr7dahr10payc1gmxgk6wjy1v3agdyvl53yn5z3z'';
     };
+    therubyracer_0_11_4 = {
+      basename = ''therubyracer'';
+      meta = {
+        description = ''Embed the V8 JavaScript interpreter into Ruby'';
+        homepage = ''http://github.com/cowboyd/therubyracer'';
+        longDescription = ''Call JavaScript code and manipulate JavaScript objects from Ruby. Call Ruby code and manipulate Ruby objects from JavaScript.'';
+      };
+      name = ''therubyracer-0.11.4'';
+      requiredGems = [ g.ref_1_0_5 g.libv8_3_11_8_17_x86_64_linux ];
+      sha256 = ''15n9zi9jzb5k34id9xfkxx39y0nap7a4h02z8r00msjjajxag3iq'';
+    };
     thin_1_5_1 = {
       basename = ''thin'';
       meta = {
@@ -1621,16 +1622,16 @@ management.
       requiredGems = [  ];
       sha256 = ''0d1g37j6sc7fkidf8rqlm3wh9zgyg3g7y8h2x1y34hmil5ywa8c3'';
     };
-    thread_safe_0_1_2 = {
+    thread_safe_0_1_0 = {
       basename = ''thread_safe'';
       meta = {
         description = ''A collection of data structures and utilities to make thread-safe programming in Ruby easier'';
         homepage = ''https://github.com/headius/thread_safe'';
         longDescription = ''Thread-safe collections and utilities for Ruby'';
       };
-      name = ''thread_safe-0.1.2'';
-      requiredGems = [ g.atomic_1_1_12 ];
-      sha256 = ''1bxyh5l11inadbk7pjyz5s98g24qj8xavh55bc56nrzj51y9aavy'';
+      name = ''thread_safe-0.1.0'';
+      requiredGems = [ g.atomic_1_1_10 ];
+      sha256 = ''0fhx4110il4iiij5wdfq3afn0wvsz7pdvmx5v2zv24gah1861rsf'';
     };
     tilt_1_4_1 = {
       basename = ''tilt'';

From e242ae058d88fedc8be8873d6070e8ca4cbf6e07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 10 Aug 2013 14:30:53 +0200
Subject: [PATCH 35/95] virtualbox: fix extension pack hash (must be base16)

---
 pkgs/applications/virtualization/virtualbox/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 724dc6ca16e..09b6e015a93 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -34,8 +34,10 @@ let
   extpackRevision = "86992";
   extensionPack = requireFile rec {
     name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack";
-    # Has to be base16 because it's used as an input to VBoxExtPackHelperApp!
-    sha256 = "03gsl0548hrcspl5mi7snng08phwd3vfn6qmx41h2xwvwvmv324g";
+    # IMPORTANT: Hash must be base16 encoded because it's used as an input to
+    # VBoxExtPackHelperApp!
+    # Tip: nix-hash --type sha256 --to-base16 "hash from nix-prefetch-url"
+    sha256 = "8f88b1ebe69b770103e9151bebf6681c5e049eb5fac45ae8d52c43440aa0fa0d";
     message = ''
       In order to use the extension pack, you need to comply with the VirtualBox Personal Use
       and Evaluation License (PUEL) by downloading the related binaries from:

From 4e8dfe71d3830ff79619b0e9096dc7202de1190d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 4 Jul 2013 21:19:25 +0200
Subject: [PATCH 36/95] liburcu: new package

liburcu is a userspace RCU (read-copy-update) library that is used by
LTTng - Linux Trace Toolkit (next generation).
---
 .../development/libraries/liburcu/default.nix | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/libraries/liburcu/default.nix

diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix
new file mode 100644
index 00000000000..74c6b8fa615
--- /dev/null
+++ b/pkgs/development/libraries/liburcu/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  version = "0.7.7";
+  name = "liburcu-${version}";
+
+  src = fetchurl {
+    url = "http://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2";
+    sha256 = "1yxxnhrsy6sv6bmp7j96jjynnqns01zjgj94mk70jz54zvcagf4a";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Userspace RCU (read-copy-update) library";
+    homepage = http://lttng.org/urcu;
+    license = licenses.lgpl21Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 53c3ba9ec73..bc9e0ccbc98 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4860,6 +4860,8 @@ let
 
   libunique = callPackage ../development/libraries/libunique/default.nix { };
 
+  liburcu = callPackage ../development/libraries/liburcu { };
+
   libusb = callPackage ../development/libraries/libusb {
     stdenv = if stdenv.isDarwin
       then overrideGCC stdenv gccApple

From 33d78777a3a9fb3802e4c7d5332519f921d182db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 4 Jul 2013 21:32:12 +0200
Subject: [PATCH 37/95] lttng-ust: new package

This is the user space library for LTTng. It is needed to do user space
tracing, as opposed to kernel space tracing.
---
 .../tools/misc/lttng-ust/default.nix          | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/tools/misc/lttng-ust/default.nix

diff --git a/pkgs/development/tools/misc/lttng-ust/default.nix b/pkgs/development/tools/misc/lttng-ust/default.nix
new file mode 100644
index 00000000000..d234a7b74f8
--- /dev/null
+++ b/pkgs/development/tools/misc/lttng-ust/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, liburcu }:
+
+# NOTE:
+#   ./configure ...
+#   [...]
+#   LTTng-UST will be built with the following options:
+#   
+#   Java support (JNI): Disabled
+#   sdt.h integration:  Disabled
+#   [...]
+#
+# Debian builds with std.h (systemtap).
+
+stdenv.mkDerivation rec {
+  name = "lttng-ust-2.2.1";
+
+  src = fetchurl {
+    url = "https://lttng.org/files/lttng-ust/${name}.tar.bz2";
+    sha256 = "0881ri3v96fjii24qnwgsypk4crri4qp6mc4zp7kwghz8gys9rla";
+  };
+
+  buildInputs = [ liburcu ];
+
+  meta = with stdenv.lib; {
+    description = "LTTng Userspace Tracer libraries";
+    homepage = http://lttng.org/;
+    license = licenses.lgpl21Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bc9e0ccbc98..d4e467267c6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3542,6 +3542,8 @@ let
 
   ltrace = callPackage ../development/tools/misc/ltrace { };
 
+  lttngUst = callPackage ../development/tools/misc/lttng-ust { };
+
   mk = callPackage ../development/tools/build-managers/mk { };
 
   neoload = callPackage ../development/tools/neoload {

From 6a4f068b9eb4928ab6ae131153a3cdc98c788730 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 4 Jul 2013 21:38:23 +0200
Subject: [PATCH 38/95] lttng-tools: new package

This is the Linux Trace Toolkit. Included in this package:

Command-line client:
  lttng
Tracing daemons:
  lttng-sessiond (automatically started by lttng)
  lttng-relayd   (remote trace collection daemon)

Userspace tracing can be done by using liblttng-ust. To do kernel
tracing we also need the LTTng kernel modules.

I've added a patch that changes "/sbin/modprobe" to just "modprobe".
---
 .../tools/misc/lttng-tools/default.nix        | 23 ++++++++
 ...-path-from-sbin-modprobe-to-modprobe.patch | 53 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 78 insertions(+)
 create mode 100644 pkgs/development/tools/misc/lttng-tools/default.nix
 create mode 100644 pkgs/development/tools/misc/lttng-tools/lttng-change-modprobe-path-from-sbin-modprobe-to-modprobe.patch

diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix
new file mode 100644
index 00000000000..9bc24b9387b
--- /dev/null
+++ b/pkgs/development/tools/misc/lttng-tools/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, popt, libuuid, liburcu, lttngUst }:
+
+stdenv.mkDerivation rec {
+  name = "lttng-tools-2.2.3";
+
+  src = fetchurl {
+    url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2";
+    sha256 = "1p16n42j34xkaj17zg2g12rzkfwpdv9ay1h4bkdq6038v320mljv";
+  };
+
+  buildInputs = [ popt libuuid liburcu lttngUst ];
+
+  patches = [ ./lttng-change-modprobe-path-from-sbin-modprobe-to-modprobe.patch ];
+
+  meta = with stdenv.lib; {
+    description = "Tracing tools (kernel + user space) for Linux";
+    homepage = http://lttng.org/;
+    license = licenses.lgpl21;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+
+}
diff --git a/pkgs/development/tools/misc/lttng-tools/lttng-change-modprobe-path-from-sbin-modprobe-to-modprobe.patch b/pkgs/development/tools/misc/lttng-tools/lttng-change-modprobe-path-from-sbin-modprobe-to-modprobe.patch
new file mode 100644
index 00000000000..7d9edbda97a
--- /dev/null
+++ b/pkgs/development/tools/misc/lttng-tools/lttng-change-modprobe-path-from-sbin-modprobe-to-modprobe.patch
@@ -0,0 +1,53 @@
+From daba2e936571a236817022b760d91c48b730c30b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
+Date: Tue, 9 Jul 2013 23:47:47 +0200
+Subject: [PATCH] Change modprobe path from "/sbin/modprobe" to "modprobe"
+ (rely on PATH lookup)
+
+---
+ src/bin/lttng-sessiond/modprobe.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/bin/lttng-sessiond/modprobe.c b/src/bin/lttng-sessiond/modprobe.c
+index 7e06dad..4075efe 100644
+--- a/src/bin/lttng-sessiond/modprobe.c
++++ b/src/bin/lttng-sessiond/modprobe.c
+@@ -90,7 +90,7 @@ void modprobe_remove_lttng_control(void)
+ 
+ 	for (i = ARRAY_SIZE(kern_modules_control) - 1; i >= 0; i--) {
+ 		ret = snprintf(modprobe, sizeof(modprobe),
+-				"/sbin/modprobe -r -q %s",
++				"modprobe -r -q %s",
+ 				kern_modules_control[i].name);
+ 		if (ret < 0) {
+ 			PERROR("snprintf modprobe -r");
+@@ -125,7 +125,7 @@ void modprobe_remove_lttng_data(void)
+ 
+ 	for (i = ARRAY_SIZE(kern_modules_list) - 1; i >= 0; i--) {
+ 		ret = snprintf(modprobe, sizeof(modprobe),
+-				"/sbin/modprobe -r -q %s",
++				"modprobe -r -q %s",
+ 				kern_modules_list[i].name);
+ 		if (ret < 0) {
+ 			PERROR("snprintf modprobe -r");
+@@ -169,7 +169,7 @@ int modprobe_lttng_control(void)
+ 
+ 	for (i = 0; i < ARRAY_SIZE(kern_modules_control); i++) {
+ 		ret = snprintf(modprobe, sizeof(modprobe),
+-				"/sbin/modprobe %s%s",
++				"modprobe %s%s",
+ 				kern_modules_control[i].required ? "" : "-q ",
+ 				kern_modules_control[i].name);
+ 		if (ret < 0) {
+@@ -205,7 +205,7 @@ int modprobe_lttng_data(void)
+ 
+ 	for (i = 0; i < ARRAY_SIZE(kern_modules_list); i++) {
+ 		ret = snprintf(modprobe, sizeof(modprobe),
+-				"/sbin/modprobe %s%s",
++				"modprobe %s%s",
+ 				kern_modules_list[i].required ? "" : "-q ",
+ 				kern_modules_list[i].name);
+ 		if (ret < 0) {
+-- 
+1.8.2.3
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d4e467267c6..f47dcb40886 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3542,6 +3542,8 @@ let
 
   ltrace = callPackage ../development/tools/misc/ltrace { };
 
+  lttngTools = callPackage ../development/tools/misc/lttng-tools { };
+
   lttngUst = callPackage ../development/tools/misc/lttng-ust { };
 
   mk = callPackage ../development/tools/build-managers/mk { };

From 1eb38f2ccb02f9a92d7206e1218d113415239244 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 4 Jul 2013 21:41:34 +0200
Subject: [PATCH 39/95] babeltrace: new package

Babeltrace is a command-line tool and library to read and convert LTTng
tracefiles. Give it a (binary) trace file/dir path and it will print a
human readable event log to standard out.
---
 .../tools/misc/babeltrace/default.nix         | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/tools/misc/babeltrace/default.nix

diff --git a/pkgs/development/tools/misc/babeltrace/default.nix b/pkgs/development/tools/misc/babeltrace/default.nix
new file mode 100644
index 00000000000..d19bb24eb37
--- /dev/null
+++ b/pkgs/development/tools/misc/babeltrace/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, pkgconfig, glib, libuuid, popt }:
+
+stdenv.mkDerivation rec {
+  name = "babeltrace-1.1.1";
+
+  src = fetchurl {
+    url = "http://www.efficios.com/files/babeltrace/${name}.tar.bz2";
+    sha256 = "04jc1yd3aaq59fmpzswzc78cywpq7wzjfqdlsg7xc76ivb8cggfz";
+  };
+
+  buildInputs = [ pkgconfig glib libuuid popt ];
+
+  meta = with stdenv.lib; {
+    description = "Command-line tool and library to read and convert LTTng tracefiles";
+    homepage = http://www.efficios.com/babeltrace;
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f47dcb40886..d7f7a9b467b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3302,6 +3302,8 @@ let
 
   avarice = callPackage ../development/tools/misc/avarice { };
 
+  babeltrace = callPackage ../development/tools/misc/babeltrace { };
+
   bam = callPackage ../development/tools/build-managers/bam {};
 
   binutils = callPackage ../development/tools/misc/binutils {

From 5a3a82d81c6447eb25210adbc145ecf01edf54ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 6 Jul 2013 10:56:42 +0200
Subject: [PATCH 40/95] lttv: new package

Linux Trace Toolkit Viewer is a GUI program to visualize LTTng trace
files. (An alternative to this program is the LTTng plugin for the
Eclipse IDE.)
---
 pkgs/development/tools/misc/lttv/default.nix | 23 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/development/tools/misc/lttv/default.nix

diff --git a/pkgs/development/tools/misc/lttv/default.nix b/pkgs/development/tools/misc/lttv/default.nix
new file mode 100644
index 00000000000..df9f81d02e6
--- /dev/null
+++ b/pkgs/development/tools/misc/lttv/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, pkgconfig, glib, gtk2, popt, babeltrace }:
+
+stdenv.mkDerivation rec {
+  name = "lttv-1.5-beta1";
+
+  src = fetchurl {
+    url = "http://lttng.org/files/packages/${name}.tar.bz2";
+    sha256 = "0cz69q189wndwpvic0l6wvzl1nsfqadbrigaaxgzij72r7n89sfc";
+  };
+
+  buildInputs = [ pkgconfig glib gtk2 popt babeltrace ];
+
+  meta = with stdenv.lib; {
+    description = "Graphical trace viewer for LTTng trace files";
+    homepage = http://lttng.org/;
+    # liblttvtraceread (ltt/ directory) is distributed under the GNU LGPL v2.1.
+    # The rest of the LTTV package is distributed under the GNU GPL v2.
+    license = with licenses; [ gpl2 lgpl21 ];
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d7f7a9b467b..d2f6a3b5211 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3548,6 +3548,8 @@ let
 
   lttngUst = callPackage ../development/tools/misc/lttng-ust { };
 
+  lttv = callPackage ../development/tools/misc/lttv { };
+
   mk = callPackage ../development/tools/build-managers/mk { };
 
   neoload = callPackage ../development/tools/neoload {

From 70ea99cfa8e75ae2efa2a4cbc37ee8c20ea6fa72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 4 Jul 2013 22:34:32 +0200
Subject: [PATCH 41/95] lttng-modules: new package

Add linux kernel modules needed to do kernel tracing with LTTng.

To make them available to lttng in NixOS, add this to configuration.nix:

  boot.extraModulePackages = [ pkgs.linuxPackages.lttngModules ];
---
 .../linux/lttng-modules/default.nix           | 31 +++++++++++++++++
 .../lttng-fix-build-error-on-linux-3.2.patch  | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 66 insertions(+)
 create mode 100644 pkgs/os-specific/linux/lttng-modules/default.nix
 create mode 100644 pkgs/os-specific/linux/lttng-modules/lttng-fix-build-error-on-linux-3.2.patch

diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix
new file mode 100644
index 00000000000..ee80b7632ba
--- /dev/null
+++ b/pkgs/os-specific/linux/lttng-modules/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchurl, kernelDev }:
+
+stdenv.mkDerivation rec {
+  pname = "lttng-modules-2.2.1";
+  name = "${pname}-${kernelDev.version}";
+
+  src = fetchurl {
+    url = "https://lttng.org/files/lttng-modules/${pname}.tar.bz2";
+    sha256 = "00ww1443ssv614s1ix6zby8llaf6zzlxcf5k4w7jsyji47ng33m2";
+  };
+
+  patches = [ ./lttng-fix-build-error-on-linux-3.2.patch ];
+
+  preConfigure = ''
+    export KERNELDIR="${kernelDev}/lib/modules/${kernelDev.modDirVersion}/build"
+    export INSTALL_MOD_PATH="$out"
+  '';
+
+  installPhase = ''
+    make modules_install
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Linux kernel modules for LTTng tracing";
+    homepage = http://lttng.org/;
+    license = with licenses; [ lgpl21 gpl2 mit ];
+    platforms = platforms.linux;
+    maintainers = [ maintainers.bjornfor ];
+  };
+
+}
diff --git a/pkgs/os-specific/linux/lttng-modules/lttng-fix-build-error-on-linux-3.2.patch b/pkgs/os-specific/linux/lttng-modules/lttng-fix-build-error-on-linux-3.2.patch
new file mode 100644
index 00000000000..dfe6d21be84
--- /dev/null
+++ b/pkgs/os-specific/linux/lttng-modules/lttng-fix-build-error-on-linux-3.2.patch
@@ -0,0 +1,33 @@
+When building against linux 3.2, we get this build error:
+
+  building /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/lttng-probe-ext3.o
+    CC [M]  /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/lttng-probe-ext3.o
+  In file included from /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/lttng-events.h:759:0,
+                   from /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/define_trace.h:148,
+                   from /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/ext3.h:868,
+                   from /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/lttng-probe-ext3.c:48:
+  /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h: In function '__event_probe__ext3__page_op':
+  /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:240:1: error: dereferencing pointer to incomplete type
+  /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:240:1: error: dereferencing pointer to incomplete type
+  /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:240:1: error: dereferencing pointer to incomplete type
+  /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h: In function '__event_probe__ext3_invalidatepage':
+  /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:298:1: error: dereferencing pointer to incomplete type
+  /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:298:1: error: dereferencing pointer to incomplete type
+  /tmp/nix-build-lttng-modules-2.2.0.drv-0/lttng-modules-2.2.0/probes/../instrumentation/events/lttng-module/../../../probes/../instrumentation/events/lttng-module/ext3.h:298:1: error: dereferencing pointer to incomplete type
+
+because a check for existing ext3/*h files in the kernel build tree is skipped
+for linux < 3.4. Fix it by extending the ext3_dep_check thing to also be run
+when building against linux >= 3.2 (not only linux >= 3.4).
+
+diff -uNr lttng-modules-2.2.0.orig/probes/Makefile lttng-modules-2.2.0/probes/Makefile
+--- lttng-modules-2.2.0.orig/probes/Makefile	2013-06-19 03:22:44.000000000 +0200
++++ lttng-modules-2.2.0/probes/Makefile	2013-07-06 13:22:15.902957717 +0200
+@@ -59,7 +59,7 @@
+ ext3_dep_check = $(wildcard $(ext3_dep))
+ ext3 = $(shell \
+ 	if [ $(VERSION) -ge 3 -a $(PATCHLEVEL) -ge 1 ] ; then \
+-		if [ $(VERSION) -ge 3 -a $(PATCHLEVEL) -ge 4 -a \
++		if [ $(VERSION) -ge 3 -a $(PATCHLEVEL) -ge 2 -a \
+ 			-z "$(ext3_dep_check)" ] ; then \
+ 			echo "warn" ; \
+ 			exit ; \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d2f6a3b5211..7c2e3647816 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6521,6 +6521,8 @@ let
 
     iwlwifi4965ucode = iwlwifi4965ucodeV2;
 
+    lttngModules = callPackage ../os-specific/linux/lttng-modules { };
+
     atheros = callPackage ../os-specific/linux/atheros/0.9.4.nix { };
 
     broadcom_sta = callPackage ../os-specific/linux/broadcom-sta/default.nix { };

From cf4e29b916bd8b597ff6748cc6f057e5cf43d86f Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 10 Aug 2013 15:06:01 +0200
Subject: [PATCH 42/95] Add pycurl2, a Python interface to libcurl

---
 pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 53128c6bb2a..ac68c66546e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3818,6 +3818,26 @@ pythonPackages = modules // rec {
     };
   });
 
+
+  pycurl2 = buildPythonPackage (rec {
+    name = "pycurl2-7.20.0";
+
+    src = fetchgit {
+      url = "https://github.com/Lispython/pycurl.git";
+      rev = "0f00109950b883d680bd85dc6e8a9c731a7d0d13";
+      sha256 = "0mhg7f9y5zl0m2xgz3rf1yqjd6l8n0qhfk7bpf36r44jfnhj75ld";
+    };
+
+    buildInputs = [ pkgs.curl simplejson unittest2 nose ];
+
+    meta = {
+      homepage = https://pypi.python.org/pypi/pycurl2;
+      description = "A fork from original PycURL library that no maintained from 7.19.0";
+      platforms = stdenv.lib.platforms.linux;
+    };
+  });
+
+
   pydot = buildPythonPackage rec {
     name = "pydot-1.0.2";
 

From 46d887aca90f7054e254badcb99060c5b6d08cd5 Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sat, 10 Aug 2013 15:26:07 +0200
Subject: [PATCH 43/95] pythonPackages: fix carbon, move dependecies to
 propagated build inputs

---
 pkgs/top-level/python-packages.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 53128c6bb2a..d90df47bb6e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6395,8 +6395,7 @@ pythonPackages = modules // rec {
       sha256 = "0wjhd87pvpcpvaj3wql2d92g8lpp33iwmxdkp7npic5mjl2y0dsg";
     };
 
-    buildInputs = [ txamqp zope_interface twisted ];
-    propagatedBuildInputs = [ whisper ];
+    propagatedBuildInputs = [ whisper txamqp zope_interface twisted ];
 
     # error: invalid command 'test'
     doCheck = false;

From 15637cf207bf8fe693e4de1f4c8ee73a6d664898 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 10 Aug 2013 21:00:14 +0400
Subject: [PATCH 44/95] Add HTTPS support to Midori

---
 pkgs/applications/networking/browsers/midori/default.nix | 7 ++++++-
 pkgs/top-level/all-packages.nix                          | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix
index b15c05c7b49..4d561737d27 100644
--- a/pkgs/applications/networking/browsers/midori/default.nix
+++ b/pkgs/applications/networking/browsers/midori/default.nix
@@ -12,6 +12,7 @@ let
     gtksourceview pkgconfig which gettext makeWrapper 
     file libidn sqlite docutils libnotify libsoup vala
     kbproto xproto scrnsaverproto libXScrnSaver dbus_glib
+    glib_networking
   ];
 in
 rec {
@@ -34,7 +35,11 @@ rec {
       
   shebangsHere = (doPatchShebangs ".");
   shebangsInstalled = (doPatchShebangs "$out/bin");
-  wrapWK = (makeManyWrappers "$out/bin/*" "--set WEBKIT_IGNORE_SSL_ERRORS 1");
+  wrapWK = (makeManyWrappers "$out/bin/*" 
+  ''
+    --set WEBKIT_IGNORE_SSL_ERRORS 1 \
+    --prefix GIO_EXTRA_MODULES : "${args.glib_networking}/lib/gio/modules" 
+  '');
 
   name = "midori-${version}.${release}";
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c2e3647816..4c573ceebf9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8015,7 +8015,7 @@ let
   midori = builderDefsPackage (import ../applications/networking/browsers/midori) {
     inherit imagemagick intltool python pkgconfig webkit libxml2
       which gettext makeWrapper file libidn sqlite docutils libnotify
-      vala dbus_glib;
+      vala dbus_glib glib_networking;
     inherit gtk3 glib;
     inherit (gnome) gtksourceview;
     inherit (webkit.passthru.args) libsoup;

From 3065a7686bfb247b0ddca9967a38ffdb6ed57b32 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sat, 10 Aug 2013 20:07:36 +0300
Subject: [PATCH 45/95] torbutton: package version 1.6.1

---
 pkgs/tools/security/torbutton/default.nix | 29 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/security/torbutton/default.nix

diff --git a/pkgs/tools/security/torbutton/default.nix b/pkgs/tools/security/torbutton/default.nix
new file mode 100644
index 00000000000..348d96b0024
--- /dev/null
+++ b/pkgs/tools/security/torbutton/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchgit, zip }:
+stdenv.mkDerivation rec {
+
+  name = "torbutton-${version}.xpi";
+  version = "1.6.1";
+
+  src = fetchgit {
+    url = https://git.torproject.org/torbutton.git;
+    rev = "refs/tags/${version}";
+    sha256 = "0ypzrl8nhckrgh45rcwsjds1jnzz3w5nr09b926a4h3a5njammlv";
+  };
+
+  buildInputs = [ zip ];
+
+  buildPhase = ''
+    mkdir pkg
+    ./makexpi.sh
+  '';
+
+  installPhase = "cat pkg/*.xpi > $out";
+
+  meta = with stdenv.lib; {
+    homepage = https://www.torproject.org/torbutton/;
+    description = "the component in Tor Browser Bundle that takes care of application-level security and privacy concerns in Firefox. To keep you safe, Torbutton disables many types of active content.";
+    license = licenses.mit;
+    maintainers = [ maintainers.phreedom ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c573ceebf9..2488f3339f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1788,6 +1788,8 @@ let
 
   tor = callPackage ../tools/security/tor { };
 
+  torbutton = callPackage ../tools/security/torbutton { };
+
   torsocks = callPackage ../tools/security/tor/torsocks.nix { };
 
   trickle = callPackage ../tools/networking/trickle {};

From f3cae400e04c7432188bc69a36c8cd652d022b1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 10 Aug 2013 20:26:35 +0200
Subject: [PATCH 46/95] unclutter: add to channel

---
 pkgs/tools/misc/unclutter/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/unclutter/default.nix b/pkgs/tools/misc/unclutter/default.nix
index 8cf31ff7208..b267074e77f 100644
--- a/pkgs/tools/misc/unclutter/default.nix
+++ b/pkgs/tools/misc/unclutter/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
     make DESTDIR="$out" MANPATH="$out/share/man" PREFIX="" install.man
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Hides mouse pointer while not in use.";
     longDescription = ''
       Unclutter hides your X mouse cursor when you do not need it, to prevent
@@ -28,5 +28,7 @@ stdenv.mkDerivation {
 
           unclutter -idle 1 &
     '';
+    maintainers = with maintainers; [ iElectric ];
+    platforms = platforms.unix;
   };
 }

From 094ffb2b08d20f1b20aa62dd87921dc3ed7cbb4e Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Sun, 11 Aug 2013 11:00:45 +0800
Subject: [PATCH 47/95] add orc 0.4.17

---
 pkgs/development/compilers/orc/default.nix | 16 ++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/compilers/orc/default.nix

diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
new file mode 100644
index 00000000000..25abd8f3e85
--- /dev/null
+++ b/pkgs/development/compilers/orc/default.nix
@@ -0,0 +1,16 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "orc-0.4.17";
+
+  src = fetchurl {
+    url = "http://code.entropywave.com/download/orc/${name}.tar.gz";
+    sha256 = "1s6psp8phrd1jmxz9j01cksh3q5xrm1bd3z7zqxg5zsrijjcrisg";
+  };
+
+  meta = {
+    description = "The Oil Runtime Compiler";
+    homepage = "http://code.entropywave.com/orc/";
+    platform = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2488f3339f5..0080661c1d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2763,6 +2763,8 @@ let
 
   ocaml_4_00_1 = callPackage ../development/compilers/ocaml/4.00.1.nix { };
 
+  orc = callPackage ../development/compilers/orc { };
+
   metaocaml_3_09 = callPackage ../development/compilers/ocaml/metaocaml-3.09.nix { };
 
   ber_metaocaml_003 = callPackage ../development/compilers/ocaml/ber-metaocaml-003.nix { };

From 4705462a2ff49fd4434be68c5054dd837b55d3a0 Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Sun, 11 Aug 2013 11:15:07 +0800
Subject: [PATCH 48/95] add libvisual 0.4.0

---
 .../libraries/libvisual/default.nix           | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/libvisual/default.nix

diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix
new file mode 100644
index 00000000000..b831fd9bdd3
--- /dev/null
+++ b/pkgs/development/libraries/libvisual/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, glib }:
+
+stdenv.mkDerivation rec {
+  name = "libvisual-0.4.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/libvisual/${name}.tar.gz";
+    sha256 = "1my1ipd5k1ixag96kwgf07bgxkjlicy9w22jfxb2kq95f6wgsk8b";
+  };
+
+  buildInputs = [ pkgconfig glib ];
+
+  meta = {
+    description = "An abstraction library for audio visualisations";
+    homepage = "http://sourceforge.net/projects/libvisual/";
+    license = stdenv.lib.licenses.lgpl21Plus;
+    platform = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2488f3339f5..f4b5a7149e8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4898,6 +4898,8 @@ let
 
   libvisio = callPackage ../development/libraries/libvisio { };
 
+  libvisual = callPackage ../development/libraries/libvisual { };
+
   libvncserver = builderDefsPackage (import ../development/libraries/libvncserver) {
     inherit libtool libjpeg openssl zlib;
     inherit (xlibs) xproto libX11 damageproto libXdamage

From 8e023d078cb2071edf2f5fd9fa5f9308ad05e5e3 Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Sun, 11 Aug 2013 12:07:57 +0800
Subject: [PATCH 49/95] orc: add missing license (bsd3)

---
 pkgs/development/compilers/orc/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
index 25abd8f3e85..fbb25effdec 100644
--- a/pkgs/development/compilers/orc/default.nix
+++ b/pkgs/development/compilers/orc/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "The Oil Runtime Compiler";
     homepage = "http://code.entropywave.com/orc/";
+    license = stdenv.lib.license.bsd3;
     platform = stdenv.lib.platforms.linux;
   };
 }

From d068505b2f2c00f9a2491f2d648b302e30f025e3 Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Sun, 11 Aug 2013 07:59:30 +0300
Subject: [PATCH 50/95] leiningen: fix hash

---
 pkgs/development/tools/build-managers/leiningen/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix
index d7f819c45f6..d041dbb5861 100644
--- a/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   jarsrc = fetchurl {
     url = "https://leiningen.s3.amazonaws.com/downloads/${pname}-${version}-standalone.jar";
-    sha256 = "1higd309b43lly7fv1pd5lfd3lyrij95nrzklqmk8vf9llw6974p";
+    sha256 = "04xmnw80f39qs2vfm5ic8bmhks1fvasiwg4snckg2zhfjkhzms05";
   };
 
   patches = ./lein_2.3.0.patch;

From 5f4fc730b12aba77bf02abeb494e45640192804b Mon Sep 17 00:00:00 2001
From: Song Wenwu <iyzsong@gmail.com>
Date: Sun, 11 Aug 2013 15:14:12 +0800
Subject: [PATCH 51/95] add myself to maintainers list, keep it sorted

orc: add myself as a maintainer
---
 pkgs/development/compilers/orc/default.nix | 1 +
 pkgs/lib/maintainers.nix                   | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
index fbb25effdec..c7582d0a90d 100644
--- a/pkgs/development/compilers/orc/default.nix
+++ b/pkgs/development/compilers/orc/default.nix
@@ -13,5 +13,6 @@ stdenv.mkDerivation rec {
     homepage = "http://code.entropywave.com/orc/";
     license = stdenv.lib.license.bsd3;
     platform = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.iyzsong ];
   };
 }
diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix
index ab76e2018c0..354bf39aea5 100644
--- a/pkgs/lib/maintainers.nix
+++ b/pkgs/lib/maintainers.nix
@@ -24,9 +24,10 @@
   goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
   guibert = "David Guibert <david.guibert@gmail.com>";
   iElectric = "Domen Kozar <domen@dev.si>";
-  lovek323 = "Jason O'Conal <jason@oconal.id.au>";
+  iyzsong = "Song Wenwu <iyzsong@gmail.com>";
   jcumming = "Jack Cummings <jack@mudshark.org>";
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
+  lovek323 = "Jason O'Conal <jason@oconal.id.au>";
   ludo = "Ludovic Courtès <ludo@gnu.org>";
   marcweber = "Marc Weber <marco-oweber@gmx.de>";
   mornfall = "Petr Ročkai <me@mornfall.net>";

From 50021ebb0a94d4dec5752dfea3e58b02c55f16af Mon Sep 17 00:00:00 2001
From: Jaka Hudoklin <jakahudoklin@gmail.com>
Date: Sun, 11 Aug 2013 12:05:02 +0200
Subject: [PATCH 52/95] pythonPackages: fix graphite_web, make it usable

---
 pkgs/top-level/python-packages.nix | 34 +++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a7c686addb9..95a7b4195e4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1627,6 +1627,26 @@ pythonPackages = modules // rec {
   };
 
 
+  django_tagging = buildPythonPackage rec {
+    name = "django-tagging-0.3.1";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/d/django-tagging/${name}.tar.gz";
+      md5 = "a0855f2b044db15f3f8a025fa1016ddf";
+    };
+
+    # error: invalid command 'test'
+    doCheck = false;
+
+    propagatedBuildInputs = [ django_1_3 ];
+
+    meta = {
+      description = "A generic tagging application for Django projects";
+      homepage = http://code.google.com/p/django-tagging/;
+    };
+  };
+
+
   djblets = buildPythonPackage rec {
     name = "Djblets-0.6.28";
 
@@ -6475,7 +6495,19 @@ pythonPackages = modules // rec {
       sha256 = "1gj8i6j2i172cldqw98395235bn78ciagw6v17fgv01rmind3lag";
     };
 
-    buildInputs = [ django pkgs.pycairo ldap memcached modules.sqlite3 ];
+    propagatedBuildInputs = [ django_1_3 django_tagging modules.sqlite3 whisper pkgs.pycairo ldap memcached ];
+
+    postInstall = ''
+      wrapProgram $out/bin/run-graphite-devel-server.py \
+        --prefix PATH : ${pkgs.which}/bin
+    '';
+
+    preConfigure = ''
+      substituteInPlace webapp/graphite/thirdparty/pytz/__init__.py --replace '/usr/share/zoneinfo' '/etc/zoneinfo'
+      substituteInPlace webapp/graphite/settings.py --replace "join(WEBAPP_DIR, 'content')" "join(WEBAPP_DIR, 'webapp', 'content')"
+      cp webapp/graphite/manage.py bin/manage-graphite.py
+      substituteInPlace bin/manage-graphite.py --replace 'settings' 'graphite.settings'
+    '';
 
     # error: invalid command 'test'
     doCheck = false;

From 1866619acc6bb163e4cc60b37333e9119a30a226 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Sun, 11 Aug 2013 10:47:09 +0000
Subject: [PATCH 53/95] Fix a few typos

---
 doc/stdenv.xml                                   | 2 +-
 maintainers/docs/cross.txt                       | 6 +++---
 pkgs/build-support/fetchmtn/builder.sh           | 2 +-
 pkgs/development/libraries/libxml2/setup-hook.sh | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 7bcbadd8ea9..f0cabe425a3 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -6,7 +6,7 @@
 
 
 <para>The standard build environment in the Nix Packages collection
-provides a environment for building Unix packages that does a lot of
+provides an environment for building Unix packages that does a lot of
 common build tasks automatically.  In fact, for Unix packages that use
 the standard <literal>./configure; make; make install</literal> build
 interface, you don’t need to write a build script at all; the standard
diff --git a/maintainers/docs/cross.txt b/maintainers/docs/cross.txt
index 32e09086b87..9c117774fc4 100644
--- a/maintainers/docs/cross.txt
+++ b/maintainers/docs/cross.txt
@@ -41,7 +41,7 @@ NB:
 
 Keep in mind that many programs are not very well suited for cross
 compilation. Either they are not intended to run on other platforms,
-because the code is highly platform specific, or the configuration proces
+because the code is highly platform specific, or the configuration process
 is not written with cross compilation in mind.
 
 Nix will not solve these problems for you!
@@ -290,7 +290,7 @@ this compiler and verified to be working on a HP Jornada 820 running Linux
 are "patch", "make" and "wget".
 
 If we want to build C++ programs it gets a lot more difficult. GCC has a
-three step compilation proces. In the first step a simple compiler, called
+three step compilation process. In the first step a simple compiler, called
 xgcc, that can compile only C programs is built. With that compiler it
 compiles itself two more times: one time to build a full compiler, and another
 time to build a full compiler once again with the freshly built compiler from
@@ -318,7 +318,7 @@ with compilation flags. This is still work in progress for Nix.
 
 ---
 
-After succesfully completing the whole toolchain you can start building
+After successfully completing the whole toolchain you can start building
 packages with the newly built tools. To make everything build correctly
 you will need a stdenv for your target platform. Setting up this platform
 will take some effort. Right now there is a very experimental setup for
diff --git a/pkgs/build-support/fetchmtn/builder.sh b/pkgs/build-support/fetchmtn/builder.sh
index 4e34aad052b..c1b0db895bc 100644
--- a/pkgs/build-support/fetchmtn/builder.sh
+++ b/pkgs/build-support/fetchmtn/builder.sh
@@ -24,7 +24,7 @@ for source in $dbs; do
 			echo "selector $selector does not match any revision";
 		fi
 	else
-		echo "pulling branch $branch wasn't succesfull";
+		echo "pulling branch $branch wasn't successful";
 	fi;
 	if test -n "$done"; then
 		break;
diff --git a/pkgs/development/libraries/libxml2/setup-hook.sh b/pkgs/development/libraries/libxml2/setup-hook.sh
index f8e4f5e0fd6..112dbe0c513 100644
--- a/pkgs/development/libraries/libxml2/setup-hook.sh
+++ b/pkgs/development/libraries/libxml2/setup-hook.sh
@@ -11,7 +11,7 @@ addXMLCatalogs () {
 if test -z "$libxmlHookDone"; then
     libxmlHookDone=1
 
-    # Set http_proxy and ftp_proxy to a invalid host to prevent
+    # Set http_proxy and ftp_proxy to an invalid host to prevent
     # xmllint and xsltproc from trying to download DTDs from the
     # network even when --nonet is not given.  That would be impure.
     # (Note that .invalid is a reserved domain guaranteed not to

From 1cdc07296da25beb824991db2b5801b96e6877ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 11 Aug 2013 14:29:40 +0200
Subject: [PATCH 54/95] update deform,colander,translationstring python modules

---
 pkgs/top-level/python-packages.nix | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 95a7b4195e4..5cfa7b94353 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -808,11 +808,11 @@ pythonPackages = modules // rec {
 
 
   colander = buildPythonPackage rec {
-    name = "colander-0.9.6";
+    name = "colander-1.0a5";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/c/colander/${name}.tar.gz";
-      md5 = "2d9f65a64cb6b7f35d6a0d7b607ce4c6";
+      md5 = "569dea523561f5d94338ef9d9a98d249";
     };
 
     propagatedBuildInputs = [ pythonPackages.translationstring ];
@@ -1005,11 +1005,11 @@ pythonPackages = modules // rec {
 
 
   deform = buildPythonPackage rec {
-    name = "deform-0.9.4";
+    name = "deform-0.9.7";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/d/deform/${name}.tar.gz";
-      md5 = "2ed7b69644a6d8f4e1404e1892329240";
+      md5 = "d450eef05432d473257da5621c72c8b7";
     };
 
     buildInputs = [] ++ optional isPy26 unittest2;
@@ -1020,6 +1020,9 @@ pythonPackages = modules // rec {
         pythonPackages.colander
         pythonPackages.translationstring
         pythonPackages.chameleon
+        pythonPackages.zope_deprecation
+        pythonPackages.coverage
+        pythonPackages.nose
       ];
 
     meta = {
@@ -1394,6 +1397,8 @@ pythonPackages = modules // rec {
   };
 
 
+
+
   zope_deprecation = buildPythonPackage rec {
     name = "zope.deprecation-3.5.0";
 
@@ -6328,11 +6333,11 @@ pythonPackages = modules // rec {
   };
 
   translationstring = buildPythonPackage rec {
-    name = "translationstring-0.4";
+    name = "translationstring-1.1";
 
     src = fetchurl {
       url = "http://pypi.python.org/packages/source/t/translationstring/${name}.tar.gz";
-      md5 = "392287923c475b660b7549b2c2f03dbc";
+      md5 = "0979b46d8f0f852810c8ec4be5c26cf2";
     };
 
     meta = {

From 078213e892bc1bfbcc47815b7e598d0047de8ff1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 11 Aug 2013 14:50:55 +0200
Subject: [PATCH 55/95] orc: add a comment about the license

---
 pkgs/development/compilers/orc/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
index c7582d0a90d..c5fe46f02c6 100644
--- a/pkgs/development/compilers/orc/default.nix
+++ b/pkgs/development/compilers/orc/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
   meta = {
     description = "The Oil Runtime Compiler";
     homepage = "http://code.entropywave.com/orc/";
+    # The source code implementing the Marsenne Twister algorithm is licensed
+    # under the 3-clause BSD license. The rest is 2-clause BSD license.
     license = stdenv.lib.license.bsd3;
     platform = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.iyzsong ];

From 12f7c0666a8e2736ad894c6124ef8d8fb812f841 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Sun, 11 Aug 2013 10:21:46 +0000
Subject: [PATCH 56/95] qgit version bump from 2.3 to 2.5

---
 .../version-management/git-and-tools/qgit/default.nix     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/qgit/default.nix b/pkgs/applications/version-management/git-and-tools/qgit/default.nix
index 963f4dd295b..d92b49b9ef6 100644
--- a/pkgs/applications/version-management/git-and-tools/qgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix
@@ -1,18 +1,18 @@
 {stdenv, fetchurl, qt, libXext, libX11}:
 
 stdenv.mkDerivation rec {
-  name = "qgit-2.3";
+  name = "qgit-2.5";
   meta =
   {
     license = "GPLv2";
-    homepage = "http://digilander.libero.it/mcostalba/";
+    homepage = "http://libre.tibirna.org/projects/qgit/wiki/QGit";
     description = "Graphical front-end to Git";
     inherit (qt.meta) platforms;
   };
   src = fetchurl
   {
-    url = "mirror://sourceforge/qgit/${name}.tar.bz2";
-    sha256 = "a5fdd7e27fea376790eed787e22f4863eb9d2fe0217fd98b9fdbcf47a45bdc64";
+    url = "http://libre.tibirna.org/attachments/download/9/${name}.tar.gz";
+    sha256 = "25f1ca2860d840d87b9919d34fc3a1b05d4163671ed87d29c3e4a8a09e0b2499";
   };
   buildInputs = [qt libXext libX11];
   configurePhase = "qmake PREFIX=$out";

From 94105045b4882f2c20bc4328e93144bb550c5252 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 11 Aug 2013 17:12:12 +0200
Subject: [PATCH 57/95] typo

---
 pkgs/development/compilers/orc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
index c5fe46f02c6..10945934d00 100644
--- a/pkgs/development/compilers/orc/default.nix
+++ b/pkgs/development/compilers/orc/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     homepage = "http://code.entropywave.com/orc/";
     # The source code implementing the Marsenne Twister algorithm is licensed
     # under the 3-clause BSD license. The rest is 2-clause BSD license.
-    license = stdenv.lib.license.bsd3;
+    license = stdenv.lib.licenses.bsd3;
     platform = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.iyzsong ];
   };

From 81db5cfe0afacda09843ccae3e0eebe072688699 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 11 Aug 2013 20:35:44 +0200
Subject: [PATCH 58/95] lttng-modules: don't use licenses.mit because it breaks
 hydra evaluation

Hydra has these evaluation errors:
  at `nixpkgs.linuxPackages.lttngModules.i686-linux' [nixosSrc = ..., nixpkgs = ..., officialRelease = false]:
  value is an attribute set while a string was expected

because licenses.mit is an attribute set and not a string.

TODO: Licenses in pkgs/lib/licenses.nix are a mix of attr sets and
strings, this needs to be standardized.
---
 pkgs/os-specific/linux/lttng-modules/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix
index ee80b7632ba..7495deb231d 100644
--- a/pkgs/os-specific/linux/lttng-modules/default.nix
+++ b/pkgs/os-specific/linux/lttng-modules/default.nix
@@ -23,7 +23,9 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Linux kernel modules for LTTng tracing";
     homepage = http://lttng.org/;
-    license = with licenses; [ lgpl21 gpl2 mit ];
+    # TODO: Add "mit" to the license list once the license attr set vs string
+    # decision has been made. (Having "mit" there breaks hydra evaluation.)
+    license = with licenses; [ lgpl21 gpl2 ];
     platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
   };

From b5b53e250bd138bbd929284cd83e3408b35d9036 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Aug 2013 18:37:13 +0200
Subject: [PATCH 59/95] haskell-elm-server: update to version 0.9

---
 pkgs/development/compilers/elm/elm-server.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/elm/elm-server.nix b/pkgs/development/compilers/elm/elm-server.nix
index f86c6688eb8..5f33b49173e 100644
--- a/pkgs/development/compilers/elm/elm-server.nix
+++ b/pkgs/development/compilers/elm/elm-server.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "elm-server";
-  version = "0.8";
-  sha256 = "0mnxayfg54f5mr27sd1zw3xrdijppgvrz2yzzmhp07qc1jiyfald";
+  version = "0.9";
+  sha256 = "1mk2ligv8has1ssmpild2dq23ld84cdayr6bm3ycg11jab0hrbsx";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [

From 8a093803834666f6a213c29ab7ac7a24eb79ac6e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Aug 2013 18:37:13 +0200
Subject: [PATCH 60/95] haskell-Elm: update to version 0.9.0.1

---
 pkgs/development/compilers/elm/elm.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/elm/elm.nix b/pkgs/development/compilers/elm/elm.nix
index 8196458c70d..95b4b1cd4ec 100644
--- a/pkgs/development/compilers/elm/elm.nix
+++ b/pkgs/development/compilers/elm/elm.nix
@@ -1,17 +1,16 @@
-{ cabal, blazeHtml, blazeMarkup, cmdargs, deepseq, filepath, hjsmin
-, indents, json, mtl, pandoc, parsec, shakespeare, text
-, transformers
+{ cabal, binary, blazeHtml, blazeMarkup, cmdargs, filepath, hjsmin
+, indents, mtl, pandoc, parsec, transformers, unionFind, uniplate
 }:
 
 cabal.mkDerivation (self: {
   pname = "Elm";
-  version = "0.8.0.3";
-  sha256 = "0zai8glmkiqramivgz405zh385cz166gpry2yl29g37dxpwxffzb";
+  version = "0.9.0.1";
+  sha256 = "0p6sqfrf11xpgj7y81hsjbvsyyyfvc4nzcg6gmfwyqkg3qc3yg6v";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    blazeHtml blazeMarkup cmdargs deepseq filepath hjsmin indents json
-    mtl pandoc parsec shakespeare text transformers
+    binary blazeHtml blazeMarkup cmdargs filepath hjsmin indents mtl
+    pandoc parsec transformers unionFind uniplate
   ];
   meta = {
     homepage = "http://elm-lang.org";

From 0a77a99c577fdbe9ab9587d6b869950ba3de1c43 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Aug 2013 18:37:13 +0200
Subject: [PATCH 61/95] haskell-bindings-posix: update to version 1.2.6

---
 pkgs/development/libraries/haskell/bindings-posix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/bindings-posix/default.nix b/pkgs/development/libraries/haskell/bindings-posix/default.nix
index 23994140d6c..8bdf30e36d1 100644
--- a/pkgs/development/libraries/haskell/bindings-posix/default.nix
+++ b/pkgs/development/libraries/haskell/bindings-posix/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "bindings-posix";
-  version = "1.2.3";
-  sha256 = "0nj18lfpn8hmlaa7cmvdkjnk8fi2f6ysjbigkx7zbrpqnvbi63ba";
+  version = "1.2.6";
+  sha256 = "1yza3qbf0f5gfpg79pb6xfpw37zg191nmxa4r6h9x4xb5na0rzff";
   buildDepends = [ bindingsDSL ];
   meta = {
     description = "Low level bindings to posix";

From 668c691afb1bd578a1ca7a987c9c2eb9e89eb151 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Aug 2013 18:37:14 +0200
Subject: [PATCH 62/95] haskell-diagrams-cairo: update to version 0.7

---
 pkgs/development/libraries/haskell/diagrams/cairo.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix
index bc2abf5c16d..a73b6d9fba8 100644
--- a/pkgs/development/libraries/haskell/diagrams/cairo.nix
+++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-cairo";
-  version = "0.6";
-  sha256 = "0fxqwkv2cpgpkr80q828rm91ybn7j0dwj1p5ysc3648w28jvhkil";
+  version = "0.7";
+  sha256 = "14ghcrzzpqdnvmpvykhf4r74sb9jgp69094mkwydslzmi8dsgdiy";
   buildDepends = [
     cairo cmdargs colour diagramsCore diagramsLib filepath mtl split
     time

From e472833ceece52b91a11c542c6ff94523a33d793 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Aug 2013 18:37:14 +0200
Subject: [PATCH 63/95] haskell-diagrams-contrib: update to version 0.7

---
 pkgs/development/libraries/haskell/diagrams/contrib.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix
index 141a820b5d1..023ac090681 100644
--- a/pkgs/development/libraries/haskell/diagrams/contrib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix
@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-contrib";
-  version = "0.6.1";
-  sha256 = "0z92sfgqpfk401lzkvnsg3ij05795qc61c4lx12glbmdpfhilcpi";
+  version = "0.7";
+  sha256 = "0dcj4rjvpgf0lmxgv50f8cpi6adkbfnsa4z4ay8khawhnn4af5ac";
   buildDepends = [
     arithmoi circlePacking colour dataDefault diagramsCore diagramsLib
     forceLayout lens MonadRandom mtl split vectorSpace

From 1a48ac3b50838a1f4f9bc7b39711cd9895dc3f61 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Aug 2013 18:37:14 +0200
Subject: [PATCH 64/95] haskell-diagrams-core: update to version 0.7

---
 pkgs/development/libraries/haskell/diagrams/core.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix
index ed23b092b02..c2dbb27aebd 100644
--- a/pkgs/development/libraries/haskell/diagrams/core.nix
+++ b/pkgs/development/libraries/haskell/diagrams/core.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-core";
-  version = "0.6.0.2";
-  sha256 = "1g4b1zabgfdpaf7y3804r3w04ll4sqqrf71rm9389dg17ghc1q85";
+  version = "0.7";
+  sha256 = "00ba31imq91w6lzy8blgxawr06igrjfrg4adrqy650wip8jafqwq";
   buildDepends = [
     dualTree MemoTrie monoidExtras newtype semigroups vectorSpace
     vectorSpacePoints

From 255abace30dae49e7526d2a84e1ea5c772072c65 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Aug 2013 18:37:14 +0200
Subject: [PATCH 65/95] haskell-diagrams: update to version 0.7

---
 pkgs/development/libraries/haskell/diagrams/diagrams.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/diagrams.nix b/pkgs/development/libraries/haskell/diagrams/diagrams.nix
index 6f201e7cd85..84d3d9bbf48 100644
--- a/pkgs/development/libraries/haskell/diagrams/diagrams.nix
+++ b/pkgs/development/libraries/haskell/diagrams/diagrams.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams";
-  version = "0.6";
-  sha256 = "1i62jbixjzw82y622ymp6lrp4kzgn7iv55arivvh0y46bbmybqvh";
+  version = "0.7";
+  sha256 = "08ibmxzykb9v8y7ars9jz2qyss8ln8i6j87sm31bq5g9kvpy287c";
   buildDepends = [
     diagramsContrib diagramsCore diagramsLib diagramsSvg
   ];

From cfe56579e5ef81c50f4ba35b5eca66ba7470666e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Aug 2013 18:37:14 +0200
Subject: [PATCH 66/95] haskell-diagrams-lib: update to version 0.7

---
 pkgs/development/libraries/haskell/diagrams/lib.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix
index 73c7ff8f8c4..50afb16f282 100644
--- a/pkgs/development/libraries/haskell/diagrams/lib.nix
+++ b/pkgs/development/libraries/haskell/diagrams/lib.nix
@@ -1,14 +1,15 @@
-{ cabal, active, colour, dataDefault, diagramsCore, monoidExtras
-, newtype, NumInstances, semigroups, vectorSpace
+{ cabal, active, colour, dataDefaultClass, diagramsCore, fingertree
+, intervals, monoidExtras, newtype, NumInstances, semigroups
+, vectorSpace
 }:
 
 cabal.mkDerivation (self: {
   pname = "diagrams-lib";
-  version = "0.6.0.3";
-  sha256 = "0rc3m2v1bxlm5rz1pi1w4k37sbgmr9qv54rllsqan1kicafjaqw1";
+  version = "0.7";
+  sha256 = "02zb9j2qb5f26azscv1m4iivp1ixdhx6rcjns5smka1hdgyzld1j";
   buildDepends = [
-    active colour dataDefault diagramsCore monoidExtras newtype
-    NumInstances semigroups vectorSpace
+    active colour dataDefaultClass diagramsCore fingertree intervals
+    monoidExtras newtype NumInstances semigroups vectorSpace
   ];
   meta = {
     homepage = "http://projects.haskell.org/diagrams";

From bb05fc78ab7dfc556f9907fbb0250050a66c544f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Aug 2013 18:37:14 +0200
Subject: [PATCH 67/95] haskell-diagrams-svg: update to version 0.7

---
 pkgs/development/libraries/haskell/diagrams/svg.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix
index 561f32118c2..644037e946e 100644
--- a/pkgs/development/libraries/haskell/diagrams/svg.nix
+++ b/pkgs/development/libraries/haskell/diagrams/svg.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "diagrams-svg";
-  version = "0.6.0.1";
-  sha256 = "0x4yjm1wdhicknls1y3fhdg89m8wcvfk2svabww9075w6ras79qk";
+  version = "0.7";
+  sha256 = "0vfykrx29dxii9mdjjkia5a42jfg4hbzgxzv5rp7zvf3fz9w8w1x";
   buildDepends = [
     blazeSvg cmdargs colour diagramsCore diagramsLib filepath
     monoidExtras mtl split time vectorSpace

From bd40d4aa2ca1a1985166aa9c01a065402ed487fc Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Aug 2013 18:37:14 +0200
Subject: [PATCH 68/95] haskell-github: update to version 0.7.1

---
 pkgs/development/libraries/haskell/github/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix
index 78711cc7c44..511b1b70f28 100644
--- a/pkgs/development/libraries/haskell/github/default.nix
+++ b/pkgs/development/libraries/haskell/github/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "github";
-  version = "0.7.0";
-  sha256 = "0r803hpyyd0nfhlk5jn4ripzi2cpj708zp9g961g7wvvvi66013p";
+  version = "0.7.1";
+  sha256 = "0aipaamd7gn5f79f451v8ifjs5g8b40g9w4kvi1i62imsh0zhh90";
   buildDepends = [
     aeson attoparsec caseInsensitive conduit dataDefault failure HTTP
     httpConduit httpTypes network text time unorderedContainers vector

From af90db8e24c8159f60603e3c6f901f5f97460a6e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Aug 2013 18:37:14 +0200
Subject: [PATCH 69/95] haskell-hakyll: update to version 4.3.3.0

---
 pkgs/development/libraries/haskell/hakyll/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix
index 766f56ee8e3..f3f2562a073 100644
--- a/pkgs/development/libraries/haskell/hakyll/default.nix
+++ b/pkgs/development/libraries/haskell/hakyll/default.nix
@@ -8,8 +8,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hakyll";
-  version = "4.3.1.0";
-  sha256 = "1cx5pf0wf49cylbcgy1di218qk0fw8rgzqri9lx1v8jfl31zvsg5";
+  version = "4.3.3.0";
+  sha256 = "11zfz55a7dr5l7xzknphqninyrb2pw2qmrs7v7ajq2gvbl0lf37n";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [

From a0cb696441d9085228db42cda765a39675e8217e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Aug 2013 18:37:14 +0200
Subject: [PATCH 70/95] haskell-hastache: update to version 0.5.1

---
 pkgs/development/libraries/haskell/hastache/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/hastache/default.nix b/pkgs/development/libraries/haskell/hastache/default.nix
index 15d32de346d..c864c7e0a5f 100644
--- a/pkgs/development/libraries/haskell/hastache/default.nix
+++ b/pkgs/development/libraries/haskell/hastache/default.nix
@@ -4,8 +4,8 @@
 
 cabal.mkDerivation (self: {
   pname = "hastache";
-  version = "0.5.0";
-  sha256 = "1c1pphw7qx5l5fdfqchihvp2yrwwb0ln8dfshkvd1giv8cjmbyn8";
+  version = "0.5.1";
+  sha256 = "05lm7mjzc1hamxcj8akq06081bhp907hrjdkhas3wzm6ran6rwn3";
   buildDepends = [
     blazeBuilder filepath ieee754 mtl syb text transformers utf8String
   ];

From aab1fed9181b0332bd9bc78618f48ee2a238f6ad Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Aug 2013 18:37:14 +0200
Subject: [PATCH 71/95] haskell-postgresql-simple: update to version 0.3.5.0

---
 .../libraries/haskell/postgresql-simple/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
index 1ae1737e4b2..2b99bb2eb6c 100644
--- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix
+++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "postgresql-simple";
-  version = "0.3.4.0";
-  sha256 = "1xqs5hpljsapgisr7q3yd8ir351196xrdrk51dsizvk4vcs85wgs";
+  version = "0.3.5.0";
+  sha256 = "09w9cdjn9jvmcwh63ydjl8p28xfhrhy448y211z3carx2zwryshi";
   buildDepends = [
     attoparsec blazeBuilder blazeTextual postgresqlLibpq text time
     transformers vector

From a2ec6565d43bdae8748a9709a0d950c45e442cfb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Aug 2013 18:37:14 +0200
Subject: [PATCH 72/95] haskell-stm-conduit: update to version 2.1.2

---
 pkgs/development/libraries/haskell/stm-conduit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/stm-conduit/default.nix b/pkgs/development/libraries/haskell/stm-conduit/default.nix
index 24af3f8b734..a2da329121b 100644
--- a/pkgs/development/libraries/haskell/stm-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/stm-conduit/default.nix
@@ -5,8 +5,8 @@
 
 cabal.mkDerivation (self: {
   pname = "stm-conduit";
-  version = "2.1.1";
-  sha256 = "06frli37jz9xag249q1gmvnpnsaic1xa304d8d8bjz08980dbmpr";
+  version = "2.1.2";
+  sha256 = "1jkjnp1sjb4sqs6zkmmlm0s1126fkh54jkhwxairdwaxx9yh9y9k";
   buildDepends = [
     async conduit monadControl resourcet stm stmChans transformers
   ];

From 669cb32bae61fa5218dce21f656d1e9a66f29061 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Aug 2013 18:37:14 +0200
Subject: [PATCH 73/95] haskell-texmath: update to version 0.6.3

---
 pkgs/development/libraries/haskell/texmath/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix
index 8082e77d282..ec8ccd01054 100644
--- a/pkgs/development/libraries/haskell/texmath/default.nix
+++ b/pkgs/development/libraries/haskell/texmath/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "texmath";
-  version = "0.6.1.5";
-  sha256 = "15cxki04khq29m9h5wxzxgppc3r58ccp2hgsslp2g1f59x2wm348";
+  version = "0.6.3";
+  sha256 = "1ajza3p4rj318l03rffscqs6rbk635drmdciv7hhl4nljc4qmnpz";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ parsec syb xml ];

From 173d4aac67321b59aa59e5038f08698ddac8512c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Aug 2013 18:37:14 +0200
Subject: [PATCH 74/95] haskell-cabal-ghci: update to version 0.3

---
 pkgs/development/tools/haskell/cabal-ghci/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/haskell/cabal-ghci/default.nix b/pkgs/development/tools/haskell/cabal-ghci/default.nix
index 4676850fd93..dee25727384 100644
--- a/pkgs/development/tools/haskell/cabal-ghci/default.nix
+++ b/pkgs/development/tools/haskell/cabal-ghci/default.nix
@@ -2,13 +2,13 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal-ghci";
-  version = "0.2.1";
-  sha256 = "0za0bf59f4a3v5zvyy7h1xvxskrazdga4j1cs6psfv9fv80qig9r";
+  version = "0.3";
+  sha256 = "1x7fpvvmr2mq7l960wgsijhyrdaiq3lnnl3z6drklc5p73pms8w6";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ Cabal filepath ];
   meta = {
-    homepage = "http://code.atnnn.com/projects/cabal-ghci/wiki";
+    homepage = "http://github.com/atnnn/cabal-ghci";
     description = "Set up ghci with options taken from a .cabal file";
     license = self.stdenv.lib.licenses.bsd3;
     platforms = self.ghc.meta.platforms;

From 30cb6ebdd1b82aa4ae5f964d073ab48006f76640 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Aug 2013 18:37:41 +0200
Subject: [PATCH 75/95] haskell-monoid-extras: update to version 0.3.0.0

---
 pkgs/development/libraries/haskell/monoid-extras/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix
index a0ba1fd9856..969ab8bd0b8 100644
--- a/pkgs/development/libraries/haskell/monoid-extras/default.nix
+++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "monoid-extras";
-  version = "0.2.2.3";
-  sha256 = "00yj7wdyznsis82fb7i07s0vz8vsn2mpqk7jkgl9xxa57gk1rsax";
+  version = "0.3.0.0";
+  sha256 = "1bb8yq2vja80177h3wfadkjkwvcrszx0nq6m5n10f4lh9spvr087";
   buildDepends = [ semigroups ];
   meta = {
     description = "Various extra monoid-related definitions and utilities";

From 60a58dda25d35b4de7f35179bd7fde2e2724504d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Aug 2013 18:52:01 +0200
Subject: [PATCH 76/95] haskell-crypto-cipher-tests: add version 0.0.1

---
 .../haskell/crypto-cipher-tests/default.nix   | 20 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix

diff --git a/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix b/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix
new file mode 100644
index 00000000000..60b4d3bad8f
--- /dev/null
+++ b/pkgs/development/libraries/haskell/crypto-cipher-tests/default.nix
@@ -0,0 +1,20 @@
+{ cabal, byteable, cryptoCipherTypes, HUnit, mtl, QuickCheck
+, securemem, testFramework, testFrameworkHunit
+, testFrameworkQuickcheck2
+}:
+
+cabal.mkDerivation (self: {
+  pname = "crypto-cipher-tests";
+  version = "0.0.1";
+  sha256 = "1g5rxx07s23pr0vam0bjlp3qwxzqa3m6x6gbv88fhkmbqwxiq2fh";
+  buildDepends = [
+    byteable cryptoCipherTypes HUnit mtl QuickCheck securemem
+    testFramework testFrameworkHunit testFrameworkQuickcheck2
+  ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-crypto-cipher";
+    description = "Generic cryptography cipher tests";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 56997382054..11e48aaeade 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -756,6 +756,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   cryptocipher = callPackage ../development/libraries/haskell/cryptocipher {};
 
+  cryptoCipherTests = callPackage ../development/libraries/haskell/crypto-cipher-tests {};
+
   cryptoConduit = callPackage ../development/libraries/haskell/crypto-conduit {};
 
   cryptohash = callPackage ../development/libraries/haskell/cryptohash {};

From 070020947896684a3d974a3c8eb06b4cc6c887ae Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Aug 2013 18:52:22 +0200
Subject: [PATCH 77/95] haskell-crypto-cipher-types: add version 0.0.1

---
 .../haskell/crypto-cipher-types/default.nix   | 20 +++++++++++++++++++
 pkgs/top-level/haskell-packages.nix           |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/crypto-cipher-types/default.nix

diff --git a/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix
new file mode 100644
index 00000000000..14edcbc99cb
--- /dev/null
+++ b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix
@@ -0,0 +1,20 @@
+{ cabal, byteable, HUnit, mtl, QuickCheck, securemem, testFramework
+, testFrameworkHunit, testFrameworkQuickcheck2
+}:
+
+cabal.mkDerivation (self: {
+  pname = "crypto-cipher-types";
+  version = "0.0.1";
+  sha256 = "0brwb6awni3jm152vi68saz6gla7kgwf2pfjalzqsi8qjpjbzgpj";
+  buildDepends = [ byteable securemem ];
+  testDepends = [
+    byteable HUnit mtl QuickCheck testFramework testFrameworkHunit
+    testFrameworkQuickcheck2
+  ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-crypto-cipher";
+    description = "Generic cryptography cipher types";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 11e48aaeade..4e159d6a6e1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -758,6 +758,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   cryptoCipherTests = callPackage ../development/libraries/haskell/crypto-cipher-tests {};
 
+  cryptoCipherTypes = callPackage ../development/libraries/haskell/crypto-cipher-types {};
+
   cryptoConduit = callPackage ../development/libraries/haskell/crypto-conduit {};
 
   cryptohash = callPackage ../development/libraries/haskell/cryptohash {};

From ea27769a6138d39473743440e1bff60f33db135c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Aug 2013 18:52:33 +0200
Subject: [PATCH 78/95] haskell-securemem: add version 0.1.2

---
 .../libraries/haskell/securemem/default.nix        | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/securemem/default.nix

diff --git a/pkgs/development/libraries/haskell/securemem/default.nix b/pkgs/development/libraries/haskell/securemem/default.nix
new file mode 100644
index 00000000000..cc031470593
--- /dev/null
+++ b/pkgs/development/libraries/haskell/securemem/default.nix
@@ -0,0 +1,14 @@
+{ cabal, byteable }:
+
+cabal.mkDerivation (self: {
+  pname = "securemem";
+  version = "0.1.2";
+  sha256 = "1szb530jw7666cnrfa8988p2b5scl2bfafi8kgslf7xi5yv7grqh";
+  buildDepends = [ byteable ];
+  meta = {
+    homepage = "http://github.com/vincenthz/hs-securemem";
+    description = "abstraction to an auto scrubbing and const time eq, memory chunk";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 4e159d6a6e1..aa43c45cfa5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1755,6 +1755,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   scotty = callPackage ../development/libraries/haskell/scotty {};
 
+  securemem = callPackage ../development/libraries/haskell/securemem {};
+
   sendfile = callPackage ../development/libraries/haskell/sendfile {};
 
   semigroups = callPackage ../development/libraries/haskell/semigroups {};

From 185439ca5f283245f8f524bd85340de634a501ad Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Aug 2013 18:55:50 +0200
Subject: [PATCH 79/95] haskell-crypto-cipher-types: disable test suite

https://github.com/vincenthz/hs-crypto-cipher/issues/29
---
 .../libraries/haskell/crypto-cipher-types/default.nix            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix
index 14edcbc99cb..daa75817673 100644
--- a/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix
+++ b/pkgs/development/libraries/haskell/crypto-cipher-types/default.nix
@@ -11,6 +11,7 @@ cabal.mkDerivation (self: {
     byteable HUnit mtl QuickCheck testFramework testFrameworkHunit
     testFrameworkQuickcheck2
   ];
+  doCheck = false;
   meta = {
     homepage = "http://github.com/vincenthz/hs-crypto-cipher";
     description = "Generic cryptography cipher types";

From de35a6dbb9f1c91f9738078746434bf56eb06535 Mon Sep 17 00:00:00 2001
From: Gergely Risko <gergely@risko.hu>
Date: Thu, 8 Aug 2013 15:43:45 +0200
Subject: [PATCH 80/95] Export ghci config files for ghc-vis and ghc-heap-view

---
 pkgs/development/compilers/ghc/with-packages.nix             | 5 +++++
 pkgs/development/libraries/haskell/ghc-heap-view/default.nix | 4 ++++
 pkgs/development/libraries/haskell/ghc-vis/default.nix       | 4 ++++
 3 files changed, 13 insertions(+)

diff --git a/pkgs/development/compilers/ghc/with-packages.nix b/pkgs/development/compilers/ghc/with-packages.nix
index 99e91901d00..e3cc71bbccf 100644
--- a/pkgs/development/compilers/ghc/with-packages.nix
+++ b/pkgs/development/compilers/ghc/with-packages.nix
@@ -76,6 +76,11 @@ stdenv.mkDerivation rec {
           ln -s $f $out/share/emacs/site-lisp/
           echo -n .
         done
+        for f in "$currentPath/share/ghci/"*; do
+          mkdir -p $out/share/ghci
+          ln -s $f $out/share/ghci/
+          echo -n .
+        done
         for f in "$currentPkgDir/"*.conf; do
           ln -s $f $linkedPkgDir
           echo -n .
diff --git a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix
index 62b07030a46..24520869551 100644
--- a/pkgs/development/libraries/haskell/ghc-heap-view/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-heap-view/default.nix
@@ -5,6 +5,10 @@ cabal.mkDerivation (self: {
   version = "0.5.1";
   sha256 = "1qi7f3phj2j63x1wd2cvk36945cxd84s12zs03hlrn49wzx2pf1n";
   buildDepends = [ binary transformers ];
+  postInstall = ''
+      ensureDir "$out/share/ghci"
+      ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname"
+    '';
   meta = {
     description = "Extract the heap representation of Haskell values and thunks";
     license = self.stdenv.lib.licenses.bsd3;
diff --git a/pkgs/development/libraries/haskell/ghc-vis/default.nix b/pkgs/development/libraries/haskell/ghc-vis/default.nix
index 856ec810463..91715894971 100644
--- a/pkgs/development/libraries/haskell/ghc-vis/default.nix
+++ b/pkgs/development/libraries/haskell/ghc-vis/default.nix
@@ -10,6 +10,10 @@ cabal.mkDerivation (self: {
     cairo deepseq fgl ghcHeapView graphviz gtk mtl svgcairo text
     transformers xdot
   ];
+  postInstall = ''
+      ensureDir "$out/share/ghci"
+      ln -s "$out/share/$pname-$version/ghci" "$out/share/ghci/$pname"
+    '';
   meta = {
     homepage = "http://felsin9.de/nnis/ghc-vis";
     description = "Live visualization of data structures in GHCi";

From e8002fadf04244306c3c3e0b469263f4785fdf36 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Aug 2013 19:18:43 +0200
Subject: [PATCH 81/95] haskell-c2hs: update to version 0.16.5

---
 pkgs/development/libraries/haskell/c2hs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/haskell/c2hs/default.nix b/pkgs/development/libraries/haskell/c2hs/default.nix
index 6ad4db61cfd..90fb53051e2 100644
--- a/pkgs/development/libraries/haskell/c2hs/default.nix
+++ b/pkgs/development/libraries/haskell/c2hs/default.nix
@@ -2,13 +2,13 @@
 
 cabal.mkDerivation (self: {
   pname = "c2hs";
-  version = "0.16.4";
-  sha256 = "0m8mzc19cgaqsi1skqimk22770xddxx0j024mgp76hl8vqc5rcgi";
+  version = "0.16.5";
+  sha256 = "19h4zppn7ry7p3f7qw1kgsrf6h2bjnknycfrj3ibxys82qpv8m8y";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ filepath languageC ];
   meta = {
-    homepage = "http://www.cse.unsw.edu.au/~chak/haskell/c2hs/";
+    homepage = "https://github.com/haskell/c2hs";
     description = "C->Haskell FFI tool that gives some cross-language type safety";
     license = self.stdenv.lib.licenses.gpl2;
     platforms = self.ghc.meta.platforms;

From 92a9b2ab831599cfd562cfdc69df6daf8913f254 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Aug 2013 19:18:43 +0200
Subject: [PATCH 82/95] haskell-cabal2nix: update to version 1.53

---
 pkgs/development/tools/haskell/cabal2nix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index 05dcb2aa119..29585256216 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -3,8 +3,8 @@
 
 cabal.mkDerivation (self: {
   pname = "cabal2nix";
-  version = "1.52";
-  sha256 = "1w38qxwbwaq37c7vypydwjjhgrn9vbaqnnk7b2y0pm8n2fh78z1s";
+  version = "1.53";
+  sha256 = "1xhvxx5maj03rc6zd8bcqwzyn3b9yqxsbzgdh4d9ss4myn8x2zp3";
   isLibrary = false;
   isExecutable = true;
   buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ];

From 35221e2be3129f957004e266018665edbc197f92 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Aug 2013 19:20:18 +0200
Subject: [PATCH 83/95] haskell-intervals: add version 0.2.2

---
 .../libraries/haskell/intervals/default.nix        | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/intervals/default.nix

diff --git a/pkgs/development/libraries/haskell/intervals/default.nix b/pkgs/development/libraries/haskell/intervals/default.nix
new file mode 100644
index 00000000000..3cc44b05dbb
--- /dev/null
+++ b/pkgs/development/libraries/haskell/intervals/default.nix
@@ -0,0 +1,14 @@
+{ cabal, numericExtras }:
+
+cabal.mkDerivation (self: {
+  pname = "intervals";
+  version = "0.2.2";
+  sha256 = "059xmk373xz6nwk61iyhx4d7xd328jxb694qmq9plry3k77mdh5q";
+  buildDepends = [ numericExtras ];
+  meta = {
+    homepage = "http://github.com/ekmett/intervals";
+    description = "Interval Arithmetic";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index aa43c45cfa5..400975cbab4 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1277,6 +1277,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   instantGenerics = callPackage ../development/libraries/haskell/instant-generics {};
 
+  intervals = callPackage ../development/libraries/haskell/intervals {};
+
   ioChoice = callPackage ../development/libraries/haskell/io-choice {};
 
   IORefCAS = callPackage ../development/libraries/haskell/IORefCAS {};

From db322400dfa834621efb4abe34b82f0e674d5b4e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Aug 2013 19:25:32 +0200
Subject: [PATCH 84/95] haskell-tls-extra: jailbreak to fix build with recent
 versions of cipher-aes

---
 pkgs/development/libraries/haskell/tls-extra/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/haskell/tls-extra/default.nix b/pkgs/development/libraries/haskell/tls-extra/default.nix
index b53b948c41d..55b2582017c 100644
--- a/pkgs/development/libraries/haskell/tls-extra/default.nix
+++ b/pkgs/development/libraries/haskell/tls-extra/default.nix
@@ -13,6 +13,7 @@ cabal.mkDerivation (self: {
     certificate cipherAes cipherRc4 cryptohash cryptoPubkey
     cryptoRandomApi mtl network pem text time tls vector
   ];
+  jailbreak = true;
   meta = {
     homepage = "http://github.com/vincenthz/hs-tls";
     description = "TLS extra default values and helpers";

From 39f336b92f01867aef86078cb381ea9f4a838acd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Aug 2013 19:31:20 +0200
Subject: [PATCH 85/95] haskell-numeric-extras: add version 0.0.3

---
 .../libraries/haskell/numeric-extras/default.nix    | 13 +++++++++++++
 pkgs/top-level/haskell-packages.nix                 |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/numeric-extras/default.nix

diff --git a/pkgs/development/libraries/haskell/numeric-extras/default.nix b/pkgs/development/libraries/haskell/numeric-extras/default.nix
new file mode 100644
index 00000000000..76783dceb49
--- /dev/null
+++ b/pkgs/development/libraries/haskell/numeric-extras/default.nix
@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "numeric-extras";
+  version = "0.0.3";
+  sha256 = "18jyjrk6iizz3sgkwgbh1rxf6zdf166bkgs7wia8b4z7f6261nzg";
+  meta = {
+    homepage = "http://github.com/ekmett/numeric-extras";
+    description = "Useful tools from the C standard library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 400975cbab4..be9d8f415fc 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1509,6 +1509,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   nonNegative = callPackage ../development/libraries/haskell/non-negative {};
 
+  numericExtras = callPackage ../development/libraries/haskell/numeric-extras {};
+
   numericPrelude = callPackage ../development/libraries/haskell/numeric-prelude {};
 
   NumInstances = callPackage ../development/libraries/haskell/NumInstances {};

From 9547cdaadc4bb9b5340454032988cc1dc5300a14 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Aug 2013 21:47:01 +0200
Subject: [PATCH 86/95] haskell-language-c: drop obsolete version 0.3.2.1

---
 .../libraries/haskell/language-c/0.3.2.1.nix     | 16 ----------------
 .../language-c/{0.4.2.nix => default.nix}        |  0
 pkgs/top-level/haskell-packages.nix              |  8 ++------
 3 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/language-c/0.3.2.1.nix
 rename pkgs/development/libraries/haskell/language-c/{0.4.2.nix => default.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix b/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix
deleted file mode 100644
index 154bc68c3c5..00000000000
--- a/pkgs/development/libraries/haskell/language-c/0.3.2.1.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ cabal, alex, filepath, happy, syb }:
-
-cabal.mkDerivation (self: {
-  pname = "language-c";
-  version = "0.3.2.1";
-  sha256 = "1qk86p88p2jk1cbgl8p5g19ip3nh6z22ddj5jac58r5ny076iimx";
-  buildDepends = [ filepath syb ];
-  buildTools = [ alex happy ];
-  meta = {
-    homepage = "http://www.sivity.net/projects/language.c/";
-    description = "Analysis and generation of C code";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/language-c/0.4.2.nix b/pkgs/development/libraries/haskell/language-c/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/language-c/0.4.2.nix
rename to pkgs/development/libraries/haskell/language-c/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index be9d8f415fc..79045f14831 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -647,9 +647,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   bytestringProgress = callPackage ../development/libraries/haskell/bytestring-progress {};
 
-  c2hs = callPackage ../development/libraries/haskell/c2hs {
-    languageC = self.languageC_0_3_2_1;
-  };
+  c2hs = callPackage ../development/libraries/haskell/c2hs {};
 
   Cabal_1_14_0 = callPackage ../development/libraries/haskell/Cabal/1.14.0.nix { cabal = self.cabal.override { Cabal = null; }; };
   Cabal_1_16_0_3 = callPackage ../development/libraries/haskell/Cabal/1.16.0.3.nix { cabal = self.cabal.override { Cabal = null; }; };
@@ -1314,9 +1312,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   knob = callPackage ../development/libraries/haskell/knob {};
 
-  languageC_0_4_2   = callPackage ../development/libraries/haskell/language-c/0.4.2.nix {};
-  languageC_0_3_2_1 = callPackage ../development/libraries/haskell/language-c/0.3.2.1.nix {};
-  languageC = self.languageC_0_4_2;
+  languageC = callPackage ../development/libraries/haskell/language-c {};
 
   languageCQuote = callPackage ../development/libraries/haskell/language-c-quote {};
 

From bb312b77b5b931ed1592a84652e625941a020362 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Aug 2013 22:08:26 +0200
Subject: [PATCH 87/95] ghc-head: update to version 7.7.20130811

---
 pkgs/development/compilers/ghc/head.nix | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 035ebc8b268..1ea283f87fe 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ghc, perl, gmp, ncurses }:
 
 stdenv.mkDerivation rec {
-  version = "7.7";
+  version = "7.7.20130811";
   name = "ghc-${version}";
 
   src = fetchurl {
-    url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2";
-    sha256 = "1f4grj1lw25vb5drn4sn8fc1as3hwhk8dl659spi5fnbrs5k4wgb";
+    url = "http://darcs.haskell.org/ghcBuilder/uploads/tn23/${name}-src.tar.bz2";
+    sha256 = "1jkks2nq9189vxim9lfiwmf3wrnxi834brv9kn9n31225f34qdyr";
   };
 
   buildInputs = [ ghc perl gmp ncurses ];
@@ -19,24 +19,16 @@ stdenv.mkDerivation rec {
     DYNAMIC_BY_DEFAULT = NO
   '';
 
-  # The tarball errorneously contains an executable that doesn't work in
-  # Nix. Deleting it will cause the program to be re-built locally.
-  postUnpack = ''
-    rm -v $sourceRoot/libraries/integer-gmp/cbits/mkGmpDerivedConstants
-  '';
-
   preConfigure = ''
     echo "${buildMK}" > mk/build.mk
     sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
   '';
 
-  configureFlags=[
-    "--with-gcc=${stdenv.gcc}/bin/gcc"
-  ];
+  configureFlags = "--with-gcc=${stdenv.gcc}/bin/gcc";
 
   # required, because otherwise all symbols from HSffi.o are stripped, and
   # that in turn causes GHCi to abort
-  stripDebugFlags=["-S" "--keep-file-symbols"];
+  stripDebugFlags = [ "-S" "--keep-file-symbols" ];
 
   meta = {
     homepage = "http://haskell.org/ghc";

From 1ce0c6d4e3c451cf9480d4c38c33a05e92fea840 Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Sun, 11 Aug 2013 16:08:01 -0430
Subject: [PATCH 88/95] racket: advance version to 5.3.6.

---
 pkgs/development/interpreters/racket/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index da3390bb1e1..ddcf2634039 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   pname = "racket";
-  version = "5.3.5";
+  version = "5.3.6";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "http://download.racket-lang.org/installers/${version}/${pname}/${name}-src-unix.tgz";
-    sha256 = "0xrd25d2iskkih08ydcjqnasg84r7g32apvdw7qzlp4xs1xynjwk";
+    sha256 = "12pvgidaym1rwyyi69bd2gfmfwi1y0lf8xgih7a8r20z4g0zzq3z";
   };
 
   # Various racket executables do run-time searches for these.

From 1ccc0025e48d56d202e3a700d1e43580501395f7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Aug 2013 23:56:02 +0200
Subject: [PATCH 89/95] haskell-union-find: add version 0.2

---
 .../libraries/haskell/union-find/default.nix       | 14 ++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/libraries/haskell/union-find/default.nix

diff --git a/pkgs/development/libraries/haskell/union-find/default.nix b/pkgs/development/libraries/haskell/union-find/default.nix
new file mode 100644
index 00000000000..b50713d5291
--- /dev/null
+++ b/pkgs/development/libraries/haskell/union-find/default.nix
@@ -0,0 +1,14 @@
+{ cabal, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "union-find";
+  version = "0.2";
+  sha256 = "1v7hj42j9w6jlzi56jg8rh4p58gfs1c5dx30wd1qqvn0p0mnihp6";
+  buildDepends = [ transformers ];
+  meta = {
+    homepage = "http://github.com/nominolo/union-find";
+    description = "Efficient union and equivalence testing of sets";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 79045f14831..ace5b0ff308 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1990,6 +1990,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   unboundedDelays = callPackage ../development/libraries/haskell/unbounded-delays {};
 
+  unionFind = callPackage ../development/libraries/haskell/union-find {};
+
   uniplate = callPackage ../development/libraries/haskell/uniplate {};
 
   uniqueid = callPackage ../development/libraries/haskell/uniqueid {};

From 91358d65297604017fe81278f29481049f7d9bf3 Mon Sep 17 00:00:00 2001
From: Karn Kallio <tierpluspluslists@gmail.com>
Date: Sun, 11 Aug 2013 18:08:05 -0430
Subject: [PATCH 90/95] racket: libpng 1.6 now supported

---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 948288c496e..afff21ee292 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3158,9 +3158,7 @@ let
 
   qi = callPackage ../development/compilers/qi { };
 
-  racket = callPackage ../development/interpreters/racket {
-    libpng = libpng15;
-  };
+  racket = callPackage ../development/interpreters/racket { };
 
   regina = callPackage ../development/interpreters/regina {};
 

From 339e1d94c65def31998f746fa27f5a11b2bd2c3f Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Mon, 12 Aug 2013 05:30:10 +0300
Subject: [PATCH 91/95] Turning off PAE support which makes kernel unbootable
 on older hardware causes CRASH_DUMP option to disappear, so make it optional.

---
 pkgs/os-specific/linux/kernel/common-config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 0c3aca17e4e..d4021e735e6 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -186,7 +186,7 @@ with stdenv.lib;
   BT_HCIUART_H4 y # UART (H4) protocol support
   BT_HCIUART_LL y
   BT_RFCOMM_TTY? y # RFCOMM TTY support
-  CRASH_DUMP n
+  CRASH_DUMP? n
   ${optionalString (versionOlder version "3.1") ''
     DMAR? n # experimental
   ''}

From 36622f59641ce27763d26af77d26f42840bbffa2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Aug 2013 14:04:46 +0200
Subject: [PATCH 92/95] nixUnstable: Update to 1.6pre3187_3fb7ae0

---
 pkgs/tools/package-management/nix/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index bab89a1145e..4d5eeca12c1 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.6pre3166_15e5ac8";
+  name = "nix-1.6pre3187_3fb7ae0";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/5566779/download/5/${name}.tar.xz";
-    sha256 = "c25209bb93ca6859df84f74bd16cb0daee9e6c9820139e9dab1d2848129a2558";
+    url = "http://hydra.nixos.org/build/5663853/download/5/${name}.tar.xz";
+    sha256 = "3cd695b3bb23ea7f9e4779f5b79180319444204b30120ed2cc0f0bf1e070403f";
   };
 
   nativeBuildInputs = [ perl pkgconfig ];

From adefbee8152f7241e561ee4f23fea34a5eca78c4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Aug 2013 14:05:18 +0200
Subject: [PATCH 93/95] Forks::Super: Disable checks

---
 pkgs/top-level/perl-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index d74d734d2c6..162a7b6eb37 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2947,6 +2947,7 @@ rec {
       url = mirror://cpan/authors/id/M/MO/MOB/Forks-Super-0.67.tar.gz;
       sha256 = "8831cd70e1eb3d4ab7d9a8c3692caa7b7220dc888cd1a8dc5640fb2a08379141";
     };
+    doCheck = false;
     meta = {
       description = "Extensions and convenience methods to manage background processes";
       license = "perl";

From 898a33bef2b29aaa0f544cdc1c3438c930ee1e24 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Aug 2013 14:20:26 +0200
Subject: [PATCH 94/95] zabbix: Update to 1.8.17

---
 pkgs/servers/monitoring/zabbix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix
index 0189f3dd8fd..6ee4712ae65 100644
--- a/pkgs/servers/monitoring/zabbix/default.nix
+++ b/pkgs/servers/monitoring/zabbix/default.nix
@@ -2,11 +2,11 @@
 
 let
 
-  version = "1.8.15";
+  version = "1.8.17";
 
   src = fetchurl {
     url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz";
-    sha256 = "0358syx6vck6l8j9wwlsb78faivh4qxrgy3jlkmjqr99xi6h3r3f";
+    sha256 = "0c2dpx7ncahp161p6zymrrxwyn3algkfzh6dz7x2j0wsnvb6lrp2";
   };
 
   preConfigure =

From 7fc87a865e052bf2e7a7af6e597181e7ce14c20f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 12 Aug 2013 14:50:55 +0200
Subject: [PATCH 95/95] openssh: Update to 6.2p2

---
 pkgs/tools/networking/openssh/default.nix     |  10 +-
 .../openssh/fix-identity-warnings.patch       | 251 ------------------
 2 files changed, 3 insertions(+), 258 deletions(-)
 delete mode 100644 pkgs/tools/networking/openssh/fix-identity-warnings.patch

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 8542580e431..4296ba57f88 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -13,11 +13,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "openssh-6.2p1";
+  name = "openssh-6.2p2";
 
   src = fetchurl {
     url = "ftp://ftp.nl.uu.net/pub/OpenBSD/OpenSSH/portable/${name}.tar.gz";
-    sha1 = "8824708c617cc781b2bb29fa20bd905fd3d2a43d";
+    sha1 = "c2b4909eba6f5ec6f9f75866c202db47f3b501ba";
   };
 
   prePatch = stdenv.lib.optionalString hpnSupport
@@ -26,11 +26,7 @@ stdenv.mkDerivation rec {
       export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s"
     '';
 
-  patches =
-    [ ./locale_archive.patch
-      # Upstream fix for gratuitous "no such identity" warnings.
-      ./fix-identity-warnings.patch
-    ];
+  patches = [ ./locale_archive.patch ];
 
   buildInputs = [ zlib openssl libedit pkgconfig pam ];
 
diff --git a/pkgs/tools/networking/openssh/fix-identity-warnings.patch b/pkgs/tools/networking/openssh/fix-identity-warnings.patch
deleted file mode 100644
index c341889b3a4..00000000000
--- a/pkgs/tools/networking/openssh/fix-identity-warnings.patch
+++ /dev/null
@@ -1,251 +0,0 @@
-https://bugzilla.mindrot.org/show_bug.cgi?id=2084
-
-@@ -, +, @@ 
-   - dtucker@cvs.openbsd.org 2013/02/17 23:16:57
-     [readconf.c ssh.c readconf.h sshconnect2.c]
-     Keep track of which IndentityFile options were manually supplied and which
-     were default options, and don't warn if the latter are missing.
-     ok markus@
-   - dtucker@cvs.openbsd.org 2013/02/22 04:45:09
-     [ssh.c readconf.c readconf.h]
-     Don't complain if IdentityFiles specified in system-wide configs are
-     missing.  ok djm, deraadt.
-Index: readconf.c
-===================================================================
-RCS file: /home/dtucker/openssh/cvs/openssh/readconf.c,v
---- a/readconf.c	2 Oct 2011 07:59:03 -0000	1.174
-+++ b/readconf.c	5 Apr 2013 02:36:11 -0000
-@@ -1,4 +1,4 @@ 
--/* $OpenBSD: readconf.c,v 1.194 2011/09/23 07:45:05 markus Exp $ */
-+/* $OpenBSD: readconf.c,v 1.196 2013/02/22 04:45:08 dtucker Exp $ */
- /*
-  * Author: Tatu Ylonen <ylo@cs.hut.fi>
-  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
-@@ -326,6 +326,26 @@ clear_forwardings(Options *options)
- 	options->tun_open = SSH_TUNMODE_NO;
- }
- 
-+void
-+add_identity_file(Options *options, const char *dir, const char *filename,
-+    int userprovided)
-+{
-+	char *path;
-+
-+	if (options->num_identity_files >= SSH_MAX_IDENTITY_FILES)
-+		fatal("Too many identity files specified (max %d)",
-+		    SSH_MAX_IDENTITY_FILES);
-+
-+	if (dir == NULL) /* no dir, filename is absolute */
-+		path = xstrdup(filename);
-+	else
-+		(void)xasprintf(&path, "%.100s%.100s", dir, filename);
-+
-+	options->identity_file_userprovided[options->num_identity_files] =
-+	    userprovided;
-+	options->identity_files[options->num_identity_files++] = path;
-+}
-+
- /*
-  * Returns the number of the token pointed to by cp or oBadOption.
-  */
-@@ -353,7 +373,7 @@ parse_token(const char *cp, const char *
- int
- process_config_line(Options *options, const char *host,
- 		    char *line, const char *filename, int linenum,
--		    int *activep)
-+		    int *activep, int userconfig)
- {
- 	char *s, **charptr, *endofnumber, *keyword, *arg, *arg2;
- 	char **cpptr, fwdarg[256];
-@@ -586,9 +606,7 @@ parse_yesnoask:
- 			if (*intptr >= SSH_MAX_IDENTITY_FILES)
- 				fatal("%.200s line %d: Too many identity files specified (max %d).",
- 				    filename, linenum, SSH_MAX_IDENTITY_FILES);
--			charptr = &options->identity_files[*intptr];
--			*charptr = xstrdup(arg);
--			*intptr = *intptr + 1;
-+			add_identity_file(options, NULL, arg, userconfig);
- 		}
- 		break;
- 
-@@ -1075,7 +1093,7 @@ parse_int:
- 
- int
- read_config_file(const char *filename, const char *host, Options *options,
--    int checkperm)
-+    int flags)
- {
- 	FILE *f;
- 	char line[1024];
-@@ -1085,7 +1103,7 @@ read_config_file(const char *filename, c
- 	if ((f = fopen(filename, "r")) == NULL)
- 		return 0;
- 
--	if (checkperm) {
-+	if (flags & SSHCONF_CHECKPERM) {
- 		struct stat sb;
- 
- 		if (fstat(fileno(f), &sb) == -1)
-@@ -1106,7 +1124,8 @@ read_config_file(const char *filename, c
- 	while (fgets(line, sizeof(line), f)) {
- 		/* Update line number counter. */
- 		linenum++;
--		if (process_config_line(options, host, line, filename, linenum, &active) != 0)
-+		if (process_config_line(options, host, line, filename, linenum,
-+		    &active, flags & SSHCONF_USERCONF) != 0)
- 			bad_options++;
- 	}
- 	fclose(f);
-@@ -1280,30 +1299,17 @@ fill_default_options(Options * options)
- 		options->protocol = SSH_PROTO_2;
- 	if (options->num_identity_files == 0) {
- 		if (options->protocol & SSH_PROTO_1) {
--			len = 2 + strlen(_PATH_SSH_CLIENT_IDENTITY) + 1;
--			options->identity_files[options->num_identity_files] =
--			    xmalloc(len);
--			snprintf(options->identity_files[options->num_identity_files++],
--			    len, "~/%.100s", _PATH_SSH_CLIENT_IDENTITY);
-+			add_identity_file(options, "~/",
-+			    _PATH_SSH_CLIENT_IDENTITY, 0);
- 		}
- 		if (options->protocol & SSH_PROTO_2) {
--			len = 2 + strlen(_PATH_SSH_CLIENT_ID_RSA) + 1;
--			options->identity_files[options->num_identity_files] =
--			    xmalloc(len);
--			snprintf(options->identity_files[options->num_identity_files++],
--			    len, "~/%.100s", _PATH_SSH_CLIENT_ID_RSA);
--
--			len = 2 + strlen(_PATH_SSH_CLIENT_ID_DSA) + 1;
--			options->identity_files[options->num_identity_files] =
--			    xmalloc(len);
--			snprintf(options->identity_files[options->num_identity_files++],
--			    len, "~/%.100s", _PATH_SSH_CLIENT_ID_DSA);
-+			add_identity_file(options, "~/",
-+			    _PATH_SSH_CLIENT_ID_RSA, 0);
-+			add_identity_file(options, "~/",
-+			    _PATH_SSH_CLIENT_ID_DSA, 0);
- #ifdef OPENSSL_HAS_ECC
--			len = 2 + strlen(_PATH_SSH_CLIENT_ID_ECDSA) + 1;
--			options->identity_files[options->num_identity_files] =
--			    xmalloc(len);
--			snprintf(options->identity_files[options->num_identity_files++],
--			    len, "~/%.100s", _PATH_SSH_CLIENT_ID_ECDSA);
-+			add_identity_file(options, "~/",
-+			    _PATH_SSH_CLIENT_ID_ECDSA, 0);
- #endif
- 		}
- 	}
-Index: readconf.h
-===================================================================
-RCS file: /home/dtucker/openssh/cvs/openssh/readconf.h,v
---- a/readconf.h	2 Oct 2011 07:59:03 -0000	1.83
-+++ b/readconf.h	5 Apr 2013 02:36:11 -0000
-@@ -1,4 +1,4 @@ 
--/* $OpenBSD: readconf.h,v 1.91 2011/09/23 07:45:05 markus Exp $ */
-+/* $OpenBSD: readconf.h,v 1.93 2013/02/22 04:45:09 dtucker Exp $ */
- 
- /*
-  * Author: Tatu Ylonen <ylo@cs.hut.fi>
-@@ -96,6 +96,7 @@ typedef struct {
- 
- 	int     num_identity_files;	/* Number of files for RSA/DSA identities. */
- 	char   *identity_files[SSH_MAX_IDENTITY_FILES];
-+	int    identity_file_userprovided[SSH_MAX_IDENTITY_FILES];
- 	Key    *identity_keys[SSH_MAX_IDENTITY_FILES];
- 
- 	/* Local TCP/IP forward requests. */
-@@ -148,15 +149,20 @@ typedef struct {
- #define REQUEST_TTY_YES		2
- #define REQUEST_TTY_FORCE	3
- 
-+#define SSHCONF_CHECKPERM	1  /* check permissions on config file */
-+#define SSHCONF_USERCONF	2  /* user provided config file not system */
-+
- void     initialize_options(Options *);
- void     fill_default_options(Options *);
- int	 read_config_file(const char *, const char *, Options *, int);
- int	 parse_forward(Forward *, const char *, int, int);
- 
- int
--process_config_line(Options *, const char *, char *, const char *, int, int *);
-+process_config_line(Options *, const char *, char *, const char *, int, int *,
-+    int);
- 
- void	 add_local_forward(Options *, const Forward *);
- void	 add_remote_forward(Options *, const Forward *);
-+void	 add_identity_file(Options *, const char *, const char *, int);
- 
- #endif				/* READCONF_H */
-Index: ssh.c
-===================================================================
-RCS file: /home/dtucker/openssh/cvs/openssh/ssh.c,v
---- a/ssh.c	6 Jul 2012 03:45:01 -0000	1.366
-+++ b/ssh.c	5 Apr 2013 02:36:11 -0000
-@@ -1,4 +1,4 @@ 
--/* $OpenBSD: ssh.c,v 1.370 2012/07/06 01:47:38 djm Exp $ */
-+/* $OpenBSD: ssh.c,v 1.372 2013/02/22 04:45:09 dtucker Exp $ */
- /*
-  * Author: Tatu Ylonen <ylo@cs.hut.fi>
-  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
-@@ -405,12 +405,7 @@ main(int ac, char **av)
- 				    strerror(errno));
- 				break;
- 			}
--			if (options.num_identity_files >=
--			    SSH_MAX_IDENTITY_FILES)
--				fatal("Too many identity files specified "
--				    "(max %d)", SSH_MAX_IDENTITY_FILES);
--			options.identity_files[options.num_identity_files++] =
--			    xstrdup(optarg);
-+			add_identity_file(&options, NULL, optarg, 1);
- 			break;
- 		case 'I':
- #ifdef ENABLE_PKCS11
-@@ -584,7 +579,8 @@ main(int ac, char **av)
- 			dummy = 1;
- 			line = xstrdup(optarg);
- 			if (process_config_line(&options, host ? host : "",
--			    line, "command-line", 0, &dummy) != 0)
-+			    line, "command-line", 0, &dummy, SSHCONF_USERCONF)
-+			    != 0)
- 				exit(255);
- 			xfree(line);
- 			break;
-@@ -678,14 +674,15 @@ main(int ac, char **av)
- 	 * file if the user specifies a config file on the command line.
- 	 */
- 	if (config != NULL) {
--		if (!read_config_file(config, host, &options, 0))
-+		if (!read_config_file(config, host, &options, SSHCONF_USERCONF))
- 			fatal("Can't open user config file %.100s: "
- 			    "%.100s", config, strerror(errno));
- 	} else {
- 		r = snprintf(buf, sizeof buf, "%s/%s", pw->pw_dir,
- 		    _PATH_SSH_USER_CONFFILE);
- 		if (r > 0 && (size_t)r < sizeof(buf))
--			(void)read_config_file(buf, host, &options, 1);
-+			(void)read_config_file(buf, host, &options,
-+			     SSHCONF_CHECKPERM|SSHCONF_USERCONF);
- 
- 		/* Read systemwide configuration file after user config. */
- 		(void)read_config_file(_PATH_HOST_CONFIG_FILE, host,
-Index: sshconnect2.c
-===================================================================
-RCS file: /home/dtucker/openssh/cvs/openssh/sshconnect2.c,v
---- a/sshconnect2.c	20 Mar 2013 01:55:15 -0000	1.184
-+++ b/sshconnect2.c	5 Apr 2013 02:36:07 -0000
-@@ -1,4 +1,4 @@ 
--/* $OpenBSD: sshconnect2.c,v 1.191 2013/02/15 00:21:01 dtucker Exp $ */
-+/* $OpenBSD: sshconnect2.c,v 1.192 2013/02/17 23:16:57 dtucker Exp $ */
- /*
-  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
-  * Copyright (c) 2008 Damien Miller.  All rights reserved.
-@@ -1384,7 +1384,7 @@ pubkey_prepare(Authctxt *authctxt)
- 		id = xcalloc(1, sizeof(*id));
- 		id->key = key;
- 		id->filename = xstrdup(options.identity_files[i]);
--		id->userprovided = 1;
-+		id->userprovided = options.identity_file_userprovided[i];
- 		TAILQ_INSERT_TAIL(&files, id, next);
- 	}
- 	/* Prefer PKCS11 keys that are explicitly listed */