Skip to content

Commit 59df4a3

Browse files
npaunnpaun
committed
Move and regenerate deps
1 parent c374a33 commit 59df4a3

File tree

6 files changed

+177
-137
lines changed

6 files changed

+177
-137
lines changed

‎MODULE.bazel‎

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,31 @@
22

33
module(name = "workerd")
44

5-
bazel_dep(name = "zlib", version = "1.3.1.bcr.7")
6-
git_override(
7-
module_name = "zlib",
8-
build_file = "//:build/BUILD.zlib",
9-
# This should match the version specified in V8 DEPS, but in practice it is generally acceptable
10-
# for it to be behind – zlib is very stable and its API has not changed in a long time, most
11-
# changes to the Chromium fork affect ancillary tools and not the zlib library itself.
12-
commit = "85f05b0835f934e52772efc308baa80cdd491838",
13-
patch_args = ["-p1"],
14-
patches = ["//:patches/zlib/0001-Add-dummy-MODULE.bazel.patch"],
15-
remote = "https://chromium.googlesource.com/chromium/src/third_party/zlib.git",
16-
)
17-
18-
# BoringSSL may subtly break backwards compatibility and behave differently than the latest FIPS
19-
# version, often by rejecting key values that it considers invalid/unsafe even though they are still
20-
# accepted by BoringSSL. Update with caution and only after confirming this is compatible with the
21-
# downstream build.
22-
bazel_dep(name = "boringssl", version = "0.20251002.0", repo_name = "ssl")
5+
# sqlite3 is downloaded from sqlite.org (not GitHub), so it remains manual.
6+
# We have some patches that aren't included in BCR:
7+
# https://github.com/bazelbuild/bazel-central-registry/tree/main/modules/sqlite3/3.47.0/patches
8+
bazel_dep(name = "sqlite3")
239
archive_override(
24-
module_name = "boringssl",
25-
patch_strip = 1,
10+
module_name = "sqlite3",
11+
build_file = "//:build/BUILD.sqlite3",
12+
patch_args = ["-p1"],
2613
patches = [
27-
"//:patches/boringssl/0001-Expose-libdecrepit-so-NodeJS-can-use-it-for-ncrypto.patch",
14+
"//:patches/sqlite/0001-row-counts-plain.patch",
15+
"//:patches/sqlite/0002-macOS-missing-PATH-fix.patch",
16+
"//:patches/sqlite/0003-sqlite-complete-early-exit.patch",
17+
"//:patches/sqlite/0004-invalid-wal-on-rollback-fix.patch",
2818
],
29-
sha256 = "f96733fc3df03d4195db656d1b7b8c174c33f95d052f811f0ecc8f4e4e3db332",
30-
strip_prefix = "boringssl-0.20251002.0",
31-
type = "tgz",
32-
urls = ["https://github.com/google/boringssl/archive/refs/tags/0.20251002.0.tar.gz"],
19+
remote_file_integrity = {
20+
"MODULE.bazel": "sha256-TtpmqyHyks3o0WcSJO0XFyKkHfAIF98wq06+urs3oKI=",
21+
},
22+
remote_file_urls = {
23+
"MODULE.bazel": ["https://raw.githubusercontent.com/bazelbuild/bazel-central-registry/refs/heads/main/modules/sqlite3/3.47.0/MODULE.bazel"],
24+
},
25+
sha256 = "f59c349bedb470203586a6b6d10adb35f2afefa49f91e55a672a36a09a8fedf7",
26+
strip_prefix = "sqlite-src-3470000",
27+
url = "https://sqlite.org/2024/sqlite-src-3470000.zip",
3328
)
3429

35-
include("//build/deps:deps.MODULE.bazel")
36-
3730
# Automatically managed dependencies
3831
include("//build/deps:gen/deps.MODULE.bazel")
3932
include("//build/deps:gen/build_deps.MODULE.bazel")

‎build/deps/deps.MODULE.bazel‎

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

‎build/deps/deps.jsonc‎

