Skip to content

Commit 4777dc2

Browse files
alexeaglefhanau
authored andcommitted
chore(deps): move ada-url and brotli to bzlmod
1 parent 4d90cb5 commit 4777dc2

File tree

6 files changed

+49
-106
lines changed

6 files changed

+49
-106
lines changed

build/BUILD.ada-url

Lines changed: 0 additions & 9 deletions
This file was deleted.

build/deps/deps.MODULE.bazel

Lines changed: 49 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,15 @@
11
"""Bazel dependencies that were previously in WORKSPACE
22
This file is included from the root MODULE.bazel"""
33

4-
bazel_dep(name = "fast_float", version = "8.0.2")
5-
bazel_dep(name = "fp16", version = "0.0.0-20210320-0a92994")
6-
bazel_dep(name = "highway", version = "1.3.0")
7-
bazel_dep(name = "sqlite3", version = "3.47.0")
8-
bazel_dep(name = "tcmalloc", version = "0.0.0-20250331-43fcf6e", repo_name = "com_google_tcmalloc")
9-
10-
# We have some patches that aren't included in BCR:
11-
# https://github.com/bazelbuild/bazel-central-registry/tree/main/modules/sqlite3/3.47.0/patches
12-
archive_override(
13-
module_name = "sqlite3",
14-
build_file = "//:build/BUILD.sqlite3",
15-
patch_args = ["-p1"],
16-
patches = [
17-
"//:patches/sqlite/0001-row-counts-plain.patch",
18-
"//:patches/sqlite/0002-macOS-missing-PATH-fix.patch",
19-
"//:patches/sqlite/0003-sqlite-complete-early-exit.patch",
20-
"//:patches/sqlite/0004-invalid-wal-on-rollback-fix.patch",
21-
],
22-
remote_file_integrity = {
23-
"MODULE.bazel": "sha256-TtpmqyHyks3o0WcSJO0XFyKkHfAIF98wq06+urs3oKI=",
24-
},
25-
remote_file_urls = {
26-
"MODULE.bazel": ["https://raw.githubusercontent.com/bazelbuild/bazel-central-registry/refs/heads/main/modules/sqlite3/3.47.0/MODULE.bazel"],
27-
},
28-
sha256 = "f59c349bedb470203586a6b6d10adb35f2afefa49f91e55a672a36a09a8fedf7",
29-
strip_prefix = "sqlite-src-3470000",
30-
url = "https://sqlite.org/2024/sqlite-src-3470000.zip",
31-
)
4+
bazel_dep(name = "ada-url", version = "3.3.0")
5+
bazel_dep(name = "brotli", version = "1.1.0")
326

