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

Commits on Apr 25, 2020

  1. haskell-cabal-install-parsers: re-factor overrides to fix build with … 

    …ghc-8.10.1
    @peti
    peti committed Apr 25, 2020
    Copy the full SHA
    21a354b View commit details
Showing with 6 additions and 5 deletions.
  1. +2 −5 pkgs/development/haskell-modules/configuration-common.nix
  2. +4 −0 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
7 changes: 2 additions & 5 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Original file line number Diff line number Diff line change
@@ -1457,11 +1457,8 @@ self: super: {
cryptonite = dontCheck super.cryptonite;

# The test suite depends on an impure cabal-install installation in
# $HOME, which we don't have in our build sandbox, and it is keeping
# up with the most recent Cabal version.
cabal-install-parsers = dontCheck (super.cabal-install-parsers.overrideScope (self: super: {
Cabal = self.Cabal_3_2_0_0;
}));
# $HOME, which we don't have in our build sandbox.
cabal-install-parsers = dontCheck super.cabal-install-parsers;

# haskell-ci-0.8 needs cabal-install-parsers ==0.1, but we have 0.2.
haskell-ci = doJailbreak super.haskell-ci;
4 changes: 4 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
@@ -102,4 +102,8 @@ self: super: {

# Only 0.7 is compatible with ghc 8.7 https://hackage.haskell.org/package/apply-refact/changelog
apply-refact = super.apply-refact_0_7_0_0;

# The package needs the latest Cabal version.
cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });

}