Merge branch 'master' into staging

Hydra: ?compare=1400181
2017-10-09 11:24:35 +02:00
parent 416979f3f7 28cd0f240a
commit 994036d857
30 changed files with 448 additions and 48 deletions
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -6,6 +6,6 @@
 fetchFromGitHub {
  owner = "commercialhaskell";
  repo = "all-cabal-hashes";
-  rev = "b490d26340638934d13c0c0cd4089dec0fb6b85e";
-  sha256 = "0cz76wcdlh5512g1aviv0ac9qwj1mmy9ncp6q4yywylxrlqgcbj5";
+  rev = "901c2522e6797270f5ded4495b1a529e6c16ef45";
+  sha256 = "0wng314y3yn6bbwa5ar254l7p8y99gsvm8ll4z7f3wg77v5fzish";
 }