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

Commits on May 25, 2020

  1. haskell-cabal-fmt: overriding Cabal-3.2 is unnecessary for ghc-8.10.x… 

    … and beyond
    @peti
    peti committed May 25, 2020
    Copy the full SHA
    0dc3638 View commit details
Showing with 3 additions and 3 deletions.
  1. +0 −3 pkgs/development/haskell-modules/configuration-common.nix
  2. +3 −0 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
3 changes: 0 additions & 3 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -1311,9 +1311,6 @@ self: super: {
'';
});

# cabal-fmt requires Cabal3
cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_2_0_0; };

# Several gtk2hs-provided packages at v0.13.8.0 fail to build on Darwin
# until we pick up https://github.com/gtk2hs/gtk2hs/pull/293 so apply that
# patch here. That single patch is for the gtk2hs super-repo, out of which
3 changes: 3 additions & 0 deletions pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
View file
Original file line number Diff line number Diff line change
@@ -106,4 +106,7 @@ self: super: {
# The package needs the latest Cabal version.
cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });

# cabal-fmt requires Cabal3
cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_2_0_0; };

}