diff --git a/.bazeliskrc b/.bazeliskrc index 9adf2699b..773a4f4c6 100644 --- a/.bazeliskrc +++ b/.bazeliskrc @@ -1 +1 @@ -USE_BAZEL_VERSION=5.x +USE_BAZEL_VERSION=6.x diff --git a/examples/toolchains/cc/nixpkgs.json b/examples/toolchains/cc/nixpkgs.json index 2542221a5..76ed35bdc 100644 --- a/examples/toolchains/cc/nixpkgs.json +++ b/examples/toolchains/cc/nixpkgs.json @@ -1,7 +1,7 @@ { "owner": "NixOS", "repo": "nixpkgs", - "branch": "22.11", - "rev": "f413457e0dd7a42adefdbcea4391dd9751509025", - "sha256": "sha256-F7/F65ZFWbq7cKSiV3K2acxCv64jKaZZ/K0A3VNT2kA=" + "branch": "nixos-23.11", + "rev": "b2cf36f43f9ef2ded5711b30b1f393ac423d8f72", + "sha256": "07mmgn752nzh8fish8ff5ar9dbdbiv79qb3hl4sazbckqkw38avc" } diff --git a/examples/toolchains/cc_cross_osx_to_linux_amd64/nixpkgs.json b/examples/toolchains/cc_cross_osx_to_linux_amd64/nixpkgs.json index d470df94d..76ed35bdc 100644 --- a/examples/toolchains/cc_cross_osx_to_linux_amd64/nixpkgs.json +++ b/examples/toolchains/cc_cross_osx_to_linux_amd64/nixpkgs.json @@ -1,7 +1,7 @@ { "owner": "NixOS", "repo": "nixpkgs", - "branch": "23.05", - "rev": "3ad64d9e2d5bf80c877286102355b1625891ae9a", - "sha256": "sha256-PuZSAHeq4/9pP/uYH1FcagQ3nLm/DrDrvKi/xC9glvw=" + "branch": "nixos-23.11", + "rev": "b2cf36f43f9ef2ded5711b30b1f393ac423d8f72", + "sha256": "07mmgn752nzh8fish8ff5ar9dbdbiv79qb3hl4sazbckqkw38avc" } diff --git a/examples/toolchains/cc_with_deps/nixpkgs.json b/examples/toolchains/cc_with_deps/nixpkgs.json index 2542221a5..76ed35bdc 100644 --- a/examples/toolchains/cc_with_deps/nixpkgs.json +++ b/examples/toolchains/cc_with_deps/nixpkgs.json @@ -1,7 +1,7 @@ { "owner": "NixOS", "repo": "nixpkgs", - "branch": "22.11", - "rev": "f413457e0dd7a42adefdbcea4391dd9751509025", - "sha256": "sha256-F7/F65ZFWbq7cKSiV3K2acxCv64jKaZZ/K0A3VNT2kA=" + "branch": "nixos-23.11", + "rev": "b2cf36f43f9ef2ded5711b30b1f393ac423d8f72", + "sha256": "07mmgn752nzh8fish8ff5ar9dbdbiv79qb3hl4sazbckqkw38avc" } diff --git a/examples/toolchains/go/nixpkgs.json b/examples/toolchains/go/nixpkgs.json index 2542221a5..76ed35bdc 100644 --- a/examples/toolchains/go/nixpkgs.json +++ b/examples/toolchains/go/nixpkgs.json @@ -1,7 +1,7 @@ { "owner": "NixOS", "repo": "nixpkgs", - "branch": "22.11", - "rev": "f413457e0dd7a42adefdbcea4391dd9751509025", - "sha256": "sha256-F7/F65ZFWbq7cKSiV3K2acxCv64jKaZZ/K0A3VNT2kA=" + "branch": "nixos-23.11", + "rev": "b2cf36f43f9ef2ded5711b30b1f393ac423d8f72", + "sha256": "07mmgn752nzh8fish8ff5ar9dbdbiv79qb3hl4sazbckqkw38avc" } diff --git a/examples/toolchains/java/WORKSPACE b/examples/toolchains/java/WORKSPACE index af1bdf449..71d4b5674 100644 --- a/examples/toolchains/java/WORKSPACE +++ b/examples/toolchains/java/WORKSPACE @@ -8,9 +8,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive( name = "rules_java", - sha256 = "ddc9e11f4836265fea905d2845ac1d04ebad12a255f791ef7fd648d1d2215a5b", - strip_prefix = "rules_java-5.0.0", - url = "https://github.com/bazelbuild/rules_java/archive/refs/tags/5.0.0.tar.gz", + urls = [ + "https://github.com/bazelbuild/rules_java/releases/download/7.3.1/rules_java-7.3.1.tar.gz", + ], + sha256 = "4018e97c93f97680f1650ffd2a7530245b864ac543fd24fae8c02ba447cb2864", ) load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains") diff --git a/examples/toolchains/java/nixpkgs.json b/examples/toolchains/java/nixpkgs.json index 3ad9818d2..76ed35bdc 100644 --- a/examples/toolchains/java/nixpkgs.json +++ b/examples/toolchains/java/nixpkgs.json @@ -1,8 +1,7 @@ { "owner": "NixOS", "repo": "nixpkgs", - "branch": "22.11", - "rev": "f413457e0dd7a42adefdbcea4391dd9751509025", - "sha256": "sha256-F7/F65ZFWbq7cKSiV3K2acxCv64jKaZZ/K0A3VNT2kA=" + "branch": "nixos-23.11", + "rev": "b2cf36f43f9ef2ded5711b30b1f393ac423d8f72", + "sha256": "07mmgn752nzh8fish8ff5ar9dbdbiv79qb3hl4sazbckqkw38avc" } - diff --git a/examples/toolchains/java/nixpkgs.nix b/examples/toolchains/java/nixpkgs.nix index 143e52be4..6db312a36 100644 --- a/examples/toolchains/java/nixpkgs.nix +++ b/examples/toolchains/java/nixpkgs.nix @@ -1,5 +1,4 @@ let - # nixpkgs as of 2022-02-21 spec = builtins.fromJSON (builtins.readFile ./nixpkgs.json); nixpkgs = fetchTarball { url = "https://github.com/${spec.owner}/${spec.repo}/archive/${spec.rev}.tar.gz"; @@ -7,4 +6,3 @@ let }; in import nixpkgs - diff --git a/examples/toolchains/nodejs/nixpkgs.json b/examples/toolchains/nodejs/nixpkgs.json index 2542221a5..76ed35bdc 100644 --- a/examples/toolchains/nodejs/nixpkgs.json +++ b/examples/toolchains/nodejs/nixpkgs.json @@ -1,7 +1,7 @@ { "owner": "NixOS", "repo": "nixpkgs", - "branch": "22.11", - "rev": "f413457e0dd7a42adefdbcea4391dd9751509025", - "sha256": "sha256-F7/F65ZFWbq7cKSiV3K2acxCv64jKaZZ/K0A3VNT2kA=" + "branch": "nixos-23.11", + "rev": "b2cf36f43f9ef2ded5711b30b1f393ac423d8f72", + "sha256": "07mmgn752nzh8fish8ff5ar9dbdbiv79qb3hl4sazbckqkw38avc" } diff --git a/examples/toolchains/python/nixpkgs.json b/examples/toolchains/python/nixpkgs.json index 2542221a5..76ed35bdc 100644 --- a/examples/toolchains/python/nixpkgs.json +++ b/examples/toolchains/python/nixpkgs.json @@ -1,7 +1,7 @@ { "owner": "NixOS", "repo": "nixpkgs", - "branch": "22.11", - "rev": "f413457e0dd7a42adefdbcea4391dd9751509025", - "sha256": "sha256-F7/F65ZFWbq7cKSiV3K2acxCv64jKaZZ/K0A3VNT2kA=" + "branch": "nixos-23.11", + "rev": "b2cf36f43f9ef2ded5711b30b1f393ac423d8f72", + "sha256": "07mmgn752nzh8fish8ff5ar9dbdbiv79qb3hl4sazbckqkw38avc" } diff --git a/examples/toolchains/rust/nixpkgs.json b/examples/toolchains/rust/nixpkgs.json index 6cbfbde98..76ed35bdc 100644 --- a/examples/toolchains/rust/nixpkgs.json +++ b/examples/toolchains/rust/nixpkgs.json @@ -2,6 +2,6 @@ "owner": "NixOS", "repo": "nixpkgs", "branch": "nixos-23.11", - "rev": "32f63574c85fbc80e4ba1fbb932cde9619bad25e", - "sha256": "sha256:1qykaq7a8kmk4nd6xz4zv35yi2jwbw93p93y4wh1dwxf9h0kqjhb" + "rev": "b2cf36f43f9ef2ded5711b30b1f393ac423d8f72", + "sha256": "07mmgn752nzh8fish8ff5ar9dbdbiv79qb3hl4sazbckqkw38avc" } diff --git a/nixpkgs/repositories.bzl b/nixpkgs/repositories.bzl index 1c8df8dda..685997607 100644 --- a/nixpkgs/repositories.bzl +++ b/nixpkgs/repositories.bzl @@ -32,9 +32,10 @@ def rules_nixpkgs_dependencies(rules_nixpkgs_name = "io_tweag_rules_nixpkgs", to maybe( http_archive, "rules_java", - sha256 = "ddc9e11f4836265fea905d2845ac1d04ebad12a255f791ef7fd648d1d2215a5b", - strip_prefix = "rules_java-5.0.0", - url = "https://github.com/bazelbuild/rules_java/archive/refs/tags/5.0.0.tar.gz", + urls = [ + "https://github.com/bazelbuild/rules_java/releases/download/7.3.1/rules_java-7.3.1.tar.gz", + ], + sha256 = "4018e97c93f97680f1650ffd2a7530245b864ac543fd24fae8c02ba447cb2864", ) maybe( http_archive, diff --git a/testing/cc/MODULE.bazel b/testing/cc/MODULE.bazel index 098b09e59..3c18601d3 100644 --- a/testing/cc/MODULE.bazel +++ b/testing/cc/MODULE.bazel @@ -24,7 +24,7 @@ bazel_dep(name = "rules_cc", version = "0.0.4") # TODO[AH] Remove these transitive dependencies once nixpkgs_java_configure has # become a module extension in rules_nixpkgs_java. bazel_dep(name = "platforms", version = "0.0.10") -bazel_dep(name = "rules_java", version = "6.5.2") +bazel_dep(name = "rules_java", version = "7.3.1") non_module_deps = use_extension("//:non_module_deps.bzl", "non_module_deps") use_repo(non_module_deps, "nixpkgs") diff --git a/testing/core/WORKSPACE.bzlmod b/testing/core/WORKSPACE.bzlmod index afdfa832f..ab147e4fa 100644 --- a/testing/core/WORKSPACE.bzlmod +++ b/testing/core/WORKSPACE.bzlmod @@ -43,9 +43,10 @@ nixpkgs_local_repository( http_archive( name = "rules_java", - sha256 = "ddc9e11f4836265fea905d2845ac1d04ebad12a255f791ef7fd648d1d2215a5b", - strip_prefix = "rules_java-5.0.0", - url = "https://github.com/bazelbuild/rules_java/archive/refs/tags/5.0.0.tar.gz", + urls = [ + "https://github.com/bazelbuild/rules_java/releases/download/7.3.1/rules_java-7.3.1.tar.gz", + ], + sha256 = "4018e97c93f97680f1650ffd2a7530245b864ac543fd24fae8c02ba447cb2864", ) local_repository( diff --git a/testing/go-bzlmod/MODULE.bazel b/testing/go-bzlmod/MODULE.bazel index 63601a1a9..3ba4c5818 100644 --- a/testing/go-bzlmod/MODULE.bazel +++ b/testing/go-bzlmod/MODULE.bazel @@ -30,7 +30,7 @@ bazel_dep(name = "rules_cc", version = "0.0.4") # TODO[AH] Remove these transitive dependencies once nixpkgs_java_configure has # become a module extension in rules_nixpkgs_java. bazel_dep(name = "platforms", version = "0.0.10") -bazel_dep(name = "rules_java", version = "6.5.2") +bazel_dep(name = "rules_java", version = "7.3.1") non_module_deps = use_extension("//:non_module_deps.bzl", "non_module_deps") use_repo(non_module_deps, "nixpkgs") diff --git a/testing/java/MODULE.bazel b/testing/java/MODULE.bazel index 326c32caa..910f084ee 100644 --- a/testing/java/MODULE.bazel +++ b/testing/java/MODULE.bazel @@ -17,7 +17,7 @@ bazel_dep(name = "bazel_skylib", version = "1.6.1") # TODO[AH] Remove these transitive dependencies once nixpkgs_java_configure has # become a module extension in rules_nixpkgs_java. bazel_dep(name = "platforms", version = "0.0.10") -bazel_dep(name = "rules_java", version = "6.5.2") +bazel_dep(name = "rules_java", version = "7.3.1") non_module_deps = use_extension("//:non_module_deps.bzl", "non_module_deps") use_repo(non_module_deps, "nixpkgs") diff --git a/testing/nodejs/MODULE.bazel b/testing/nodejs/MODULE.bazel index fd95fab3e..67386f2da 100644 --- a/testing/nodejs/MODULE.bazel +++ b/testing/nodejs/MODULE.bazel @@ -35,7 +35,7 @@ use_repo(nix_repo, "nixpkgs") # TODO[AH] Remove these transitive dependencies once nixpkgs_java_configure has # become a module extension in rules_nixpkgs_java. bazel_dep(name = "platforms", version = "0.0.10") -bazel_dep(name = "rules_java", version = "6.5.2") +bazel_dep(name = "rules_java", version = "7.3.1") non_module_deps = use_extension("//:non_module_deps.bzl", "non_module_deps") use_repo(non_module_deps, "nixpkgs_config_cc") diff --git a/testing/posix/MODULE.bazel b/testing/posix/MODULE.bazel index f16afbccd..c18fb0c23 100644 --- a/testing/posix/MODULE.bazel +++ b/testing/posix/MODULE.bazel @@ -24,7 +24,7 @@ bazel_dep(name = "rules_sh", version = "0.4.0") # TODO[AH] Remove these transitive dependencies once nixpkgs_java_configure has # become a module extension in rules_nixpkgs_java. bazel_dep(name = "platforms", version = "0.0.10") -bazel_dep(name = "rules_java", version = "6.5.2") +bazel_dep(name = "rules_java", version = "7.3.1") non_module_deps = use_extension("//:non_module_deps.bzl", "non_module_deps") use_repo(non_module_deps, "nixpkgs") diff --git a/testing/python/MODULE.bazel b/testing/python/MODULE.bazel index 9872c721a..cb1291deb 100644 --- a/testing/python/MODULE.bazel +++ b/testing/python/MODULE.bazel @@ -30,7 +30,7 @@ bazel_dep(name = "rules_cc", version = "0.0.4") # TODO[AH] Remove these transitive dependencies once nixpkgs_java_configure has # become a module extension in rules_nixpkgs_java. bazel_dep(name = "platforms", version = "0.0.10") -bazel_dep(name = "rules_java", version = "6.5.2") +bazel_dep(name = "rules_java", version = "7.3.1") non_module_deps = use_extension("//:non_module_deps.bzl", "non_module_deps") diff --git a/testing/rust/MODULE.bazel b/testing/rust/MODULE.bazel index a4211aff2..577d4ce0e 100644 --- a/testing/rust/MODULE.bazel +++ b/testing/rust/MODULE.bazel @@ -31,7 +31,7 @@ bazel_dep(name = "rules_rust", version = "0.35.0") # TODO[AH] Remove these transitive dependencies once nixpkgs_java_configure has # become a module extension in rules_nixpkgs_java. bazel_dep(name = "platforms", version = "0.0.10") -bazel_dep(name = "rules_java", version = "6.5.2") +bazel_dep(name = "rules_java", version = "7.3.1") # we must use the extension, and we must call the `toolchain` tag rust = use_extension("@rules_rust//rust:extensions.bzl", "rust") diff --git a/toolchains/java/MODULE.bazel b/toolchains/java/MODULE.bazel index bd69427c9..3c64b421f 100644 --- a/toolchains/java/MODULE.bazel +++ b/toolchains/java/MODULE.bazel @@ -4,7 +4,7 @@ module( ) bazel_dep(name = "rules_nixpkgs_core", version = "0.11.1") -bazel_dep(name = "rules_java", version = "6.5.2") +bazel_dep(name = "rules_java", version = "7.3.1") bazel_dep(name = "bazel_skylib", version = "1.0.3") toolchains = use_extension("@rules_java//java:extensions.bzl", "toolchains")