summary refs log tree commit diff
diff options
context:
space:
mode:
authorProfpatsch <mail@profpatsch.de>2016-11-23 16:15:45 +0100
committerProfpatsch <mail@profpatsch.de>2016-11-23 16:21:59 +0100
commit54f8379321d3e44c9d286d29d756c756f3a59f42 (patch)
tree31e6796cf1e4b20186f45a9389e8a8ed849eab9e
parent7a038b931158ae6d1605d6456709b9a9fa90a3a6 (diff)
downloadnixlib-54f8379321d3e44c9d286d29d756c756f3a59f42.tar
nixlib-54f8379321d3e44c9d286d29d756c756f3a59f42.tar.gz
nixlib-54f8379321d3e44c9d286d29d756c756f3a59f42.tar.bz2
nixlib-54f8379321d3e44c9d286d29d756c756f3a59f42.tar.lz
nixlib-54f8379321d3e44c9d286d29d756c756f3a59f42.tar.xz
nixlib-54f8379321d3e44c9d286d29d756c756f3a59f42.tar.zst
nixlib-54f8379321d3e44c9d286d29d756c756f3a59f42.zip
haskellPackages: fix HDBC-odbc haddockPhase
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix10
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f46735e55511..f521f3100500 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -144,7 +144,6 @@ self: super: {
   groupoids = dontHaddock super.groupoids;
   hamlet = dontHaddock super.hamlet;
   HaXml = dontHaddock super.HaXml;
-  HDBC-odbc = dontHaddock super.HDBC-odbc;
   hoodle-core = dontHaddock super.hoodle-core;
   hsc3-db = dontHaddock super.hsc3-db;
   http-client-conduit = dontHaddock super.http-client-conduit;
@@ -1067,6 +1066,15 @@ self: super: {
   # https://github.com/roelvandijk/terminal-progress-bar/issues/13
   terminal-progress-bar = doJailbreak super.terminal-progress-bar;
 
+  # https://github.com/hdbc/hdbc-odbc/pull/29
+  HDBC-odbc = overrideCabal super.HDBC-odbc (old: {
+    postPatch = old.postPatch or "" + ''
+      sed -e '/data BoundValue =/ { s/$/{/ ; n; n ; s/{ bvVal/  bvVal/ }' \
+          -e 's/-- | This is rather/-- This is rather/' \
+          -i Database/HDBC/ODBC/Statement.hsc
+    '';
+  });
+
   # https://github.com/vshabanov/HsOpenSSL/issues/11
   HsOpenSSL = doJailbreak super.HsOpenSSL;