about summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-common.nix
diff options
context:
space:
mode:
authorJack Kelly <jack@jackkelly.name>2019-01-09 13:15:43 +1100
committerPeter Simons <simons@cryp.to>2019-02-02 13:11:53 +0100
commitf5d52c1949d5b209becb1a832453c73a84198f58 (patch)
tree14daf8d949bf7e3c5a835d5fc206a09edea1c83d /pkgs/development/haskell-modules/configuration-common.nix
parent230d55edc8120af49000a95bde23e5b1a424d456 (diff)
downloadnixlib-f5d52c1949d5b209becb1a832453c73a84198f58.tar
nixlib-f5d52c1949d5b209becb1a832453c73a84198f58.tar.gz
nixlib-f5d52c1949d5b209becb1a832453c73a84198f58.tar.bz2
nixlib-f5d52c1949d5b209becb1a832453c73a84198f58.tar.lz
nixlib-f5d52c1949d5b209becb1a832453c73a84198f58.tar.xz
nixlib-f5d52c1949d5b209becb1a832453c73a84198f58.tar.zst
nixlib-f5d52c1949d5b209becb1a832453c73a84198f58.zip
haskellPackages.beam-*: GHC 8.6.x fixes, and relax version bounds
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix12
1 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3ff96bf25449..174ab1a8a7ae 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1178,4 +1178,16 @@ self: super: {
   hlint = super.hlint.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; });
   hoogle = super.hoogle.overrideScope (self: super: { haskell-src-exts = self.haskell-src-exts_1_21_0; });
 
+  # jailbreak tasty < 1.2: https://github.com/phadej/tdigest/issues/30
+  tdigest = doJailbreak super.tdigest; # until tdigest > 0.2.1
+
+  # These patches contain fixes for 8.6 that should be safe for
+  # earlier versions, but we need the relaxed version bounds in GHC
+  # 8.4 builds. beam needs to release a round of updates that relax
+  # bounds and include the 8.6 fixes:
+  # https://github.com/tathougies/beam/issues/315
+  beam-core = appendPatch super.beam-core ./patches/beam-core-fix-ghc-8.6.x-build.patch;
+  beam-migrate = appendPatch super.beam-migrate ./patches/beam-migrate-fix-ghc-8.6.x-build.patch;
+  beam-postgres = appendPatch super.beam-postgres ./patches/beam-postgres-fix-ghc-8.6.x-build.patch;
+  beam-sqlite = appendPatch super.beam-sqlite ./patches/beam-sqlite-fix-ghc-8.6.x-build.patch;
 } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super