| ... |
... |
@@ -447,7 +447,6 @@ opsysVariables _ FreeBSD14 = mconcat |
|
447
|
447
|
, "CC" =: "cc"
|
|
448
|
448
|
, "CXX" =: "c++"
|
|
449
|
449
|
, "GHC_VERSION" =: "9.6.4"
|
|
450
|
|
- , "CABAL_INSTALL_VERSION" =: "3.10.3.0"
|
|
451
|
450
|
]
|
|
452
|
451
|
opsysVariables arch (Linux distro) = distroVariables arch distro
|
|
453
|
452
|
opsysVariables AArch64 (Darwin {}) = mconcat
|
| ... |
... |
@@ -476,7 +475,6 @@ opsysVariables Amd64 (Darwin {}) = mconcat |
|
476
|
475
|
opsysVariables _ (Windows {}) = mconcat
|
|
477
|
476
|
[ "MSYSTEM" =: "CLANG64"
|
|
478
|
477
|
, "LANG" =: "en_US.UTF-8"
|
|
479
|
|
- , "CABAL_INSTALL_VERSION" =: "3.10.2.0"
|
|
480
|
478
|
, "HADRIAN_ARGS" =: "--docs=no-sphinx-pdfs"
|
|
481
|
479
|
, "GHC_VERSION" =: "9.6.4"
|
|
482
|
480
|
]
|
| ... |
... |
@@ -884,6 +882,7 @@ job arch opsys buildConfig = NamedJob { name = jobName, jobInfo = Job {..} } |
|
884
|
882
|
, "BIGNUM_BACKEND" =: bignumString (bignumBackend buildConfig)
|
|
885
|
883
|
, "CONFIGURE_ARGS" =: configureArgsStr buildConfig
|
|
886
|
884
|
, "INSTALL_CONFIGURE_ARGS" =: "--enable-strict-ghc-toolchain-check"
|
|
|
885
|
+ , "CABAL_INSTALL_VERSION" =: "3.12.1.0"
|
|
887
|
886
|
, maybe mempty ("CONFIGURE_WRAPPER" =:) (configureWrapper buildConfig)
|
|
888
|
887
|
, maybe mempty ("CROSS_TARGET" =:) (crossTarget buildConfig)
|
|
889
|
888
|
, case crossEmulator buildConfig of
|