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: 87cfea92f894
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ad6c23585783
Choose a head ref
  • 3 commits
  • 4 files changed
  • 1 contributor

Commits on Jun 29, 2017

  1. haskell: fix builds of hledger-iadd, opencv-extra, and logging-facade… 

    …-syslog
    @peti
    peti committed Jun 29, 2017
    Copy the full SHA
    78377ae View commit details

  2. ghc-syb-utils: disable test suite for GHC 8.x or later 

    The test suite fails when compiling with GHC 8.x. This seems to be a known issue.

Cc: DanielG/ghc-syb#20, #26689
    @peti
    peti committed Jun 29, 2017
    Copy the full SHA
    46fe4bd View commit details

  3. hackage-packages.nix: automatic Haskell package set update 

    This update was generated by hackage2nix v2.2.1-13-g5c18fb5 from Hackage revision
commercialhaskell/all-cabal-hashes@68ba901.
    @peti
    peti committed Jun 29, 2017
    Copy the full SHA
    ad6c235 View commit details
2 changes: 2 additions & 0 deletions pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
View file
Original file line number Diff line number Diff line change
@@ -55,5 +55,7 @@ self: super: {
# https://github.com/thoughtbot/yesod-auth-oauth2/pull/77
yesod-auth-oauth2 = doJailbreak super.yesod-auth-oauth2;

# https://github.com/nominolo/ghc-syb/issues/20
ghc-syb-utils = dontCheck super.ghc-syb-utils;

}
2 changes: 2 additions & 0 deletions pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
View file
Original file line number Diff line number Diff line change
@@ -56,5 +56,7 @@ self: super: {
# https://github.com/thoughtbot/yesod-auth-oauth2/pull/77
yesod-auth-oauth2 = doJailbreak super.yesod-auth-oauth2;

# https://github.com/nominolo/ghc-syb/issues/20
ghc-syb-utils = dontCheck super.ghc-syb-utils;

}
9 changes: 9 additions & 0 deletions pkgs/development/haskell-modules/configuration-nix.nix
View file
Original file line number Diff line number Diff line change
@@ -464,4 +464,13 @@ self: super: builtins.intersectAttrs super {
# Haskell OpenCV bindings need contrib code enabled in the C++ library.
opencv = super.opencv.override { opencv3 = pkgs.opencv3.override { enableContrib = true; }; };

# Without this override, the builds lacks pkg-config.
opencv-extra = addPkgconfigDepend super.opencv-extra (pkgs.opencv3.override { enableContrib = true; });

# Needs a newer version of brick than lts-8.x provides.
hledger-iadd = super.hledger-iadd.override { brick = self.brick_0_19; };

# Needs a newer version of hsyslog than lts-8.x provides.
logging-facade-syslog = super.logging-facade-syslog.override { hsyslog = self.hsyslog_5; };

}
Loading