Merge branch 'master' into cb/fix-bazel-head-workspace

.github/workflows/update-ghc.yaml

@@ -22,7 +22,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: master
-      - uses: cachix/install-nix-action@V28
+      - uses: cachix/install-nix-action@v30
         with:
           nix_path: nixpkgs=nixpkgs/default.nix
       - name: Fetch updates

.github/workflows/workflow.yaml

@@ -71,7 +71,7 @@ jobs:
         with:
           path: ~/repo-cache
           key: repo-cache-${{ runner.os }}-nixpkgs-${{ env.cache-version }}
-      - uses: cachix/install-nix-action@V28
+      - uses: cachix/install-nix-action@v30
         with:
           nix_path: nixpkgs=./nixpkgs/default.nix
           extra_nix_config: |

haskell/ghc_bindist.bzl

@@ -201,6 +201,8 @@ include Makefile""")
             # https://source.chromium.org/chromium/chromium/src/+/62848c8d298690e086e49a9832278ff56b6976b5.
             environment = {"ZERO_AR_DATE": "1"},
             working_directory = unpack_dir,
+            # use a big timeout because copying GHC is slow (1.5G)
+            timeout = 30 * 60,
         )
 
         if not is_hadrian_dist:

haskell/private/workspace_utils.bzl

@@ -2,13 +2,15 @@ def execute_or_fail_loudly(
         repository_ctx,
         arguments,
         environment = {},
-        working_directory = ""):
+        working_directory = "",
+        timeout = 600):
     """Execute the given command
 
     Fails if the command does not exit with exit-code 0.
 
     Args:
       arguments: List, the command line to execute.
+      timeout: The timeout for the command in seconds (default: 600).
 
     Returns:
       exec_result: The output of the command.
@@ -19,6 +21,7 @@ def execute_or_fail_loudly(
         environment = environment,
         quiet = True,
         working_directory = working_directory,
+        timeout = timeout,
     )
     if exec_result.return_code != 0:
         arguments = [_as_string(x) for x in arguments]