Merge branch 'master' into renovate/gazelle-0.x

Author: mergify[bot]

.bazelci/presubmit.yml

@@ -9,7 +9,7 @@ tasks:
   ubuntu1804:
     bazel: ${{ bazel }}
     working_directory: ${{ workdir }}
-    platform: "ubuntu1804"
+    platform: "ubuntu2204"
     environment:
       # haskell base uses the environment locale to decode sockets
       LANG: "C.UTF-8"

.bcr/presubmit.yml

@@ -1,7 +1,7 @@
 matrix:
   platform:
   - debian10
-  - ubuntu2004
+  - ubuntu2404
   - macos
   - macos_arm64
   # disable Windows for now, it fails with
@@ -19,7 +19,7 @@ tasks:
     - |
       if apt --version >/dev/null 2>/dev/null; then
         sudo apt update
-        sudo apt install --no-install-recommends -yy libtinfo5 libgmp-dev
+        sudo apt install --no-install-recommends -yy libgmp-dev
       fi
     - |
       if xcodebuild -version; then

.github/actions/free_disk_space_on_linux/action.yaml

@@ -9,4 +9,4 @@ runs:
       run: |-
         sudo swapoff -a
         sudo rm -rf /swapfile /usr/share/dotnet /usr/local/lib/android /opt/ghc "$ANDROID_HOME" /usr/local/.ghcup /usr/local/share/powershell /opt/az /opt/microsoft /etc/skel
-        docker rmi $(docker images -q) -f
+        docker images -q | xargs -r docker rmi -f

.github/extract_from_ghc_bindist.py

@@ -1,28 +1,36 @@
 import json
 import os
 import sys
+from packaging import version
 
-current_dir = os.path.dirname(__file__)
-haskell_dir = os.path.join(current_dir, "..", "haskell")
 
+def get_latest_versions(version_list):
+    # Create a dictionary to store the latest version for each major.minor pair
+    latest_versions = {}
+
+    for ver in version_list:
+        # Split the version into major, minor, and patch
+        major, minor, patch = map(int, ver.split('.'))
+
+        # Create a key for the major.minor pair
+        key = f"{major}.{minor}"
+
+        # If the key is not in the dictionary or the current version is greater than the stored version
+        if key not in latest_versions or version.parse(ver) > version.parse(latest_versions[key]):
+            # Update the dictionary with the latest version
+            latest_versions[key] = ver
 
-def unexpected(unexpected, l, error_message):
-    for a in unexpected:
-        if a in l:
-            print(error_message, file=sys.stderr)
-            list.remove(a)
+    # Return the latest versions
+    return list(latest_versions.values())
 
 
+current_dir = os.path.dirname(__file__)
+haskell_dir = os.path.join(current_dir, "..", "haskell")
+
 with open(
     os.path.join(haskell_dir, "private", "ghc_bindist_generated.json"), mode="rb"
 ) as f:
-    version_numbers = list(json.load(f).keys())
-
-unexpected(
-    ["8.10.1", "8.10.2"],
-    version_numbers,
-    "GHC 8.10.1 and 8.10.2 not supported. Upgrade to 8.10.3 or later.",
-)
+    version_numbers = get_latest_versions(json.load(f).keys())
 
 with open(os.environ["GITHUB_OUTPUT"], mode="a", encoding="utf-8") as output:
     output.write("ghc-matrix={}\n".format(version_numbers))

.github/workflows/patch-test.yaml

@@ -13,7 +13,7 @@ env:
 jobs:
   find-ghc-version:
     name: Find GHC versions for which a bindist is provided
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     outputs:
       ghc-matrix: ${{ steps.set-ghc-versions.outputs.ghc-matrix }}
     steps:
@@ -30,16 +30,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, macos-13, windows-latest]
+        os: [ubuntu-24.04, macos-13, windows-2022]
         ghc-version: ${{ fromJSON(needs.find-ghc-version.outputs.ghc-matrix) }}
     runs-on: ${{ matrix.os }}
     steps:
-      - name: Install required packages
-        run: |
-          sudo apt-get update
-          sudo apt-get install --no-install-recommends -yy libtinfo5
-          sudo apt-get clean
-        if: ${{ matrix.os == 'ubuntu-22.04' }}
       - uses: actions/checkout@v4
       - name: Mount Bazel cache
         uses: actions/cache@v4
@@ -68,6 +62,10 @@ jobs:
           machine api.github.com
                   password ${{ secrets.GITHUB_TOKEN }}
           EOF
+      - uses: ./.github/actions/install_apt_pkgs
+        with:
+          # some old ghc distributions require libnuma, see https://gitlab.haskell.org/ghc/ghc/-/issues/15688
+          packages: libnuma-dev
       - name: Build & test
         shell: bash
         run: |

.github/workflows/prepare-release.yaml

@@ -15,7 +15,7 @@ permissions:
 jobs:
   release:
     name: Prepare Release
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check version
         run: |

.github/workflows/publish.yaml

@@ -8,7 +8,7 @@ on:
 jobs:
   webpage:
     name: Update webpage
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.github/workflows/update-ghc.yaml

@@ -7,7 +7,7 @@ on:
 jobs:
   update_ghc:
     name: GHC ${{ matrix.ghc }} Update
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:

