From 404b37594898ebaa5765237adc8ae77a2e10ed06 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Fri, 7 Aug 2015 13:42:37 +0900
Subject: [PATCH 01/65] mupdf: desktop file fix

---
 pkgs/applications/misc/mupdf/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix
index c988d171327..12dbbe6a9aa 100644
--- a/pkgs/applications/misc/mupdf/default.nix
+++ b/pkgs/applications/misc/mupdf/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     Version=1.0
     Name=mupdf
     Comment=PDF viewer
-    Exec=$out/bin/mupdf-x11
+    Exec=$out/bin/mupdf-x11 %f
     Terminal=false
     EOF
   '';

From 825b8403a258106d8e0c5894b3558c01b915979a Mon Sep 17 00:00:00 2001
From: Thomas Bereknyei <tomberek@gmail.com>
Date: Fri, 7 Aug 2015 00:43:29 -0400
Subject: [PATCH 02/65] Check for pidDir and create

---
 nixos/modules/services/networking/gateone.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/gateone.nix b/nixos/modules/services/networking/gateone.nix
index b8ae5490d7b..93273837181 100644
--- a/nixos/modules/services/networking/gateone.nix
+++ b/nixos/modules/services/networking/gateone.nix
@@ -36,8 +36,10 @@ config = mkIf cfg.enable {
     preStart = ''
       if [ ! -d ${cfg.settingsDir} ] ; then
         mkdir -m 0750 -p ${cfg.settingsDir}
-        mkdir -m 0750 -p ${cfg.pidDir}
         chown -R gateone.gateone ${cfg.settingsDir}
+      fi
+      if [ ! -d ${cfg.pidDir} ] ; then
+        mkdir -m 0750 -p ${cfg.pidDir}
         chown -R gateone.gateone ${cfg.pidDir}
       fi
       '';

From 825a8a86234aa69acf31d5ec69d2e18f8d311fb1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Aug 2015 15:33:19 +0200
Subject: [PATCH 03/65] jailbreak-cabal: build ghc-7.10.x version from source
 again

https://github.com/peti/jailbreak-cabal/issues/9 forced us to use a
binary version of jailbreak-cabal built with ghc 7.8.x in the 7.10.x
package set, which is awkward. Upstream fixed the underlying issue
in https://github.com/haskell/cabal/issues/2598, but unfortunately
that fix didn't make it into the Cabal 1.22.4.0 release shipped by
ghc 7.10.2.

Now, we work around that issue by building jailbreak-cabal with an
unreleased development snapshot of Cabal in the ghc 7.10.x package
set.

Closes https://github.com/NixOS/nixpkgs/issues/8901.
---
 .../configuration-ghc-7.10.x.nix                | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 88edc88b3f9..e78aa0e9839 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -42,7 +42,22 @@ self: super: {
   cabal-install = dontCheck (super.cabal-install.override { Cabal = null; });
 
   # Don't use jailbreak built with Cabal 1.22.x because of https://github.com/peti/jailbreak-cabal/issues/9.
-  jailbreak-cabal = pkgs.haskell.packages.ghc784.jailbreak-cabal;
+  Cabal_1_23_0_0 = overrideCabal super.Cabal_1_22_4_0 (drv: {
+    version = "1.23.0.0";
+    src = pkgs.fetchFromGitHub {
+      owner = "haskell";
+      repo = "cabal";
+      rev = "fe7b8784ac0a5848974066bdab76ce376ba67277";
+      sha256 = "1d70ryz1l49pkr70g8r9ysqyg1rnx84wwzx8hsg6vwnmg0l5am7s";
+    };
+    jailbreak = false;
+    doHaddock = false;
+    postUnpack = "sourceRoot+=/Cabal";
+  });
+  jailbreak-cabal = overrideCabal super.jailbreak-cabal (drv: {
+    executableHaskellDepends = [ self.Cabal_1_23_0_0 ];
+    preConfigure = "sed -i -e 's/Cabal == 1.20\\.\\*/Cabal >= 1.23/' jailbreak-cabal.cabal";
+  });
 
   idris =
     let idris' = overrideCabal super.idris (drv: {

From 66a2dbbd77e6b90f6533359b34cd0e7681305b39 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Aug 2015 20:01:32 +0200
Subject: [PATCH 04/65] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/1f18eb65463817b88fed29ee1560a3ec95a562a4
 with hackage2nix revision v20150807-5-g2b9cf46

---
 .../haskell-modules/hackage-packages.nix      | 382 +++++++++++-------
 1 file changed, 247 insertions(+), 135 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 9c95632413e..9b04ebd424a 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -7157,8 +7157,8 @@ self: {
     ({ mkDerivation, allocated-processor, base, opencv, vector-space }:
      mkDerivation {
        pname = "HOpenCV";
-       version = "0.1.2.4";
-       sha256 = "1q32rcrzv79z125sbjlzhd4sl1pl8if01vrwd7y18s3acs3aqr4b";
+       version = "0.3.0.1";
+       sha256 = "0v9pcbbfj254n6mryb16rplh6mgjizdm4c8qqdsb41gdpx1h59n6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ allocated-processor base vector-space ];
@@ -7166,7 +7166,7 @@ self: {
        executableHaskellDepends = [ base ];
        executablePkgconfigDepends = [ opencv ];
        description = "A binding for the OpenCV computer vision library";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.gpl2;
      }) { inherit (pkgs) opencv;};
 
   "HPDF" = callPackage
@@ -29555,8 +29555,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-helper";
-       version = "0.3.7.0";
-       sha256 = "1lq8i45wvk8rqilay7j9i9iv5irhqvdg3bp96mj2xxaxrpfi7l20";
+       version = "0.3.8.0";
+       sha256 = "1l2ign8q4kdsnypqvjl8x152lkb0s1zfn08vshirz2qf4v5wxs3n";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -31042,6 +31042,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "casing" = callPackage
+    ({ mkDerivation, base, split }:
+     mkDerivation {
+       pname = "casing";
+       version = "0.1.0.0";
+       sha256 = "0d7frpz512gig2crpx3kxsnfwf3kbcklkann158wrzg8q02jhjhi";
+       libraryHaskellDepends = [ base split ];
+       description = "Convert between various source code casing conventions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "cassandra-cql" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, cryptohash
      , Decimal, hslogger, MonadCatchIO-transformers, mtl, network
@@ -36133,8 +36144,8 @@ self: {
     ({ mkDerivation, base, tagged, void }:
      mkDerivation {
        pname = "constrained-categories";
-       version = "0.2.0.0";
-       sha256 = "1mh61gfydh068qws3r52rbnw30ihi9k88wklx8p18j43c7jngamx";
+       version = "0.2.1.1";
+       sha256 = "0m4c2kva0djxhiqnbxbnlrkq10wvzpbjbbvjv3mz9b550sxr6azy";
        libraryHaskellDepends = [ base tagged void ];
        homepage = "https://github.com/leftaroundabout/constrained-categories";
        description = "Constrained clones of the category-theory type classes, using ConstraintKinds";
@@ -39111,24 +39122,22 @@ self: {
      }) {};
 
   "cv-combinators" = callPackage
-    ({ mkDerivation, allocated-processor, base
-     , graphics-drawingcombinators, HOpenCV, SDL, vector-space
+    ({ mkDerivation, allocated-processor, base, HOpenCV, vector-space
      }:
      mkDerivation {
        pname = "cv-combinators";
-       version = "0.1.2.3";
-       sha256 = "1bdhs4dy9yfgc9j281rxiiy9md3s27yy44scz86s29vbm7prccvp";
+       version = "0.1.3";
+       sha256 = "1lak96kr1fpsrqcvgv9k0igd5w2f42hv20f2mw8cvr0q0xwzc9zb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          allocated-processor base HOpenCV vector-space
        ];
        executableHaskellDepends = [
-         allocated-processor base graphics-drawingcombinators HOpenCV SDL
-         vector-space
+         allocated-processor base HOpenCV vector-space
        ];
        description = "Functional Combinators for Computer Vision";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.gpl2;
      }) {};
 
   "cyclotomic" = callPackage
@@ -44260,6 +44269,7 @@ self: {
          network network-multicast network-transport network-transport-tcp
          transformers
        ];
+       jailbreak = true;
        homepage = "http://haskell-distributed.github.com";
        description = "Simple zero-configuration backend for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -52533,6 +52543,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "formattable" = callPackage
+    ({ mkDerivation, base, bytestring, data-default-class
+     , double-conversion, hspec, HUnit, lens, old-locale, QuickCheck
+     , text, time
+     }:
+     mkDerivation {
+       pname = "formattable";
+       version = "0.1.1";
+       sha256 = "0brp1j21ll6g266zyzknqc20k5nf3na97fjbh66hjbsw6yxah5x7";
+       libraryHaskellDepends = [
+         base bytestring data-default-class old-locale text time
+       ];
+       testHaskellDepends = [
+         base bytestring data-default-class double-conversion hspec HUnit
+         lens old-locale QuickCheck text time
+       ];
+       homepage = "https://github.com/Soostone/formattable";
+       description = "Business-quality formatting of numbers, dates, and other things";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "formatting" = callPackage
     ({ mkDerivation, base, clock, old-locale, scientific, text
      , text-format, time
@@ -56194,8 +56225,8 @@ self: {
      }:
      mkDerivation {
        pname = "github-backup";
-       version = "1.20150618";
-       sha256 = "110nivss9436ls2mr5bl0m6fzg6ds5m0ams803zq60b8dya96wic";
+       version = "1.20150807";
+       sha256 = "19x8716wdhrj3nv4pgz4ncmnfnids8wjirkp3jkw5sd6fnx6q8sj";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -60467,10 +60498,11 @@ self: {
        pname = "hadoop-formats";
        version = "0.2.1.1";
        sha256 = "1w3869jz3mxhzdik5fwaha7dn9rhjg5w8g0qnznd4x45cnzxv5ga";
+       revision = "1";
+       editedCabalFile = "59248cb9b3f28b9f003d694ee356a13ff1313c8edd3bf2963c154ce7e1de0553";
        libraryHaskellDepends = [ attoparsec base bytestring text vector ];
        librarySystemDepends = [ snappy ];
        testHaskellDepends = [ base bytestring filepath text vector ];
-       jailbreak = true;
        homepage = "http://github.com/jystic/hadoop-formats";
        description = "Read/write file formats commonly used by Hadoop";
        license = stdenv.lib.licenses.asl20;
@@ -64615,8 +64647,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-postgres";
-       version = "0.10.3.3";
-       sha256 = "0xwc1r7jirscsn1f11s7hkhc5knzzhb5l6if7c5w4skfx0vla7rh";
+       version = "0.10.4.0";
+       sha256 = "0s2ng84m7mals3wm3lzmhfd9xlh8fm231gklzjyh6q7z5yw4yszf";
        libraryHaskellDepends = [
          aeson attoparsec base-prelude bytestring either free hashable
          hashtables hasql-backend list-t loch-th mmorph placeholders
@@ -64722,8 +64754,8 @@ self: {
      }:
      mkDerivation {
        pname = "haste-compiler";
-       version = "0.5.0";
-       sha256 = "18n9sl9m2fpzshpj3gqvd7wlmvz5mrgsz8awcd3imcb7136qa9s9";
+       version = "0.5.0.1";
+       sha256 = "14kqrkjhfxzg0gv4v2kzxh938085bmzg426vp2jrhzvf5dzypkh0";
        configureFlags = [ "-fportable" ];
        isLibrary = true;
        isExecutable = true;
@@ -67847,9 +67879,10 @@ self: {
     ({ mkDerivation, base, containers, directory, unix }:
      mkDerivation {
        pname = "hinotify";
-       version = "0.3.7";
-       sha256 = "0i7mxg9ilzcgijda6j3ya5xnpbxa3wm9xswdfif95jim9w82sw0b";
+       version = "0.3.8";
+       sha256 = "13xjhbx3b6icqf7451dzknxz41lb874a9s3zs0h0c19p902ii9ff";
        libraryHaskellDepends = [ base containers directory unix ];
+       testHaskellDepends = [ base directory ];
        homepage = "https://github.com/kolmodin/hinotify.git";
        description = "Haskell binding to inotify";
        license = stdenv.lib.licenses.bsd3;
@@ -68727,7 +68760,6 @@ self: {
        testHaskellDepends = [ base process ];
        description = "Low-level bindings to libgit2";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) { inherit (pkgs) openssl;};
 
   "hlibsass" = callPackage
@@ -72465,28 +72497,27 @@ self: {
     ({ mkDerivation, aeson, aeson-pretty, array, attoparsec, base
      , bin-package-db, bytestring, Cabal, containers, deepseq, directory
      , exceptions, filepath, fsnotify, ghc, ghc-mod, ghc-paths
-     , haddock-api, haskell-src-exts, hdocs, hlint, HTTP, lens
-     , lifted-base, monad-control, monad-loops
+     , ghc-syb-utils, haddock-api, haskell-src-exts, hdocs, hlint, HTTP
+     , lens, lifted-base, monad-control, monad-loops
      , MonadCatchIO-transformers, mtl, network, process
-     , regex-pcre-builtin, scientific, simple-log, system-filepath
-     , template-haskell, text, time, transformers, transformers-base
-     , uniplate, unix, unordered-containers, vector
+     , regex-pcre-builtin, scientific, simple-log, syb, template-haskell
+     , text, time, transformers, transformers-base, uniplate, unix
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "hsdev";
-       version = "0.1.4.1";
-       sha256 = "180xrxamas2fg2366k3cpy7al8mq82d1hgjrs7i1r2s3gr877xz8";
+       version = "0.1.4.2";
+       sha256 = "1l2pm2p0k2m8aln6an3kxswcalc7w72v7mxs5fzq0nfy60iphcys";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-pretty array attoparsec base bin-package-db bytestring
          Cabal containers deepseq directory exceptions filepath fsnotify ghc
-         ghc-mod ghc-paths haddock-api haskell-src-exts hdocs hlint HTTP
-         lens lifted-base monad-control monad-loops
+         ghc-mod ghc-paths ghc-syb-utils haddock-api haskell-src-exts hdocs
+         hlint HTTP lens lifted-base monad-control monad-loops
          MonadCatchIO-transformers mtl network process regex-pcre-builtin
-         scientific simple-log system-filepath template-haskell text time
-         transformers transformers-base uniplate unix unordered-containers
-         vector
+         scientific simple-log syb template-haskell text time transformers
+         transformers-base uniplate unix unordered-containers vector
        ];
        executableHaskellDepends = [
          aeson aeson-pretty base bytestring containers deepseq directory
@@ -74564,8 +74595,8 @@ self: {
      }:
      mkDerivation {
        pname = "html-tokenizer";
-       version = "0.3.0.3";
-       sha256 = "0xdjjmpp1wh17cb4lnziglwhv7frr0y5v216s5ycy9lkby9r9fyv";
+       version = "0.4.0.0";
+       sha256 = "0a44jxw90hk1i3h8j1vk8rjz3z91z9gdszyjbkngnpnfwrdhfrw7";
        libraryHaskellDepends = [
          attoparsec base-prelude case-insensitive conversion
          conversion-case-insensitive conversion-text text
@@ -74573,7 +74604,6 @@ self: {
        testHaskellDepends = [
          base base-prelude directory doctest filepath
        ];
-       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/html-tokenizer";
        description = "An \"attoparsec\"-based HTML tokenizer";
        license = stdenv.lib.licenses.mit;
@@ -75135,6 +75165,24 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "http-listen" = callPackage
+    ({ mkDerivation, base, bytestring, exceptions, HTTP, network
+     , transformers
+     }:
+     mkDerivation {
+       pname = "http-listen";
+       version = "0.1.0.0";
+       sha256 = "1ccm4lzlngcw7hp4rvk2d85zg5725pj01mzavl3zx140i6w0psz0";
+       revision = "1";
+       editedCabalFile = "3fcb0a5c155c41513cf81c4cd5058be331d56aed083a3f42892feef452a0cd8b";
+       libraryHaskellDepends = [
+         base bytestring exceptions HTTP network transformers
+       ];
+       homepage = "http://rel4tion.org/projects/http-listen/";
+       description = "Listen to HTTP requests and handle them in arbitrary ways";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "http-media" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , QuickCheck, test-framework, test-framework-quickcheck2
@@ -77033,15 +77081,15 @@ self: {
      , bytestring-trie, Cabal-ide-backend, containers, crypto-api
      , data-accessor, data-accessor-mtl, deepseq, directory
      , executable-path, filemanip, filepath, fingertree, ghc-prim, HUnit
-     , ide-backend-common, mtl, pretty-show, process, pureMD5, random
-     , regex-compat, stm, tagged, tasty, template-haskell, temporary
-     , test-framework, test-framework-hunit, text, time, transformers
-     , unix, unordered-containers, utf8-string
+     , ide-backend-common, monads-tf, mtl, parallel, pretty-show
+     , process, pureMD5, random, regex-compat, stm, tagged, tasty
+     , template-haskell, temporary, test-framework, test-framework-hunit
+     , text, time, transformers, unix, unordered-containers, utf8-string
      }:
      mkDerivation {
        pname = "ide-backend";
-       version = "0.9.0.11";
-       sha256 = "06ip0yq8vb8i0qcz2l7z4s1myxm6ix3l44gmjpvspj9vwlsrfxpp";
+       version = "0.10.0";
+       sha256 = "18p079m9hfi4mbhyp8fhlhzlvhdpr9v82ih49s1630rxaf15z8r6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -77062,9 +77110,9 @@ self: {
        testHaskellDepends = [
          aeson async base binary bytestring Cabal-ide-backend containers
          deepseq directory executable-path filemanip filepath HUnit
-         ide-backend-common process random regex-compat stm tagged tasty
-         template-haskell temporary test-framework test-framework-hunit text
-         unix utf8-string
+         ide-backend-common monads-tf parallel process random regex-compat
+         stm tagged tasty template-haskell temporary test-framework
+         test-framework-hunit text unix utf8-string
        ];
        description = "An IDE backend library";
        license = stdenv.lib.licenses.mit;
@@ -77073,18 +77121,18 @@ self: {
   "ide-backend-common" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring
      , bytestring-trie, containers, crypto-api, data-accessor, directory
-     , filepath, fingertree, mtl, pretty-show, pureMD5, tagged
-     , template-haskell, temporary, text, transformers, unix
+     , filepath, fingertree, monad-logger, mtl, pretty-show, pureMD5
+     , tagged, template-haskell, temporary, text, transformers, unix
      }:
      mkDerivation {
        pname = "ide-backend-common";
-       version = "0.9.1.3";
-       sha256 = "11dnm1ibgibrjkxigzh9l442npb2br5rchahm6gza88imy3xcd96";
+       version = "0.10.0";
+       sha256 = "1x230hvxr5n8d04q9cdjryalrp47q9vsamgd0qafw1x25ar1fxwl";
        libraryHaskellDepends = [
          aeson async attoparsec base binary bytestring bytestring-trie
          containers crypto-api data-accessor directory filepath fingertree
-         mtl pretty-show pureMD5 tagged template-haskell temporary text
-         transformers unix
+         monad-logger mtl pretty-show pureMD5 tagged template-haskell
+         temporary text transformers unix
        ];
        description = "Shared library used be ide-backend and ide-backend-server";
        license = stdenv.lib.licenses.mit;
@@ -77103,21 +77151,22 @@ self: {
 
   "ide-backend-server" = callPackage
     ({ mkDerivation, array, async, base, bytestring, Cabal, containers
-     , data-accessor, data-accessor-mtl, directory, filemanip, filepath
-     , ghc, haddock-api, ide-backend-common, mtl, process, temporary
-     , text, time, transformers, unix, unordered-containers
+     , data-accessor, data-accessor-mtl, directory, file-embed
+     , filemanip, filepath, ghc, haddock-api, ide-backend-common, mtl
+     , process, tar, temporary, text, time, transformers, unix
+     , unordered-containers, zlib
      }:
      mkDerivation {
        pname = "ide-backend-server";
-       version = "0.9.0";
-       sha256 = "0kljg5dpcxhk4dr8mi5ywb0ykygqm9p89rinyk1i2fqdcvza89rm";
+       version = "0.10.0";
+       sha256 = "1kahc57f5jrz7869phzlbk6y3apwyh3j6k8b7xbyfcc4qwq6jgry";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          array async base bytestring Cabal containers data-accessor
-         data-accessor-mtl directory filemanip filepath ghc haddock-api
-         ide-backend-common mtl process temporary text time transformers
-         unix unordered-containers
+         data-accessor-mtl directory file-embed filemanip filepath ghc
+         haddock-api ide-backend-common mtl process tar temporary text time
+         transformers unix unordered-containers zlib
        ];
        description = "An IDE backend server";
        license = stdenv.lib.licenses.mit;
@@ -81213,26 +81262,26 @@ self: {
      }) {};
 
   "json-rpc" = callPackage
-    ({ mkDerivation, aeson, async, attoparsec, base, bytestring
-     , conduit, conduit-extra, deepseq, hashable, mtl, QuickCheck, stm
-     , stm-conduit, test-framework, test-framework-quickcheck2, text
-     , transformers, unordered-containers
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit
+     , conduit-extra, deepseq, hashable, lifted-async, monad-control
+     , monad-logger, mtl, QuickCheck, stm, stm-conduit, test-framework
+     , test-framework-quickcheck2, text, transformers
+     , unordered-containers
      }:
      mkDerivation {
        pname = "json-rpc";
-       version = "0.2.1.6";
-       sha256 = "1y9c95qbvkg0r75y4dd0fvcy5r0bj08pklf7hl052ncwm87l9hln";
+       version = "0.6.0.0";
+       sha256 = "0ld8r5zln9a18vzgpiylifzbpiivv8icalqg1l1863kgirgsz2hg";
        libraryHaskellDepends = [
-         aeson async attoparsec base bytestring conduit conduit-extra
-         deepseq hashable mtl stm stm-conduit text transformers
-         unordered-containers
+         aeson attoparsec base bytestring conduit conduit-extra deepseq
+         hashable lifted-async monad-control monad-logger mtl QuickCheck stm
+         stm-conduit text transformers unordered-containers
        ];
        testHaskellDepends = [
-         aeson async base bytestring conduit conduit-extra deepseq hashable
-         mtl QuickCheck stm stm-conduit test-framework
+         aeson base bytestring conduit lifted-async monad-logger mtl
+         QuickCheck stm stm-conduit test-framework
          test-framework-quickcheck2 text unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/xenog/json-rpc";
        description = "Fully-featured JSON-RPC 2.0 library";
        license = stdenv.lib.licenses.publicDomain;
@@ -81296,10 +81345,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-schema";
-       version = "0.7.3.7";
-       sha256 = "0lrr5zhydb2g36xlpr3mhn0m6bz138gbm0zih3f3qamnsm21mjk5";
-       revision = "1";
-       editedCabalFile = "94b50ebb4b1aa921270db172dbef2ed18c85846d147d1526ec9c85ea0be1705a";
+       version = "0.7.4.0";
+       sha256 = "073hs9wmpmv7b07s7by9r6hjcwn7bjhwyf256f2xiz4y355zljf5";
        libraryHaskellDepends = [
          aeson base containers generic-aeson generic-deriving mtl scientific
          text time unordered-containers vector
@@ -82258,6 +82305,7 @@ self: {
          keera-hails-reactivevalues MissingK mtl network process SDL
          SDL-mixer setlocale time utf8-string
        ];
+       jailbreak = true;
        homepage = "http://keera.co.uk/projects/keera-posture";
        description = "Get notifications when your sitting posture is inappropriate";
        license = "unknown";
@@ -87435,8 +87483,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-general";
-       version = "3.4.5.3";
-       sha256 = "03rps9ga20cdqfh2khqnahwrkljs714ac7yx9x7krb3dngf83zsm";
+       version = "3.4.5.4";
+       sha256 = "1zfixhvwagvznrvnxzrb9fzkswa43mj1nmbpmx87888q8z9m31j0";
        libraryHaskellDepends = [
          array base bytestring containers llvm-general-pure mtl parsec
          setenv template-haskell transformers transformers-compat
@@ -87459,8 +87507,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-general-pure";
-       version = "3.4.5.3";
-       sha256 = "1b3zh2y3b3jj5sg6421wv2qsrhyjs23qdzrk693r7mpj10rd258k";
+       version = "3.4.5.4";
+       sha256 = "0kc4f431j65qfsa54a17y3m82a8xf3dmd3hzr8mj514jz4wv6jn5";
        libraryHaskellDepends = [
          base containers mtl parsec setenv template-haskell transformers
          transformers-compat
@@ -87863,8 +87911,8 @@ self: {
     ({ mkDerivation, array, base }:
      mkDerivation {
        pname = "logfloat";
-       version = "0.13.3.1";
-       sha256 = "0rqnp2zkp247sb3parn3ywsk9clasy4l906a1wyrrybc3p72126s";
+       version = "0.13.3.2";
+       sha256 = "092c9xviq9gsr3q25q254x9kdl80lfssbwjyvi8rrv1300nw7h4c";
        libraryHaskellDepends = [ array base ];
        homepage = "http://code.haskell.org/~wren/";
        description = "Log-domain floating point numbers";
@@ -87911,13 +87959,11 @@ self: {
     ({ mkDerivation, base, hspec, template-haskell, transformers }:
      mkDerivation {
        pname = "logging-facade";
-       version = "0.0.0";
-       sha256 = "0i7m4dpj7b556bfiahisvxcvdb1lv352zggjyrcr69iqnrac30z8";
-       revision = "1";
-       editedCabalFile = "18d32076d981102462c3f24c95c6d9dc2470be80f5f36f99759cb23cc3db2d24";
+       version = "0.1.0";
+       sha256 = "0zhdbjyj0j9by19rma9alxysrxnnl3s4kks4zk4bx0dg5xa0264y";
        libraryHaskellDepends = [ base template-haskell transformers ];
        testHaskellDepends = [ base hspec ];
-       description = "Simple logging abstraction that allows multiple backends";
+       description = "Simple logging abstraction that allows multiple back-ends";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -89767,18 +89813,22 @@ self: {
 
   "manifolds" = callPackage
     ({ mkDerivation, base, comonad, constrained-categories, containers
-     , MemoTrie, MonadRandom, random, semigroups, tagged, transformers
+     , deepseq, hmatrix, MemoTrie, semigroups, tagged, transformers
      , vector, vector-algorithms, vector-space, void
      }:
      mkDerivation {
        pname = "manifolds";
-       version = "0.1.0.2";
-       sha256 = "05ysr2rmjc0rqgy409qcga8j748l0w322vxbjdw9yyhcp2kbrv14";
+       version = "0.1.3.0";
+       sha256 = "17i77nhp65ikgyz0yif6i1pnj65da38mnx87yy96wkcdlad3zivj";
+       revision = "1";
+       editedCabalFile = "2495967b40c73a494475058072f59fc2c730c655bfb6861c5d0c2f51531a0060";
        libraryHaskellDepends = [
-         base comonad constrained-categories containers MemoTrie MonadRandom
-         random semigroups tagged transformers vector vector-algorithms
+         base comonad constrained-categories containers deepseq hmatrix
+         MemoTrie semigroups tagged transformers vector vector-algorithms
          vector-space void
        ];
+       jailbreak = true;
+       homepage = "https://github.com/leftaroundabout/manifolds";
        description = "Working with manifolds in a direct, embedding-free way";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -91229,8 +91279,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "microlens";
-       version = "0.1.3.0";
-       sha256 = "1ryjxc3qa583ryp9sig3rjjr3dpv9sx2ybag4qrlkwja1dz8r2dm";
+       version = "0.2.0.0";
+       sha256 = "08m0qcsazq690w1k6hd2h3z8w47bqc01s53j6qbf3jbfin28axbg";
        libraryHaskellDepends = [ base ];
        homepage = "http://github.com/aelve/microlens";
        description = "A tiny part of the lens library which you can depend upon";
@@ -91244,19 +91294,34 @@ self: {
        version = "0.1.0.0";
        sha256 = "00bk2vriwh8aj2c6n5g2w84pfq0nssfa62iw97dm9c3zkp558wxj";
        libraryHaskellDepends = [ base microlens ];
+       jailbreak = true;
        homepage = "http://github.com/aelve/microlens";
        description = "'each' for microlens";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens-ghc" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, microlens }:
+     mkDerivation {
+       pname = "microlens-ghc";
+       version = "0.1.0.1";
+       sha256 = "17kkh6dnxhr2j1a9nll5ia0y5rd68icxjjk4kqs0wml1whmhhg55";
+       libraryHaskellDepends = [
+         array base bytestring containers microlens
+       ];
+       homepage = "http://github.com/aelve/microlens";
+       description = "Orphan instances of microlens classes for packages coming with GHC (array, bytestring, containers)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "microlens-mtl" = callPackage
     ({ mkDerivation, base, microlens, mtl, transformers
      , transformers-compat
      }:
      mkDerivation {
        pname = "microlens-mtl";
-       version = "0.1.2.0";
-       sha256 = "1jvw9pspnr24rh7bvl6q7hv7x0g6vwy2a5xl19pxf36rl8wlfm9v";
+       version = "0.1.3.1";
+       sha256 = "118ym5n1c6b2lg815hikzbwc4bnz8kz3j4flfxwq3m50dbn29vzc";
        libraryHaskellDepends = [
          base microlens mtl transformers transformers-compat
        ];
@@ -91269,8 +91334,8 @@ self: {
     ({ mkDerivation, base, containers, microlens, template-haskell }:
      mkDerivation {
        pname = "microlens-th";
-       version = "0.2.0.0";
-       sha256 = "048q6ridxvg7zi272q01k6ds0f411kg27p5whgj63qgg3k9w72sp";
+       version = "0.2.1.0";
+       sha256 = "1l4hxkq8z8h6pvld54bjlnzy5g30wr0akv1xjrjyk552mfi9gwvl";
        libraryHaskellDepends = [
          base containers microlens template-haskell
        ];
@@ -92323,21 +92388,21 @@ self: {
      }) {};
 
   "moesocks" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
+    ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring
      , containers, cryptohash, hslogger, HsOpenSSL, lens, mtl, network
-     , optparse-applicative, random, safe, text, transformers, unix
+     , optparse-applicative, random, safe, stm, text, transformers, unix
      , unordered-containers
      }:
      mkDerivation {
        pname = "moesocks";
-       version = "0.1.0.8";
-       sha256 = "1f09sf41kbza3mci2yps0b38xi2j5gakjqx9hmi7lfzga4dkqgg0";
+       version = "0.1.0.10";
+       sha256 = "0cv741gcbjcd4gvqbiys40dh8y553cy6rxhpz0bvdv8xv4qfsz47";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         aeson attoparsec base binary bytestring containers cryptohash
+         aeson async attoparsec base binary bytestring containers cryptohash
          hslogger HsOpenSSL lens mtl network optparse-applicative random
-         safe text transformers unix unordered-containers
+         safe stm text transformers unix unordered-containers
        ];
        homepage = "https://github.com/nfjinjing/moesocks";
        description = "moe for all";
@@ -92892,8 +92957,8 @@ self: {
     ({ mkDerivation, base, mmorph, mtl, transformers }:
      mkDerivation {
        pname = "monad-resumption";
-       version = "0.1.1.5";
-       sha256 = "08h750qbvzvlw5hyp1d44rkhiqlhgnsfy8sya2ya7p62l80w96sf";
+       version = "0.1.2.0";
+       sha256 = "09yz5cbvjlmqdlr25adxggpdz52jxyryyyrzix1pkdjr6aqpidkr";
        libraryHaskellDepends = [ base mmorph mtl transformers ];
        homepage = "https://github.com/igraves/resumption_monads";
        description = "Resumption and reactive resumption monads for Haskell";
@@ -94250,12 +94315,19 @@ self: {
      }) {};
 
   "mtl-unleashed" = callPackage
-    ({ mkDerivation, base, mtl }:
+    ({ mkDerivation, base, contravariant, hspec, hspec-core, lens, mtl
+     , profunctors
+     }:
      mkDerivation {
        pname = "mtl-unleashed";
-       version = "0.2.2";
-       sha256 = "0ih03zznq8mf8c76ic43j3vana6127bh6hxfz549g5kv9h54y83h";
-       libraryHaskellDepends = [ base mtl ];
+       version = "0.3";
+       sha256 = "1rirgbs4b7q7yjnvdw1j2y6nmym47adm8lcl0xysxi2hhhvs8r9c";
+       libraryHaskellDepends = [
+         base contravariant lens mtl profunctors
+       ];
+       testHaskellDepends = [
+         base contravariant hspec hspec-core lens mtl profunctors
+       ];
        homepage = "https://github.com/seereason/mtl-unleashed";
        description = "MTL classes without the functional dependency";
        license = stdenv.lib.licenses.bsd3;
@@ -94395,6 +94467,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "multi-cabal" = callPackage
+    ({ mkDerivation, AAI, aeson, base, bytestring, directory, filepath
+     , HUnit, mtl, process, strict, test-framework, test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "multi-cabal";
+       version = "0.1.0.0";
+       sha256 = "0qzphh4pmrdqanv9sjy0ipf3z775xvrvdyagd0291vv1mqkbbz3g";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ aeson base filepath mtl ];
+       executableHaskellDepends = [
+         AAI aeson base bytestring directory filepath process strict
+       ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
+       homepage = "https://github.com/aka-bash0r/multi-cabal";
+       description = "A tool supporting multi cabal project builds";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "multiarg" = callPackage
     ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck
      , tasty-th
@@ -96977,8 +97071,8 @@ self: {
     ({ mkDerivation, base, network }:
      mkDerivation {
        pname = "network-multicast";
-       version = "0.0.11";
-       sha256 = "0fgscv9crk2lx99rh234ipgl5psbrjili95inxj23drvwmsj3135";
+       version = "0.1.0";
+       sha256 = "12kswjqg4xv7gdjqabbyr7wvqkkzsyga3fjxnv9z9fdmil7xphhq";
        libraryHaskellDepends = [ base network ];
        description = "Simple multicast library";
        license = stdenv.lib.licenses.publicDomain;
@@ -98508,6 +98602,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "nurbs" = callPackage
+    ({ mkDerivation, base, base-unicode-symbols, hspec, lens, linear
+     , mtl
+     }:
+     mkDerivation {
+       pname = "nurbs";
+       version = "0.1.0.0";
+       sha256 = "1rxg0d8j6srhw5mq0i6ma9dyqrx3h1c15pv3gj8brh8ghjw9z1wi";
+       libraryHaskellDepends = [
+         base base-unicode-symbols lens linear mtl
+       ];
+       testHaskellDepends = [
+         base base-unicode-symbols hspec lens linear
+       ];
+       homepage = "https://github.com/mvoidex/nurbs";
+       description = "NURBS";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "nvim-hs" = callPackage
     ({ mkDerivation, base, bytestring, cereal, cereal-conduit, conduit
      , conduit-extra, containers, data-default, directory, dyre
@@ -111717,8 +111830,8 @@ self: {
      }:
      mkDerivation {
        pname = "rei";
-       version = "0.2.0.0";
-       sha256 = "17ldmx351b54fxmiw3z89v7cs6p33x09k2aav7jphqgv2520phyv";
+       version = "0.3.0.0";
+       sha256 = "03dd4miy0r2mkh603f1p7f93mgxqhfkz8gfk6b4macqcw5pvi3vf";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -111981,14 +112094,13 @@ self: {
     ({ mkDerivation, array, base, ghc, ghc-paths, json, network }:
      mkDerivation {
        pname = "remote-debugger";
-       version = "0.2.1";
-       sha256 = "0mgq2n92d4xk6yqzrbghlp0h18nmkyhxnv5zynrqykfw5h9xl0f8";
+       version = "0.2.2";
+       sha256 = "1c6xh390963hk7q2qvhqb6yma5ma7hk39nxjikizwh7s2h9vi9k4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          array base ghc ghc-paths json network
        ];
-       jailbreak = true;
        homepage = "https://github.com/octomarat/HaskellDebugger";
        description = "Interface to ghci debugger";
        license = stdenv.lib.licenses.bsd3;
@@ -120253,8 +120365,8 @@ self: {
      }:
      mkDerivation {
        pname = "smallcheck-series";
-       version = "0.3";
-       sha256 = "1vdwafwdv38n1bvjf1rybfhh42a0q0g0g4wmw0v4fgxh73qndfdv";
+       version = "0.4";
+       sha256 = "05iixqnq9mfqc2gbwxnhx640apbppck8zb8akkwz1linlypvym60";
        libraryHaskellDepends = [
          base bytestring containers logict smallcheck text transformers
        ];
@@ -125246,10 +125358,9 @@ self: {
     ({ mkDerivation, base, bytestring, tagged, text }:
      mkDerivation {
        pname = "string-class";
-       version = "0.1.6.4";
-       sha256 = "0hh2xcbf7sjsv15jgldpy5njjvkkkxwlg2g9961z9fn94zyi7854";
+       version = "0.1.6.5";
+       sha256 = "0yi3fagwqkgr8pf6wnl360qikyvfb649qs2y6gp0n7jjw0zc27c2";
        libraryHaskellDepends = [ base bytestring tagged text ];
-       jailbreak = true;
        homepage = "https://github.com/bairyn/string-class";
        description = "String class library";
        license = stdenv.lib.licenses.bsd3;
@@ -130230,8 +130341,8 @@ self: {
      }:
      mkDerivation {
        pname = "th-typegraph";
-       version = "0.27";
-       sha256 = "1v7vic9kfig9flcnqcpzazd1s4wgqiz3mj9gcyc1ijkrd4y83cdr";
+       version = "0.28";
+       sha256 = "0dwkhrrcb5n3n06dr0ck613yr3j6f05sldnvrkb654xm69pw1qfc";
        libraryHaskellDepends = [
          base base-compat containers data-default haskell-src-exts lens mtl
          mtl-unleashed set-extra syb template-haskell th-desugar th-orphans
@@ -130661,7 +130772,7 @@ self: {
 
   "thyme" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, Cabal
-     , containers, deepseq, directory, filepath, mtl, old-locale
+     , containers, cpphs, deepseq, directory, filepath, mtl, old-locale
      , profunctors, QuickCheck, random, system-posix-redirect, text
      , time, vector, vector-space, vector-th-unbox
      }:
@@ -130674,6 +130785,7 @@ self: {
          profunctors QuickCheck random text time vector vector-space
          vector-th-unbox
        ];
+       libraryToolDepends = [ cpphs ];
        testHaskellDepends = [
          attoparsec base bytestring Cabal containers directory filepath mtl
          old-locale profunctors QuickCheck random system-posix-redirect text
@@ -130682,7 +130794,6 @@ self: {
        homepage = "https://github.com/liyang/thyme";
        description = "A faster time library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tianbar" = callPackage
@@ -130772,8 +130883,8 @@ self: {
      }:
      mkDerivation {
        pname = "tidal-midi";
-       version = "0.0.2";
-       sha256 = "0q3g4qgzpd8p4z3l1npcs0gy14967l3yn4xqingdbcq22xasim6q";
+       version = "0.1";
+       sha256 = "04d5xfr57rw22jq62iil6sa9drya6z545hcm1fx98jrkcyglb10c";
        libraryHaskellDepends = [
          base bytestring containers hashable hosc PortMidi process tidal
          time
@@ -134418,8 +134529,8 @@ self: {
      }:
      mkDerivation {
        pname = "uhc-util";
-       version = "0.1.5.6";
-       sha256 = "1axg2apkvg3xk1cq78shbnc68i0h6fqcpjg8z3l4nc49kl5dywwz";
+       version = "0.1.6.0";
+       sha256 = "1ndnmk8rfa8hwp72hgh6xx043lf59a8k50cqjm8bibfpd7fl31hj";
        libraryHaskellDepends = [
          array base binary bytestring containers directory fclabels fgl
          hashable ListLike mtl process syb time time-compat uulib
@@ -138432,11 +138543,10 @@ self: {
     ({ mkDerivation, base, QtWebKit, wai, warp }:
      mkDerivation {
        pname = "wai-handler-webkit";
-       version = "3.0.0.1";
-       sha256 = "1fm985jq1sa8v3vj850cpcjl6kcyq2kgq6xwpb1rmzi8zmb80kpc";
+       version = "3.0.0.2";
+       sha256 = "0y7di5pnrri4dkqi8lx4gfksfpbqfwax1wjp1ijc5cw6p34mmzcs";
        libraryHaskellDepends = [ base wai warp ];
        libraryPkgconfigDepends = [ QtWebKit ];
-       jailbreak = true;
        homepage = "https://github.com/yesodweb/wai/tree/master/wai-handler-webkit";
        description = "Turn WAI applications into standalone GUIs using QtWebkit";
        license = stdenv.lib.licenses.mit;
@@ -142599,6 +142709,8 @@ self: {
        pname = "xmonad-contrib";
        version = "0.11.4";
        sha256 = "1g5cw9vvnfbiyi599fngk02zlmdhrf82x0bndhypkn6kybab6yd3";
+       revision = "1";
+       editedCabalFile = "0280216420efaa06de7080d5998a24e27166e8b2c3d8a012846d004799c5edf2";
        libraryHaskellDepends = [
          base containers directory extensible-exceptions mtl old-locale
          old-time process random unix utf8-string X11 X11-xft xmonad

From e7084d1a8215e73285cdef68a8497bbf1ea008da Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Aug 2015 19:53:16 +0200
Subject: [PATCH 05/65] haskell-thyme can't compile its test suite.

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c8a5377b090..88d661b1c25 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -922,4 +922,7 @@ self: super: {
   # https://github.com/qnikst/imagemagick/issues/34
   imagemagick = dontCheck super.imagemagick;
 
+  # https://github.com/liyang/thyme/issues/36
+  thyme = dontCheck super.thyme;
+
 }

From 1ab9c7d7e095ea8707e63b074bad26f1b2c8b84b Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Thu, 6 Aug 2015 06:15:30 -0400
Subject: [PATCH 06/65] Add build-tool override for hlibgit2.

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 88d661b1c25..3d3a02db066 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -271,6 +271,9 @@ self: super: {
   webkitgtk3-javascriptcore = super.webkitgtk3-javascriptcore.override { webkit = pkgs.webkitgtk24x; };
   websnap = super.websnap.override { webkit = pkgs.webkitgtk24x; };
 
+  # While waiting for https://github.com/jwiegley/gitlib/pull/53 to be merged
+  hlibgit2 = addBuildTool super.hlibgit2 pkgs.git;
+
   # https://github.com/mvoidex/hsdev/issues/11
   hsdev = dontHaddock super.hsdev;
 

From fe0499899466c8bff223779600c0386f8d0fe353 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Aug 2015 21:08:57 +0200
Subject: [PATCH 07/65] haskell-llvm-general-pure has been fixed upstream.

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3d3a02db066..bfd3bd04df1 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -916,9 +916,6 @@ self: super: {
   # https://github.com/bos/pcap/issues/5
   pcap = addExtraLibrary super.pcap pkgs.libpcap;
 
-  # https://github.com/bscarlet/llvm-general/issues/143
-  llvm-general-pure = dontCheck super.llvm-general-pure;
-
   # https://github.com/skogsbaer/hscurses/issues/24
   hscurses = markBroken super.hscurses;
 

From 13dc24f5c3d855c5fdd6fbbdd331ae78df9eb0e9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Aug 2015 22:25:03 +0200
Subject: [PATCH 08/65] cabal2nix: update to version 20150807-6-g9f58996

The generated shell.nix file accepts a string argument called "compiler" that
determines the package set used to instantiate the generated expression. For
example, running "nix-shell --argstr compiler ghc7102" would evaluate the build
inside of "pkgs.haskell.packages.ghc7102". Earlier versions of cabal2nix had the
current default compiler hard-coded in the expression, but after this change this
is no longer the case. When "compiler" remains unspecified, it defaults to
"default", and this value causes evaluation in "pkgs.haskellPackages", which is
the package set most people would like to use by default. That change has to
benefits:

 1) Generated expression no longer contain any particular compiler version. The
    choice of the default compiler depends on the version of Nixpkgs that's used
    to build the expression.

 2) When the default compiler is used, overrides configured for the default
    package set apply, which was not the case in earlier versions.
---
 pkgs/development/tools/haskell/cabal2nix/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index b56dc6bdd89..4a234cbc1e8 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -8,11 +8,11 @@
 
 mkDerivation rec {
   pname = "cabal2nix";
-  version = "20150807";
+  version = "20150807-6-g9f58996";
   src = fetchgit {
     url = "http://github.com/NixOS/cabal2nix.git";
-    rev = "796dabfc3fb0a98174b680c5d722954096465103";
-    sha256 = "1blyjq80w9534ap4cg0m6awks0zj2135kxld1i9d2z88x1ijzx9v";
+    rev = "9f589961fba9fa6a92900c37cf1ab16c597b0c69";
+    sha256 = "1w5ba7cdanpq4nr8xngk1jsj0p6b17c6ap24ldzggrln216f3f7d";
     deepClone = true;
   };
   isLibrary = true;

From 3dbfcdc3d4148f4094bcd50973b8008f62c0c6c2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 7 Aug 2015 22:59:45 +0200
Subject: [PATCH 09/65] cabal2nix: make the package visible from the top-level

This means that "nix-env -i cabal2nix" suffices to install this package.
---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 pkgs/development/tools/haskell/cabal2nix/default.nix      | 2 +-
 pkgs/top-level/all-packages.nix                           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index bfd3bd04df1..7a972ee1f21 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -766,7 +766,7 @@ self: super: {
   zlib = dontCheck super.zlib;
 
   # Override the obsolete version from Hackage with our more up-to-date copy.
-  cabal2nix = pkgs.cabal2nix;
+  cabal2nix = self.callPackage ../tools/haskell/cabal2nix {};
 
   # https://github.com/urs-of-the-backwoods/HGamer3D/issues/7
   HGamer3D-Bullet-Binding = dontDistribute super.HGamer3D-Bullet-Binding;
diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix
index 4a234cbc1e8..cf0cfd64e8f 100644
--- a/pkgs/development/tools/haskell/cabal2nix/default.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/default.nix
@@ -15,7 +15,7 @@ mkDerivation rec {
     sha256 = "1w5ba7cdanpq4nr8xngk1jsj0p6b17c6ap24ldzggrln216f3f7d";
     deepClone = true;
   };
-  isLibrary = true;
+  isLibrary = false;
   isExecutable = true;
   libraryHaskellDepends = [
     aeson ansi-wl-pprint base bytestring Cabal containers
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8ca0f13c24f..3f7e25d6314 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -788,7 +788,7 @@ let
 
   byobu = callPackage ../tools/misc/byobu { };
 
-  cabal2nix = haskellPackages.callPackage ../development/tools/haskell/cabal2nix {};
+  cabal2nix = haskellPackages.cabal2nix;
 
   capstone = callPackage ../development/libraries/capstone { };
 

From 2f620f57675f3117b013d9e4ef51adab73b049fa Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 7 Aug 2015 14:18:26 -0700
Subject: [PATCH 10/65] ceph-git: 2015-08-05 -> 2015-08-07

---
 pkgs/tools/filesystems/ceph/generic.nix | 1 +
 pkgs/tools/filesystems/ceph/git.nix     | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 8b9cefdbf23..77d24766f13 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -213,6 +213,7 @@ stdenv.mkDerivation {
     (mkWith   true                         "rgw-user"             "rgw")
     (mkWith   true                         "rgw-group"            "rgw")
     (mkWith   true                         "systemd-unit-dir"     "\${out}/etc/systemd/system")
+    (mkWith   false                        "selinux"              null)  # TODO: Implement
   ];
 
   preBuild = optionalString (versionAtLeast version "9.0.0") ''
diff --git a/pkgs/tools/filesystems/ceph/git.nix b/pkgs/tools/filesystems/ceph/git.nix
index 9343d2cdf33..c71ad134222 100644
--- a/pkgs/tools/filesystems/ceph/git.nix
+++ b/pkgs/tools/filesystems/ceph/git.nix
@@ -1,12 +1,12 @@
 { callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "2015-08-05";
+  version = "2015-08-07";
 
   src = fetchgit {
-    url = "git://github.com/wkennington/ceph.git";
-    rev = "043a780feb973b7ad571bb696437476da3260133";
-    sha256 = "02kk24wm6mxsclklsz5zzpj3wm6f341blj2anx3v5x20cixzdnhp";
+    url = "git://github.com/ceph/ceph.git";
+    rev = "dcd6e96495d949066962d1c7e18a9d4188b0fa37";
+    sha256 = "1w62xfbcdx2q5wjz2bqlhn4bb1iag8xyhgjc2nklqk7py9lif16m";
   };
 
   patches = [ ./fix-pythonpath.patch ];

From 5b6db8f1dfdb12e83533ec43f90d87dc87f4e034 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 7 Aug 2015 14:23:09 -0700
Subject: [PATCH 11/65] mongodb: 3.0.4 -> 3.0.5

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

diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index 81205c92d4c..43ab075090c 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -4,7 +4,7 @@
 
 with stdenv.lib;
 
-let version = "3.0.4";
+let version = "3.0.5";
     system-libraries = [
       "pcre"
       "wiredtiger"
@@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz";
-    sha256 = "0q23hvi0axc14s1ah1p67rxvi36skw34kj9ahpijx2dd2a5smrvd";
+    sha256 = "1nvzbxgyjsp72w4fvfd8zxpj38zv0whn5p53jv9v2rdaj5wnmc85";
   };
 
   nativeBuildInputs = [ scons ];

From 8dd3ee6bae4c5ec3af0b26416d688e42b32337d5 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 7 Aug 2015 14:42:45 -0700
Subject: [PATCH 12/65] jsoncpp: 1.6.2 -> 1.6.5

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

diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix
index 8bb1d40b2a9..923d8af59bf 100644
--- a/pkgs/development/libraries/jsoncpp/default.nix
+++ b/pkgs/development/libraries/jsoncpp/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "jsoncpp-${version}";
-  version = "1.6.2";
+  version = "1.6.5";
 
   src = fetchFromGitHub {
     owner = "open-source-parsers";
     repo = "jsoncpp";
     rev = version;
-    sha256 = "0p92i0hx2k3g8mwrcy339b56bfq8qgpb65id8xllkgd2ns4wi9zi";
+    sha256 = "08y54n4v3q18ik8iv8zyziava3x130ilzf1l3qli3vjwf6l42fm0";
   };
 
   /* During darwin bootstrap, we have a cp that doesn't understand the

From 46acdd1608630a9b6db0551cf6e96b5fb8b959f2 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 7 Aug 2015 14:42:57 -0700
Subject: [PATCH 13/65] rocksdb: 3.11.2 -> 3.12.1

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

diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix
index 004e5e57de4..78623503794 100644
--- a/pkgs/development/libraries/rocksdb/default.nix
+++ b/pkgs/development/libraries/rocksdb/default.nix
@@ -13,13 +13,13 @@ let
 in
 stdenv.mkDerivation rec {
   name = "rocksdb-${version}";
-  version = "3.11.2";
+  version = "3.12.1";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "rocksdb";
     rev = "rocksdb-${version}";
-    sha256 = "0cjwr7n5l2wdzdv4b0p90k0ijg9ka28akpq2aqa8lknsa1kb1cyv";
+    sha256 = "0692jlnakwd5c1h6czd3l7rxhz514whpixyd8y805bnkj2ag61sa";
   };
 
   buildInputs = [ snappy google-gflags zlib bzip2 lz4 numactl malloc ];

From 6f5c2ec3113157ac5c207973d9b2729ff2590be1 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 7 Aug 2015 18:16:14 +0200
Subject: [PATCH 14/65] checksyle: update from 6.8.2 to 6.9

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

diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index f0698de5c7e..5817edbf2e3 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "6.8.2";
+  version = "6.9";
   name = "checkstyle-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz";
-    sha256 = "1r0wb8iqvmhvgxk1ya39x8b4ayd549bfxmnw26i84870hnqr179c";
+    sha256 = "122lzqai6nb1wx9z9hc92sld9ghrynywf4f4lz6wk50kywcp0p70";
   };
 
   installPhase = ''

From f5c2cd8059961eb2ef8a775184ef92b5cc2ada96 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 8 Aug 2015 00:07:26 +0200
Subject: [PATCH 15/65] pdf2djvu: update from 0.7.21 to 0.8

---
 pkgs/tools/typesetting/pdf2djvu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix
index a85aa045b66..942f40a0cf0 100644
--- a/pkgs/tools/typesetting/pdf2djvu/default.nix
+++ b/pkgs/tools/typesetting/pdf2djvu/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.21";
+  version = "0.8";
   name = "pdf2djvu-${version}";
 
   src = fetchurl {
     url = "https://bitbucket.org/jwilk/pdf2djvu/downloads/${name}.tar.xz";
-    sha256 = "1fc7nrc8z5z66ifjjqbqn3c52hxlzgkgbdrr3cgrwdp27k681m0j";
+    sha256 = "0xdxx5c7hvhzfmi37cf9p17smm2y55wc8z1vsncqqvf1sxqpjmbn";
   };
 
   buildInputs = [ pkgconfig djvulibre poppler fontconfig libjpeg ];

From ad4adbdcb2f321a4a74fecea4ef108b9b19b488c Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Fri, 7 Aug 2015 23:42:20 +0200
Subject: [PATCH 16/65] rustc: rename beta.patch to stable.patch

---
 pkgs/development/compilers/rustc/default.nix                    | 2 +-
 .../compilers/rustc/patches/{beta.patch => stable.patch}        | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/development/compilers/rustc/patches/{beta.patch => stable.patch} (100%)

diff --git a/pkgs/development/compilers/rustc/default.nix b/pkgs/development/compilers/rustc/default.nix
index b61a407223c..9b0cac9a578 100644
--- a/pkgs/development/compilers/rustc/default.nix
+++ b/pkgs/development/compilers/rustc/default.nix
@@ -27,7 +27,7 @@ callPackage ./generic.nix {
   snapshotRev = "857ef6e";
 
   patches = [
-    ./patches/beta.patch
+    ./patches/stable.patch
     ] ++ stdenv.lib.optional stdenv.needsPax ./patches/grsec.patch;
   configureFlags = [ "--release-channel=stable" ];
 }
diff --git a/pkgs/development/compilers/rustc/patches/beta.patch b/pkgs/development/compilers/rustc/patches/stable.patch
similarity index 100%
rename from pkgs/development/compilers/rustc/patches/beta.patch
rename to pkgs/development/compilers/rustc/patches/stable.patch

From f49da34d827c39c0320bce03852e77b217d73015 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Fri, 7 Aug 2015 23:46:13 +0200
Subject: [PATCH 17/65] rustc: 1.1.0 -> 1.2.0

---
 pkgs/development/compilers/rustc/default.nix  | 16 ++---
 pkgs/development/compilers/rustc/generic.nix  |  4 --
 .../compilers/rustc/patches/stable.patch      | 69 ++++++++-----------
 3 files changed, 35 insertions(+), 54 deletions(-)

diff --git a/pkgs/development/compilers/rustc/default.nix b/pkgs/development/compilers/rustc/default.nix
index 9b0cac9a578..a4f70172e1f 100644
--- a/pkgs/development/compilers/rustc/default.nix
+++ b/pkgs/development/compilers/rustc/default.nix
@@ -1,8 +1,8 @@
 { stdenv, callPackage }:
 callPackage ./generic.nix {
-  shortVersion = "1.1.0";
+  shortVersion = "1.2.0";
   isRelease = true;
-  srcSha = "0lsfrclj5imxy6129ggya7rb2h04cgqq53f75z2jv40y5xk25sy8";
+  srcSha = "1zq2nhgaxkv1ghi3z2qgff6cylqirn33nphvkjiczlkjfi0pyw16";
 
   /* Rust is bootstrapped from an earlier built version. We need
   to fetch these earlier versions, which vary per platform.
@@ -12,19 +12,19 @@ callPackage ./generic.nix {
   */
 
   # linux-i386
-  snapshotHashLinux686 = "0bc8cffdce611fb71fd7d3d8e7cdbfaf748a4f16";
+  snapshotHashLinux686 = "a6f22e481eabf098cc65bda97bf7e434a1fcc20b";
 
   # linux-x86_64
-  snapshotHashLinux64 = "94089740e48167c5975c92c139ae9c286764012f";
+  snapshotHashLinux64 = "5fd8698fdfe953e6c4d86cf4fa1d5f3a0053248c";
 
   # macos-i386
-  snapshotHashDarwin686 = "54cc35e76497e6e94fddf38d6e40e9d168491ddb";
+  snapshotHashDarwin686 = "9a273324a6b63a40f67a553029c0a9fb692ffd1f";
 
   # macos-x86_64
-  snapshotHashDarwin64 = "43a1c1fba0d1dfee4c2ca310d506f8f5f51b3f6f";
+  snapshotHashDarwin64 = "e5b12cb7c179fc98fa905a3c84803645d946a6ae";
 
-  snapshotDate = "2015-04-27";
-  snapshotRev = "857ef6e";
+  snapshotDate = "2015-05-24";
+  snapshotRev = "ba0e1cd";
 
   patches = [
     ./patches/stable.patch
diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rustc/generic.nix
index da72495ee7a..6bb60c6dc69 100644
--- a/pkgs/development/compilers/rustc/generic.nix
+++ b/pkgs/development/compilers/rustc/generic.nix
@@ -123,10 +123,6 @@ stdenv.mkDerivation {
   inherit patches;
 
   postPatch = ''
-    substituteInPlace src/librustc_trans/back/link.rs \
-      --subst-var-by "ccPath" "${stdenv.cc}/bin/cc"
-    substituteInPlace src/librustc_back/archive.rs \
-      --subst-var-by "arPath" "${stdenv.cc.binutils}/bin/ar"
     substituteInPlace src/librustc_back/target/mod.rs \
       --subst-var-by "ccPath" "${stdenv.cc}/bin/cc" \
       --subst-var-by "arPath" "${stdenv.cc.binutils}/bin/ar"
diff --git a/pkgs/development/compilers/rustc/patches/stable.patch b/pkgs/development/compilers/rustc/patches/stable.patch
index cffc773dd3e..e927d7a742a 100644
--- a/pkgs/development/compilers/rustc/patches/stable.patch
+++ b/pkgs/development/compilers/rustc/patches/stable.patch
@@ -1,43 +1,28 @@
-diff --git a/src/etc/local_stage0.sh b/src/etc/local_stage0.sh
-index ca59b1c..65ee7bf 100755
---- a/src/etc/local_stage0.sh
-+++ b/src/etc/local_stage0.sh
-@@ -50,11 +50,6 @@ if [ -z $TARG_DIR ]; then
- fi
- 
- cp ${PREFIX}/bin/rustc${BIN_SUF} ${TARG_DIR}/stage0/bin/
--cp ${PREFIX}/${LIB_DIR}/${RUSTLIBDIR}/${TARG_DIR}/${LIB_DIR}/* ${TARG_DIR}/stage0/${LIB_DIR}/
--cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}extra*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
--cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}rust*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
--cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}std*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
--cp ${PREFIX}/${LIB_DIR}/${LIB_PREFIX}syntax*${LIB_SUF} ${TARG_DIR}/stage0/${LIB_DIR}/
- 
- # do not fail if one of the above fails, as all we need is a working rustc!
- exit 0
-diff --git a/src/librustc_back/archive.rs b/src/librustc_back/archive.rs
-index ed44bf8..2b84627 100644
---- a/src/librustc_back/archive.rs
-+++ b/src/librustc_back/archive.rs
-@@ -57,7 +57,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option<String>,
-           paths: &[&Path]) -> Output {
-     let ar = match *maybe_ar_prog {
-         Some(ref ar) => &ar[..],
--        None => "ar"
-+        None => "@arPath@"
-     };
-     let mut cmd = Command::new(ar);
- 
-diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs
-index 3087a8e..578448f 100644
---- a/src/librustc_trans/back/link.rs
-+++ b/src/librustc_trans/back/link.rs
-@@ -352,7 +352,7 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri
- 
- pub fn get_cc_prog(sess: &Session) -> String {
-     match sess.opts.cg.linker {
--        Some(ref linker) => return linker.to_string(),
--        None => sess.target.target.options.linker.clone(),
-+        Some(ref linker) => linker.to_string(),
-+        None => "@ccPath@".to_string(),
-     }
+diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs
+index 402fbcd..8fe2de2 100644
+--- a/src/librustc_back/target/mod.rs
++++ b/src/librustc_back/target/mod.rs
+@@ -172,8 +172,8 @@ impl Default for TargetOptions {
+     /// incomplete, and if used for compilation, will certainly not work.
+     fn default() -> TargetOptions {
+         TargetOptions {
+-            linker: "cc".to_string(),
+-            ar: "ar".to_string(),
++            linker: "@ccPath@".to_string(), // ignore-tidy-linelength
++            ar: "@arPath@".to_string(), // ignore-tidy-linelength
+             pre_link_args: Vec::new(),
+             post_link_args: Vec::new(),
+             cpu: "generic".to_string(),
+diff --git a/src/test/run-pass/issue-20797.rs b/src/test/run-pass/issue-20797.rs
+index 2772fc8..3d37b08 100644
+--- a/src/test/run-pass/issue-20797.rs
++++ b/src/test/run-pass/issue-20797.rs
+@@ -97,7 +97,7 @@ impl<S: Strategy> Iterator for Subpaths<S> {
  }
+ 
+ fn _foo() {
+-    let _walker: Subpaths<Recursive> = Subpaths::walk(&PathBuf::from("/home")).unwrap();
++    let _walker: Subpaths<Recursive> = Subpaths::walk(&PathBuf::from("/tmp")).unwrap();
+ }
+ 
+ fn main() {}

From 7151c0be17bfd8babb9db49ece63016c926e7830 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 8 Aug 2015 01:21:55 +0200
Subject: [PATCH 18/65] haskell-mockery: disable the failing test suite
 altogether

---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7a972ee1f21..c9b976448d8 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -878,7 +878,7 @@ self: super: {
   vimus = overrideCabal super.vimus (drv: { broken = pkgs.stdenv.isLinux && pkgs.stdenv.isi686; });
 
   # https://github.com/hspec/mockery/issues/6
-  mockery = overrideCabal super.mockery (drv: { preCheck = "export TRAVIS=true"; });
+  mockery = dontCheck (overrideCabal super.mockery (drv: { preCheck = "export TRAVIS=true"; }));
 
   # https://github.com/diagrams/diagrams-lib/issues/258
   # https://github.com/diagrams/diagrams-lib/issues/259

From d708a73e46684624713e463ffe4b135065ea043f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 8 Aug 2015 03:20:56 +0200
Subject: [PATCH 19/65] dfasma: 1.0.1 -> 1.1.2

To quote upstream: many bug fix.
---
 pkgs/applications/audio/dfasma/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix
index 0dda6e3dabd..065374d876b 100644
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/applications/audio/dfasma/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub, fftw, libsndfile, qt5 }:
 
-let version = "1.0.1"; in
+let version = "1.1.2"; in
 stdenv.mkDerivation {
   name = "dfasma-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "16m6jnr49j525xxqiwmwni07rcdg92p0dcznd5bmzz34xsm0cbiz";
+    sha256 = "0xqam5hm4kvfksdlyz1rviijv386fk3px4lhz6glfsimbcvvzl0r";
     rev = "v${version}";
     repo = "dfasma";
     owner = "gillesdegottex";

From 4ed5b4c7fdedaf05ad1f1da79a9f4ada9147161a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 8 Aug 2015 04:03:50 +0200
Subject: [PATCH 20/65] dfasma: patch around broken version detection

---
 pkgs/applications/audio/dfasma/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix
index 065374d876b..2f236eab4e1 100644
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/applications/audio/dfasma/default.nix
@@ -30,6 +30,10 @@ stdenv.mkDerivation {
 
   buildInputs = [ fftw libsndfile qt5.base qt5.multimedia ];
 
+  postPatch = ''
+    substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}'
+  '';
+
   configurePhase = ''
     qmake DESTDIR=$out/bin dfasma.pro
   '';

From ffa58ba098e065abe38ab4fb017e578c7e7ff9bc Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Sat, 8 Aug 2015 08:22:07 +0200
Subject: [PATCH 21/65] Update Pharo VM and Launcher

---
 pkgs/development/pharo/launcher/default.nix | 4 ++--
 pkgs/development/pharo/vm/default.nix       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/pharo/launcher/default.nix b/pkgs/development/pharo/launcher/default.nix
index e88e82845b9..4c46a9d13b4 100644
--- a/pkgs/development/pharo/launcher/default.nix
+++ b/pkgs/development/pharo/launcher/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, bash, pharo-vm, unzip, makeDesktopItem }:
 
 stdenv.mkDerivation rec {
-  version = "0.2.7-2015.04.20";
+  version = "0.2.8-2015.08.08";
   name = "pharo-launcher-${version}";
   src = fetchurl {
     url = "http://files.pharo.org/platform/launcher/blessed/PharoLauncher-user-${version}.zip";
-    sha256 = "0qz8469hadlv6mj8b0hp0jas153alwmja7fr4099jv1b0sx4s0kf";
+    sha256 = "1cpjihdkywlqvjsvrpkkx7fx14wxi6yhymmayjbl0l7bpci0l7qm";
   };
 
   executable-name = "pharo-launcher";
diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix
index 8fa1bc12646..b98d1f2385d 100644
--- a/pkgs/development/pharo/vm/default.nix
+++ b/pkgs/development/pharo/vm/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
 
-  version = "2015.04.30";
+  version = "2015.08.06";
 
   name = "pharo-vm-core-i386-${version}";
   system = "x86_32-linux";
   src = fetchurl {
     url = "http://files.pharo.org/vm/src/vm-unix-sources/blessed/pharo-vm-${version}.tar.bz2";
-    sha256 = "0lg9ahqfrwbn3srxbbvr1vhjnx267chbs1la0nrc2ivpd55iwjgv";
+    sha256 = "1kmb6phxb94d37awwldwbkj704l6m0c6sv0m54mcz6d4rx41fqgp";
   };
 
   sources10Zip = fetchurl {

From e75e0d9aa472de61dce14b100ba5d0d3cb9c0a68 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 8 Aug 2015 09:35:26 +0200
Subject: [PATCH 22/65] haskell-hinotify: test suite won't compile

---
 pkgs/development/haskell-modules/configuration-common.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c9b976448d8..57b44f9d92f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -191,8 +191,9 @@ self: super: {
   vector = if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector;
 
   # cabal2nix likes to generate dependencies on hinotify when hfsevents is really required
-  # on darwin: https://github.com/NixOS/cabal2nix/issues/146
-  hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify;
+  # on darwin: https://github.com/NixOS/cabal2nix/issues/146.
+  # hinotify's test suite is broken: https://github.com/kolmodin/hinotify/issues/15.
+  hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else dontCheck super.hinotify;
 
   # hfsevents needs CoreServices in scope
   hfsevents = if pkgs.stdenv.isDarwin

From c25d82f64fcefe6cbdd7462c55261f10c64a2c8d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 8 Aug 2015 09:48:17 +0200
Subject: [PATCH 23/65] haskell-ide-backend: test suite depends on external
 processes

---
 pkgs/development/haskell-modules/configuration-common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 57b44f9d92f..cca7b7771fa 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -325,6 +325,7 @@ self: super: {
   wai-middleware-throttle = dontCheck super.wai-middleware-throttle; # https://github.com/creichert/wai-middleware-throttle/issues/1
   xkbcommon = dontCheck super.xkbcommon;
   xmlgen = dontCheck super.xmlgen;
+  ide-backend = dontCheck super.ide-backend;
 
   # These packages try to access the network.
   amqp = dontCheck super.amqp;

From 711d7a87baecc884992b3fe90f6130819221f840 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 8 Aug 2015 10:54:00 +0200
Subject: [PATCH 24/65] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/886308a014aa439967b0eaac1dd52bfa3ea8a952
 with hackage2nix revision v20150807-9-gbccef2c

---
 .../haskell-modules/hackage-packages.nix      | 84 +++++++++++--------
 1 file changed, 48 insertions(+), 36 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 9b04ebd424a..f21e78a642e 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -55681,8 +55681,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghcjs-websockets";
-       version = "0.3.0.4";
-       sha256 = "03ycfbp756hiivbynfsmkn4ddh5gj82dswzkj3cm8dwq94m8wd16";
+       version = "0.3.0.5";
+       sha256 = "1km7hdpa036hqxzddwxw23zaq1sjvbmjmqdp4fzdz62azp6g4ygq";
        libraryHaskellDepends = [
          base base64-bytestring binary bytestring text
        ];
@@ -61083,19 +61083,18 @@ self: {
 
   "halive" = callPackage
     ({ mkDerivation, base, bin-package-db, containers, directory
-     , filepath, foreign-store, fsnotify, ghc, ghc-paths
-     , system-filepath, transformers
+     , filepath, foreign-store, fsnotify, ghc, ghc-paths, transformers
      }:
      mkDerivation {
        pname = "halive";
-       version = "0.1.0.5";
-       sha256 = "0rxcklxmfk6z9f3alvzszq7g5wik7x9nj43m4vvf6iw1nsjvk580";
+       version = "0.1.0.6";
+       sha256 = "0mwj3d45dynsygmblr2h8dj9bkl581zjxc66871rd02c7rj914ng";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers foreign-store ];
        executableHaskellDepends = [
          base bin-package-db directory filepath fsnotify ghc ghc-paths
-         system-filepath transformers
+         transformers
        ];
        homepage = "https://github.com/lukexi/halive";
        description = "A live recompiler";
@@ -61999,6 +61998,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) { inherit (pkgs) openssl;};
 
+  "happstack-server-tls-cryptonite" = callPackage
+    ({ mkDerivation, base, bytestring, cryptonite, data-default-class
+     , extensible-exceptions, happstack-server, hslogger, network
+     , sendfile, time, tls, unix
+     }:
+     mkDerivation {
+       pname = "happstack-server-tls-cryptonite";
+       version = "0.1.1";
+       sha256 = "1y450dvdswkqcaqillrzlpizss9hlk2q61x1p715wfhrlmizlrjq";
+       libraryHaskellDepends = [
+         base bytestring cryptonite data-default-class extensible-exceptions
+         happstack-server hslogger network sendfile time tls unix
+       ];
+       description = "Extend happstack-server with native HTTPS support (TLS/SSL)";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "happstack-state" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, directory
      , extensible-exceptions, filepath, happstack-data, happstack-util
@@ -67879,8 +67895,8 @@ self: {
     ({ mkDerivation, base, containers, directory, unix }:
      mkDerivation {
        pname = "hinotify";
-       version = "0.3.8";
-       sha256 = "13xjhbx3b6icqf7451dzknxz41lb874a9s3zs0h0c19p902ii9ff";
+       version = "0.3.8.1";
+       sha256 = "03c1f4d7x805zdiq2w26kl09xrfjw19saycdkhnixzv2qcr6xm1p";
        libraryHaskellDepends = [ base containers directory unix ];
        testHaskellDepends = [ base directory ];
        homepage = "https://github.com/kolmodin/hinotify.git";
@@ -81270,8 +81286,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-rpc";
-       version = "0.6.0.0";
-       sha256 = "0ld8r5zln9a18vzgpiylifzbpiivv8icalqg1l1863kgirgsz2hg";
+       version = "0.6.1.0";
+       sha256 = "1vm6x08xqsw7sd3s0cq8i4hxagyxxc5jwypc80nv2rcdnyyhdmf7";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring conduit conduit-extra deepseq
          hashable lifted-async monad-control monad-logger mtl QuickCheck stm
@@ -88931,10 +88947,8 @@ self: {
      }:
      mkDerivation {
        pname = "machinecell";
-       version = "2.0.1";
-       sha256 = "0gl207a97zcs48k6pdr82x9ckg1bc2vn6wachc57gmnspk3j43xd";
-       revision = "1";
-       editedCabalFile = "5470f26ae4ebbbe5f88e6c70d3193a28ce9e5f94fd48b76c4ef576fcac92ac7d";
+       version = "2.1.0";
+       sha256 = "10ywc93sihag844ifsimxz0vmr34i3a7rjpy63gs0ikkvr4vxs1g";
        libraryHaskellDepends = [
          arrows base free mtl profunctors semigroups
        ];
@@ -89818,16 +89832,13 @@ self: {
      }:
      mkDerivation {
        pname = "manifolds";
-       version = "0.1.3.0";
-       sha256 = "17i77nhp65ikgyz0yif6i1pnj65da38mnx87yy96wkcdlad3zivj";
-       revision = "1";
-       editedCabalFile = "2495967b40c73a494475058072f59fc2c730c655bfb6861c5d0c2f51531a0060";
+       version = "0.1.3.1";
+       sha256 = "1d1hcdv76bzw2pl6ik2kdprdjdv7nmbbxs31rgz93lzhpkn8dlpj";
        libraryHaskellDepends = [
          base comonad constrained-categories containers deepseq hmatrix
          MemoTrie semigroups tagged transformers vector vector-algorithms
          vector-space void
        ];
-       jailbreak = true;
        homepage = "https://github.com/leftaroundabout/manifolds";
        description = "Working with manifolds in a direct, embedding-free way";
        license = stdenv.lib.licenses.gpl3;
@@ -92186,8 +92197,8 @@ self: {
      }:
      mkDerivation {
        pname = "mockery";
-       version = "0.3.0";
-       sha256 = "1k9ywdamdl1c8nvp4yrjmqpbis1nqj9p9cim5rh72n9w5h3qaa6x";
+       version = "0.3.2";
+       sha256 = "0m0lp2z63sgkylz5318j53r5hnrkp705qh7nqbb149ir4gy7g1bg";
        libraryHaskellDepends = [
          base bytestring directory filepath logging-facade temporary
        ];
@@ -92306,13 +92317,13 @@ self: {
     ({ mkDerivation, applicative-extras, base, bytestring, Cabal
      , cmdargs, containers, data-default, directory, filepath, haskeline
      , haskell-src-exts, HUnit, lens, lifted-base, monad-control, mtl
-     , pretty, process, pureMD5, set-extra, syb, system-fileio
-     , temporary, transformers-base
+     , pretty, process, pureMD5, regex-compat, set-extra, syb
+     , system-fileio, template-haskell, temporary, transformers-base
      }:
      mkDerivation {
        pname = "module-management";
-       version = "0.20.3";
-       sha256 = "1lj2jhlpn1ywq60q4ph9fbmjn6rjd8wqkj2lrdgscagcvryh9ad2";
+       version = "0.20.4";
+       sha256 = "185vky00i0cm7rd019xa87x1rld4j92fqcm4a4igpn13lh2y4nzq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -92321,8 +92332,9 @@ self: {
          mtl pretty process pureMD5 set-extra syb system-fileio temporary
        ];
        executableHaskellDepends = [
-         base Cabal cmdargs containers directory haskeline lens
-         monad-control mtl set-extra transformers-base
+         base Cabal cmdargs containers directory haskeline haskell-src-exts
+         lens monad-control mtl regex-compat set-extra template-haskell
+         transformers-base
        ];
        testHaskellDepends = [
          base containers filepath haskell-src-exts HUnit process
@@ -92395,8 +92407,8 @@ self: {
      }:
      mkDerivation {
        pname = "moesocks";
-       version = "0.1.0.10";
-       sha256 = "0cv741gcbjcd4gvqbiys40dh8y553cy6rxhpz0bvdv8xv4qfsz47";
+       version = "0.1.0.11";
+       sha256 = "1qmgsps9c6hcpb1y1z6jb0bjl51apll8s1vg6arz8kma98dkd79d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -92405,7 +92417,7 @@ self: {
          safe stm text transformers unix unordered-containers
        ];
        homepage = "https://github.com/nfjinjing/moesocks";
-       description = "moe for all";
+       description = "A functional firewall killer";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -134101,15 +134113,15 @@ self: {
      }) {};
 
   "type-unary" = callPackage
-    ({ mkDerivation, applicative-numbers, base, newtype, ty
-     , vector-space
+    ({ mkDerivation, applicative-numbers, base, constraints, newtype
+     , ty, vector-space
      }:
      mkDerivation {
        pname = "type-unary";
-       version = "0.2.16";
-       sha256 = "1pn65smi07gwd4h46irjawh1dnjnizs9ag0cyv55i0mjg8plyzvj";
+       version = "0.2.19";
+       sha256 = "04hpqmppwv6cs8vnf3whvmp1x4sqhirlkxcr2fjzcr1ji1gfchvr";
        libraryHaskellDepends = [
-         applicative-numbers base newtype ty vector-space
+         applicative-numbers base constraints newtype ty vector-space
        ];
        homepage = "https://github.com/conal/type-unary";
        description = "Type-level and typed unary natural numbers, inequality proofs, vectors";

From 102c690ee90cfe4d1194571c301da48f35f756fe Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 8 Aug 2015 10:54:37 +0200
Subject: [PATCH 25/65] haskell-hinotify: test suite fixed upstream

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index cca7b7771fa..be5c8cdabff 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -192,8 +192,7 @@ self: super: {
 
   # cabal2nix likes to generate dependencies on hinotify when hfsevents is really required
   # on darwin: https://github.com/NixOS/cabal2nix/issues/146.
-  # hinotify's test suite is broken: https://github.com/kolmodin/hinotify/issues/15.
-  hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else dontCheck super.hinotify;
+  hinotify = if pkgs.stdenv.isDarwin then self.hfsevents else super.hinotify;
 
   # hfsevents needs CoreServices in scope
   hfsevents = if pkgs.stdenv.isDarwin

From cfaa75a7c98e6f2f78d46baafc8349622081084f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 8 Aug 2015 10:55:49 +0200
Subject: [PATCH 26/65] haskell-mockery: test suite fixed upstream

---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index be5c8cdabff..ed23b190ec6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -879,7 +879,7 @@ self: super: {
   vimus = overrideCabal super.vimus (drv: { broken = pkgs.stdenv.isLinux && pkgs.stdenv.isi686; });
 
   # https://github.com/hspec/mockery/issues/6
-  mockery = dontCheck (overrideCabal super.mockery (drv: { preCheck = "export TRAVIS=true"; }));
+  mockery = overrideCabal super.mockery (drv: { preCheck = "export TRAVIS=true"; });
 
   # https://github.com/diagrams/diagrams-lib/issues/258
   # https://github.com/diagrams/diagrams-lib/issues/259

From f3cb7010855972002431f8d97d73d40c016cf173 Mon Sep 17 00:00:00 2001
From: "Desmond O. Chang" <dochang@gmail.com>
Date: Sat, 8 Aug 2015 01:15:39 +0800
Subject: [PATCH 27/65] git-crypt: init at 0.5.0

---
 .../git-and-tools/default.nix                 |  2 +
 .../git-and-tools/git-crypt/default.nix       | 41 +++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-crypt/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index a73d1637417..b8bce1c9eb5 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -105,4 +105,6 @@ rec {
   git-cola = callPackage ./git-cola { };
 
   git-imerge = callPackage ./git-imerge { };
+
+  git-crypt = callPackage ./git-crypt { };
 }
diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
new file mode 100644
index 00000000000..c13c5e07001
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, openssl }:
+
+stdenv.mkDerivation rec {
+
+  name = "git-crypt-${meta.version}";
+
+  src = fetchFromGitHub {
+    owner = "AGWA";
+    repo = "git-crypt";
+    rev = meta.version;
+    sha256 = "4fe45f903a4b3cc06a5fe11334b914c225009fe8440d9e91a54fdf21cf4dcc4d";
+    inherit name;
+  };
+
+  buildInputs = [ openssl ];
+
+  installPhase = ''
+    make install PREFIX=$out
+  '';
+
+  meta = {
+    homepage = "https://www.agwa.name/projects/git-crypt";
+    description = "transparent file encryption in git";
+    longDescription = ''
+      git-crypt enables transparent encryption and decryption of files in a git
+      repository. Files which you choose to protect are encrypted when
+      committed, and decrypted when checked out. git-crypt lets you freely
+      share a repository containing a mix of public and private
+      content. git-crypt gracefully degrades, so developers without the secret
+      key can still clone and commit to a repository with encrypted files. This
+      lets you store your secret material (such as keys or passwords) in the
+      same repository as your code, without requiring you to lock down your
+      entire repository.
+    '';
+    downloadPage = "https://github.com/AGWA/git-crypt/releases";
+    license = stdenv.lib.licenses.gpl3;
+    version = "0.5.0";
+    maintainers = [ "Desmond O. Chang <dochang@gmail.com>" ];
+  };
+
+}

From 08f2c9e0a57c9aaad4a1cc9e21e9ece131146e8e Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 7 Aug 2015 18:43:56 +0200
Subject: [PATCH 28/65] pecita: fix changed sha256 (close #9161)

---
 pkgs/data/fonts/pecita/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/data/fonts/pecita/default.nix b/pkgs/data/fonts/pecita/default.nix
index a64512af845..e28ac6c2618 100644
--- a/pkgs/data/fonts/pecita/default.nix
+++ b/pkgs/data/fonts/pecita/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://pecita.eu/b/Pecita.otf";
-    sha256 = "1smf1mqciwavf29lwgzjam3xb37bwxp6wf6na4c9xv6islidsrd9";
+    sha256 = "11v5yzxa38fxpz8j3fc0v3l7py4i12avjnwrgkmd9clq9jhzk78s";
   };
 
   phases = ["installPhase"];

From 24517d331ae69583a454f7a6f9ef4637629ee543 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Aug 2015 10:20:01 +0300
Subject: [PATCH 29/65] Update LibreOffice sources for 5.0.0.

---
 .../office/libreoffice/default.nix            | 14 ++--
 .../office/libreoffice/libreoffice-srcs.nix   | 71 +++++++------------
 2 files changed, 34 insertions(+), 51 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index c053c886e92..5c2772ea303 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -22,10 +22,10 @@
 
 let
   langsSpaces = stdenv.lib.concatStringsSep " " langs;
-  major = "4";
-  minor = "4";
-  patch = "4";
-  tweak = "3";
+  major = "5";
+  minor = "0";
+  patch = "0";
+  tweak = "5";
   subdir = "${major}.${minor}.${patch}";
   version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
 
@@ -80,14 +80,14 @@ let
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "1zyfpbdsx0kjkabdpkf0lg7hjnvxsf6hj9ljs8v9iqw3x3b7llib";
+      sha256 = "0x86vf1fhgnjgkj25rqcfgrvid6smikmb96121sasydmg0jcsypm";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "1jbbbv63p63mwby52ynz2yk79pb32wsnakhxfhc75ng1br6cpll0";
+      sha256 = "18wqmbm3yvjz6pfnz5qfklwv4d53vrv2npiz3796d4d1j245ylcv";
     };
 
   };
@@ -97,7 +97,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "0wns7ny19bsl5ar1rq7n4033rfijl2cjn9l8bj1gwhpqlkd8db1i";
+    sha256 = "046f5lakw2rygs5qjmhsxmdw7pa9gwcamavnyqpk1rfbis2ga5wv";
   };
 
   # Openoffice will open libcups dynamically, so we link it directly
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index 2cb20027b4c..20619c90d0f 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -29,16 +29,6 @@
   md5 = "8ab049135b2d15313da5d9f0656894a1";
   brief = false;
 }
-{
-  name = "commons-logging-1.1.3-src.tar.gz";
-  md5 = "e8e197d628436490886d17cffa108fe3";
-  brief = false;
-}
-{
-  name = "commons-httpclient-3.1-src.tar.gz";
-  md5 = "2c9b0f83ed5890af02c0df1c1776f39b";
-  brief = false;
-}
 {
   name = "commons-logging-1.2-src.tar.gz";
   md5 = "ce977548f1cbf46918e93cd38ac35163";
@@ -60,8 +50,8 @@
   brief = false;
 }
 {
-  name = "bsh-2.0b1-src.tar.gz";
-  md5 = "ea570af93c284aa9e5621cd563f54f4d";
+  name = "bsh-2.0b5-src.zip";
+  md5 = "ec1941a74d3ef513c4ce57a9092b74e1";
   brief = false;
 }
 {
@@ -105,8 +95,8 @@
   brief = false;
 }
 {
-  name = "curl-7.36.0.tar.bz2";
-  md5 = "e6d1f9d1b59da5062109ffe14e0569a4";
+  name = "curl-7.43.0.tar.bz2";
+  md5 = "11bddbb452a8b766b932f859aaeeed39";
   brief = true;
 }
 {
@@ -120,8 +110,8 @@
   brief = false;
 }
 {
-  name = "libetonyek-0.1.1.tar.bz2";
-  md5 = "805f941b06448212a988cb65f0691a7a";
+  name = "libetonyek-0.1.3.tar.bz2";
+  md5 = "e5947373dd7834f27e93f1636faa419f";
   brief = true;
 }
 {
@@ -195,8 +185,8 @@
   brief = false;
 }
 {
-  name = "libfreehand-0.1.0.tar.bz2";
-  md5 = "5f029fef73e42a2c2ae4524a7513f97d";
+  name = "libfreehand-0.1.1.tar.bz2";
+  md5 = "8cf70c5dc4d24d2dc4a107f509d2d6d7";
   brief = true;
 }
 {
@@ -220,8 +210,8 @@
   brief = true;
 }
 {
-  name = "harfbuzz-0.9.23.tar.bz2";
-  md5 = "a4a9b548577e2ee22f0887937da5fd6c";
+  name = "harfbuzz-0.9.40.tar.bz2";
+  md5 = "0e27e531f4c4acff601ebff0957755c2";
   brief = true;
 }
 {
@@ -240,8 +230,8 @@
   brief = false;
 }
 {
-  name = "icu4c-53_1-src.tgz";
-  md5 = "b73baa6fbdfef197608d1f69300919b9";
+  name = "icu4c-54_1-src.tgz";
+  md5 = "e844caed8f2ca24c088505b0d6271bc0";
   brief = false;
 }
 {
@@ -310,8 +300,8 @@
   brief = true;
 }
 {
-  name = "language-subtag-registry-2014-12-03.tar.bz2";
-  md5 = "0f2677ec23bb43ddc7355d1b4cc8ed45";
+  name = "language-subtag-registry-2015-06-08.tar.bz2";
+  md5 = "d431bd8a70455be1fa8523fa633c005b";
   brief = true;
 }
 {
@@ -343,7 +333,6 @@
   name = "libgltf-0.0.2.tar.bz2";
   md5 = "d63a9f47ab048f5009d90693d6aa6424";
   brief = true;
-  subDir = "libgltf/";
 }
 {
   name = "liblangtag-0.5.1.tar.bz2";
@@ -376,9 +365,9 @@
   brief = false;
 }
 {
-  name = "mdds_0.11.2.tar.bz2";
-  md5 = "cb4207cb913c7a5a8bfa5b91234618ee";
-  brief = false;
+  name = "mdds_0.12.1.tar.bz2";
+  md5 = "ef2560ed5416652a7fe195305b14cebe";
+  brief = true;
 }
 {
   name = "libmspub-0.1.2.tar.bz2";
@@ -386,8 +375,8 @@
   brief = true;
 }
 {
-  name = "libmwaw-0.3.1.tar.bz2";
-  md5 = "6f1ac4a0e24131c422e1e91f07718fb6";
+  name = "libmwaw-0.3.5.tar.bz2";
+  md5 = "bdc58bbf89aaaf6d29b3516d96830a06";
   brief = true;
 }
 {
@@ -406,13 +395,13 @@
   brief = false;
 }
 {
-  name = "nss-3.16.5-with-nspr-4.10.6.tar.gz";
-  md5 = "b279551b7638d0e36d1199548124c247";
+  name = "nss-3.19.2-with-nspr-4.10.8.tar.gz";
+  md5 = "2100bc5a7ea9685928ff68cda2e60569";
   brief = false;
 }
 {
-  name = "libodfgen-0.1.1.tar.bz2";
-  md5 = "c22c83c17cda0754382ada4e116594b7";
+  name = "libodfgen-0.1.4.tar.bz2";
+  md5 = "8716be5c22ae8353f9aaa380d74840dc";
   brief = true;
 }
 {
@@ -426,8 +415,8 @@
   brief = false;
 }
 {
-  name = "openssl-1.0.1j.tar.gz";
-  md5 = "f7175c9cd3c39bb1907ac8bba9df8ed3";
+  name = "openssl-1.0.2a.tar.gz";
+  md5 = "a06c547dac9044161a477211049f60ef";
   brief = true;
 }
 {
@@ -526,8 +515,8 @@
   brief = true;
 }
 {
-  name = "libwps-0.3.1.tar.bz2";
-  md5 = "a111d9ef5a0dab564e9aec0f2cf8d218";
+  name = "libwps-0.4.0.tar.bz2";
+  md5 = "e9162d2566421d9d71b3ad2377a68fd5";
   brief = true;
 }
 {
@@ -540,10 +529,4 @@
   md5 = "44d667c142d7cda120332623eab69f40";
   brief = true;
 }
-{
-  name = "libgltf-0.0.0.tar.bz2";
-  md5 = "ca5436e916bfe70694adfe2607782786";
-  brief = true;
-  subDir = "libgltf/";
-}
 ]

From 93dc62187b2d484852d57fe4cf2771876ca573bd Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Aug 2015 10:27:45 +0300
Subject: [PATCH 30/65] Update MDDS homepage and version, needed for
 LibreOffice 5.0.0

---
 pkgs/development/libraries/mdds/default.nix      | 6 +++---
 pkgs/development/libraries/mdds/default.upstream | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix
index bc8f91dcb93..f379d8c4e32 100644
--- a/pkgs/development/libraries/mdds/default.nix
+++ b/pkgs/development/libraries/mdds/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "0.12.0";
+  version = "0.12.1";
   name = "mdds-${version}";
 
   src = fetchurl {
     url = "http://kohei.us/files/mdds/src/mdds_${version}.tar.bz2";
-    sha256 = "10ar7r0gkdl2r7916jlkl5c38cynrh7x9s90a5i8d242r8ixw8ia";
+    sha256 = "0gg8mb9kxh3wggh7njj1gf90xy27p0yq2cw88wqar9hhg2fmwmi3";
   };
 
   postInstall = ''
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     inherit version;
-    homepage = https://code.google.com/p/multidimalgorithm/;
+    homepage = "https://gitlab.com/mdds/mdds";
     description = "A collection of multi-dimensional data structure and indexing algorithm";
     platforms = stdenv.lib.platforms.all;
   };
diff --git a/pkgs/development/libraries/mdds/default.upstream b/pkgs/development/libraries/mdds/default.upstream
index 5c07878fdf2..94b6c78b06b 100644
--- a/pkgs/development/libraries/mdds/default.upstream
+++ b/pkgs/development/libraries/mdds/default.upstream
@@ -1,4 +1,4 @@
-url https://code.google.com/p/multidimalgorithm/wiki/Downloads
+url https://gitlab.com/mdds/mdds
 version_link '[.]tar[.][a-z0-9]+$'
 version '.*_([0-9.]+)[.]tar[.].*' '\1'
 

From db9679259a92dc77d86ee52288114e3b0ecd1362 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Aug 2015 16:18:38 +0300
Subject: [PATCH 31/65] LibreOffice: Kill one failing test which is fragile
 elsewhere, too

---
 pkgs/applications/office/libreoffice/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 5c2772ea303..d603bf86537 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -17,6 +17,7 @@
 , fontsConf, pkgconfig, libzip, bluez5, libtool, maven
 , libatomic_ops, graphite2, harfbuzz, libodfgen
 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
+, gdb
 , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" ]
 }:
 
@@ -148,6 +149,11 @@ stdenv.mkDerivation rec {
   postConfigure = ''
     sed -e '1ilibreoffice-translations-${version}.tar.xz=libreoffice-translations-${version}.tar.xz' -i Makefile
     sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile
+
+    # unit test sd_tiledrendering seems to be fragile
+    # http://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html
+    echo > ./sd/CppunitTest_sd_tiledrendering.mk
+    sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk
   '';
 
   makeFlags = "SHELL=${bash}/bin/bash";
@@ -255,10 +261,10 @@ stdenv.mkDerivation rec {
       gst_all_1.gst-plugins-base
       neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler
       python3 sablotron saneBackends tcsh unzip vigra which zip zlib
-      mdds bluez5 glibc /*libixion*/
+      mdds bluez5 glibc
       libxshmfence libatomic_ops graphite2 harfbuzz
       librevenge libe-book libmwaw glm glew
-      /*liborcus*/ libodfgen
+      libodfgen
     ];
 
   meta = with stdenv.lib; {

From f059656ef2e665d6a8ee41a6215ec2c7e969d390 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 8 Aug 2015 10:16:32 +0900
Subject: [PATCH 32/65] thunderbird: 31.7.0 -> 38.1.0

---
 .../networking/mailreaders/thunderbird/default.nix   | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index f2a088164d2..5d6e0faad4a 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -13,15 +13,17 @@
   enableOfficialBranding ? false
 }:
 
-let version = "31.7.0"; in
+let version = "38.1.0"; in
 let verName = "${version}"; in
 
 stdenv.mkDerivation rec {
   name = "thunderbird-${verName}";
 
   src = fetchurl {
-    url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.bz2";
-    sha1 = "90e18f8ecccdaf1ee39493223a7e3ad8b3b7bede";
+    url = "http://archive.mozilla.org/pub/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.bz2";
+
+    # https://archive.mozilla.org/pub/thunderbird/releases/${verName}/SHA1SUMS
+    sha1 = "7bb0c85e889e397e53dcbcbd36957dbd7c8c10bd";
   };
 
   buildInputs = # from firefox30Pkgs.xulrunner, but without gstreamer and libvpx
@@ -75,6 +77,10 @@ stdenv.mkDerivation rec {
     cd objdir
     echo '${stdenv.lib.concatMapStrings (s : "ac_add_options ${s}\n") configureFlags}' > .mozconfig
     echo 'ac_add_options --prefix="'"$out"'"' >> .mozconfig
+    # From version 38, we need to specify the source directory to build
+    # Thunderbird. Refer to mozilla/configure and search a line with
+    # "checking for application to build" and "# Support comm-central".
+    echo 'ac_add_options --with-external-source-dir="'`realpath ..`'"' >> .mozconfig
     echo 'mk_add_options MOZ_MAKE_FLAGS="-j'"$NIX_BUILD_CORES"'"' >> .mozconfig
     echo 'mk_add_options MOZ_OBJDIR="'`pwd`'"' >> .mozconfig
 

From 4f700948578c10c7371e10f4d65889fec369c577 Mon Sep 17 00:00:00 2001
From: Daniel Fox Franke <dfoxfranke@gmail.com>
Date: Sat, 8 Aug 2015 11:07:12 -0400
Subject: [PATCH 33/65] chrony: 1.31 -> 2.1.1

---
 pkgs/tools/networking/chrony/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix
index e11fb377c21..3acf921cd79 100644
--- a/pkgs/tools/networking/chrony/default.nix
+++ b/pkgs/tools/networking/chrony/default.nix
@@ -5,11 +5,11 @@ assert stdenv.isLinux -> libcap != null;
 stdenv.mkDerivation rec {
   name = "chrony-${version}";
 
-  version = "1.31";
+  version = "2.1.1";
   
   src = fetchurl {
     url = "http://download.tuxfamily.org/chrony/${name}.tar.gz";
-    sha256 = "0vcr4hr1a01l5c3z0rgzna8rbmq35aklgfr342pi9gpc8sp1qpm3";
+    sha256 = "b0565148eaa38e971291281d76556c32f0138ec22e9784f8bceab9c65f7ad7d4";
   };
   
   buildInputs = [ readline texinfo ] ++ stdenv.lib.optional stdenv.isLinux libcap;

From a04b6f729a7be3c26f4f26f5a29754f13902ed6f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Aug 2015 19:10:33 +0300
Subject: [PATCH 34/65] SBCL: 1.2.13 -> 1.2.14

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

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 96843abbd45..2d6a3a45147 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.2.13";
+  version = "1.2.14";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "018jxd7f39a5aimjzfjdj739m3jq82k0qi59032v48gqrfa3mng6";
+    sha256 = "01jw1w5siv6q16y1vmgd7s1i22aq0cqaipgn12jvq18c8vb6s55r";
   };
 
   buildInputs = [ which ]

From 6863fde51574e794d23b6906aab4fa720cec59bd Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Aug 2015 19:12:42 +0300
Subject: [PATCH 35/65] E prover: 1.8 -> 1.9

---
 pkgs/applications/science/logic/eprover/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix
index c04cfffbb14..97fe7065b85 100644
--- a/pkgs/applications/science/logic/eprover/default.nix
+++ b/pkgs/applications/science/logic/eprover/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="eprover";
-    version="1.8";
+    version="1.9";
     name="${baseName}-${version}";
-    hash="0bl4dr7k6simwdvdyxhnjkiz4nm5y0nr8bfhc34zk0360i9m6sk3";
-    url="http://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_1.8/E.tgz";
-    sha256="0bl4dr7k6simwdvdyxhnjkiz4nm5y0nr8bfhc34zk0360i9m6sk3";
+    hash="0vipapqjg0339lpc98vpvz58m6xkqrhgxylmp0hrnld4lrhmcdn4";
+    url="http://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_1.9/E.tgz";
+    sha256="0vipapqjg0339lpc98vpvz58m6xkqrhgxylmp0hrnld4lrhmcdn4";
   };
 in
 stdenv.mkDerivation {

From f89b651008a6ed0585b63fc74d33e1d970446410 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Aug 2015 19:15:12 +0300
Subject: [PATCH 36/65] Botan: stable: 1.10.9 -> 1.10.10; unstable: 1.11.16 ->
 1.11.19

---
 pkgs/development/libraries/botan/default.nix  | 4 ++--
 pkgs/development/libraries/botan/unstable.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix
index 3006a5a456d..6eba16847f8 100644
--- a/pkgs/development/libraries/botan/default.nix
+++ b/pkgs/development/libraries/botan/default.nix
@@ -2,7 +2,7 @@
 
 callPackage ./generic.nix (args // {
   baseVersion = "1.10";
-  revision = "9";
-  sha256 = "1wldp9py3qcdgswgxya83c03y6345a6cf3vwz0y41bl1l39jfza8";
+  revision = "10";
+  sha256 = "0qs1ps25k79jnzm31zjl6hj8kxzfwwjsdrlc9bz621218r3v2rvb";
   extraConfigureFlags = "--with-gnump";
 })
diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix
index cc2a5ebaa31..5685d261829 100644
--- a/pkgs/development/libraries/botan/unstable.nix
+++ b/pkgs/development/libraries/botan/unstable.nix
@@ -2,7 +2,7 @@
 
 callPackage ./generic.nix (args // {
   baseVersion = "1.11";
-  revision = "16";
-  sha256 = "0z3a7jp10w9ipmbzhc2xazd2savxmns57ca2a8d6vvjahxg4w6m3";
+  revision = "19";
+  sha256 = "0a1hgd3w2pyn6yx89bal61bkxxazv0p8x8x4kri73p1b4vj3n3sb";
   openssl = null;
 })

From 9786c74792a8fcbe2e84a548c81b9bf3d0a12af0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Aug 2015 19:16:14 +0300
Subject: [PATCH 37/65] libgphoto2: 2.5.7 -> 2.5.8

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

diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix
index 9583696df43..2fdf3d5e69b 100644
--- a/pkgs/development/libraries/libgphoto2/default.nix
+++ b/pkgs/development/libraries/libgphoto2/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/gphoto/${name}.tar.bz2";
-    sha256 = "154qs3j1k72xn8p5vgjcwvywkskxz0j145cgvlcw7d5xfwr1jq3j";
+    sha256 = "1di7iv2r5ghzrylfbpvp694gpqbwjj3ngrmg4kvl7big6hp2c6h3";
   };
 
   nativeBuildInputs = [ pkgconfig gettext ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
       MTP, and other vendor specific protocols for controlling and transferring data
       from digital cameras.
     '';
-    version = "2.5.7";
+    version = "2.5.8";
     # XXX: the homepage claims LGPL, but several src files are lgpl21Plus
     license = stdenv.lib.licenses.lgpl21Plus;
     platforms = with stdenv.lib.platforms; unix;

From 081dff71be60cf92c55ad84b14f53fedb126a74f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Aug 2015 19:32:01 +0300
Subject: [PATCH 38/65] baresip: 0.4.13 -> 0.4.14

---
 .../networking/instant-messengers/baresip/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index 5dde5b62dda..d41ba5fcdb3 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -4,11 +4,11 @@
 , gsm, speex, portaudio, spandsp, libuuid
 }:
 stdenv.mkDerivation rec {
-  version = "0.4.13";
+  version = "0.4.14";
   name = "baresip-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
-    sha256 = "1mndpcclp5cqlm5jfbh37ig8dmga75qxqfinp4dyd1c0wnd0f0jg";
+    sha256 = "19vn63j6dpybjy14mgnwf0yk2jbcbfdjs50whzwyrrkcv6ipj6hc";
   };
   buildInputs = [zlib openssl libre librem pkgconfig
     cairo mpg123 gstreamer gst_ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good

From f383b2971cf52e194b1908a52cb14be4daf423b0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Aug 2015 19:40:07 +0300
Subject: [PATCH 39/65] python-nbxmpp: 0.5.2 -> 0.5.3; needed for fresher Gajim

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cf0140a25d3..247955e9765 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8163,12 +8163,12 @@ let
   };
 
   nbxmpp = buildPythonPackage rec {
-    name = "nbxmpp-0.5.2";
+    name = "nbxmpp-0.5.3";
 
     src = pkgs.fetchurl {
       name = "${name}.tar.gz";
-      url = "https://python-nbxmpp.gajim.org/downloads/7";
-      sha256 = "0q2iph07aahwn6hlr38v0cvzlfc9hrf5mz6qs1kp4b4x9l8x5mqn";
+      url = "https://python-nbxmpp.gajim.org/downloads/8";
+      sha256 = "0dcr786dyips1fdvgsn8yvpgcz5j7217fi05c29cfypdl8jnp6mp";
     };
 
     meta = {

From e346b417d3092b6bb959d776da98ff390d871bcb Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Aug 2015 19:40:25 +0300
Subject: [PATCH 40/65] gajim: 0.16.1 -> 0.16.3

---
 .../networking/instant-messengers/gajim/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index fbd9954d3aa..69497f87c6b 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -22,11 +22,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "gajim-${version}";
-  version = "0.16.1";
+  version = "0.16.3";
 
   src = fetchurl {
     url = "http://www.gajim.org/downloads/0.16/gajim-${version}.tar.bz2";
-    sha256 = "1gp8mdn6sz2pks5irsf563zbz98ldqksfky84ga9fzqndmq35bi6";
+    sha256 = "05a59hf9wna6n9fi0a4bhz1hifqj21bwb4ff9rd0my23rdwmij51";
   };
 
   patches = [

From bd09d75b96d830c82bb4b640062a376b8c7e609a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Aug 2015 19:41:56 +0300
Subject: [PATCH 41/65] CL-Launch: 4.1.3.3 -> 4.1.4

---
 pkgs/development/tools/misc/cl-launch/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix
index 40c4085adab..17b1f3382cc 100644
--- a/pkgs/development/tools/misc/cl-launch/default.nix
+++ b/pkgs/development/tools/misc/cl-launch/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="cl-launch";
-    version="4.1.3.3";
+    version="4.1.4";
     name="${baseName}-${version}";
-    hash="1al7jrj4fy9w4lpgizgb1ppk4rhhlcrfkz1yxpjv3w0wij1h67zl";
-    url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.3.3.tar.gz";
-    sha256="1al7jrj4fy9w4lpgizgb1ppk4rhhlcrfkz1yxpjv3w0wij1h67zl";
+    hash="0j3lapjsqzdkc7ackqdk13li299lp706gdc9bh28kvs0diyamjiv";
+    url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.4.tar.gz";
+    sha256="0j3lapjsqzdkc7ackqdk13li299lp706gdc9bh28kvs0diyamjiv";
   };
   buildInputs = [
   ];

From eee6f2801fcf58950f7b32f4b98d240728e8a70b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Aug 2015 20:09:45 +0300
Subject: [PATCH 42/65] sysdig: 0.1.101 -> 0.1.102

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

diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 9478e07468e..e2758e7c2b6 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -3,10 +3,10 @@ let
   inherit (stdenv.lib) optional optionalString;
   s = rec {
     baseName="sysdig";
-    version = "0.1.101";
+    version = "0.1.102";
     name="${baseName}-${version}";
     url="https://github.com/draios/sysdig/archive/${version}.tar.gz";
-    sha256 = "1dlx1v7wr0i36sbybr4kj8sziyrfxs4pcn6bnl0ljlb5wndy75b9";
+    sha256 = "0mrz14wvcb8m8idr4iqbr3jmxfs7dlmh06n0q9fcfph75wkc5fp0";
   };
   buildInputs = [
     cmake zlib luajit ncurses

From 462ce2a65ec50e6434cdb1ba40a693f4d8fb09a6 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Aug 2015 20:10:20 +0300
Subject: [PATCH 43/65] GlusterFS: 3.7.2 -> 3.7.3

---
 pkgs/tools/filesystems/glusterfs/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index 55e4e17fa1f..062f27e286f 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -6,11 +6,11 @@ let
   s = # Generated upstream information 
   rec {
     baseName="glusterfs";
-    version="3.7.2";
+    version="3.7.3";
     name="${baseName}-${version}";
-    hash="0cw6p21nnxcvzd8rymd5q0ydlaz4hx4rmv22hwbb39h7a2rvfv79";
-    url="http://download.gluster.org/pub/gluster/glusterfs/3.7/3.7.2/glusterfs-3.7.2.tar.gz";
-    sha256="0cw6p21nnxcvzd8rymd5q0ydlaz4hx4rmv22hwbb39h7a2rvfv79";
+    hash="0xdzxprsi0gybv6jdp0ycfpsxzijwfrm3217fk3fnixcs92frshv";
+    url="http://download.gluster.org/pub/gluster/glusterfs/3.7/3.7.3/glusterfs-3.7.3.tar.gz";
+    sha256="0xdzxprsi0gybv6jdp0ycfpsxzijwfrm3217fk3fnixcs92frshv";
   };
   buildInputs = [
     fuse bison flex_2_5_35 openssl python ncurses readline

From 1caa629b331f87d7b3fa3f3b9808ac6f400065c0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Aug 2015 20:56:16 +0300
Subject: [PATCH 44/65] Apache Jena: 2.13.0 -> 3.0.0

---
 pkgs/servers/nosql/apache-jena/binary.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix
index 8c4db178e78..9b4e19b3270 100644
--- a/pkgs/servers/nosql/apache-jena/binary.nix
+++ b/pkgs/servers/nosql/apache-jena/binary.nix
@@ -3,10 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="apache-jena";
-    version = "2.13.0";
+    version = "3.0.0";
     name="${baseName}-${version}";
     url="http://archive.apache.org/dist/jena/binaries/apache-jena-${version}.tar.gz";
-    sha256 = "0fb5f2rv7rgi60r4b80r1wzap1rngmajv378mdkcyhm7bj4ba31d";
+    sha256 = "1pqg27m295v7v456pidb0fq5120blkc466pdzksqxqcjrwivq4kb";
   };
   buildInputs = [
     makeWrapper

From 3e86c32254128d4bc02b329ebc1f7978842e28ad Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 8 Aug 2015 21:01:19 +0300
Subject: [PATCH 45/65] ASDF: 3.1.4 -> 3.1.5

---
 pkgs/development/lisp-modules/asdf/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix
index 33cd07b4807..6b7b88469b1 100644
--- a/pkgs/development/lisp-modules/asdf/default.nix
+++ b/pkgs/development/lisp-modules/asdf/default.nix
@@ -1,16 +1,16 @@
-{stdenv, fetchurl, texinfo, texLive}:
+{stdenv, fetchurl, texinfo, texLive, perl}:
 let
   s = # Generated upstream information
   rec {
     baseName="asdf";
-    version="3.1.4";
+    version="3.1.5";
     name="${baseName}-${version}";
-    hash="0hyc2g22khcmvxmlcaq0xbxqhq59spgc2nc1s0gz1r9mcgrzm2xw";
-    url="http://common-lisp.net/project/asdf/archives/asdf-3.1.4.tar.gz";
-    sha256="0hyc2g22khcmvxmlcaq0xbxqhq59spgc2nc1s0gz1r9mcgrzm2xw";
+    hash="1barrkj549d24pyh86gdc8v3vvsv4w7k0kkfg0zzrvhg8x8al19h";
+    url="http://common-lisp.net/project/asdf/archives/asdf-3.1.5.tar.gz";
+    sha256="1barrkj549d24pyh86gdc8v3vvsv4w7k0kkfg0zzrvhg8x8al19h";
   };
   buildInputs = [
-    texinfo texLive
+    texinfo texLive perl
   ];
 in
 stdenv.mkDerivation {
@@ -19,7 +19,6 @@ stdenv.mkDerivation {
   src = fetchurl {
     inherit (s) url sha256;
   };
-  sourceRoot=".";
   buildPhase = ''
     make build/asdf.lisp
     make -C doc asdf.info asdf.html

From 6542c344bcf0077e7530a0e8f02034aa92b52b39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 8 Aug 2015 19:55:40 +0200
Subject: [PATCH 46/65] ngspice: rename pkgname (s/ng-spice-rework/ngspice/)

I think the previous name comes from the fact that some older versions
were distributed in tarballs named ng-spice-rework-<version>. But now
the "rework" name seems odd; most references I found on the internet
calls the package "ngspice". Fix it.
---
 pkgs/applications/science/electronics/ngspice/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/electronics/ngspice/default.nix b/pkgs/applications/science/electronics/ngspice/default.nix
index e64ea909cbb..4f887f511ae 100644
--- a/pkgs/applications/science/electronics/ngspice/default.nix
+++ b/pkgs/applications/science/electronics/ngspice/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, readline, bison, libX11, libICE, libXaw, libXext}:
 
 stdenv.mkDerivation {
-  name = "ng-spice-rework-25";
+  name = "ngspice-25";
 
   src = fetchurl {
     url = "mirror://sourceforge/ngspice/ngspice-25.tar.gz";

From 062cdfb3a17e13b476d41de09ba3eaa2652cf402 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Fri, 7 Aug 2015 18:46:23 +0200
Subject: [PATCH 47/65] sbt: add JAVA_HOME to sbt script

---
 pkgs/development/tools/build-managers/sbt/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 01a3b740e6e..a273ea75087 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -15,6 +15,9 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     cat > $out/bin/sbt << EOF
     #! ${stdenv.shell}
+    if [ ! -v JAVA_HOME ]; then
+        export JAVA_HOME="${jre.home}"
+    fi
     ${jre}/bin/java \$SBT_OPTS -jar ${src} "\$@"
     EOF
     chmod +x $out/bin/sbt

From 715e7726672f32698c9ccec66d079a28f778204a Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Sat, 8 Aug 2015 19:49:38 +0000
Subject: [PATCH 48/65] Add initial Brightbox expression.

(cherry picked from commit 55d97862890350a3cc069d547114c1a880f2e583)
---
 .../virtualisation/brightbox-config.nix       |   5 +
 .../virtualisation/brightbox-image.nix        | 166 ++++++++++++++++++
 2 files changed, 171 insertions(+)
 create mode 100644 nixos/modules/virtualisation/brightbox-config.nix
 create mode 100644 nixos/modules/virtualisation/brightbox-image.nix

diff --git a/nixos/modules/virtualisation/brightbox-config.nix b/nixos/modules/virtualisation/brightbox-config.nix
new file mode 100644
index 00000000000..528ffecc0bf
--- /dev/null
+++ b/nixos/modules/virtualisation/brightbox-config.nix
@@ -0,0 +1,5 @@
+{ config, pkgs, modulesPath, ... }:
+
+{
+  imports = [ "${modulesPath}/virtualisation/brightbox-image.nix" ];
+}
diff --git a/nixos/modules/virtualisation/brightbox-image.nix b/nixos/modules/virtualisation/brightbox-image.nix
new file mode 100644
index 00000000000..3a956caca0c
--- /dev/null
+++ b/nixos/modules/virtualisation/brightbox-image.nix
@@ -0,0 +1,166 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+  diskSize = "20G";
+in
+{
+  imports = [ ../profiles/headless.nix ../profiles/qemu-guest.nix ];
+
+  system.build.brightboxImage =
+    pkgs.vmTools.runInLinuxVM (
+      pkgs.runCommand "brightbox-image"
+        { preVM =
+            ''
+              mkdir $out
+              diskImage=$out/$diskImageBase
+              truncate $diskImage --size ${diskSize}
+              mv closure xchg/
+            '';
+
+          postVM =
+            ''
+              PATH=$PATH:${pkgs.gnutar}/bin:${pkgs.gzip}/bin
+              pushd $out
+              ${pkgs.qemu_kvm}/bin/qemu-img convert -c -O qcow2 $diskImageBase nixos.qcow2
+              rm $diskImageBase
+              popd
+            '';
+          diskImageBase = "nixos-${config.system.nixosVersion}-${pkgs.stdenv.system}.raw";
+          buildInputs = [ pkgs.utillinux pkgs.perl ];
+          exportReferencesGraph =
+            [ "closure" config.system.build.toplevel ];
+        }
+        ''
+          # Create partition table
+          ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos
+          ${pkgs.parted}/sbin/parted /dev/vda mkpart primary ext4 1 ${diskSize}
+          ${pkgs.parted}/sbin/parted /dev/vda print
+          . /sys/class/block/vda1/uevent
+          mknod /dev/vda1 b $MAJOR $MINOR
+
+          # Create an empty filesystem and mount it.
+          ${pkgs.e2fsprogs}/sbin/mkfs.ext4 -L nixos /dev/vda1
+          ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1
+
+          mkdir /mnt
+          mount /dev/vda1 /mnt
+
+          # The initrd expects these directories to exist.
+          mkdir /mnt/dev /mnt/proc /mnt/sys
+
+          mount --bind /proc /mnt/proc
+          mount --bind /dev /mnt/dev
+          mount --bind /sys /mnt/sys
+
+          # Copy all paths in the closure to the filesystem.
+          storePaths=$(perl ${pkgs.pathsFromGraph} /tmp/xchg/closure)
+
+          mkdir -p /mnt/nix/store
+          echo "copying everything (will take a while)..."
+          cp -prd $storePaths /mnt/nix/store/
+
+          # Register the paths in the Nix database.
+          printRegistration=1 perl ${pkgs.pathsFromGraph} /tmp/xchg/closure | \
+              chroot /mnt ${config.nix.package}/bin/nix-store --load-db --option build-users-group ""
+
+          # Create the system profile to allow nixos-rebuild to work.
+          chroot /mnt ${config.nix.package}/bin/nix-env \
+              -p /nix/var/nix/profiles/system --set ${config.system.build.toplevel} \
+              --option build-users-group ""
+
+          # `nixos-rebuild' requires an /etc/NIXOS.
+          mkdir -p /mnt/etc
+          touch /mnt/etc/NIXOS
+
+          # `switch-to-configuration' requires a /bin/sh
+          mkdir -p /mnt/bin
+          ln -s ${config.system.build.binsh}/bin/sh /mnt/bin/sh
+
+          # Install a configuration.nix.
+          mkdir -p /mnt/etc/nixos /mnt/boot/grub
+          cp ${./brightbox-config.nix} /mnt/etc/nixos/configuration.nix
+
+          # Generate the GRUB menu.
+          ln -s vda /dev/sda
+          chroot /mnt ${config.system.build.toplevel}/bin/switch-to-configuration boot
+
+          umount /mnt/proc /mnt/dev /mnt/sys
+          umount /mnt
+        ''
+    );
+
+  fileSystems."/".label = "nixos";
+
+  # Generate a GRUB menu.  Amazon's pv-grub uses this to boot our kernel/initrd.
+  boot.loader.grub.device = "/dev/vda";
+  boot.loader.grub.timeout = 0;
+
+  # Don't put old configurations in the GRUB menu.  The user has no
+  # way to select them anyway.
+  boot.loader.grub.configurationLimit = 0;
+
+  # Allow root logins only using the SSH key that the user specified
+  # at instance creation time.
+  services.openssh.enable = true;
+  services.openssh.permitRootLogin = "without-password";
+
+  # Force getting the hostname from Google Compute.
+  networking.hostName = mkDefault "";
+
+  # Always include cryptsetup so that NixOps can use it.
+  environment.systemPackages = [ pkgs.cryptsetup ];
+
+  systemd.services."fetch-ec2-data" =
+    { description = "Fetch EC2 Data";
+
+      wantedBy = [ "multi-user.target" "sshd.service" ];
+      before = [ "sshd.service" ];
+      wants = [ "ip-up.target" ];
+      after = [ "ip-up.target" ];
+
+      path = [ pkgs.wget pkgs.iproute ];
+
+      script =
+        ''
+          wget="wget -q --retry-connrefused -O -"
+
+          ${optionalString (config.networking.hostName == "") ''
+            echo "setting host name..."
+            ${pkgs.nettools}/bin/hostname $($wget http://169.254.169.254/latest/meta-data/hostname)
+          ''}
+
+          # Don't download the SSH key if it has already been injected
+          # into the image (a Nova feature).
+          if ! [ -e /root/.ssh/authorized_keys ]; then
+              echo "obtaining SSH key..."
+              mkdir -m 0700 -p /root/.ssh
+              $wget http://169.254.169.254/latest/meta-data/public-keys/0/openssh-key > /root/key.pub
+              if [ $? -eq 0 -a -e /root/key.pub ]; then
+                  if ! grep -q -f /root/key.pub /root/.ssh/authorized_keys; then
+                      cat /root/key.pub >> /root/.ssh/authorized_keys
+                      echo "new key added to authorized_keys"
+                  fi
+                  chmod 600 /root/.ssh/authorized_keys
+                  rm -f /root/key.pub
+              fi
+          fi
+
+          # Extract the intended SSH host key for this machine from
+          # the supplied user data, if available.  Otherwise sshd will
+          # generate one normally.
+          $wget http://169.254.169.254/2011-01-01/user-data > /root/user-data || true
+          key="$(sed 's/|/\n/g; s/SSH_HOST_DSA_KEY://; t; d' /root/user-data)"
+          key_pub="$(sed 's/SSH_HOST_DSA_KEY_PUB://; t; d' /root/user-data)"
+          if [ -n "$key" -a -n "$key_pub" -a ! -e /etc/ssh/ssh_host_dsa_key ]; then
+              mkdir -m 0755 -p /etc/ssh
+              (umask 077; echo "$key" > /etc/ssh/ssh_host_dsa_key)
+              echo "$key_pub" > /etc/ssh/ssh_host_dsa_key.pub
+          fi
+        '';
+
+      serviceConfig.Type = "oneshot";
+      serviceConfig.RemainAfterExit = true;
+    };
+
+}

From bdb24b90c8cd6faaac4b4b18d0268354bb0298e4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 8 Aug 2015 15:23:05 -0500
Subject: [PATCH 49/65] qt53: gdb required only for developerBuild

---
 pkgs/development/libraries/qt-5/5.3/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix
index 14675af48fb..595bb5bb10b 100644
--- a/pkgs/development/libraries/qt-5/5.3/default.nix
+++ b/pkgs/development/libraries/qt-5/5.3/default.nix
@@ -176,7 +176,9 @@ stdenv.mkDerivation rec {
   ++ optional (postgresql != null) postgresql
   ++ optionals gtkStyle [gnome_vfs libgnomeui gtk GConf];
 
-  buildInputs = [ gdb bison flex gperf ruby ];
+  buildInputs =
+    [ bison flex gperf ruby ]
+    ++ optional developerBuild gdb;
 
   nativeBuildInputs = [ python perl pkgconfig ];
 

From 28f0eb5af8867a476abf395aeab9added9dc4d84 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 8 Aug 2015 15:23:48 -0500
Subject: [PATCH 50/65] qt54: gdb required only for developerBuild

---
 pkgs/development/libraries/qt-5/5.4/qtbase.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
index ecefa891332..780f1b60f7c 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
@@ -174,7 +174,9 @@ stdenv.mkDerivation {
   ++ optional (postgresql != null) postgresql
   ++ optionals gtkStyle [gnome_vfs libgnomeui gtk GConf];
 
-  buildInputs = [ gdb bison flex gperf ruby ];
+  buildInputs =
+    [ bison flex gperf ruby ]
+    ++ optional developerBuild gdb;
 
   nativeBuildInputs = [ python perl pkgconfig ];
 

From 2104e01ec76b058ff5bd9cc84a39f79c447dd07b Mon Sep 17 00:00:00 2001
From: hiberno <mail@elfsechsundzwanzig.de>
Date: Sat, 8 Aug 2015 23:55:28 +0200
Subject: [PATCH 51/65] bar: 1.0 -> 1.1

---
 pkgs/applications/window-managers/bar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/bar/default.nix b/pkgs/applications/window-managers/bar/default.nix
index 46a19b90b8b..964390d3b59 100644
--- a/pkgs/applications/window-managers/bar/default.nix
+++ b/pkgs/applications/window-managers/bar/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, perl, libxcb }:
 
 let
-  version = "1.0";
+  version = "1.1";
 in
   stdenv.mkDerivation rec {
     name = "bar-${version}";
   
     src = fetchurl {
       url = "https://github.com/LemonBoy/bar/archive/v${version}.tar.gz";
-      sha256 = "1n2vak2acs37sslxl250cnz9c3irif5z4s54wi9qjyxbfzr2h2nc";
+      sha256 = "171ciw676cvj80zzbqfbg9nwix36zph0683zmqf279q9b9bmayan";
     };
   
     buildInputs = [ libxcb perl ];

From a73336ad67b4c41b5c67af8d9a730d6bd899c706 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Sat, 8 Aug 2015 19:51:18 +0200
Subject: [PATCH 52/65] pencil 2.0.11 -> 2.0.13

---
 pkgs/applications/graphics/pencil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix
index 19c6334d1d6..94ab1b76cda 100644
--- a/pkgs/applications/graphics/pencil/default.nix
+++ b/pkgs/applications/graphics/pencil/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, xulrunner }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.11";
+  version = "2.0.13";
   name = "pencil-${version}";
 
   src = fetchurl {
     url = "https://github.com/prikhi/pencil/releases/download/v${version}/Pencil-${version}-linux-pkg.tar.gz";
-    sha256 = "a35d1353de6665cbd4a5bd821dcdf7439f2a3c1fcbccee0f01ec8dd1bb67c4f3";
+    sha256 = "150jsaq27n01l0vf10jiyrlfm0canqhphdxi42di96b9zsfkphpk";
 
   };
 

From 70ae60feb15f1ff12d6351a70ed2716ffba4943a Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 9 Aug 2015 01:36:29 +0200
Subject: [PATCH 53/65] i2p: 0.9.20 -> 0.9.21

See https://geti2p.net/en/blog/post/2015/07/31/0.9.21-Release
---
 pkgs/tools/networking/i2p/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix
index 1ef159131af..cbfedab0faf 100644
--- a/pkgs/tools/networking/i2p/default.nix
+++ b/pkgs/tools/networking/i2p/default.nix
@@ -1,10 +1,10 @@
 { stdenv, procps, coreutils, fetchurl, jdk, jre, ant, gettext, which }:
 
 stdenv.mkDerivation rec {
-  name = "i2p-0.9.20";
+  name = "i2p-0.9.21";
   src = fetchurl {
     url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz";
-    sha256 = "10rynkl9dbnfl67ck3d7wdwz52h7354r7nbwcypsjnng4f1dmj5s";
+    sha256 = "1cgki9sg0pc4d66rr556lw0682c4mmdvmr6awvsn7ch0rp4zav9f";
   };
   buildInputs = [ jdk ant gettext which ];
   patches = [ ./i2p.patch ];
@@ -34,9 +34,9 @@ stdenv.mkDerivation rec {
     '';
 
   meta = with stdenv.lib; {
-    homepage = "https://geti2p.net";
+    homepage = https://geti2p.net;
     description = "Applications and router for I2P, anonymity over the Internet";
-    maintainers = [ stdenv.lib.maintainers.joelmo ];
+    maintainers = [ maintainers.joelmo ];
     license = licenses.gpl2;
     # TODO: support other systems, just copy appropriate lib/wrapper.. to $out
     platforms = [ "x86_64-linux" ];

From 2c5775b141372fc87da66c405dda473f4679f11c Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 9 Aug 2015 02:24:58 +0200
Subject: [PATCH 54/65] i2p service: use mkEnableOption

---
 nixos/modules/services/networking/i2p.nix | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/nixos/modules/services/networking/i2p.nix b/nixos/modules/services/networking/i2p.nix
index bad22c79138..e6ee5fd1f95 100644
--- a/nixos/modules/services/networking/i2p.nix
+++ b/nixos/modules/services/networking/i2p.nix
@@ -7,15 +7,7 @@ let
   homeDir = "/var/lib/i2p";
 in {
   ###### interface
-  options.services.i2p = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Enables i2p as a running service upon activation.
-        '';
-      };
-  };
+  options.services.i2p.enable = mkEnableOption "I2P router";
 
   ###### implementation
   config = mkIf cfg.enable {

From 306575d95cb2eb621c3e4d833329d3903867a5c9 Mon Sep 17 00:00:00 2001
From: Sven Keidel <svenkeidel@googlemail.com>
Date: Sun, 9 Aug 2015 12:05:25 +0200
Subject: [PATCH 55/65] gpodder: 3.8.3 -> 3.8.4

---
 pkgs/applications/audio/gpodder/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix
index 853cdff4a51..58b9be41545 100644
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@@ -7,11 +7,11 @@ let
   inherit (pythonPackages) coverage feedparser minimock sqlite3 dbus pygtk eyeD3;
 
 in buildPythonPackage rec {
-  name = "gpodder-3.8.3";
+  name = "gpodder-3.8.4";
 
   src = fetchurl {
     url = "http://gpodder.org/src/${name}.tar.gz";
-    sha256 = "8ac120a6084bded6bc88ecadbbc9df54a85f44ef4507f73a76de1d7a5574303c";
+    sha256 = "0cjpk92qjsws7ddbnq0r2h7vm5019zlpafgbxwsgllmjzkknj6pn";
   };
 
   buildInputs = [

From fb0ea4122fa22be6c7c6210e1aeb754d4d4cb116 Mon Sep 17 00:00:00 2001
From: Andreas Baldeau <andreas@baldeau.net>
Date: Sun, 9 Aug 2015 14:17:29 +0200
Subject: [PATCH 56/65] Font Awesome updated => 4.4.0

---
 pkgs/data/fonts/font-awesome-ttf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/font-awesome-ttf/default.nix b/pkgs/data/fonts/font-awesome-ttf/default.nix
index ed91713d03a..992b87b8ec7 100644
--- a/pkgs/data/fonts/font-awesome-ttf/default.nix
+++ b/pkgs/data/fonts/font-awesome-ttf/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation rec {
-  name = "font-awesome-4.3.0";
+  name = "font-awesome-4.4.0";
 
   src = fetchurl {
     url = "http://fortawesome.github.io/Font-Awesome/assets/${name}.zip";
-    sha256 = "0wg9q6mq026jjw1bsyj9b5dgba7bb4h7i9xiwgsfckd412xpsbzd";
+    sha256 = "1bmjh3j533awihdxihvlk2d1ypzs9q7azj0viqbm0df8jj2v4rwq";
   };
 
   buildCommand = ''

From 4f47002352328306dc64b1e0ab02564bfee0c643 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 9 Aug 2015 13:23:29 +0200
Subject: [PATCH 57/65] python-packages pyusb: 1.0.0b1 -> 1.0.0b2

Small update. Tested succesfully with `nox-review wip`

cc maintainer @bjornfor
---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 247955e9765..818bdba09e5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15636,7 +15636,7 @@ let
 
 
   pyusb = buildPythonPackage rec {
-    name = "pyusb-1.0.0b1";
+    name = "pyusb-1.0.0b2";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/pyusb/${name}.tar.gz";
@@ -15653,7 +15653,7 @@ let
     meta = {
       description = "Python USB access module (wraps libusb 1.0)";  # can use other backends
       homepage = http://pyusb.sourceforge.net/;
-      license = "BSD";
+      license = licenses.bsd3;
       maintainers = with maintainers; [ bjornfor ];
     };
   };

From b92259d68fe42ac0c5ed01044cbcdd676012afa9 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 9 Aug 2015 15:13:50 +0200
Subject: [PATCH 58/65] fix $out creation of ir.lv2

---
 pkgs/applications/audio/ir.lv2/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/ir.lv2/default.nix b/pkgs/applications/audio/ir.lv2/default.nix
index 804d6e7d4e4..d6dbc4c55a9 100644
--- a/pkgs/applications/audio/ir.lv2/default.nix
+++ b/pkgs/applications/audio/ir.lv2/default.nix
@@ -17,10 +17,9 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    mkdir "$out/bin"
+    mkdir -p "$out/bin"
     mkdir "$out/include"
-    mkdir "$out/share"
-    mkdir "$out/share/doc"
+    mkdir -p "$out/share/doc"
 
     make PREFIX="$out" install
     install -Dm755 convert4chan "$out/bin/convert4chan"

From 61e804a35f06c5cd7c6207302e12ef75c3d11a52 Mon Sep 17 00:00:00 2001
From: Sven Keidel <svenkeidel@googlemail.com>
Date: Thu, 6 Aug 2015 23:04:44 +0200
Subject: [PATCH 59/65] cataclysm-dda: init at 0.C

---
 pkgs/games/cataclysm-dda/default.nix | 71 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 +
 2 files changed, 73 insertions(+)
 create mode 100644 pkgs/games/cataclysm-dda/default.nix

diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix
new file mode 100644
index 00000000000..c8d69d3078d
--- /dev/null
+++ b/pkgs/games/cataclysm-dda/default.nix
@@ -0,0 +1,71 @@
+{ fetchFromGitHub, stdenv, makeWrapper, pkgconfig, ncurses, lua, SDL2, SDL2_image, SDL2_ttf,
+SDL2_mixer, freetype, gettext }:
+
+let architecture =
+      if stdenv.system == "i686-linux" then
+        "linux32"
+      else if stdenv.system == "x86_64-linux" then
+        "linux64"
+      else
+        abort "currently only linux 32-bit and 64-bit are supported";
+
+in stdenv.mkDerivation rec {
+  version = "0.C";
+  name = "cataclysm-dda-${version}";
+
+  src = fetchFromGitHub {
+    owner = "CleverRaven";
+    repo = "Cataclysm-DDA";
+    rev = "${version}";
+    sha256 = "03sdzsk4qdq99qckq0axbsvg1apn6xizscd8pwp5w6kq2fyj5xkv";
+  };
+
+  buildInputs = [ makeWrapper pkgconfig ncurses lua SDL2 SDL2_image SDL2_ttf SDL2_mixer freetype gettext ];
+
+  patchPhase = ''
+    patchShebangs .
+    substituteAllInPlace lang/compile_mo.sh \
+      --replace msgfmt ${gettext}/msgfmt
+    sed -i -e 's|DATA_PREFIX=$(PREFIX)/share/cataclysm-dda/|DATA_PREFIX=$(PREFIX)/share/|g' Makefile
+  '';
+
+  makeFlags = "PREFIX=$(out) LUA=1 TILES=1 SOUND=1 RELEASE=1 USE_HOME_DIR=1";
+
+  postInstall = ''
+    wrapProgram $out/bin/cataclysm-tiles \
+      --add-flags "--datadir $out/share/"
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "A free, post apocalyptic, zombie infested rogue-like";
+    longDescription = ''
+      Cataclysm: Dark Days Ahead is a roguelike set in a post-apocalyptic world.
+      Surviving is difficult: you have been thrown, ill-equipped, into a
+      landscape now riddled with monstrosities of which flesh eating zombies are
+      neither the strangest nor the deadliest.
+
+      Yet with care and a little luck, many things are possible. You may try to
+      eke out an existence in the forests silently executing threats and
+      providing sustenance with your longbow. You can ride into town in a
+      jerry-rigged vehicle, all guns blazing, to settle matters in a fug of
+      smoke from your molotovs. You could take a more measured approach and
+      construct an impregnable fortress, surrounded by traps to protect you from
+      the horrors without. The longer you survive, the more skilled and adapted
+      you will get and the better equipped and armed to deal with the threats
+      you are presented with.
+
+      In the course of your ordeal there will be opportunities and temptations
+      to improve or change your very nature. There are tales of survivors fitted
+      with extraordinary cybernetics giving great power and stories too of
+      gravely mutated survivors who, warped by their ingestion of exotic
+      substances or radiation, now more closely resemble insects, birds or fish
+      than their original form.
+    '';
+    homepage = http://en.cataclysmdda.com/;
+    license = licenses.cc-by-sa-30;
+    maintainers = [ maintainers.skeidel ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3f7e25d6314..9bf619201af 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13572,6 +13572,8 @@ let
 
   castle_combat = callPackage ../games/castle-combat { };
 
+  cataclysm-dda = callPackage ../games/cataclysm-dda { };
+
   chessdb = callPackage ../games/chessdb { };
 
   construoBase = lowPrio (callPackage ../games/construo {

From b568ca5c9d492cb7f2003a24e74f2fb6c0b9b99e Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 9 Aug 2015 16:13:25 +0200
Subject: [PATCH 60/65] apcu: init at 4.0.7

closes #6334
---
 pkgs/top-level/php-packages.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index bfd741ccb4b..9fc605be1e3 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -6,6 +6,12 @@ let self = with self; {
     inherit (pkgs) stdenv autoreconfHook fetchurl;
   };
 
+  apcu = buildPecl {
+    name = "apcu-4.0.7";
+
+    sha256 = "1mhbz56mbnq7dryf2d64l84lj3fpr5ilmg2424glans3wcg772hp";
+  };
+
   memcache = buildPecl {
     name = "memcache-3.0.8";
 

From 2c9c135ee23f831960a5ae234196aa8c5332c75e Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 9 Aug 2015 16:14:52 +0200
Subject: [PATCH 61/65] calibre: update from 2.33.0 to 2.34.0

---
 pkgs/applications/misc/calibre/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 4c15ccc0428..8cad0a95ec9 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "calibre-2.33.0";
-  version = "2.33.0";
+  name = "calibre-${version}";
+  version = "2.34.0";
 
   src = fetchurl {
     url = "https://github.com/kovidgoyal/calibre/releases/download/v${version}/${name}.tar.xz";
-    sha256 = "0j1micmjffi6rsn3ayblnz0wq648v05ckbn1qsiz086iaj2285q9";
+    sha256 = "04khi2jz7jrp6ppax57648sjkczvcxfqyzlyvhw155ggmpg8fiki";
   };
 
   inherit python;

From 201650325c74484c01a10d4737d5b1e9d36e0e2e Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 9 Aug 2015 18:37:08 +0200
Subject: [PATCH 62/65] ardour: 4.0 -> 4.1

---
 pkgs/applications/audio/ardour/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 5327b6b77d7..2338af6ec99 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw
+{ stdenv, fetchFromGitHub, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw
 , fftwSinglePrec, flac, glibc, glibmm, graphviz, gtk, gtkmm, libjack2
 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf
 , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile
@@ -15,24 +15,25 @@ let
   # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH.
 
   # Version to build.
-  tag = "4.0";
+  tag = "4.1";
 
   # Version info that is built into the binary. Keep in sync with 'tag'. The
   # last 8 digits is a (fake) commit id.
-  revision = "4.0-e1aa66cb3f";
+  revision = "4.1-fe672c8";
 
 in
 
 stdenv.mkDerivation rec {
   name = "ardour-${tag}";
 
-  src = fetchgit {
-    url = git://git.ardour.org/ardour/ardour.git;
-    rev = "e1aa66cb3f";
-    sha256 = "396668fb9116a68f5079f0d880930e890fd0cdf7ee5f3b97fcf44b88cf840b4c";
+  src = fetchFromGitHub {
+    owner = "Ardour";
+    repo = "ardour";
+    rev = "fe672c827cb2c08c94b1fa7e527d884c522a1af7";
+    sha256 = "12yfy9l5mnl96ix4s2qicp3m2zscli1a4bd50nk9v035pgf77s3f";
   };
 
-  buildInputs = 
+  buildInputs =
     [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc
       glibmm graphviz gtk gtkmm libjack2 libgnomecanvas libgnomecanvasmm liblo
       libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate

From 230a448fe6b4b5dcfdccb1ad9a7490a2d1a9954b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 8 Aug 2015 14:58:45 +0200
Subject: [PATCH 63/65] hackage-packages.nix: update to
 https://github.com/commercialhaskell/all-cabal-files/commit/5d8c308f9f1b9cd67d32bdd83903d65ce6a41d00
 with hackage2nix revision v20150807-15-ge2a125b

---
 .../haskell-modules/hackage-packages.nix      | 94 +++++++++----------
 1 file changed, 46 insertions(+), 48 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index f21e78a642e..27345770034 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -15448,8 +15448,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "TypeNat";
-       version = "0.2.1.0";
-       sha256 = "01dsw64zzwbkvm7q4jwyidjvxbkx6fvx8hhn70d2bpdxxammnxry";
+       version = "0.4.0.0";
+       sha256 = "0v6xd98nwl7zg5q5xmlrgzsb3219vcwj8rfacdyzdb9xpq5l9dnv";
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/avieth/TypeNat";
@@ -29334,8 +29334,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-bounds";
-       version = "0.9.4";
-       sha256 = "1l1nqf8878kmmdc5ssrpn52cszn9w0ym70pjjbaprpa1c7mdbziy";
+       version = "0.9.5";
+       sha256 = "0l4s0j75ianggpl3hbqrr3zp7v9jjgd5646ydqbcg040win20lzh";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -29420,8 +29420,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-debian";
-       version = "4.30";
-       sha256 = "07wv05fi9sgh8v9239c4rvwrxrmwk7awmk5hpcnpyx8yj8z9z7q5";
+       version = "4.30.2";
+       sha256 = "1vafxq1h2nispc7jdckxy2c746ikh60cscg9rrrbvs01wvjam9xw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -42863,8 +42863,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-hsqml";
-       version = "0.1.0.0";
-       sha256 = "1j1n9bamb1fyfgbmiyqssyzh93fahmg48yb7z3z18rrxmn04rnax";
+       version = "0.2.0.0";
+       sha256 = "0f84919h7k93nnzgr2k9jp08qsgs2dgzihavmz2g9q1c6d53q6v0";
        libraryHaskellDepends = [
          base colour containers diagrams-core diagrams-lib hsqml lens text
          transformers
@@ -55649,18 +55649,17 @@ self: {
      }) {};
 
   "ghcjs-dom" = callPackage
-    ({ mkDerivation, base, glib, gtk, mtl, text, transformers, webkit
-     }:
+    ({ mkDerivation, base, ghcjs-base, mtl, text }:
      mkDerivation {
        pname = "ghcjs-dom";
        version = "0.1.1.3";
        sha256 = "0pdxb2s7fflrh8sbqakv0qi13jkn3d0yc32xhg2944yfjg5fvlly";
-       libraryHaskellDepends = [
-         base glib gtk mtl text transformers webkit
-       ];
+       libraryHaskellDepends = [ base ghcjs-base mtl text ];
+       jailbreak = true;
        description = "DOM library that supports both GHCJS and WebKitGTK";
        license = stdenv.lib.licenses.mit;
-     }) {};
+       broken = true;
+     }) { ghcjs-base = null;};
 
   "ghcjs-dom-hello" = callPackage
     ({ mkDerivation, base, ghcjs-dom, mtl }:
@@ -81008,21 +81007,20 @@ self: {
      }) {};
 
   "jsaddle" = callPackage
-    ({ mkDerivation, base, glib, gtk3, hslogger, lens, template-haskell
-     , text, transformers, webkitgtk3, webkitgtk3-javascriptcore
+    ({ mkDerivation, base, hslogger, lens, template-haskell, text
+     , transformers
      }:
      mkDerivation {
        pname = "jsaddle";
        version = "0.2.0.6";
        sha256 = "1ggnhv9lgsd330p1k6zvg20dbqb1ysh282nalxramqvn2yhmqsx4";
        libraryHaskellDepends = [
-         base lens template-haskell text transformers webkitgtk3
-         webkitgtk3-javascriptcore
+         base lens template-haskell text transformers
        ];
        testHaskellDepends = [
-         base glib gtk3 hslogger lens template-haskell text transformers
-         webkitgtk3 webkitgtk3-javascriptcore
+         base hslogger lens template-haskell text transformers
        ];
+       jailbreak = true;
        description = "High level interface for webkit-javascriptcore";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -81286,8 +81284,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-rpc";
-       version = "0.6.1.0";
-       sha256 = "1vm6x08xqsw7sd3s0cq8i4hxagyxxc5jwypc80nv2rcdnyyhdmf7";
+       version = "0.6.2.0";
+       sha256 = "1d9w18x9l0iyq5br1xgjaxkclcmrw56nlkifqkcv9fgsividhyw3";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring conduit conduit-extra deepseq
          hashable lifted-async monad-control monad-logger mtl QuickCheck stm
@@ -92402,19 +92400,19 @@ self: {
   "moesocks" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring
      , containers, cryptohash, hslogger, HsOpenSSL, lens, mtl, network
-     , optparse-applicative, random, safe, stm, text, transformers, unix
-     , unordered-containers
+     , optparse-applicative, random, safe, stm, text, time, transformers
+     , unix, unordered-containers
      }:
      mkDerivation {
        pname = "moesocks";
-       version = "0.1.0.11";
-       sha256 = "1qmgsps9c6hcpb1y1z6jb0bjl51apll8s1vg6arz8kma98dkd79d";
+       version = "0.1.0.12";
+       sha256 = "1f31qd4lgc2li9q7cf7zx700v23sln9wxfd7yaw0d2q0qmqj2zvi";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson async attoparsec base binary bytestring containers cryptohash
          hslogger HsOpenSSL lens mtl network optparse-applicative random
-         safe stm text transformers unix unordered-containers
+         safe stm text time transformers unix unordered-containers
        ];
        homepage = "https://github.com/nfjinjing/moesocks";
        description = "A functional firewall killer";
@@ -94328,14 +94326,14 @@ self: {
 
   "mtl-unleashed" = callPackage
     ({ mkDerivation, base, contravariant, hspec, hspec-core, lens, mtl
-     , profunctors
+     , profunctors, tagged
      }:
      mkDerivation {
        pname = "mtl-unleashed";
-       version = "0.3";
-       sha256 = "1rirgbs4b7q7yjnvdw1j2y6nmym47adm8lcl0xysxi2hhhvs8r9c";
+       version = "0.3.1";
+       sha256 = "04kbm0lxfwv34991384blz8a4qjwl32jv0d3x6rvgpjlidphfi2l";
        libraryHaskellDepends = [
-         base contravariant lens mtl profunctors
+         base contravariant lens mtl profunctors tagged
        ];
        testHaskellDepends = [
          base contravariant hspec hspec-core lens mtl profunctors
@@ -107864,8 +107862,8 @@ self: {
     ({ mkDerivation, base, filepath, hspec, template-haskell }:
      mkDerivation {
        pname = "publicsuffix";
-       version = "0.20150804";
-       sha256 = "06b311vdwihqhdwf2zr0akndgyaxycli7lymzzyfbn0rhhx1g2kn";
+       version = "0.20150808";
+       sha256 = "1dcmi45vz9m4asf7i8bw6qigdcd2f7f48dmm2bq4w4dsjrp247dk";
        libraryHaskellDepends = [ base filepath template-haskell ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
@@ -112359,8 +112357,8 @@ self: {
     ({ mkDerivation, base, hmatrix, repa, vector }:
      mkDerivation {
        pname = "repa-linear-algebra";
-       version = "0.0.0.0";
-       sha256 = "1y16rmdygxay46xbm617g944aazml48izzmkx46avvqvjyql96w1";
+       version = "0.1.0.0";
+       sha256 = "06lvp3sj6w4kvw6qhn5wcy2c2v7w15jaicw1pm14ssxhs4xl866g";
        libraryHaskellDepends = [ base hmatrix repa vector ];
        homepage = "https://github.com/marcinmrotek/repa-linear-algebra";
        description = "HMatrix operations for Repa";
@@ -133960,8 +133958,8 @@ self: {
     ({ mkDerivation, base, singletons }:
      mkDerivation {
        pname = "type-list";
-       version = "0.1.0.0";
-       sha256 = "0y5qa882rcrlq13mfsp8yzbn6fqsc2clii2qjhk1nmg8ivqf026v";
+       version = "0.2.0.0";
+       sha256 = "19akcmjn1jgcxfsyw49pfydil47vh5zp99rb8qsyhmlv7x9czc03";
        libraryHaskellDepends = [ base singletons ];
        description = "Operations on type-level lists and tuples";
        license = stdenv.lib.licenses.bsd3;
@@ -140102,14 +140100,14 @@ self: {
 
   "webkit" = callPackage
     ({ mkDerivation, base, bytestring, cairo, glib, gtk
-     , gtk2hs-buildtools, mtl, pango, text, webkit
+     , gtk2hs-buildtools, mtl, pango, text, transformers, webkit
      }:
      mkDerivation {
        pname = "webkit";
-       version = "0.13.1.3";
-       sha256 = "00h9465xl6rfnd72cmn68z3mpany63dxl6fm2gqjbdzbrssj7306";
+       version = "0.14.1.0";
+       sha256 = "1mmlsdnq9pws3jhk0gzqdhy8b7zwm80g2cmygahqagvyh7jvb7r4";
        libraryHaskellDepends = [
-         base bytestring cairo glib gtk mtl pango text
+         base bytestring cairo glib gtk mtl pango text transformers
        ];
        libraryPkgconfigDepends = [ webkit ];
        libraryToolDepends = [ gtk2hs-buildtools ];
@@ -140126,6 +140124,7 @@ self: {
        sha256 = "1gj40kdll7pd84graxcrc327za6kgp453zh48srmzvrk9yvnj67x";
        libraryHaskellDepends = [ base glib gtk webkit ];
        libraryToolDepends = [ gtk2hs-buildtools ];
+       jailbreak = true;
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -140133,18 +140132,17 @@ self: {
 
   "webkitgtk3" = callPackage
     ({ mkDerivation, base, bytestring, cairo, glib, gtk2hs-buildtools
-     , gtk3, mtl, pango, text, webkit
+     , gtk3, mtl, pango, text, transformers, webkit
      }:
      mkDerivation {
        pname = "webkitgtk3";
-       version = "0.13.1.3";
-       sha256 = "0gfznb6n46576im72m6k9wrwc2n9f48nk4dsaz2llvzlzlzx4zfk";
+       version = "0.14.1.0";
+       sha256 = "16dypc71xh223746cgwa143vqyxymx6dqxk01j3ixpx7ybzr7lnm";
        libraryHaskellDepends = [
-         base bytestring cairo glib gtk3 mtl pango text
+         base bytestring cairo glib gtk3 mtl pango text transformers
        ];
        libraryPkgconfigDepends = [ webkit ];
        libraryToolDepends = [ gtk2hs-buildtools ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the Webkit library";
        license = stdenv.lib.licenses.lgpl21;
@@ -141674,8 +141672,8 @@ self: {
      }:
      mkDerivation {
        pname = "xcffib";
-       version = "0.3.4";
-       sha256 = "03z31c5gnybpfvh3idqimnz90pzbijhrqa8hlikryab148gp1gzn";
+       version = "0.3.5";
+       sha256 = "0ri50cbsh8a67q3frsz6214b73ahmga348my5x5bp6w7likiqnly";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [

From eb5f4d3d36199d48cd2cf6a5cb0fe2da569e489b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 9 Aug 2015 16:28:12 +0200
Subject: [PATCH 64/65] ghc: make sure the HEAD version is built with a
 deterministic version number

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

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index c92f002a026..6c3041f2943 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
 
   postUnpack = ''
     pushd ghc-${builtins.substring 0 7 rev}
+    echo ${version} >VERSION
+    echo ${rev} >GIT_COMMIT_ID
     patchShebangs .
     ./boot
     popd

From bfa187de6821a64efa93c4398fa57c01f63dc739 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 9 Aug 2015 17:52:13 +0200
Subject: [PATCH 65/65] ghc-head: bump version to current git HEAD

---
 pkgs/development/compilers/ghc/head.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 6c3041f2943..65d52c1a3e5 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -17,14 +17,14 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "7.11.20150705";
+  version = "7.11.20150809";
   name = "ghc-${version}";
-  rev = "3fabb71a559b493efdfb5bb91907f6a0f696a114";
+  rev = "a40ec755d8e020cd4b87975f5a751f1e35c36977";
 
   src = fetchgit {
     url = "git://git.haskell.org/ghc.git";
     inherit rev;
-    sha256 = "1c0fsk2yk08x02n6s722d36igc9prrql4wcnr8m8c62wp4yrf25z";
+    sha256 = "1hh1p9vrd1nrfi56jan4bnlczld2qzx85v7lfb6nara2bhcgqa1l";
   };
 
   postUnpack = ''