Skip to content

Commit a8a1239

Browse files
committed
Move and regenerate deps
1 parent 0759e3b commit a8a1239

File tree

6 files changed

+192
-137
lines changed

6 files changed

+192
-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: 81 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,26 @@
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
},
8+
// BoringSSL may subtly break backwards compatibility and behave differently than the latest FIPS
9+
// version, often by rejecting key values that it considers invalid/unsafe even though they are still
10+
// accepted by BoringSSL. Update with caution and only after confirming this is compatible with the
11+
// downstream build.
12+
{
13+
"name": "boringssl",
14+
"type": "github_release",
15+
"use_bazel_dep": true,
16+
"owner": "google",
17+
"repo": "boringssl",
18+
"repo_name": "ssl",
19+
"freeze_version": "0.20251002.0",
20+
"patches": [
21+
"//:patches/boringssl/0001-Expose-libdecrepit-so-NodeJS-can-use-it-for-ncrypto.patch"
22+
]
23+
},
924
{
1025
"name": "brotli",
1126
"type": "bazel_dep"
@@ -22,6 +37,48 @@
2237
"branch": "v2",
2338
"extra_strip_prefix": "/c++"
2439
},
40+
// We want to avoid version skew with v8, so we use identical versions.
41+
{
42+
"name": "dragonbox",
43+
"type": "github_tarball",
44+
"build_file_content": "cc_library(name = 'dragonbox', hdrs = glob(['include/dragonbox/*.h']), visibility = ['//visibility:public'], include_prefix = 'third_party/dragonbox/src')",
45+
"owner": "jk-jeon",
46+
"repo": "dragonbox",
47+
"freeze_commit": "6c7c925b571d54486b9ffae8d9d18a822801cbda"
48+
},
49+
// We want to avoid version skew with v8, so we use identical versions.
50+
{
51+
"name": "fast_float",
52+
"type": "github_tarball",
53+
"use_bazel_dep": true,
54+
"owner": "fastfloat",
55+
"repo": "fast_float",
56+
"branch": "main",
57+
"freeze_commit": "cb1d42aaa1e14b09e1452cfdef373d051b8c02a4",
58+
"build_file_content": "cc_library(name = 'fast_float', hdrs = glob(['include/fast_float/*.h']), visibility = ['//visibility:public'], include_prefix = 'third_party/fast_float/src')",
59+
"use_module_bazel_from_bcr": "8.0.2"
60+
},
61+
// We want to avoid version skew with v8, so we use identical versions.
62+
{
63+
"name": "fp16",
64+
"type": "github_tarball",
65+
"use_bazel_dep": true,
66+
"owner": "Maratyszcza",
67+
"repo": "FP16",
68+
"freeze_commit": "b3720617faf1a4581ed7e6787cc51722ec7751f0",
69+
"build_file_content": "exports_files(glob(['**']))",
70+
"use_module_bazel_from_bcr": "0.0.0-20210320-0a92994"
71+
},
72+
// We want to avoid version skew with v8, so we use identical versions.
73+
{
74+
"name": "highway",
75+
"type": "github_tarball",
76+
"use_bazel_dep": true,
77+
"owner": "google",
78+
"repo": "highway",
79+
"freeze_commit": "00fe003dac355b979f36157f9407c7c46448958e",
80+
"use_module_bazel_from_bcr": "1.3.0"
81+
},
2582
{
2683
"name": "nbytes",
2784
"type": "github_release",
@@ -37,12 +94,16 @@
3794
"branch": "main"
3895
},
3996
{
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"
97+
"name": "perfetto",
98+
"type": "github_release",
99+
"use_bazel_dep": true,
100+
"owner": "google",
101+
"repo": "perfetto",
102+
"freeze_version": "v53.0",
103+
"patches": [
104+
"//:patches/perfetto/0001-Don-t-attempt-to-use-rules_android.patch",
105+
"//:patches/perfetto/0002-disable-info-level-logging.patch"
106+
]
46107
},
47108
{
48109
"name": "simdutf",
@@ -52,7 +113,6 @@
52113
"build_file": "//:build/BUILD.simdutf",
53114
"file_regex": "singleheader.zip"
54115
},
55-
//wpt
56116
// TODO: wpt was temporarily removed from shared_deps.jsonc because it would require
57117
// workerd to be fully converted to bzlmod before the internal repo can load it.
58118
{
@@ -63,6 +123,19 @@
63123
"file_regex": "wpt-.*.tar.gz",
64124
"build_file": "@workerd//:build/BUILD.wpt",
65125
"freeze_version": "wpt-c1ad85a22"
126+
},
127+
// This should match the version specified in V8 DEPS, but in practice it is generally acceptable
128+
// for it to be behind – zlib is very stable and its API has not changed in a long time, most
129+
// changes to the Chromium fork affect ancillary tools and not the zlib library itself.
130+
{
131+
"name": "zlib",
132+
"type": "git_clone",
133+
"use_bazel_dep": true,
134+
"url": "https://chromium.googlesource.com/chromium/src/third_party/zlib.git",
135+
"branch": "main",
136+
"freeze_commit": "85f05b0835f934e52772efc308baa80cdd491838",
137+
"build_file": "//:build/BUILD.zlib",
138+
"patches": ["//:patches/zlib/0001-Add-dummy-MODULE.bazel.patch"]
66139
}
67140
]
68141
}

build/deps/gen/build_deps.MODULE.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ 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")
2424

2525
# aspect_rules_ts
26-
bazel_dep(name = "aspect_rules_ts", version = "3.8.1")
26+
bazel_dep(name = "aspect_rules_ts", version = "3.8.3")
2727

2828
# bazel_features
2929
bazel_dep(name = "bazel_features", version = "1.39.0")
@@ -114,7 +114,7 @@ bazel_dep(name = "rules_cc", version = "0.2.16")
114114
bazel_dep(name = "rules_multirun", version = "0.13.0")
115115

116116
# rules_nodejs
117-
bazel_dep(name = "rules_nodejs", version = "6.6.2")
117+
bazel_dep(name = "rules_nodejs", version = "6.7.3")
118118

119119
# rules_oci
120120
bazel_dep(name = "rules_oci", version = "2.2.7")

0 commit comments

Comments
 (0)