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

Commits on Sep 10, 2017

  1. haskell: fix build of attoparsec-data 

    Fixes: https://hydra.nixos.org/build/60421889
    @basvandijk
    basvandijk committed Sep 10, 2017
    Copy the full SHA
    c910bbb View commit details

  2. Merge pull request #29177 from LumiGuide/fix-attoparsec-data 

    haskell: fix build of attoparsec-data
    @peti
    peti authored Sep 10, 2017
    Copy the full SHA
    a037526 View commit details
Showing with 7 additions and 0 deletions.
  1. +7 −0 pkgs/development/haskell-modules/configuration-common.nix
7 changes: 7 additions & 0 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,13 @@ with haskellLib;

self: super: {

attoparsec-time_1 = super.attoparsec-time_1.override {
doctest = super.doctest_0_13_0;
};
attoparsec-data = super.attoparsec-data.override {
attoparsec-time = self.attoparsec-time_1;
};

# This used to be a core package provided by GHC, but then the compiler
# dropped it. We define the name here to make sure that old packages which
# depend on this library still evaluate (even though they won't compile