mirror of
https://github.com/digital-asset/daml.git
synced 2024-11-13 00:16:19 +03:00
try to bump GHC in Nix (#18534)
* try to bump GHC in Nix * also bump Windows
This commit is contained in:
parent
aa1ea4cefd
commit
9c345d41b4
@ -21,7 +21,7 @@ sh_binaries(
|
||||
"@cabal_win//:tools",
|
||||
"@dadew_ghc_lib_deps//:tools",
|
||||
"@dadew_ghc_lib_deps_python//:tools",
|
||||
"@ghc_865_win//:tools",
|
||||
"@ghc_win//:tools",
|
||||
],
|
||||
) if is_windows else None
|
||||
|
||||
|
@ -106,17 +106,17 @@ def _ghc_lib_deps_windows():
|
||||
)
|
||||
|
||||
http_archive(
|
||||
name = "ghc_865_win",
|
||||
name = "ghc_win",
|
||||
build_file_content = """\
|
||||
load("@rules_sh//sh:sh.bzl", "sh_binaries")
|
||||
sh_binaries(
|
||||
name = "tools",
|
||||
srcs = glob(["ghc-8.6.5/bin/*"]),
|
||||
srcs = glob(["ghc-9.0.2*/bin/*"]),
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
""",
|
||||
sha256 = "457024c6ea43bdce340af428d86319931f267089398b859b00efdfe2fd4ce93f",
|
||||
urls = ["https://downloads.haskell.org/~ghc/8.6.5/ghc-8.6.5-x86_64-unknown-mingw32.tar.xz"],
|
||||
sha256 = "f6fbb8047ae16049dc6215a6abb652b4307205310bfffddea695a854af92dc99",
|
||||
urls = ["https://downloads.haskell.org/~ghc/9.0.2/ghc-9.0.2-x86_64-unknown-mingw32.tar.xz"],
|
||||
)
|
||||
|
||||
http_archive(
|
||||
|
@ -46,7 +46,7 @@ let shared = rec {
|
||||
gnumake
|
||||
ncurses
|
||||
perl
|
||||
haskell.compiler.ghc865Binary
|
||||
haskell.compiler.ghc902
|
||||
stdenv.cc # ghc-lib needs `gcc` or `clang`, but Bazel provides `cc`.
|
||||
xz
|
||||
] ++ (
|
||||
|
Loading…
Reference in New Issue
Block a user