b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

haskell.packages.*.ghc-api-compat: fix across all supported sets

Browse source 
* haskell.packages.ghc884.ghc-api-compat needed us to re-add the 8.6
  version of the package.
* haskell.packages.ghc901.ghc-api-compat now points to the newly
  released 9.0.1 version of the package.
* haskell.packages.ghc8107.ghc-api-compat now correctly points to
  ghc-api-compat 8.10.7.

GHC 9.2.1 is still unsupported (which is to be expected, with it
being a release candidate).

To make sure everything stays working we'll build ghc-api-compat as part
of versionedCompilerJobs.
This commit is contained in:
sternenseemann 2021-09-07 15:48:08 +02:00
parent bcc8e62a23
commit 61b713abd6
6 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -1926,9 +1926,6 @@ EOT
Cabal = self.Cabal_3_6_0_0;
};
# ghc-api-compat needlessly requires 8.10.5 exactly, but we have 8.10.6
ghc-api-compat = doJailbreak super.ghc-api-compat;
# 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too.
streamly-posix = doJailbreak super.streamly-posix;

2
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
View file

@ -129,5 +129,5 @@ self: super: {
# vector 0.12.2 indroduced doctest checks that don‘t work on older compilers
vector = dontCheck super.vector;
ghc-api-compat = super.ghc-api-compat_8_6;
ghc-api-compat = doDistribute super.ghc-api-compat_8_6;
}

3
pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
View file

@ -112,4 +112,7 @@ self: super: {
};
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_0_0_4;
});
# pick right version for compiler
ghc-api-compat = doDistribute super.ghc-api-compat_9_0_1;
}

4
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View file

@ -94,6 +94,8 @@ default-package-overrides:
- dhall-nix < 1.1.22
# reflex-dom-pandoc is only used by neuron which needs a version < 1.0.0.0
- reflex-dom-pandoc < 1.0.0.0
# 2021-09-07: pin to our current GHC version
- ghc-api-compat == 8.10.7
extra-packages:
- base16-bytestring < 1 # required for cabal-install etc.
@ -122,7 +124,7 @@ extra-packages:
- crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses
- ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version
- cabal-install-parsers == 0.4.2 # 2021-09-04: needed haskell-ci by until it upgrades to Cabal >= 3.6
- ghc-api-compat < 8.10.5 # 2021-08-18: ghc-api-compat 8.10.5 is only compatible with ghc 8.10.5
- ghc-api-compat == 8.6 # 2021-09-07: preserve for GHC 8.8.4
package-maintainers:
abbradar:

13
pkgs/development/haskell-modules/hackage-packages.nix generated
View file

@ -102413,6 +102413,18 @@ self: {
}) {};
"ghc-api-compat" = callPackage
({ mkDerivation, base, ghc }:
mkDerivation {
pname = "ghc-api-compat";
version = "8.10.7";
sha256 = "1swsly340pj4inmk1l57q4s0dpw8iibl192y1zayvkgc43zky62a";
libraryHaskellDepends = [ base ghc ];
doHaddock = false;
description = "GHC-API compatibility helpers";
license = lib.licenses.bsd3;
}) {};
"ghc-api-compat_9_0_1" = callPackage
({ mkDerivation, base, containers, ghc }:
mkDerivation {
pname = "ghc-api-compat";
@ -102421,6 +102433,7 @@ self: {
libraryHaskellDepends = [ base containers ghc ];
description = "GHC-API compatibility helpers";
license = lib.licenses.bsd3;
hydraPlatforms = lib.platforms.none;
}) {};
"ghc-bignum" = callPackage

1
pkgs/top-level/release-haskell.nix
View file

@ -312,6 +312,7 @@ let
language-nix = all;
nix-paths = all;
titlecase = all;
ghc-api-compat = all;
})
{
mergeable = pkgs.releaseTools.aggregate {