diff --git a/conda-reqs/conda-reqs.conda-lock.yml b/conda-reqs/conda-reqs.conda-lock.yml index 6af38037fa..4776ccdb3e 100644 --- a/conda-reqs/conda-reqs.conda-lock.yml +++ b/conda-reqs/conda-reqs.conda-lock.yml @@ -19,7 +19,7 @@ metadata: - url: nodefaults used_env_vars: [] content_hash: - linux-64: ec12a8e0c5dfe11ace8dde301bb27940fbfc2f97498857b7686d3e7f023ee8b5 + linux-64: 31489a3ac2acce6d83d0f5c7ed2f13f050afd7b10e4f45bae097e872c302abf9 platforms: - linux-64 sources: @@ -1332,13 +1332,13 @@ package: libzlib: '>=1.2.13,<1.3.0a0' xz: '>=5.2.6,<6.0a0' hash: - md5: 3b933ea47ef8f330c4c068af25fcd6a8 - sha256: b30713fb4477ff4f722280d956593e7e7a2cb705b7444dcc278de447432b43b1 + md5: 29474f139e5017090f218ef6b3753efd + sha256: fe7a739103454593d4a83d33223443700031140ac1b1e726d653a8db98960790 manager: conda name: libxml2 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.10.3-h7463322_0.tar.bz2 + url: https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.10.3-hca2bb57_3.conda version: 2.10.3 - category: main dependencies: @@ -1749,13 +1749,13 @@ package: libzlib: '>=1.2.13,<1.3.0a0' zstd: '>=1.5.2,<1.6.0a0' hash: - md5: 70cbb0c2033665f2a7339bf0ec51a67f - sha256: 3fb9a9cfd2f5c79e8116c67f95d5a9b790ec66807ae0d8cebefc26fda9f836a7 + md5: 17d91085ccf5934ce652cb448d0cb65a + sha256: f649fac60cb122bf0d85c4955725d94c353fdbd768bcd44f0444979b363cc9ab manager: conda name: libllvm15 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/libllvm15-15.0.7-hadd5161_0.conda + url: https://conda.anaconda.org/conda-forge/linux-64/libllvm15-15.0.7-hadd5161_1.conda version: 15.0.7 - category: main dependencies: @@ -3238,19 +3238,18 @@ package: gxx_impl_linux-64: '' libgcc-ng: '>=12' libstdcxx-ng: '>=12' - libzlib: '>=1.2.13,<1.3.0a0' + libzlib: '>=1.2.12,<1.3.0a0' make: '' perl: '' - python: '' hash: - md5: 1a0130b3de431ee4dd26734a234a1cde - sha256: 12971e7e175a7dfb70d4afcf76e38d1ed21a979d49e215d439e7392de221a14d + md5: 41af6df1758bae89161daf268566384e + sha256: e2f2302d69c0d6928d95a1c699b5ef0b14e0243e78495734962c78136d2e6b9f manager: conda name: verilator optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/verilator-5.006-h07cc95c_1.conda - version: '5.006' + url: https://conda.anaconda.org/conda-forge/linux-64/verilator-4.226-he0ac6c6_1.tar.bz2 + version: '4.226' - category: main dependencies: gettext: '>=0.21.1,<1.0a0' @@ -3537,14 +3536,14 @@ package: zlib: '' zstd: '>=1.5.2,<1.6.0a0' hash: - md5: 6709d5b453c44b4e630b146d596d1d41 - sha256: 806ddedebceedb0147f53851b10069dac521a2f83a2edb8039445ce20e5fb4e9 + md5: 02142080aee43c8ef90db543ffbc13dd + sha256: cbd17c0375a021b7de854e0841f3f1b28b1359bc52bdc0ba5aabaee0f65a0b7d manager: conda name: cmake optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/cmake-3.25.3-h077f3f9_0.conda - version: 3.25.3 + url: https://conda.anaconda.org/conda-forge/linux-64/cmake-3.26.0-h077f3f9_0.conda + version: 3.26.0 - category: main dependencies: libgcc-ng: '>=12' @@ -4891,14 +4890,14 @@ package: python-dateutil: '>=2.1,<3.0.0' urllib3: '>=1.25.4,<1.27' hash: - md5: f5f163a412ecc6be50ef913cf3de6ad6 - sha256: 1172449dfba0f4bba3adb2a0c9878878fdf7c4cc22c0f6c3ebbc42d3b11bfda4 + md5: c23737efb6d9e44fa00795cded4f5ed9 + sha256: 38e65d48b017160bbcc455159616e1025ca48a8e54304d5f9448d304837021e2 manager: conda name: botocore optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.29.90-pyhd8ed1ab_0.conda - version: 1.29.90 + url: https://conda.anaconda.org/conda-forge/noarch/botocore-1.29.76-pyhd8ed1ab_0.conda + version: 1.29.76 - category: main dependencies: cairo: '>=1.16.0,<2.0a0' @@ -4948,18 +4947,18 @@ package: dependencies: aiohttp: '>=3.3.1' aioitertools: '>=0.5.1' - botocore: '>=1.27.59,<1.27.60' - python: '>=3.6' + botocore: '>=1.29.76,<1.29.77' + python: '>=3.7' wrapt: '>=1.10.10' hash: - md5: a3f48ea10883a5df371b895008b1ca4b - sha256: 76068553358b26c9c03be992cbe982a369d1e015a53700f092db92c784ce98a9 + md5: 7e3b07efee162390a72ef004440198c1 + sha256: 1e301342489a5c01fcc823e27a7b835eb7a953f827ff0d4253fb4493476f1569 manager: conda name: aiobotocore optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/aiobotocore-2.4.2-pyhd8ed1ab_0.conda - version: 2.4.2 + url: https://conda.anaconda.org/conda-forge/noarch/aiobotocore-2.5.0-pyhd8ed1ab_0.conda + version: 2.5.0 - category: main dependencies: botocore: '>=1.11.3' @@ -5159,7 +5158,7 @@ package: version: 5.1.1 - category: main dependencies: - botocore: 1.29.90 + botocore: 1.29.76 colorama: '>=0.2.5,<0.4.5' docutils: '>=0.10,<0.17' python: '>=3.10,<3.11.0a0' @@ -5168,14 +5167,14 @@ package: rsa: '>=3.1.2,<4.8' s3transfer: '>=0.6.0,<0.7.0' hash: - md5: f22d497dccdfef2df007457017d9caf2 - sha256: 564d3ad709000c3b043c68e42e0614732c34ad6cd94179ba5162109df800d6e3 + md5: 8c10a8f0d1fdf0bcaf3e7ddba412dab1 + sha256: 80b95da17548e8ba8e2b3aa292829bc0c0e8edf37f25019b2a1ce97b94bb66f7 manager: conda name: awscli optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.27.90-py310hff52083_0.conda - version: 1.27.90 + url: https://conda.anaconda.org/conda-forge/linux-64/awscli-1.27.76-py310hff52083_0.conda + version: 1.27.76 - category: main dependencies: azure-core: '>=1.24.0,<2.0.0' @@ -5191,19 +5190,19 @@ package: version: 1.3.2 - category: main dependencies: - botocore: '>=1.29.90,<1.30.0' + botocore: '>=1.29.76,<1.30.0' jmespath: '>=0.7.1,<2.0.0' python: '>=3.7' s3transfer: '>=0.6.0,<0.7.0' hash: - md5: a57ff13af4774f422569fe6630d73c08 - sha256: 045c5d6441b6b6790d0e9a826bee129b6f6c14ce65e8c50556b8a109a84d9912 + md5: 5246a3712ba575428ab1e4cf8c5e289d + sha256: bd52736dcdcf9a46d7fd93baea1140b0185af3880bdfef78b9d62fdf586b65fc manager: conda name: boto3 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.26.90-pyhd8ed1ab_0.conda - version: 1.26.90 + url: https://conda.anaconda.org/conda-forge/noarch/boto3-1.26.76-pyhd8ed1ab_0.conda + version: 1.26.76 - category: main dependencies: cachecontrol: 0.12.11 pyhd8ed1ab_1 @@ -5281,6 +5280,21 @@ package: platform: linux-64 url: https://conda.anaconda.org/conda-forge/noarch/msrest-0.7.1-pyhd8ed1ab_0.tar.bz2 version: 0.7.1 +- category: main + dependencies: + aiobotocore: '' + botocore: '' + fsspec: '>=0.9.0' + python: '>=3.6' + hash: + md5: f20c8f33a3aa1256d88dd4b5bc67530c + sha256: 36d2b377c87acb3f5958e00d6ef5acd36f89a903fc54ba98084a2fccb7e2e051 + manager: conda + name: s3fs + optional: false + platform: linux-64 + url: https://conda.anaconda.org/conda-forge/noarch/s3fs-0.6.0-pyhd8ed1ab_0.tar.bz2 + version: 0.6.0 - category: main dependencies: python: '>=2.7' @@ -5377,14 +5391,14 @@ package: python: '' typing_extensions: '' hash: - md5: 72b6b21dfad72737aab3d4988b51244f - sha256: 77179ed8be45e06e010dc0143bf56201aa028ba59d573e4216be8c1a49ff372b + md5: 84e24eeed37acfdf0dc0b79eaf63b785 + sha256: 0df91414088feb5d051309b4c07d2e6ec002a6f31179bd8eaa1a4566bb65baea manager: conda name: boto3-stubs optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/boto3-stubs-1.26.90-pyhd8ed1ab_0.conda - version: 1.26.90 + url: https://conda.anaconda.org/conda-forge/noarch/boto3-stubs-1.26.91-pyhd8ed1ab_0.conda + version: 1.26.91 - category: main dependencies: cachecontrol-with-filecache: '>=0.12.9' @@ -5439,28 +5453,14 @@ package: python: '>=3.6' typing-extensions: '' hash: - md5: 1d91d141687b375eab2e63bbecf191b1 - sha256: 8c5af95bf4090318c138501ca271158cd00ff51898c608a4753a4fb09a31973c + md5: a0ead2e95ffa5942c419234c15463344 + sha256: 7e7bb339939a50d9e682c01938062d2d4e1157a7b034d7f91e44e11d98c0d05d manager: conda name: mypy_boto3_ec2 optional: false platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/mypy_boto3_ec2-1.26.87-pyhd8ed1ab_0.conda - version: 1.26.87 -- category: main - dependencies: - boto3: '' - fsspec: '>=0.6.0' - python: '>=3.5' - hash: - md5: ead328eb12f01d88706126ba061e7a69 - sha256: 7a4cb574ff7edf773e5e4c396733dcb08ffcfd6e4f8b27e5b84b35fd4666ef5b - manager: conda - name: s3fs - optional: false - platform: linux-64 - url: https://conda.anaconda.org/conda-forge/noarch/s3fs-0.4.2-py_0.tar.bz2 - version: 0.4.2 + url: https://conda.anaconda.org/conda-forge/noarch/mypy_boto3_ec2-1.26.91-pyhd8ed1ab_0.conda + version: 1.26.91 - category: main dependencies: docutils: <0.19 diff --git a/conda-reqs/firesim.yaml b/conda-reqs/firesim.yaml index a35b589195..3a03eb9d55 100644 --- a/conda-reqs/firesim.yaml +++ b/conda-reqs/firesim.yaml @@ -83,7 +83,9 @@ dependencies: - graphviz - expect - dtc - - verilator==5.006 + # Pull in a newer build of verilator 4.226 that defaults to C++17 for verilation + # See https://github.com/verilator/verilator/issues/3588 + - verilator==4.226=he0ac6c6_1 - screen - elfutils - libdwarf-dev==0.0.0.20190110_28_ga81397fc4 # from ucb-bar channel - using mainline libdwarf-feedstock