diff options
| author | Peter Simons <simons@cryp.to> | 2016-11-23 20:35:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-23 20:35:14 +0100 |
| commit | 88fa37099262cb895886f3fe1489f51b1f5f5a43 (patch) | |
| tree | 29c46459f57afa3fa61bd3dff1289fa6433fe252 /pkgs | |
| parent | 56dc7dee02e644cfefd7319f5720dea1a9be8522 (diff) | |
| parent | 54f8379321d3e44c9d286d29d756c756f3a59f42 (diff) | |
| download | nixlib-88fa37099262cb895886f3fe1489f51b1f5f5a43.tar nixlib-88fa37099262cb895886f3fe1489f51b1f5f5a43.tar.gz nixlib-88fa37099262cb895886f3fe1489f51b1f5f5a43.tar.bz2 nixlib-88fa37099262cb895886f3fe1489f51b1f5f5a43.tar.lz nixlib-88fa37099262cb895886f3fe1489f51b1f5f5a43.tar.xz nixlib-88fa37099262cb895886f3fe1489f51b1f5f5a43.tar.zst nixlib-88fa37099262cb895886f3fe1489f51b1f5f5a43.zip | |
Merge pull request #20652 from Profpatsch/hdbc-odbc-haddock
haskellPackages: fix HDBC-odbc haddockPhase
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 10 |
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; |