Skip to content

Support cabal-install 3.10.3 #2177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Support cabal-install 3.10.3 #2177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions modules/cabal-project.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ in {
ghc910FullName = pkgs.haskell-nix.resolve-compiler-name "ghc910X";
ghc911FullName = pkgs.haskell-nix.resolve-compiler-name "ghc911";
in
# cabal-install from hackage (3.10.1.0) does not build with GHC HEAD
if builtins.elem fullName [ ghc910FullName ghc911FullName ] && config.name == "cabal-install" && (builtins.elem config.version ["3.10.1.0" "3.10.2.0" "3.10.2.1"])
# cabal-install from hackage (3.10.3.0) does not build with GHC HEAD
if builtins.elem fullName [ ghc910FullName ghc911FullName ] && config.name == "cabal-install" && (builtins.elem config.version ["3.10.1.0" "3.10.2.0" "3.10.2.1" "3.10.3.0"])
then "ghc964"
else pkgs.haskell-nix.resolve-compiler-name name;
};
Expand Down
26 changes: 1 addition & 25 deletions overlays/bootstrap.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1329,31 +1329,7 @@ in {
cabal-install-tool = {compiler-nix-name, ...}@args:
(final.haskell-nix.tool compiler-nix-name "cabal" ({pkgs, ...}: {
evalPackages = pkgs.buildPackages;
version = "3.10.1.0";
} // final.lib.optionalAttrs (__compareVersions final.buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.8.0" >= 0) {
# It is important not to include this when not needed as it
# introduces a eval time dependency on the `buildPackages`
# version of nix-tools (on platforms where we cannot use the
# static nix-tools).
cabalProjectLocal = ''
-- allow newer packages, that are bound to be newer due to
-- being shipped with a newer compiler. If you extend this
-- be very careful to only extend it for absolutely necessary packages
-- otherwise we risk running into broken build-plans down the line.
allow-newer: *:base, *:template-haskell, *:bytestring, *:text

repository head.hackage.ghc.haskell.org
url: https://ghc.gitlab.haskell.org/head.hackage/
secure: True
key-threshold: 3
root-keys:
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
--sha256: sha256-h/vbKTUdGVdkt2ogJer2d+gRuHkayiblQ7oFRqpj14c=

active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
'';
version = "3.10.3.0";
} // final.lib.optionalAttrs (__compareVersions final.buildPackages.haskell-nix.compiler.${compiler-nix-name}.version "9.8.0" < 0) {
index-state = final.haskell-nix.internalHackageIndexState;
materialized = ../materialized + "/${compiler-nix-name}/cabal-install";
Expand Down
Loading