diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2019-09-01 21:00:00 -0500 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2019-09-03 09:23:52 +0200 |
| commit | 6beccdcb8346598c39013c28a34fdd6d010492a8 (patch) | |
| tree | 23f066c7d5b2e406683cfd139810ff82095272a3 /pkgs/development/haskell-modules | |
| parent | 5791d8e600e46f0f72c6dea3ffa1edfcdca3277f (diff) | |
| download | nixlib-6beccdcb8346598c39013c28a34fdd6d010492a8.tar nixlib-6beccdcb8346598c39013c28a34fdd6d010492a8.tar.gz nixlib-6beccdcb8346598c39013c28a34fdd6d010492a8.tar.bz2 nixlib-6beccdcb8346598c39013c28a34fdd6d010492a8.tar.lz nixlib-6beccdcb8346598c39013c28a34fdd6d010492a8.tar.xz nixlib-6beccdcb8346598c39013c28a34fdd6d010492a8.tar.zst nixlib-6beccdcb8346598c39013c28a34fdd6d010492a8.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 | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1fc8d68164b0..7b173da2a91b 100644 --- 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"; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 8817b6558e07..c0f3ec25fe8d 100644 --- 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 |