Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update bazel #503

Merged
merged 3 commits into from
May 22, 2024
Merged

update bazel #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a81473a
update `bazeliskrc`
prednaz Apr 12, 2024
2056312
`java_rules 7.3.1`
prednaz Apr 11, 2024
47f5307
update `nixpkgs` in `examples/toolchains`
prednaz Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bazeliskrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
USE_BAZEL_VERSION=5.x
USE_BAZEL_VERSION=6.x
6 changes: 3 additions & 3 deletions examples/toolchains/cc/nixpkgs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
6 changes: 3 additions & 3 deletions examples/toolchains/cc_cross_osx_to_linux_amd64/nixpkgs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
6 changes: 3 additions & 3 deletions examples/toolchains/cc_with_deps/nixpkgs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
6 changes: 3 additions & 3 deletions examples/toolchains/go/nixpkgs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
7 changes: 4 additions & 3 deletions examples/toolchains/java/WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
7 changes: 3 additions & 4 deletions examples/toolchains/java/nixpkgs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}

2 changes: 0 additions & 2 deletions examples/toolchains/java/nixpkgs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
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";
sha256 = spec.sha256;
};
in
import nixpkgs

6 changes: 3 additions & 3 deletions examples/toolchains/nodejs/nixpkgs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
6 changes: 3 additions & 3 deletions examples/toolchains/python/nixpkgs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
4 changes: 2 additions & 2 deletions examples/toolchains/rust/nixpkgs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"owner": "NixOS",
"repo": "nixpkgs",
"branch": "nixos-23.11",
"rev": "32f63574c85fbc80e4ba1fbb932cde9619bad25e",
"sha256": "sha256:1qykaq7a8kmk4nd6xz4zv35yi2jwbw93p93y4wh1dwxf9h0kqjhb"
"rev": "b2cf36f43f9ef2ded5711b30b1f393ac423d8f72",
"sha256": "07mmgn752nzh8fish8ff5ar9dbdbiv79qb3hl4sazbckqkw38avc"
}
7 changes: 4 additions & 3 deletions nixpkgs/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion testing/cc/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
7 changes: 4 additions & 3 deletions testing/core/WORKSPACE.bzlmod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion testing/go-bzlmod/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion testing/java/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion testing/nodejs/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion testing/posix/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion testing/python/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down
2 changes: 1 addition & 1 deletion testing/rust/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion toolchains/java/MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down