Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 56dc7dee02e6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 88fa37099262
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 23, 2016

  1. haskellPackages: fix HDBC-odbc haddockPhase

    @Profpatsch
    Profpatsch committed Nov 23, 2016
    Copy the full SHA
    54f8379 View commit details

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

    haskellPackages: fix HDBC-odbc haddockPhase
    @peti
    peti authored Nov 23, 2016
    Copy the full SHA
    88fa370 View commit details
Showing with 9 additions and 1 deletion.
  1. +9 −1 pkgs/development/haskell-modules/configuration-common.nix
10 changes: 9 additions & 1 deletion pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -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;