Lines changed: 73 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
11
{
22
"$schema": "deps.schema.json",
33
"repositories": [
4-
// bazel_deps from deps.MODULE.bazel
54
{
65
"name": "ada-url",
76
"type": "bazel_dep"
87
},
98
{
10-
"name": "brotli",
11-
"type": "bazel_dep"
9+
"name": "boringssl",
10+
"type": "github_release",
11+
"use_bazel_dep": true,
12+
"owner": "google",
13+
"repo": "boringssl",
14+
"repo_name": "ssl",
15+
"freeze_version": "0.20251002.0",
16+
"patches": [
17+
"//:patches/boringssl/0001-Expose-libdecrepit-so-NodeJS-can-use-it-for-ncrypto.patch"
18+
]
1219
},
1320
{
14-
"name": "tcmalloc",
21+
"name": "brotli",
1522
"type": "bazel_dep"
1623
},
1724
{
@@ -22,6 +29,44 @@
2229
"branch": "v2",
2330
"extra_strip_prefix": "/c++"
2431
},
32+
{
33+
"name": "dragonbox",
34+
"type": "github_tarball",
35+
"build_file_content": "cc_library(name = \"dragonbox\", hdrs = glob([\"include/dragonbox/*.h\"]), visibility = [\"//visibility:public\"], include_prefix = \"third_party/dragonbox/src\")",
36+
"owner": "jk-jeon",
37+
"repo": "dragonbox",
38+
"freeze_commit": "6c7c925b571d54486b9ffae8d9d18a822801cbda"
39+
},
40+
{
41+
"name": "fast_float",
42+
"type": "github_tarball",
43+
"use_bazel_dep": true,
44+
"owner": "fastfloat",
45+
"repo": "fast_float",
46+
"branch": "main",
47+
"freeze_commit": "cb1d42aaa1e14b09e1452cfdef373d051b8c02a4",
48+
"build_file_content": "cc_library(\n name = \"fast_float\",\n hdrs = glob([\"include/fast_float/*.h\"]),\n visibility = [\"//visibility:public\"],\n include_prefix = \"third_party/fast_float/src\",\n)",
49+
"use_module_bazel_from_bcr": "8.0.2"
50+
},
51+
{
52+
"name": "fp16",
53+
"type": "github_tarball",
54+
"use_bazel_dep": true,
55+
"owner": "Maratyszcza",
56+
"repo": "FP16",
57+
"freeze_commit": "b3720617faf1a4581ed7e6787cc51722ec7751f0",
58+
"build_file_content": "exports_files(glob([\"**\"]))",
59+
"use_module_bazel_from_bcr": "0.0.0-20210320-0a92994"
60+
},
61+
{
62+
"name": "highway",
63+
"type": "github_tarball",
64+
"use_bazel_dep": true,
65+
"owner": "google",
66+
"repo": "highway",
67+
"freeze_commit": "00fe003dac355b979f36157f9407c7c46448958e",
68+
"use_module_bazel_from_bcr": "1.3.0"
69+
},
2570
{
2671
"name": "nbytes",
2772
"type": "github_release",
@@ -37,12 +82,16 @@
3782
"branch": "main"
3883
},
3984
{
40-
"name": "dragonbox",
41-
"type": "github_tarball",
42-
"build_file_content": "cc_library(name = \"dragonbox\", hdrs = glob([\"include/dragonbox/*.h\"]), visibility = [\"//visibility:public\"], include_prefix = \"third_party/dragonbox/src\")",
43-
"owner": "jk-jeon",
44-
"repo": "dragonbox",
45-
"freeze_commit": "6c7c925b571d54486b9ffae8d9d18a822801cbda"
85+
"name": "perfetto",
86+
"type": "github_release",
87+
"use_bazel_dep": true,
88+
"owner": "google",
89+
"repo": "perfetto",
90+
"freeze_version": "v53.0",
91+
"patches": [
92+
"//:patches/perfetto/0001-Don-t-attempt-to-use-rules_android.patch",
93+
"//:patches/perfetto/0002-disable-info-level-logging.patch"
94+
]
4695
},
4796
{
4897
"name": "simdutf",
@@ -52,7 +101,10 @@
52101
"build_file": "//:build/BUILD.simdutf",
53102
"file_regex": "singleheader.zip"
54103
},
55-
//wpt
104+
{
105+
"name": "tcmalloc",
106+
"type": "bazel_dep"
107+
},
56108
// TODO: wpt was temporarily removed from shared_deps.jsonc because it would require
57109
// workerd to be fully converted to bzlmod before the internal repo can load it.
58110
{
@@ -63,6 +115,16 @@
63115
"file_regex": "wpt-.*.tar.gz",
64116
"build_file": "@workerd//:build/BUILD.wpt",
65117
"freeze_version": "wpt-c1ad85a22"
118+
},
119+
{
120+
"name": "zlib",
121+
"type": "git_clone",
122+
"use_bazel_dep": true,
123+
"url": "https://chromium.googlesource.com/chromium/src/third_party/zlib.git",
124+
"branch": "main",
125+
"freeze_commit": "85f05b0835f934e52772efc308baa80cdd491838",
126+
"build_file": "//:build/BUILD.zlib",
127+
"patches": ["//:patches/zlib/0001-Add-dummy-MODULE.bazel.patch"]
66128
}
67129
]
68130
}

