haskellPackages: unbreak cachix build

2019-09-01 21:00:00 -05:00 · 2019-09-01 21:00:00 -05:00 · 6beccdcb83
commit 6beccdcb83
parent 5791d8e600
2 changed files with 7 additions and 2 deletions
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -77,6 +77,13 @@ self: super: {
    hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
  };

+  # compatibility with servant-0.16.2. Remove with the next release
+  cachix = appendPatch super.cachix (pkgs.fetchpatch {
+    url = "https://github.com/cachix/cachix/commit/051679a99cd56e2497c0f05310035b6649129a13.patch";
+    sha256 = "198n5byp9mfiymgzpvyd42l6vqy6hfy9kdi7svfx7mcwsy7sg7kp";
+    stripLen = 1;
+  });
+
  # Fix test trying to access /home directory
  shell-conduit = overrideCabal super.shell-conduit (drv: {
    postPatch = "sed -i s/home/tmp/ test/Spec.hs";
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@ -3592,8 +3592,6 @@ broken-packages:
  - cabin
  - cabocha
  - cached
-  - cachix
-  - cachix-api
  - cacophony
  - caffegraph
  - cairo-core