Skip to content

Commit 0ecf32f

Browse files
authored
Merge pull request hdl#308 from proppy/bump-boost
dependency_support/boost: switch lzma to a safer repo
2 parents 544ab6b + 01ed9c9 commit 0ecf32f

File tree

5 files changed

+59
-42
lines changed

5 files changed

+59
-42
lines changed

dependency_support/boost/boost.bzl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,7 @@ def boost():
3434
# that the rest of XLS uses.
3535
Label("@rules_hdl//dependency_support/boost:add_python.patch"),
3636
Label("@rules_hdl//dependency_support/boost:libbacktrace.patch"),
37+
# See: https://github.com/nelhage/rules_boost/issues/555
38+
Label("@rules_hdl//dependency_support/boost:downgrade_lzma.patch"),
3739
],
3840
)
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
diff --git boost/boost.bzl boost/boost.bzl
2+
index 4381996..587a37d 100644
3+
--- boost/boost.bzl
4+
+++ boost/boost.bzl
5+
@@ -140,9 +140,9 @@ def boost_deps():
6+
http_archive,
7+
name = "org_lzma_lzma",
8+
build_file = "@com_github_nelhage_rules_boost//:lzma.BUILD",
9+
- url = "https://github.com/tukaani-project/xz/releases/download/v5.4.3/xz-5.4.3.tar.gz",
10+
- sha256 = "1c382e0bc2e4e0af58398a903dd62fff7e510171d2de47a1ebe06d1528e9b7e9",
11+
- strip_prefix = "xz-5.4.3",
12+
+ url = "https://src.fedoraproject.org/lookaside/extras/xz/xz-5.4.6.tar.gz/sha512/b08a61d8d478d3b4675cb1ddacdbbd98dc6941a55bcdd81a28679e54e9367d3a595fa123ac97874a17da571c1b712e2a3e901c2737099a9d268616a1ba3de497/xz-5.4.6.tar.gz",
13+
+ sha256 = "aeba3e03bf8140ddedf62a0a367158340520f6b384f75ca6045ccc6c0d43fd5c",
14+
+ strip_prefix = "xz-5.4.6",
15+
)
16+
17+
maybe(

dependency_support/pip_requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ jwt==1.3.1
33
requests==2.28.2
44
absl-py==1.4.0
55
cocotb==1.8.0
6-
klayout==0.28.12
6+
klayout==0.29.0

dependency_support/pip_requirements.txt

Lines changed: 38 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -228,46 +228,44 @@ idna==3.4 \
228228
jwt==1.3.1 \
229229
--hash=sha256:61c9170f92e736b530655e75374681d4fcca9cfa8763ab42be57353b2b203494
230230
# via -r dependency_support/pip_requirements.in
231-
klayout==0.28.12 \
232-
--hash=sha256:0149622bf894bb67b0106f36cc0fa69afbf7ee621f5a900247c926c5f0ba871b \
233-
--hash=sha256:02a4085f2677f7bfd7c4e1131a678478e70eb92292bc81b5f6f7f381dc868e92 \
234-
--hash=sha256:03226cdbaf94106ea77db207ac5f4f44b9c44c0ebfeb4c7f95f1d06820f78a46 \
235-
--hash=sha256:0aee6253ca44e6e128df1555c513299883c60fdeb2fd4033d14eb4d288b09963 \
236-
--hash=sha256:0d4a3a8cd1fe1331f547bb37674c1e10ceed887ec394dbe7b473c527ebc6129e \
237-
--hash=sha256:1b9d3a644e1f0b823c824e0754c3c5e4aadd02972ff4bc2fa81e9503ecda8938 \
238-
--hash=sha256:24ffe67be0db82215d5395d1fc8bbd54584f873deb9081f7979a31b5b47d68e6 \
239-
--hash=sha256:26f9b623291ac0e3b11efb758caa180d13c7adc493542dc1042f9ce0eccaa376 \
240-
--hash=sha256:2b5ad971863c494f2fe9bafef63d79663bad08eb2caf6d1e008b72e35f042716 \
241-
--hash=sha256:308bb93a979a245594a37362570a826525b1f998530701ec87ad52af74414828 \
242-
--hash=sha256:355fb2694da95215dfb0af6b717eac491623acf30ed34d0c7f92e367c31825c3 \
243-
--hash=sha256:36931fcfff841b11bf85d1feee6ac197f9ac84bcab3d1dca88685a209febf62a \
244-
--hash=sha256:4b110b372d7c318b417d80e85e2b3e924a40df3c2596081359682bb34ec813c2 \
245-
--hash=sha256:5c9da58357395baf322e797d1dcd895d51dc26b252e4a868cf48eb0b066c5db9 \
246-
--hash=sha256:81fda2af5fbe048201a8ebc7d5e32ba9aaf700bb70b4b2754a047f8ef4198313 \
247-
--hash=sha256:8b051697815e9d600d0dbdeb54ae1778f3b34b58e6ffd59e0550721c4348f72f \
248-
--hash=sha256:8b7761d52ff3882c67b61dac09ae7424763b5a679454b35f99d2826123bff7c4 \
249-
--hash=sha256:93b91580f259305b0052764b9f32da7a58ac763cb04028131d40d778e977dbc6 \
250-
--hash=sha256:9a83dd927ead70c5e5e56e7faaae49217eafe08922f0fedfc72bfac8b4c83a5b \
251-
--hash=sha256:9aa3a5a6b15667381bfe944b2ebb5cff65db4486fda417902bb918262ae5f078 \
252-
--hash=sha256:9cfd70cbd1aa859ec05ff19bac824cd51febc40d1e56f57512e3e3fac4e028a2 \
253-
--hash=sha256:aad49432446291f311ed47c394e554d842be65c4a4a027c3362a56121a2be508 \
254-
--hash=sha256:afa849de3027b8b8bff03b41921456ef4575791e8171a87284f23793026f7577 \
255-
--hash=sha256:b86d301df499ccead33f84418f1b11397ea742dbe832cc228bf6d9e98c37156f \
256-
--hash=sha256:bce4e8d687285b6b5856db9139e8d6b627669a9bd85439dc84276e7da2e28d6e \
257-
--hash=sha256:be854cac32b6fe0e42eecf5f54c709e24afd12f0f2d6af65e6d7e076e75ac028 \
258-
--hash=sha256:c07e9e8e85f135f7ae813d225932a597299213c005e6f88b94f77c6c2490b4ef \
259-
--hash=sha256:c341470710858711f2005211db7eb81d5b7928dc5443d32a23d491c0c0405f45 \
260-
--hash=sha256:c578d751d73fcdecbeaef66f77851822be68519a2303ff4d550b0e3389ae8131 \
261-
--hash=sha256:d506781814663a6e1ef7a74ec66327b0fb2d53bb3a47aa8b2aeef04ef165f191 \
262-
--hash=sha256:d6e68b7c7ae988d44002c4e60f23cbaee282283c3503e55dd21a851d937e0d42 \
263-
--hash=sha256:dbaac224940cdebd6d303f31cad50d7754ee3299d6c1b9077096e8d205d404d2 \
264-
--hash=sha256:e136fee9ef35c14ad85adad8faa80dc29d7dbfa168bdc35d524613f5cf4a8c2b \
265-
--hash=sha256:e3216385f5af7a66fd8de68e80d2b6906e2000f04dd2891022ef94a617ca5ea6 \
266-
--hash=sha256:e823fa93034aa7f6c37d117ec701424db4a19cf42ff70db71fc1b6988fe3fafe \
267-
--hash=sha256:ee2e1a4b2ea8debc9ee4d8b1b1c1c1ddd5d466339f0a7d2594261b9e039b3a3a \
268-
--hash=sha256:f0dc82a729bc222e537028d73edfeb9ade75a01ccd3f9acae5204af4987c7a9b \
269-
--hash=sha256:f85039f741d8144feed29ad7294af1c7e5b2957adb42ae32a47123e12dfcfeca \
270-
--hash=sha256:fe81d6ae4b66f64abdcb895be8fb62d2973b68a9ad16a3dcfe6a05363ffe3585
231+
klayout==0.29.0 \
232+
--hash=sha256:0256e848cba2b4b2a18402061750c9c23bca316079f989722804a4c52b44cfcc \
233+
--hash=sha256:16d22f316ec50672f0eef99864e33918d5dd3c9fff88463c44c4f9a95201541c \
234+
--hash=sha256:1df13dfbc3d7be89b7bf5d739f83285a03dec5a25baa752a92637068b006e698 \
235+
--hash=sha256:268b4b34db44c756e182f3cd8f3355f2dedd367af8143cab694992444dc27a09 \
236+
--hash=sha256:2fa4f8e7a3ab31bf8f94a5927495cacb8e6feeb193a5007f29d50518812d38df \
237+
--hash=sha256:303c831c57a40815863bfecbe77ec811f1f6a6b94397d2071d68c8466c38aeea \
238+
--hash=sha256:350d396bc843e31aadf24b66d2dddfdc9a2e13f73931fe34c8d266fce7e9053e \
239+
--hash=sha256:52a5201257005c8f18d3e60ef912d88c5461b2c09bf0d76fd41790461fadac53 \
240+
--hash=sha256:5ec36645819ac636ae80dfdd159c230a0ce92c24a25a220937b1b1b02bb1e445 \
241+
--hash=sha256:64b7a1b7745f29679d81956d66953cd322400602550d088934443c35ef0482b8 \
242+
--hash=sha256:6c43e729070ee5f6fcbc8e4f312fd0cf3ce40bfcf3b43c49325193d902b2f7a8 \
243+
--hash=sha256:6fbb3869c861e4999b9bd910f6cebdd63f5f32c68726b58ea6e0e985f3fdb93b \
244+
--hash=sha256:78d0646362dac7300cbf3a0839dde6c9d59eb2d34be610d624ae6fdfdb866c42 \
245+
--hash=sha256:7907b5cd5d291b4bf67456496139c79c729377499cd672e25dd13bf9316f3294 \
246+
--hash=sha256:8a9c2987bb33b0dd28095448ea73d4dac112ba28877734a485b181605b48ef77 \
247+
--hash=sha256:9bf1504c626341f0f22b1c275acea3f4452ef300867fdab5fcd97ab8cb04ae3c \
248+
--hash=sha256:9d424292240dc0d34d6a3f3fe049ea70568eb24be84c2257b448b304eadaba16 \
249+
--hash=sha256:9e0f8c6271d641f16fb29287e1d6b474f96aca6613ecc2cea362ee8b0caef05a \
250+
--hash=sha256:a668412f7637d53919afaa4bb9b866e310cb27a2d447f5e2e0bea5c2498b818b \
251+
--hash=sha256:a9375fafeb8849ffe2e2dce8c3f990ad473c84b722cba0afc4748569e3fb7960 \
252+
--hash=sha256:a985702e6a56a3417d163b136467598faadf74bcb099bc5364cb08b397a0bcca \
253+
--hash=sha256:aaa427d9025c580f9bfac477751bda66731587b5c9413110e01ae33753fa16b9 \
254+
--hash=sha256:ab1240396de04d64ea95eaee609d46335d508e8425508434fc91853d12ce6778 \
255+
--hash=sha256:ae6e5f547d8801a90784c0c05cf6d1eb693e238a56af8648c0fb755b2fc56230 \
256+
--hash=sha256:b1c0186a3a27a05060e8f643dfcecf9e0137829df68e228a28b72619ed7a37e6 \
257+
--hash=sha256:b1d56aa41e2530d167dae9f4e40b044464dac78e1f59a45a229927391058daec \
258+
--hash=sha256:b6a8a1def51c4570c7b60c16001b659537100ed192a370ff352c1a006c125b6f \
259+
--hash=sha256:c04e1da03f23452a413268f185a3a0fae15f0c9e5e75786047d4fdc356e21963 \
260+
--hash=sha256:c1b569216c3915fa3c7982586c9abe50f70eacc1b3efc1252e0ff6d2cd1c6d3e \
261+
--hash=sha256:c8ad026d70916d8b580fd6494f605d57d0e81cbd476f64c51b0394c34e7987be \
262+
--hash=sha256:ce29bda3f19853aa9c26dea73bcb8562b96599570e1e1de2c3940b03758ae669 \
263+
--hash=sha256:d66150d5938c47d4eb5ed4987430b34824869c34ab6bd7e2e9fbd2b56df234b2 \
264+
--hash=sha256:e620ffe51ad92f54719702ba1a193dc17df679b2097618b9518ebbfa1ae96680 \
265+
--hash=sha256:e9ecd58bae7063a32885e48b48b4b7b6e516dbea3e28f78efbccd75bcfa25872 \
266+
--hash=sha256:f2782eb9d6bcaa51db67a298e0fee098880caf56be3514bdaa1590098c449cdf \
267+
--hash=sha256:fb94e285d6591a1aa159e4c0eb93c930f31097585266dab43ca91e4c916ab119 \
268+
--hash=sha256:ffd221a2e8cb2d8e4538c6bdf2ffd80f0b696455e8e2090c67ba715e70da3873
271269
# via -r dependency_support/pip_requirements.in
272270
marshmallow==3.20.1 \
273271
--hash=sha256:5d2371bbe42000f2b3fb5eaa065224df7d8f8597bc19a1bbfa5bfe7fba8da889 \

0 commit comments

Comments
 (0)