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: 04f456ef9409
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9e56f1a6b825
Choose a head ref
  • 5 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 8, 2017

  1. Fix hw-kafka-client haskell package

    Ben Ford committed Sep 8, 2017
    Copy the full SHA
    3205d16 View commit details

  2. Also had to add dontCheck integration test seems to hang 

    (unit tests all pass)
    Ben Ford committed Sep 8, 2017
    Copy the full SHA
    017a356 View commit details

  3. Add a note about the changes

    Ben Ford committed Sep 8, 2017
    Copy the full SHA
    30ce53d View commit details

  4. Change link in explanation to upstream issue

    Ben Ford committed Sep 8, 2017
    Copy the full SHA
    94ba1c0 View commit details

  5. Merge pull request #29109 from boothead/hw-kafka-client 

    Fix hw-kafka-client haskell package
    @peti
    peti authored Sep 8, 2017
    Copy the full SHA
    9e56f1a View commit details
Showing with 6 additions and 0 deletions.
  1. +6 −0 pkgs/development/haskell-modules/configuration-nix.nix
6 changes: 6 additions & 0 deletions pkgs/development/haskell-modules/configuration-nix.nix
View file
Original file line number Diff line number Diff line change
@@ -105,6 +105,12 @@ self: super: builtins.intersectAttrs super {
configureFlags = "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka";
});

# library has hard coded directories that need to be removed. Reported upstream here https://github.com/haskell-works/hw-kafka-client/issues/32
hw-kafka-client = dontCheck (overrideCabal super.hw-kafka-client (drv: {
preConfigure = "sed -i -e /extra-lib-dirs/d -e /include-dirs/d -e /librdkafka/d hw-kafka-client.cabal";
configureFlags = "--extra-include-dirs=${pkgs.rdkafka}/include/librdkafka";
}));

# Foreign dependency name clashes with another Haskell package.
libarchive-conduit = super.libarchive-conduit.override { archive = pkgs.libarchive; };