337
########################################################
348
# Override BCR versions.
359
# We want to avoid version skew with v8, so we use identical versions.
10+
11+
bazel_dep(name = "fast_float")
12+
3613
archive_override(
3714
module_name = "fast_float",
3815
build_file_content = """cc_library(
@@ -52,6 +29,8 @@ archive_override(
5229
url = "https://github.com/fastfloat/fast_float/archive/cb1d42aaa1e14b09e1452cfdef373d051b8c02a4.tar.gz",
5330
)
5431

32+
bazel_dep(name = "fp16")
33+
5534
archive_override(
5635
module_name = "fp16",
5736
build_file_content = "exports_files(glob([\"**\"]))",
@@ -66,19 +45,7 @@ archive_override(
6645
url = "https://github.com/Maratyszcza/FP16/archive/b3720617faf1a4581ed7e6787cc51722ec7751f0.tar.gz",
6746
)
6847

69-
archive_override(
70-
module_name = "tcmalloc",
71-
integrity = "sha256-29cSZUwbEyiW8Y7FneaAzNNYLHeBmAPqBuIciHeE/u0=",
72-
remote_file_integrity = {
73-
"MODULE.bazel": "sha384-yOIZPSA2AN4Fnlo43D677Up7bTjiB+y1xFzwvLgQH6QIS3eGncWqjo6dTda+Vad2",
74-
},
75-
remote_file_urls = {
76-
"MODULE.bazel": ["https://raw.githubusercontent.com/bazelbuild/bazel-central-registry/refs/heads/main/modules/tcmalloc/0.0.0-20250331-43fcf6e/MODULE.bazel"],
77-
},
78-
strip_prefix = "google-tcmalloc-cf3dc2d",
79-
type = "tgz",
80-
url = "https://github.com/google/tcmalloc/tarball/cf3dc2d98bd64cb43f4f98db0acaf5028a7b81eb",
81-
)
48+
bazel_dep(name = "highway")
8249

8350
archive_override(
8451
module_name = "highway",
@@ -93,6 +60,47 @@ archive_override(
9360
url = "https://github.com/google/highway/archive/00fe003dac355b979f36157f9407c7c46448958e.tar.gz",
9461
)
9562

63+
bazel_dep(name = "sqlite3")
64+
65+
# We have some patches that aren't included in BCR:
66+
# https://github.com/bazelbuild/bazel-central-registry/tree/main/modules/sqlite3/3.47.0/patches
67+
archive_override(
68+
module_name = "sqlite3",
69+
build_file = "//:build/BUILD.sqlite3",
70+
patch_args = ["-p1"],
71+
patches = [
72+
"//:patches/sqlite/0001-row-counts-plain.patch",
73+
"//:patches/sqlite/0002-macOS-missing-PATH-fix.patch",
74+
"//:patches/sqlite/0003-sqlite-complete-early-exit.patch",
75+
"//:patches/sqlite/0004-invalid-wal-on-rollback-fix.patch",
76+
],
77+
remote_file_integrity = {
78+
"MODULE.bazel": "sha256-TtpmqyHyks3o0WcSJO0XFyKkHfAIF98wq06+urs3oKI=",
79+
},
80+
remote_file_urls = {
81+
"MODULE.bazel": ["https://raw.githubusercontent.com/bazelbuild/bazel-central-registry/refs/heads/main/modules/sqlite3/3.47.0/MODULE.bazel"],
82+
},
83+
sha256 = "f59c349bedb470203586a6b6d10adb35f2afefa49f91e55a672a36a09a8fedf7",
84+
strip_prefix = "sqlite-src-3470000",
85+
url = "https://sqlite.org/2024/sqlite-src-3470000.zip",
86+
)
87+
88+
bazel_dep(name = "tcmalloc", repo_name = "com_google_tcmalloc")
89+
90+
archive_override(
91+
module_name = "tcmalloc",
92+
integrity = "sha256-29cSZUwbEyiW8Y7FneaAzNNYLHeBmAPqBuIciHeE/u0=",
93+
remote_file_integrity = {
94+
"MODULE.bazel": "sha384-yOIZPSA2AN4Fnlo43D677Up7bTjiB+y1xFzwvLgQH6QIS3eGncWqjo6dTda+Vad2",
95+
},
96+
remote_file_urls = {
97+
"MODULE.bazel": ["https://raw.githubusercontent.com/bazelbuild/bazel-central-registry/refs/heads/main/modules/tcmalloc/0.0.0-20250331-43fcf6e/MODULE.bazel"],
98+
},
99+
strip_prefix = "google-tcmalloc-cf3dc2d",
100+
type = "tgz",
101+
url = "https://github.com/google/tcmalloc/tarball/cf3dc2d98bd64cb43f4f98db0acaf5028a7b81eb",
102+
)
103+
96104
########################################################
97105
# Libraries which are not on the BCR
98106
http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

build/deps/deps.jsonc

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,6 @@
88
"repo": "capnproto",
99
"branch": "v2",
1010
"extra_strip_prefix": "/c++"
11-
},
12-
{
13-
"name": "ada-url",
14-
"type": "github_release",
15-
"owner": "ada-url",
16-
"repo": "ada",
17-
"file_regex": "singleheader.zip",
18-
"strip_prefix": "",
19-
"build_file": "//:build/BUILD.ada-url"
20-
},
21-
{
22-
"type": "github_release",
23-
"name": "brotli",
24-
"owner": "google",
25-
"repo": "brotli"
2611
}
2712
]
2813
}

build/deps/gen/dep_ada_url.bzl

Lines changed: 0 additions & 19 deletions
This file was deleted.

build/deps/gen/dep_brotli.bzl

Lines changed: 0 additions & 18 deletions
This file was deleted.

build/deps/gen/deps.bzl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
# WARNING: THIS FILE IS AUTOGENERATED BY update-deps.py DO NOT EDIT
22

3-
load("@//build/deps:gen/dep_ada_url.bzl", "dep_ada_url")
4-
load("@//build/deps:gen/dep_brotli.bzl", "dep_brotli")
53
load("@//build/deps:gen/dep_capnp_cpp.bzl", "dep_capnp_cpp")
64

75
def deps_gen():
86
dep_capnp_cpp()
9-
dep_ada_url()
10-
dep_brotli()

0 commit comments

Comments
 (0)