From d5421c5282e93f589528e5a8c9296843d488dc0a Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Mon, 25 Sep 2023 13:27:56 +0200 Subject: [PATCH 1/6] Update rules_haskell to latest HEAD --- WORKSPACE | 6 +++--- example/WORKSPACE | 6 +++--- tests/alternative-deps/WORKSPACE | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 44cf5b3..8eb1640 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -8,9 +8,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "rules_haskell", - sha256 = "441c45778bf469a36c7b9457c962579408ec47f9c5883c8001e9412d6c801f08", - strip_prefix = "rules_haskell-1bd3c46ee88c8c4ff729959de56cc2ca9bf1cf89", - urls = ["https://github.com/tweag/rules_haskell/archive/1bd3c46ee88c8c4ff729959de56cc2ca9bf1cf89.zip"], + sha256 = "1485a90366039fe8ea5051732dc50827d8c1e9bb6feb2c8bb1ad1fed5344cff0", + strip_prefix = "rules_haskell-155ba21c7d315cc421ee3f17a1c09b758cc7279d", + urls = ["https://github.com/tweag/rules_haskell/archive/155ba21c7d315cc421ee3f17a1c09b758cc7279d.tar.gz"], ) load("@rules_haskell//haskell:repositories.bzl", "rules_haskell_dependencies") diff --git a/example/WORKSPACE b/example/WORKSPACE index 22abf9a..b571d46 100644 --- a/example/WORKSPACE +++ b/example/WORKSPACE @@ -13,9 +13,9 @@ local_repository( http_archive( name = "rules_haskell", - sha256 = "441c45778bf469a36c7b9457c962579408ec47f9c5883c8001e9412d6c801f08", - strip_prefix = "rules_haskell-1bd3c46ee88c8c4ff729959de56cc2ca9bf1cf89", - urls = ["https://github.com/tweag/rules_haskell/archive/1bd3c46ee88c8c4ff729959de56cc2ca9bf1cf89.zip"], + sha256 = "1485a90366039fe8ea5051732dc50827d8c1e9bb6feb2c8bb1ad1fed5344cff0", + strip_prefix = "rules_haskell-155ba21c7d315cc421ee3f17a1c09b758cc7279d", + urls = ["https://github.com/tweag/rules_haskell/archive/155ba21c7d315cc421ee3f17a1c09b758cc7279d.tar.gz"], ) load("@rules_haskell//haskell:repositories.bzl", "rules_haskell_dependencies") diff --git a/tests/alternative-deps/WORKSPACE b/tests/alternative-deps/WORKSPACE index 6de9510..948e205 100644 --- a/tests/alternative-deps/WORKSPACE +++ b/tests/alternative-deps/WORKSPACE @@ -13,9 +13,9 @@ local_repository( http_archive( name = "rules_haskell", - sha256 = "441c45778bf469a36c7b9457c962579408ec47f9c5883c8001e9412d6c801f08", - strip_prefix = "rules_haskell-1bd3c46ee88c8c4ff729959de56cc2ca9bf1cf89", - urls = ["https://github.com/tweag/rules_haskell/archive/1bd3c46ee88c8c4ff729959de56cc2ca9bf1cf89.zip"], + sha256 = "1485a90366039fe8ea5051732dc50827d8c1e9bb6feb2c8bb1ad1fed5344cff0", + strip_prefix = "rules_haskell-155ba21c7d315cc421ee3f17a1c09b758cc7279d", + urls = ["https://github.com/tweag/rules_haskell/archive/155ba21c7d315cc421ee3f17a1c09b758cc7279d.tar.gz"], ) load("@rules_haskell//haskell:repositories.bzl", "rules_haskell_dependencies") From c2bf2cb20fbef03e61b0062edf69b2ef06df1b78 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Mon, 25 Sep 2023 13:32:07 +0200 Subject: [PATCH 2/6] Update rules_go to the latest release 0.41.0 --- WORKSPACE | 6 +++--- example/WORKSPACE | 6 +++--- tests/alternative-deps/WORKSPACE | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 8eb1640..085fd7f 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -108,10 +108,10 @@ haskell_register_ghc_nixpkgs( http_archive( name = "io_bazel_rules_go", - sha256 = "6dc2da7ab4cf5d7bfc7c949776b1b7c733f05e56edc4bcd9022bb249d2e2a996", + sha256 = "278b7ff5a826f3dc10f04feaf0b70d48b68748ccd512d7f98bf442077f043fe3", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.39.1/rules_go-v0.39.1.zip", - "https://github.com/bazelbuild/rules_go/releases/download/v0.31.0/rules_go-v0.39.1.zip", + "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip", + "https://github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip", ], ) diff --git a/example/WORKSPACE b/example/WORKSPACE index b571d46..1298a4a 100644 --- a/example/WORKSPACE +++ b/example/WORKSPACE @@ -89,10 +89,10 @@ haskell_register_ghc_nixpkgs( http_archive( name = "io_bazel_rules_go", - sha256 = "6dc2da7ab4cf5d7bfc7c949776b1b7c733f05e56edc4bcd9022bb249d2e2a996", + sha256 = "278b7ff5a826f3dc10f04feaf0b70d48b68748ccd512d7f98bf442077f043fe3", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.39.1/rules_go-v0.39.1.zip", - "https://github.com/bazelbuild/rules_go/releases/download/v0.31.0/rules_go-v0.39.1.zip", + "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip", + "https://github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip", ], ) diff --git a/tests/alternative-deps/WORKSPACE b/tests/alternative-deps/WORKSPACE index 948e205..e1e2879 100644 --- a/tests/alternative-deps/WORKSPACE +++ b/tests/alternative-deps/WORKSPACE @@ -100,10 +100,10 @@ haskell_register_ghc_nixpkgs( http_archive( name = "io_bazel_rules_go", - sha256 = "6dc2da7ab4cf5d7bfc7c949776b1b7c733f05e56edc4bcd9022bb249d2e2a996", + sha256 = "278b7ff5a826f3dc10f04feaf0b70d48b68748ccd512d7f98bf442077f043fe3", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.39.1/rules_go-v0.39.1.zip", - "https://github.com/bazelbuild/rules_go/releases/download/v0.31.0/rules_go-v0.39.1.zip", + "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip", + "https://github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip", ], ) From 44e22e870123ea5dfd8c8e68c33921655e850498 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Mon, 25 Sep 2023 13:33:35 +0200 Subject: [PATCH 3/6] Update Gazelle to the latest release 0.33.0 --- WORKSPACE | 6 +++--- example/WORKSPACE | 6 +++--- tests/alternative-deps/WORKSPACE | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 085fd7f..2f71f9c 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -132,10 +132,10 @@ go_rules_dependencies() http_archive( name = "bazel_gazelle", - sha256 = "5982e5463f171da99e3bdaeff8c0f48283a7a5f396ec5282910b9e8a49c0dd7e", + sha256 = "d3fa66a39028e97d76f9e2db8f1b0c11c099e8e01bf363a923074784e451f809", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.25.0/bazel-gazelle-v0.25.0.tar.gz", - "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.25.0/bazel-gazelle-v0.25.0.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.33.0/bazel-gazelle-v0.33.0.tar.gz", + "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.33.0/bazel-gazelle-v0.33.0.tar.gz", ], ) diff --git a/example/WORKSPACE b/example/WORKSPACE index 1298a4a..0c53a56 100644 --- a/example/WORKSPACE +++ b/example/WORKSPACE @@ -113,10 +113,10 @@ go_rules_dependencies() http_archive( name = "bazel_gazelle", - sha256 = "5982e5463f171da99e3bdaeff8c0f48283a7a5f396ec5282910b9e8a49c0dd7e", + sha256 = "d3fa66a39028e97d76f9e2db8f1b0c11c099e8e01bf363a923074784e451f809", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.25.0/bazel-gazelle-v0.25.0.tar.gz", - "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.25.0/bazel-gazelle-v0.25.0.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.33.0/bazel-gazelle-v0.33.0.tar.gz", + "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.33.0/bazel-gazelle-v0.33.0.tar.gz", ], ) diff --git a/tests/alternative-deps/WORKSPACE b/tests/alternative-deps/WORKSPACE index e1e2879..ee8c157 100644 --- a/tests/alternative-deps/WORKSPACE +++ b/tests/alternative-deps/WORKSPACE @@ -124,10 +124,10 @@ go_rules_dependencies() http_archive( name = "bazel_gazelle", - sha256 = "5982e5463f171da99e3bdaeff8c0f48283a7a5f396ec5282910b9e8a49c0dd7e", + sha256 = "d3fa66a39028e97d76f9e2db8f1b0c11c099e8e01bf363a923074784e451f809", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.25.0/bazel-gazelle-v0.25.0.tar.gz", - "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.25.0/bazel-gazelle-v0.25.0.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.33.0/bazel-gazelle-v0.33.0.tar.gz", + "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.33.0/bazel-gazelle-v0.33.0.tar.gz", ], ) From 21ed600853c12b156f71ca9ff79c1c2940c0ed13 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Mon, 25 Sep 2023 13:40:16 +0200 Subject: [PATCH 4/6] Update buildtools to latest release 6.3.3 --- WORKSPACE | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 2f71f9c..980b832 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -157,7 +157,9 @@ gazelle_dependencies() http_archive( name = "com_github_bazelbuild_buildtools", - sha256 = "5b7fe9aa131ab64a51de4da3668005cf58418c967438ce129aad24fd3e6dfaa9", - strip_prefix = "buildtools-4890966c38b910fd5bd1ad78a3dd88538d09854f", - url = "https://github.com/bazelbuild/buildtools/archive/4890966c38b910fd5bd1ad78a3dd88538d09854f.zip", + sha256 = "42968f9134ba2c75c03bb271bd7bb062afb7da449f9b913c96e5be4ce890030a", + strip_prefix = "buildtools-6.3.3", + urls = [ + "https://github.com/bazelbuild/buildtools/archive/refs/tags/v6.3.3.tar.gz", + ], ) From e78cbf66ac14745ef6840034da9394c7231244bc Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Mon, 25 Sep 2023 13:44:34 +0200 Subject: [PATCH 5/6] Add stack to the Nix shell Otherwise rules_haskell will download a binary release which would not work on NixOS. ``` DEBUG: .../external/rules_haskell/haskell/cabal.bzl:2384:10: Stack not found. DEBUG: .../external/rules_haskell/haskell/cabal.bzl:2385:10: Downloading Stack 2.7.5 ... ``` --- shell.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/shell.nix b/shell.nix index b2f711f..71838a4 100644 --- a/shell.nix +++ b/shell.nix @@ -16,6 +16,7 @@ mkShell { git openjdk11 python3 + stack # convenience dependencies less ]; From 4b1c22d6343952fbea797b412d64b384c6d304cc Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Mon, 25 Sep 2023 13:56:31 +0200 Subject: [PATCH 6/6] Update Bazel itself to version 6.2.0 --- shell.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shell.nix b/shell.nix index 71838a4..af3a64a 100644 --- a/shell.nix +++ b/shell.nix @@ -9,7 +9,7 @@ mkShell { # See: https://github.com/bazelbuild/bazel/issues/4231 BAZEL_USE_CPP_ONLY_TOOLCHAIN=1; buildInputs = [ - bazel_5 + bazel_6 binutils cacert nix