Use deb10 dist on Linux amd64

avdv · avdv · commit 7f531c6e47bb · 2025-04-08T13:30:02.000+02:00
On newer Ubuntu systems, older ghc binary distributions do not work
anymore since they are lacking the legacy tinfo5 library package.

Note, there are also Ubuntu specific binary distributions available,
such as `ubuntu18_04`, `ubuntu20_04` and even `ubuntu22_04`, but these
are not available for all GHC versions and the Debian based ones are
working just as well.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -79,7 +79,11 @@ haskell_toolchains = use_extension(
     "@rules_haskell//extensions:haskell_toolchains.bzl",
     "haskell_toolchains",
 )
-haskell_toolchains.bindists()
+haskell_toolchains.bindists(
+    dist = {
+        "linux_amd64": "deb10",
+    },
+)
 use_repo(
     haskell_toolchains,
     "all_bindist_toolchains",
diff --git a/WORKSPACE b/WORKSPACE
@@ -67,7 +67,12 @@ load(
 )
 load("@rules_haskell_ghc_version//:ghc_version.bzl", "GHC_VERSION")
 
-haskell_register_ghc_bindists(version = GHC_VERSION)
+haskell_register_ghc_bindists(
+    dist = {
+        "linux_amd64": "deb10",
+    },
+    version = GHC_VERSION,
+)
 
 load("@os_info//:os_info.bzl", "is_nix_shell", "is_windows")
 load(
diff --git a/examples/WORKSPACE b/examples/WORKSPACE
@@ -26,7 +26,12 @@ haskell_register_ghc_nixpkgs(
 
 load("@rules_haskell//haskell:toolchain.bzl", "rules_haskell_toolchains")
 
-rules_haskell_toolchains(version = GHC_VERSION)
+rules_haskell_toolchains(
+    dist = {
+        "linux_amd64": "deb10",
+    },
+    version = GHC_VERSION,
+)
 
 load("@rules_nixpkgs_cc//:cc.bzl", "nixpkgs_cc_configure")
 load("@rules_nixpkgs_python//:python.bzl", "nixpkgs_python_configure")
diff --git a/extensions/haskell_toolchains.bzl b/extensions/haskell_toolchains.bzl
@@ -130,6 +130,8 @@ def _haskell_toolchains_impl(mctx):
                 bindist_targets.append(bindist_tag.target)
             ghc_bindist(
                 name = name,
+                dist = bindist_tag.dist,
+                variant = bindist_tag.variant,
                 version = bindist_tag.version,
                 target = bindist_tag.target,
                 ghcopts = bindist_tag.ghcopts,
@@ -164,6 +166,8 @@ def _haskell_toolchains_impl(mctx):
             targets = bindist_info_for_version(mctx, bindists_tag.version).keys()
 
             haskell_register_ghc_bindists(
+                dist = bindists_tag.dist,
+                variant = bindists_tag.variant,
                 version = bindists_tag.version,
                 ghcopts = bindists_tag.ghcopts,
                 haddock_flags = bindists_tag.haddock_flags,
diff --git a/rules_haskell_tests/MODULE.bazel b/rules_haskell_tests/MODULE.bazel
@@ -295,6 +295,9 @@ cabalopts_windows = test_cabalopts + [
 
 haskell_toolchains.bindists(
     cabalopts = test_cabalopts,
+    dist = {
+        "linux_amd64": "deb10",
+    },
     ghcopts = test_ghcopts,
     haddock_flags = test_haddock_flags,
     repl_ghci_args = test_repl_ghci_args,
diff --git a/rules_haskell_tests/WORKSPACE b/rules_haskell_tests/WORKSPACE
@@ -137,6 +137,9 @@ load(
 
 haskell_register_ghc_bindists(
     cabalopts = test_cabalopts,
+    dist = {
+      "linux_amd64": "deb10",
+    },
     ghcopts = test_ghcopts,
     version = GHC_VERSION,
 )
diff --git a/rules_haskell_tests/tests/haskell_module/repl/haskell_module_repl_cross_library_deps_test/WORKSPACE b/rules_haskell_tests/tests/haskell_module/repl/haskell_module_repl_cross_library_deps_test/WORKSPACE
@@ -24,7 +24,12 @@ haskell_register_ghc_nixpkgs(
 
 load("@rules_haskell//haskell:toolchain.bzl", "rules_haskell_toolchains")
 
-rules_haskell_toolchains(version = GHC_VERSION)
+rules_haskell_toolchains(
+    dist = {
+        "linux_amd64": "deb10",
+    },
+    version = GHC_VERSION,
+)
 
 load("@rules_nixpkgs_cc//:cc.bzl", "nixpkgs_cc_configure")
 load(
diff --git a/rules_haskell_tests/tests/haskell_module/repl/haskell_module_repl_test/WORKSPACE b/rules_haskell_tests/tests/haskell_module/repl/haskell_module_repl_test/WORKSPACE
@@ -25,7 +25,12 @@ haskell_register_ghc_nixpkgs(
 
 load("@rules_haskell//haskell:toolchain.bzl", "rules_haskell_toolchains")
 
-rules_haskell_toolchains(version = GHC_VERSION)
+rules_haskell_toolchains(
+    dist = {
+        "linux_amd64": "deb10",
+    },
+    version = GHC_VERSION,
+)
 
 load(
     "@io_tweag_rules_nixpkgs//nixpkgs:nixpkgs.bzl",
diff --git a/rules_haskell_tests/tests/recompilation/recompilation_workspace/WORKSPACE b/rules_haskell_tests/tests/recompilation/recompilation_workspace/WORKSPACE
@@ -20,7 +20,12 @@ haskell_register_ghc_nixpkgs(
 
 load("@rules_haskell//haskell:toolchain.bzl", "rules_haskell_toolchains")
 
-rules_haskell_toolchains(version = "8.10.7")
+rules_haskell_toolchains(
+    dist = {
+        "linux_amd64": "deb10",
+    },
+    version = "8.10.7",
+)
 
 load("@io_tweag_rules_nixpkgs//nixpkgs:nixpkgs.bzl", "nixpkgs_cc_configure")
 
diff --git a/rules_haskell_tests/tests/repl-targets/hs_bin_repl_test/WORKSPACE b/rules_haskell_tests/tests/repl-targets/hs_bin_repl_test/WORKSPACE
@@ -19,7 +19,12 @@ haskell_register_ghc_nixpkgs(
 
 load("@rules_haskell//haskell:toolchain.bzl", "rules_haskell_toolchains")
 
-rules_haskell_toolchains(version = GHC_VERSION)
+rules_haskell_toolchains(
+    dist = {
+        "linux_amd64": "deb10",
+    },
+    version = GHC_VERSION,
+)
 
 load(
     "@io_tweag_rules_nixpkgs//nixpkgs:nixpkgs.bzl",
diff --git a/rules_haskell_tests/tests/repl-targets/hs_lib_repl_test/WORKSPACE b/rules_haskell_tests/tests/repl-targets/hs_lib_repl_test/WORKSPACE
@@ -26,7 +26,12 @@ haskell_register_ghc_nixpkgs(
 
 load("@rules_haskell//haskell:toolchain.bzl", "rules_haskell_toolchains")
 
-rules_haskell_toolchains(version = GHC_VERSION)
+rules_haskell_toolchains(
+    dist = {
+        "linux_amd64": "deb10",
+    },
+    version = GHC_VERSION,
+)
 
 load(
     "@io_tweag_rules_nixpkgs//nixpkgs:nixpkgs.bzl",
diff --git a/rules_haskell_tests/tests/stack-snapshot-deps/hs_override_stack_test/WORKSPACE b/rules_haskell_tests/tests/stack-snapshot-deps/hs_override_stack_test/WORKSPACE
@@ -19,7 +19,12 @@ haskell_register_ghc_nixpkgs(
 
 load("@rules_haskell//haskell:toolchain.bzl", "rules_haskell_toolchains")
 
-rules_haskell_toolchains(version = GHC_VERSION)
+rules_haskell_toolchains(
+    dist = {
+        "linux_amd64": "deb10",
+    },
+    version = GHC_VERSION,
+)
 
 load(
     "@io_tweag_rules_nixpkgs//nixpkgs:nixpkgs.bzl",
diff --git a/start b/start
@@ -317,6 +317,9 @@ EOF
         "bindists") cat <<-EOF
 		# Download a GHC binary distribution from haskell.org and register it as a toolchain.
 		rules_haskell_toolchains(
+		    dist = {
+		        "linux_amd64": "deb10",
+		    },
 		    version = "${GHC_VERSION}",
 		)
 
@@ -403,7 +406,12 @@ haskell_toolchains = use_extension(
     "haskell_toolchains",
 )
 
-haskell_toolchains.bindists(version = "$GHC_VERSION")
+haskell_toolchains.bindists(
+    dist = {
+        "linux_amd64": "deb10",
+    },
+    version = "$GHC_VERSION",
+)
 
 non_module_deps = use_extension(
     "//:non_module_deps.bzl",
diff --git a/tutorial/WORKSPACE b/tutorial/WORKSPACE
@@ -21,7 +21,12 @@ haskell_register_ghc_nixpkgs(
 
 load("@rules_haskell//haskell:toolchain.bzl", "rules_haskell_toolchains")
 
-rules_haskell_toolchains(version = GHC_VERSION)
+rules_haskell_toolchains(
+    dist = {
+        "linux_amd64": "deb10",
+    },
+    version = GHC_VERSION,
+)
 
 load(
     "@io_tweag_rules_nixpkgs//nixpkgs:nixpkgs.bzl",

Original file line number	Diff line number	Diff line change
`@@ -137,6 +137,9 @@ load(`
`137`	`137`
`138`	`138`	`haskell_register_ghc_bindists(`
`139`	`139`	`cabalopts = test_cabalopts,`
	`140`	`+ dist = {`
	`141`	`+ "linux_amd64": "deb10",`
	`142`	`+ },`
`140`	`143`	`ghcopts = test_ghcopts,`
`141`	`144`	`version = GHC_VERSION,`
`142`	`145`	`)`