public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #20652 from Profpatsch/hdbc-odbc-haddock

Browse Source 
haskellPackages: fix HDBC-odbc haddockPhase
This commit is contained in:
Peter Simons 2016-11-23 20:35:14 +01:00 committed by GitHub
commit 88fa370992
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -144,7 +144,6 @@ self: super: {
groupoids = dontHaddock super.groupoids; groupoids = dontHaddock super.groupoids;
hamlet = dontHaddock super.hamlet; hamlet = dontHaddock super.hamlet;
HaXml = dontHaddock super.HaXml; HaXml = dontHaddock super.HaXml;
HDBC-odbc = dontHaddock super.HDBC-odbc;
hoodle-core = dontHaddock super.hoodle-core; hoodle-core = dontHaddock super.hoodle-core;
hsc3-db = dontHaddock super.hsc3-db; hsc3-db = dontHaddock super.hsc3-db;
http-client-conduit = dontHaddock super.http-client-conduit; http-client-conduit = dontHaddock super.http-client-conduit;
@ -1067,6 +1066,15 @@ self: super: {
# https://github.com/roelvandijk/terminal-progress-bar/issues/13 # https://github.com/roelvandijk/terminal-progress-bar/issues/13
terminal-progress-bar = doJailbreak super.terminal-progress-bar; 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 # https://github.com/vshabanov/HsOpenSSL/issues/11
HsOpenSSL = doJailbreak super.HsOpenSSL; HsOpenSSL = doJailbreak super.HsOpenSSL;