‎build/deps/gen/build_deps.MODULE.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ bazel_dep(name = "aspect_bazel_lib", version = "2.22.2")
1717
bazel_dep(name = "aspect_rules_esbuild", version = "0.25.0")
1818

1919
# aspect_rules_js
20-
bazel_dep(name = "aspect_rules_js", version = "2.8.3")
20+
bazel_dep(name = "aspect_rules_js", version = "2.9.1")
2121

2222
# aspect_rules_lint
2323
bazel_dep(name = "aspect_rules_lint", version = "1.13.0")

‎build/deps/gen/deps.MODULE.bazel‎

Lines changed: 81 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,28 @@ git_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:git.bzl", "g
77
# ada-url
88
bazel_dep(name = "ada-url", version = "3.4.1")
99

10+
# boringssl
11+
bazel_dep(name = "boringssl", repo_name = "ssl")
12+
archive_override(
13+
module_name = "boringssl",
14+
patch_args = ["-p1"],
15+
patches = ["//:patches/boringssl/0001-Expose-libdecrepit-so-NodeJS-can-use-it-for-ncrypto.patch"],
16+
sha256 = "c54bb763140d86bc13ce1ec256f02189ddb59597c9765b75f945b7401b4916a7",
17+
strip_prefix = "google-boringssl-bc2e0ff",
18+
type = "tgz",
19+
url = "https://api.github.com/repos/google/boringssl/tarball/0.20251002.0",
20+
)
21+
1022
# brotli
1123
bazel_dep(name = "brotli", version = "1.2.0")
1224

1325
# capnp-cpp
1426
http.archive(
1527
name = "capnp-cpp",
16-
sha256 = "8b1ca3b27292f0dabe6dd4fac70d923c79992ec97fbd34b2804dcbc7e4e9f495",
17-
strip_prefix = "capnproto-capnproto-fe46415/c++",
28+
sha256 = "3a3f15c850b115289ef6d4571c55453727d034b1d485be055780d5ae3e5cc6c5",
29+
strip_prefix = "capnproto-capnproto-ac2d9e8/c++",
1830
type = "tgz",
19-
url = "https://github.com/capnproto/capnproto/tarball/fe46415eb2b1038420e6cae41dd76b28df2511e6",
31+
url = "https://github.com/capnproto/capnproto/tarball/ac2d9e83fab1d1bdd89089eb7cbf6e0036c5cc87",
2032
)
2133
use_repo(http, "capnp-cpp")
2234

@@ -31,6 +43,44 @@ http.archive(
3143
)
3244
use_repo(http, "dragonbox")
3345

