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

Commits on Mar 26, 2018

  1. haskellPackages.lenz: Remove outdated patch.

    @shlevy
    shlevy committed Mar 26, 2018

    Unverified

    The committer email address is not verified.
    Learn about vigilant mode
    Copy the full SHA
    2b3ba40 View commit details
Showing with 0 additions and 11 deletions.
  1. +0 −11 pkgs/development/haskell-modules/configuration-common.nix
11 changes: 0 additions & 11 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -920,17 +920,6 @@ self: super: {
# https://github.com/bos/text-icu/issues/32
text-icu = dontCheck super.text-icu;

# https://github.com/strake/lenz.hs/issues/2
lenz =
let patch = pkgs.fetchpatch
{ url = https://github.com/strake/lenz.hs/commit/4b9b79104759b9c6b24484455e1eb0d962eb3cff.patch;
sha256 = "02i0w9i55a4r251wgjzl5vbk6m2qhilwl7bfp5jwmf22z66sglyn";
};
in overrideCabal super.lenz (drv:
{ patches = (drv.patches or []) ++ [ patch ];
editedCabalFile = null;
});

# https://github.com/haskell/cabal/issues/4969
haddock-library_1_4_4 = dontHaddock super.haddock-library_1_4_4;
haddock-api = super.haddock-api.override { haddock-library = self.haddock-library_1_4_4; };