haskellPackages: unbreak cachix build

2019-09-07 04:20:00 -05:00 · 2019-09-07 04:20:00 -05:00 · 86321d3ab5
commit 86321d3ab5
parent 925501a5d5
2 changed files with 0 additions and 8 deletions
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@ -77,13 +77,6 @@ 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
@ -3598,7 +3598,6 @@ broken-packages:
  - cabin
  - cabocha
  - cached
-  - cachix
  - cacophony
  - caffegraph
  - cairo-core