Update dependency bazel to v7 - abandoned

.bazelrc.common

@@ -17,6 +17,10 @@ startup --host_jvm_args=-Djdk.tls.client.protocols=TLSv1.2
 common --incompatible_require_linker_input_cc_api
 common --incompatible_disallow_empty_glob=true
 
+# explicitly disable sandboxing exclusive tests (it was false in Bazel 6, but is true in Bazel 7+)
+# (otherise this causes some integration tests to fail)
+common --noincompatible_exclusive_test_sandboxed
+
 # test environment does not propagate locales by default some tests reads files
 # written in UTF8, we need to propagate the correct environment variables, such
 # as LOCALE_ARCHIVE We also need to setup an utf8 locale

.bazelversion

@@ -1 +1 @@
-6.5.0
+7.1.0

.gitattributes

@@ -1,3 +1,6 @@
 # Prevent git from automatically introducing \r characters in .sha256 files.
 # Otherwise msys sha256sum fails.
 *.sha256 binary
+
+# keep LF line endings in patch files to keep hash the same
+registry/**/*.patch  text eol=lf

.github/workflows/workflow.yaml

@@ -47,16 +47,16 @@ jobs:
         module: [rules_haskell, rules_haskell_nix, rules_haskell_tests]
         bzlmod: [true, false]
         ghc:
-          - 9.4.6
+          - 9.4.8
           - 9.6.5
-          - 9.8.1
+          - 9.8.2
         exclude:
           - module: rules_haskell_nix
 
             bzlmod: false
           # TODO: in a MODULE.bazel file we declare version specific dependencies, would need to use stack snapshot json
           #       and stack config per GHC version
-          - ghc: 9.8.1
+          - ghc: 9.8.2
             bzlmod: true
           - ghc: 9.6.5
             bzlmod: true
@@ -143,20 +143,20 @@ jobs:
         module: [rules_haskell, rules_haskell_tests]
         bzlmod: [true, false]
         ghc:
-          - 9.4.6
+          - 9.4.8
           - 9.6.5
-          - 9.8.1
+          - 9.8.2
         exclude:
           # TODO: in a MODULE.bazel file we declare version specific dependencies, would need to use stack snapshot json
           #       and stack config per GHC version
-          - ghc: 9.8.1
+          - ghc: 9.8.2
             bzlmod: true
           - ghc: 9.6.5
             bzlmod: true
-          # currently proto-lens-protoc fails with an access violation on Windows
+          # currently proto-lens-protoc (read: protoc-gen-haskell) fails with an access violation on Windows
           - ghc: 9.6.5
             os: windows-latest
-          - ghc: 9.8.1
+          - ghc: 9.8.2
             os: windows-latest
     env:
       GHC_VERSION: ${{ matrix.ghc }}

BUILD.bazel

