diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2019-09-07 04:20:00 -0500 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2019-09-07 20:00:22 +0200 |
| commit | 86321d3ab509f076b56a6fe2de0457f88c84f196 (patch) | |
| tree | c0a0a0cfcc1a3bd6fe8d6bc67c84ae0eca3a8f3a /pkgs/development/haskell-modules | |
| parent | 925501a5d5541bb62e6b24daea1883304b4c3fd2 (diff) | |
| download | nixlib-86321d3ab509f076b56a6fe2de0457f88c84f196.tar nixlib-86321d3ab509f076b56a6fe2de0457f88c84f196.tar.gz nixlib-86321d3ab509f076b56a6fe2de0457f88c84f196.tar.bz2 nixlib-86321d3ab509f076b56a6fe2de0457f88c84f196.tar.lz nixlib-86321d3ab509f076b56a6fe2de0457f88c84f196.tar.xz nixlib-86321d3ab509f076b56a6fe2de0457f88c84f196.tar.zst nixlib-86321d3ab509f076b56a6fe2de0457f88c84f196.zip | |
haskellPackages: unbreak cachix build
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index decf430d78f9..fc008d52623d 100644 --- 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"; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 996120c6f1d0..3ea6e1380b47 100644 --- 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 |