.github/workflows/workflow.yaml

@@ -18,7 +18,7 @@ concurrency:
 jobs:
   lint:
     name: Format & Lint
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: tweag/configure-bazel-remote-cache-auth@v0
@@ -43,7 +43,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, macos-13]
+        os: [ubuntu-24.04, macos-13]
         module: [rules_haskell, rules_haskell_nix, rules_haskell_tests]
         bzlmod: [true, false]
         ghc:
@@ -139,7 +139,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, macos-13, windows-latest]
+        os: [ubuntu-24.04, macos-13, windows-2022]
         module: [rules_haskell, rules_haskell_tests]
         bzlmod: [true, false]
         ghc:
@@ -155,18 +155,15 @@ jobs:
             bzlmod: true
           # currently proto-lens-protoc (read: protoc-gen-haskell) fails with an access violation on Windows
           - ghc: 9.6.5
-            os: windows-latest
+            os: windows-2022
           - ghc: 9.8.2
-            os: windows-latest
+            os: windows-2022
     env:
       GHC_VERSION: ${{ matrix.ghc }}
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/free_disk_space_on_linux
-      - uses: ./.github/actions/install_apt_pkgs
-        with:
-          packages: libtinfo5
       - name: Mount Bazel cache
         uses: actions/cache@v4
         with:
@@ -257,7 +254,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, macos-13, macos-14, windows-latest]
+        os: [ubuntu-24.04, macos-13, macos-14, windows-latest]
         bzlmod: [true, false]
         bazel:
           - "6.x"
@@ -272,9 +269,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/free_disk_space_on_linux
-      - uses: ./.github/actions/install_apt_pkgs
-        with:
-          packages: libtinfo5
       - name: Mount Bazel cache
         uses: actions/cache@v4
         with:
@@ -332,7 +326,7 @@ jobs:
           bazelisk build "//..."
 
   all_ci_tests:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs:
       - lint
       - examples-bindist

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",

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(

docs/haskell-use-cases.rst

@@ -54,9 +54,17 @@ toolchain resolution based on the target platform)::
   )
 
   rules_haskell_toolchains(
+      dist = {
+          "<arch>": "abc", # Select a concrete dist available for the <arch>
+      },
+      variant = {
+          "<arch>": "abc", # Select a concrete variant available for the <arch> and <dist>
+      }
       version = "X.Y.Z", # Any GHC version
   )
 
+*Note*: if no `dist` attribute is specified, we pick a Debian based binary
+        distribution on Linux by default.
 
 The compiler can also be pulled from Nixpkgs_, a set of package
 definitions for the `Nix package manager`_. Pulling the compiler from

docs/haskell.rst

@@ -30,14 +30,17 @@ On a Unix system you will need the following tools installed.
 * ``gcc``
 * ``libffi``
 * ``libgmp``
-* ``libtinfo5``
+* ``libtinfo6``
 * ``make``
-* ``python3`` (``python`` also needs to be available in ``$PATH``. Depending on your distribution, this might require installing the ``python`` meta-package, which might use Python 2 or 3, ``rules_haskell`` works with both.)
+* ``python3``
 * JDK (e.g., OpenJDK 8 or 11)
 
 On Ubuntu you can obtain them by installing the following packages. ::
 
-  build-essential libffi-dev libgmp-dev libtinfo5 libtinfo-dev python python3 openjdk-11-jdk
+  build-essential libffi-dev libgmp-dev libtinfo6 libtinfo-dev python3 openjdk-11-jdk
+
+*Note*: on older Unix systems, with older GHC versions you might need to install
+        ``libtinfo5`` instead of ``libtinfo6`` and ``libnuma-dev`` additionally.
 
 On Windows you will need.
 

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")

extensions/haskell_toolchains.bzl

@@ -14,6 +14,12 @@ _bindists_tag = tag_class(
         "version": attr.string(
             doc = "[see rules_haskell_toolchains](toolchain.html#rules_haskell_toolchains-version)",
         ),
+        "dist": attr.string_dict(
+            doc = "Select a specific `dist` of a GHC binary tarball (e.g. deb10, alpine312) for a platform",
+        ),
+        "variant": attr.string_dict(
+            doc = "Select a specific `variant` of a GHC binary tarball (e.g. dwarf, native_int) for a platform",
+        ),
         "ghcopts": attr.string_list(
             doc = "[see rules_haskell_toolchains](toolchain.html#rules_haskell_toolchains-ghcopts)",
         ),
@@ -41,6 +47,12 @@ _bindist_tag = tag_class(
             mandatory = True,
             doc = "The desired GHC version",
         ),
+        "dist": attr.string_dict(
+            doc = "Select a specific `dist` of a GHC binary tarball (e.g. deb10, alpine312) for a platform",
+        ),
+        "variant": attr.string_dict(
+            doc = "Select a specific `variant` of a GHC binary tarball (e.g. dwarf, native_int) for a platform",
+        ),
         "target": attr.string(
             mandatory = True,
             doc = "The desired architecture (See [ghc_bindist_generated.json](https://github.com/tweag/rules_haskell/blob/master/haskell/private/ghc_bindist_generated.json))",
@@ -118,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,
@@ -152,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,