@@ -29,6 +29,7 @@ filegroup(
         "BUILD.bazel",
         "WORKSPACE",
         "constants.bzl",
+        "rules_nixpkgs_core_bazelignore.patch",
         "stackage_snapshot.json",
         "stackage_snapshot.yaml",
         "//debug/linking_utils:all_files",

MODULE.bazel

@@ -153,6 +153,13 @@ bazel_dep(
     version = "0.12.0",
     dev_dependency = True,
 )
+single_version_override(
+    module_name = "rules_nixpkgs_nodejs",
+    patch_strip = 3,
+    patches = [
+        "rules_nixpkgs_nodejs-bazelignore.patch",
+    ],
+)
 
 non_module_dev_deps = use_extension(
     "//:non_module_dev_deps.bzl",

constants.bzl

@@ -1,2 +1,2 @@
-test_ghc_version = "9.4.6"
+test_ghc_version = "9.4.8"
 test_asterius_version = "0.0.1"

examples/WORKSPACE

@@ -16,15 +16,17 @@ rules_haskell_dependencies()
 
 load("@rules_haskell//haskell:nixpkgs.bzl", "haskell_register_ghc_nixpkgs")
 
+GHC_VERSION = "9.4.8"
+
 haskell_register_ghc_nixpkgs(
-    attribute_path = "haskell.compiler.ghc946",
+    attribute_path = "haskell.compiler.ghc{}".format(GHC_VERSION.replace(".", "")),
     repository = "@rules_haskell//nixpkgs:default.nix",
-    version = "9.4.6",
+    version = GHC_VERSION,
 )
 
 load("@rules_haskell//haskell:toolchain.bzl", "rules_haskell_toolchains")
 
-rules_haskell_toolchains(version = "9.4.6")
+rules_haskell_toolchains(version = GHC_VERSION)
 
 load("@rules_nixpkgs_cc//:cc.bzl", "nixpkgs_cc_configure")
 load("@rules_nixpkgs_python//:python.bzl", "nixpkgs_python_configure")

haskell/ghc.bzl

@@ -2,4 +2,4 @@
 # (see stackage.org).
 
 # Currently, we are using GHC 9.2.x as default.
-DEFAULT_GHC_VERSION = "9.4.6"
+DEFAULT_GHC_VERSION = "9.4.8"

haskell/repositories.bzl

@@ -108,6 +108,9 @@ def rules_haskell_dependencies():
             strip_prefix = strip_prefix + "/core",
             urls = [rules_nixpkgs_url],
             sha256 = _rules_nixpkgs_sha256,
+            # work around invalid path on Windows
+            patches = ["@rules_haskell//:rules_nixpkgs_core_bazelignore.patch"],
+            patch_args = ["-p1"],
         )
 
         for toolchain in ["cc", "java", "python", "go", "rust", "posix", "nodejs"]:

registry/modules/rules_nixpkgs_core/0.12.0/MODULE.bazel

@@ -0,0 +1,15 @@
+module(
+    name = "rules_nixpkgs_core",
+    version = "0.12.0",
+)
+
+bazel_dep(name = "platforms", version = "0.0.4")
+bazel_dep(name = "bazel_skylib", version = "1.0.3")
+
+nix_repo = use_extension("//extensions:repository.bzl", "nix_repo")
+nix_repo.github(
+    name = "nixpkgs",
+    tag = "24.05",
+    sha256 = "911314b81780f26fdaf87e17174210bdbd40c86bac1795212f257cdc236a1e78",
+)
+use_repo(nix_repo, "nixpkgs")

registry/modules/rules_nixpkgs_core/0.12.0/patches/bazelignore.patch

@@ -0,0 +1,8 @@
+diff --git a/.bazelignore b/.bazelignore
+index a61f183..850ed9f 100644
+--- a/.bazelignore
++++ b/.bazelignore
+@@ -1,2 +1,2 @@
+-bazel-*
++bazel-core
+ testing

registry/modules/rules_nixpkgs_core/0.12.0/source.json

@@ -0,0 +1,9 @@
+{
+    "integrity": "sha256-GtsE3AQWkV/vQndX9CcsT32s7+zu78UPaDrsf36beHo=",
+    "strip_prefix": "rules_nixpkgs-0.12.0/core",
+    "url": "https://github.com/tweag/rules_nixpkgs/releases/download/v0.12.0/rules_nixpkgs-0.12.0.tar.gz",
+    "patch_strip": 1,
+    "patches": {
+        "bazelignore.patch": "sha256-ZfaE3Ej4NpUIV8jh/pOrZ5WIVPmYE7zrqIv7jGbxgYc="
+    }
+}

registry/modules/rules_nixpkgs_core/metadata.json

@@ -0,0 +1,17 @@
+{
+  "homepage": "",
+  "maintainers": [
+    {
+      "email": "[email protected] ",
+      "github": "benradf",
+      "name": "Benjamin Radford"
+    },
+    {
+      "email": "[email protected]",
+      "github": "aherrmann",
+      "name": "Andreas Herrmann"
+    }
+  ],
+  "versions": ["0.12.0"],
+  "yanked_versions": []
+}

rules_haskell_nix/MODULE.bazel

@@ -39,12 +39,14 @@ nix_haskell_toolchains = use_extension(
     "nix_haskell_toolchains",
 )
 
+GHC_VERSION = "9.4.8"
+
 # Declare a default nix-based toolchain
 nix_haskell_toolchains.new(
     attribute_path = "",
-    nix_file_content = """with import <nixpkgs> {}; haskell.packages.ghc946.ghc""",
+    nix_file_content = "with import <nixpkgs> {{}}; haskell.packages.ghc{}.ghc".format(GHC_VERSION.replace(".", "")),
     repository = "@nixpkgs_default",
-    version = "9.4.6",
+    version = GHC_VERSION,
 )
 use_repo(
     nix_haskell_toolchains,

rules_haskell_tests/.ghcide

@@ -1,13 +1,9 @@
 #!/usr/bin/env bash
 set -euo pipefail
 build_ghcide() {
-  bazel build //tests/ghcide \
-    --experimental_show_artifacts \
-    2>&1 \
-    | awk '
-      /^>>>/ { print substr($1, 4); next }
-      { print $0 > "/dev/stderr" }
-    '
+  bazel build //tests/ghcide
+  outfile=$( bazel cquery --output=files //tests/ghcide )
+  echo "$( bazel info execution_root)/${outfile}"
 }
 ghcide="$(build_ghcide)"
 "$ghcide" "$@"

rules_haskell_tests/MODULE.bazel

@@ -43,6 +43,14 @@ bazel_dep(
     name = "rules_nixpkgs_nodejs",
     version = "0.12.0",
 )
+single_version_override(
+    module_name = "rules_nixpkgs_nodejs",
+    patch_strip = 3,
+    patches = [
+        "rules_nixpkgs_nodejs-bazelignore.patch",
+    ],
+)
+
 bazel_dep(
     name = "platforms",
     version = "0.0.10",
@@ -257,7 +265,7 @@ haskell_toolchains = use_extension(
     "haskell_toolchains",
 )
 
-test_ghc_version = "9.4.6"
+test_ghc_version = "9.4.8"
 
 test_ghcopts = [
     "-XStandaloneDeriving",  # Flag used at compile time
@@ -328,7 +336,7 @@ nix_haskell_toolchains.new(
     cabalopts = test_cabalopts,
     ghcopts = test_ghcopts,
     haddock_flags = test_haddock_flags,
-    nix_file_content = """with import <nixpkgs> {}; haskell.packages.ghc946.ghc""",
+    nix_file_content = "with import <nixpkgs> {{}}; haskell.packages.ghc{}.ghc".format(test_ghc_version.replace(".", "")),
     repl_ghci_args = test_repl_ghci_args,
     repository = "@nixpkgs_default",
     version = test_ghc_version,