46+
# fast_float
47+
bazel_dep(name = "fast_float")
48+
archive_override(
49+
module_name = "fast_float",
50+
build_file_content = "cc_library(\n name = \"fast_float\",\n hdrs = glob([\"include/fast_float/*.h\"]),\n visibility = [\"//visibility:public\"],\n include_prefix = \"third_party/fast_float/src\",\n)",
51+
remote_file_integrity = {"MODULE.bazel": "sha256-Q1BGZO/fpMbPE0libIcTXJuHkmMlxyBFjzlu7iVWjto="},
52+
remote_file_urls = {"MODULE.bazel": ["https://raw.githubusercontent.com/bazelbuild/bazel-central-registry/refs/heads/main/modules/fast_float/8.0.2/MODULE.bazel"]},
53+
sha256 = "8f1dc06ac2ea1a39343c1bfbd8319134f295677ed04f0a4e63c296f5bd4d20d6",
54+
strip_prefix = "fastfloat-fast_float-cb1d42a",
55+
type = "tgz",
56+
url = "https://github.com/fastfloat/fast_float/tarball/cb1d42aaa1e14b09e1452cfdef373d051b8c02a4",
57+
)
58+
59+
# fp16
60+
bazel_dep(name = "fp16")
61+
archive_override(
62+
module_name = "fp16",
63+
build_file_content = "exports_files(glob([\"**\"]))",
64+
remote_file_integrity = {"MODULE.bazel": "sha256-2YAHXAyoWo6FapWo2MBLpWyewByY+F4tSWUMbYt8gmg="},
65+
remote_file_urls = {"MODULE.bazel": ["https://raw.githubusercontent.com/bazelbuild/bazel-central-registry/refs/heads/main/modules/fp16/0.0.0-20210320-0a92994/MODULE.bazel"]},
66+
sha256 = "adccd6b677a166a0f5073dc4dd0d897c6cc1ffe99a475997ed3627aca3909d83",
67+
strip_prefix = "Maratyszcza-FP16-b372061",
68+
type = "tgz",
69+
url = "https://github.com/Maratyszcza/FP16/tarball/b3720617faf1a4581ed7e6787cc51722ec7751f0",
70+
)
71+
72+
# highway
73+
bazel_dep(name = "highway")
74+
archive_override(
75+
module_name = "highway",
76+
remote_file_integrity = {"MODULE.bazel": "sha256-2UVSfmwaox6VsgqN+q+Ci+ofGKIJCDc+psSq2YsurfQ="},
77+
remote_file_urls = {"MODULE.bazel": ["https://raw.githubusercontent.com/bazelbuild/bazel-central-registry/refs/heads/main/modules/highway/1.3.0/MODULE.bazel"]},
78+
sha256 = "716d5d824c0243a802c22549295ea983381325b45678d24cc171fc69b9cc2b97",
79+
strip_prefix = "google-highway-00fe003",
80+
type = "tgz",
81+
url = "https://github.com/google/highway/tarball/00fe003dac355b979f36157f9407c7c46448958e",
82+
)
83+
3484
# nbytes
3585
http.archive(
3686
name = "nbytes",
@@ -52,14 +102,29 @@ http.archive(
52102
)
53103
use_repo(http, "ncrypto")
54104

105+
# perfetto
106+
bazel_dep(name = "perfetto")
107+
archive_override(
108+
module_name = "perfetto",
109+
patch_args = ["-p1"],
110+
patches = [
111+
"//:patches/perfetto/0001-Don-t-attempt-to-use-rules_android.patch",
112+
"//:patches/perfetto/0002-disable-info-level-logging.patch",
113+
],
114+
sha256 = "feae4e379ef39e12f6f18b1e62e132ed411b5369750a23e18cae76cb42ef7192",
115+
strip_prefix = "google-perfetto-095212b",
116+
type = "tgz",
117+
url = "https://api.github.com/repos/google/perfetto/tarball/v53.0",
118+
)
119+
55120
# simdutf
56121
http.archive(
57122
name = "simdutf",
58123
build_file = "//:build/BUILD.simdutf",
59-
sha256 = "6ea51d54c1a76418663a0c3a5bb48656bfed175c914ffc10279150a88506a0b6",
124+
sha256 = "3500cca10b2ff311d77c87e420fe9fa83f351d82ac0c80a5216b934ef0140208",
60125
strip_prefix = "",
61126
type = "zip",
62-
url = "https://github.com/simdutf/simdutf/releases/download/v7.7.1/singleheader.zip",
127+
url = "https://github.com/simdutf/simdutf/releases/download/v8.0.0/singleheader.zip",
63128
)
64129
use_repo(http, "simdutf")
65130

@@ -76,3 +141,14 @@ http.archive(
76141
url = "https://github.com/cloudflare/workerd-tools/releases/download/wpt-c1ad85a22/wpt-c1ad85a22.tar.gz",
77142
)
78143
use_repo(http, "wpt")
144+
145+
# zlib
146+
bazel_dep(name = "zlib")
147+
git_override(
148+
module_name = "zlib",
149+
build_file = "//:build/BUILD.zlib",
150+
commit = "85f05b0835f934e52772efc308baa80cdd491838",
151+
patch_args = ["-p1"],
152+
patches = ["//:patches/zlib/0001-Add-dummy-MODULE.bazel.patch"],
153+
remote = "https://chromium.googlesource.com/chromium/src/third_party/zlib.git",
154+
)

0 commit comments

Comments
 (0)