Skip to content

Commit eb6e1c2

Browse files
committed
Use cabal 3.8
Includes workarounds for: haskell/cabal#8352 haskell/cabal#8370
1 parent 2b9b99a commit eb6e1c2

File tree

166 files changed

+17017
-8276
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+17017
-8276
lines changed

builder/hspkg-builder.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ let
5353
||
5454
# These are the dependencies of `Cabal`
5555
!builtins.elem package.identifier.name
56-
["nix-tools" "alex" "happy" "hscolour" "Cabal" "bytestring" "aeson" "time"
56+
["nix-tools" "alex" "happy" "hscolour" "Cabal" "Cabal-syntax" "bytestring" "aeson" "time"
5757
"filepath" "base-compat-batteries" "base-compat" "unix" "directory" "transformers"
5858
"containers" "binary" "mtl" "text" "process" "parsec"];
5959

lib/call-cabal-project-to-nix.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -329,14 +329,14 @@ let
329329
# when `checkMaterialization` is set.
330330
dummy-ghc-data =
331331
let
332-
materialized = ../materialized/dummy-ghc + "/${ghc.targetPrefix}${ghc.name}-${pkgs.stdenv.buildPlatform.system}";
332+
materialized = ../materialized/dummy-ghc + "/${ghc.targetPrefix}${ghc.name}-${pkgs.stdenv.buildPlatform.system}"
333+
+ pkgs.lib.optionalString (builtins.compareVersions ghc.version "8.10" < 0 && ghc.targetPrefix == "" && builtins.compareVersions pkgs.lib.version "22.05" < 0) "-old";
333334
in pkgs.haskell-nix.materialize ({
334335
sha256 = null;
335336
sha256Arg = "sha256";
336337
materialized = if __pathExists materialized
337338
then materialized
338-
else __trace ("WARNING: No materialized dummy-ghc-data for "
339-
+ "${ghc.targetPrefix}${ghc.name}-${pkgs.stdenv.buildPlatform.system}.")
339+
else __trace "WARNING: No materialized dummy-ghc-data. mkdir ${toString materialized}"
340340
null;
341341
reasonNotSafe = null;
342342
} // pkgs.lib.optionalAttrs (checkMaterialization != null) {

lib/ghcjs-project.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
if (builtins.compareVersions ghcjsVersion "8.10.0.0" >= 0)
4040
then pkgs.haskell-nix.tool compiler-nix-name "cabal" {
4141
index-state = pkgs.haskell-nix.internalHackageIndexState;
42-
version = "3.6.2.0";
42+
version = "3.8.1.0";
4343
materialized = ../materialized/ghcjs/cabal + "/${compiler-nix-name}";
4444
}
4545
else pkgs.haskell-nix.tool compiler-nix-name "cabal" {
@@ -48,7 +48,7 @@
4848
# Cabal 3.2.1.0 no longer supports he mix of `cabal-version`,
4949
# lack of `custom-setup` and `v1-install` used by ghcjs boot.
5050
cabalProjectLocal = ''
51-
constraints: Cabal <3.2.1.0
51+
constraints: Cabal <3.2.1.0, Cabal-syntax <0
5252
'';
5353
materialized = ../materialized/ghcjs/cabal + "/${compiler-nix-name}";
5454
}

materialized/dummy-ghc/aarch64-unknown-linux-gnu-aarch64-unknown-linux-gnu-ghc-8.10.5-x86_64-linux/ghc-pkg/dump-global

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/dummy-ghc/aarch64-unknown-linux-gnu-aarch64-unknown-linux-gnu-ghc-8.10.5-x86_64-linux/ghc/info

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/dummy-ghc/aarch64-unknown-linux-gnu-aarch64-unknown-linux-gnu-ghc-8.10.6-x86_64-linux/ghc-pkg/dump-global

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/dummy-ghc/aarch64-unknown-linux-gnu-aarch64-unknown-linux-gnu-ghc-8.10.6-x86_64-linux/ghc/info

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/dummy-ghc/aarch64-unknown-linux-gnu-aarch64-unknown-linux-gnu-ghc-8.10.7-x86_64-linux/ghc-pkg/dump-global

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/dummy-ghc/aarch64-unknown-linux-gnu-aarch64-unknown-linux-gnu-ghc-8.10.7-x86_64-linux/ghc/info

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/dummy-ghc/aarch64-unknown-linux-gnu-aarch64-unknown-linux-gnu-ghc-8.8.4-x86_64-linux/ghc-pkg/dump-global

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

materialized/dummy-ghc/aarch64-unknown-linux-gnu-aarch64-unknown-linux-gnu-ghc-8.8.4-x86_64-linux/ghc/info

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)