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: d8d7d3f1bf84
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0f64501db7df
Choose a head ref
  • 3 commits
  • 4 files changed
  • 2 contributors

Commits on Apr 21, 2020

  1. Haskell: apply-refact version has to match ghc 

    This commit maps:

* GHC 8.6 to apply-refact 0.6
* GHC 8.8 to apply-refact 0.7
* GHC 8.10 to apply-refact 0.8

See:
<https://hackage.haskell.org/package/apply-refact/changelog>
<mpickering/apply-refact#56>
    @andys8
    andys8 committed Apr 21, 2020
    Copy the full SHA
    1c70da8 View commit details

Commits on Apr 22, 2020

  1. Update pkgs/development/haskell-modules/configuration-hackage2nix.yaml

    @cdepillabout
    cdepillabout authored Apr 22, 2020
    Copy the full SHA
    f20acd4 View commit details

  2. Merge pull request #85617 from andys8/fix/haskell-apply-refact-version 

    Haskell: apply-refact version has to match ghc
    @cdepillabout
    cdepillabout authored Apr 22, 2020
    Copy the full SHA
    0f64501 View commit details
2 changes: 2 additions & 0 deletions pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
View file
Original file line number Diff line number Diff line change
@@ -94,4 +94,6 @@ self: super: {
sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f";
});

# Only 0.8 is compatible with ghc 8.10 https://hackage.haskell.org/package/apply-refact/changelog
apply-refact = super.apply-refact_0_8_0_0;
}
2 changes: 2 additions & 0 deletions pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
View file
Original file line number Diff line number Diff line change
@@ -91,4 +91,6 @@ self: super: {
# ghc versions prior to 8.8.x needs additional dependency to compile successfully.
ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser;

# Only 0.6 is compatible with ghc 8.6 https://hackage.haskell.org/package/apply-refact/changelog
apply-refact = super.apply-refact_0_6_0_0;
}
2 changes: 2 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
@@ -96,4 +96,6 @@ self: super: {
# of issues with Cabal 3.x.
darcs = dontDistribute super.darcs;

# 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;
}
3 changes: 3 additions & 0 deletions pkgs/development/haskell-modules/configuration-hackage2nix.yaml
View file
Original file line number Diff line number Diff line change
@@ -2358,6 +2358,9 @@ extra-packages:
- ansi-terminal == 0.10.3 # required by cabal-plan, and policeman in ghc-8.8.x
- aeson-pretty < 0.8 # required by elm compiler
- apply-refact < 0.4 # newer versions don't work with GHC 8.0.x
- apply-refact == 0.6.0.0 # works with GHC 8.6.x https://hackage.haskell.org/package/apply-refact/changelog
- apply-refact == 0.7.0.0 # works with GHC 8.8.x https://hackage.haskell.org/package/apply-refact/changelog
- apply-refact == 0.8.0.0 # works with GHC 8.10.x https://hackage.haskell.org/package/apply-refact/changelog
- binary > 0.7 && < 0.8 # keep a 7.x major release around for older compilers
- binary > 0.8 && < 0.9 # keep a 8.x major release around for older compilers
- blank-canvas < 0.6.3 # more recent versions depend on base-compat-batteries == 0.10.* but we're on base-compat-0.9.*