Merge remote-tracking branch 'origin/main' into bump-verilator
This commit is contained in:
@@ -1,5 +1,6 @@
|
||||
channels:
|
||||
- ucb-bar
|
||||
- litex-hub
|
||||
- conda-forge
|
||||
- nodefaults
|
||||
|
||||
@@ -46,7 +47,6 @@ dependencies:
|
||||
- doit>=0.34.0
|
||||
- gitpython
|
||||
- humanfriendly
|
||||
- e2fsprogs
|
||||
- ctags
|
||||
- bison
|
||||
- flex
|
||||
@@ -101,8 +101,9 @@ dependencies:
|
||||
|
||||
# hammer packages
|
||||
- sty
|
||||
- open_pdks.sky130a
|
||||
- pip:
|
||||
- hammer-vlsi[asap7]==1.0.1
|
||||
- hammer-vlsi[asap7]==1.0.5
|
||||
|
||||
# doc requirements
|
||||
- sphinx
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,6 @@
|
||||
channels:
|
||||
- ucb-bar
|
||||
- litex-hub
|
||||
- conda-forge
|
||||
- nodefaults
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
channels:
|
||||
- ucb-bar
|
||||
- litex-hub
|
||||
- conda-forge
|
||||
- nodefaults
|
||||
|
||||
@@ -14,4 +15,4 @@ dependencies:
|
||||
# https://docs.conda.io/projects/conda/en/latest/user-guide/concepts/pkg-specs.html#package-match-specifications
|
||||
# documentation on package_spec syntax for constraining versions
|
||||
|
||||
- riscv-tools=1.0.1 # from ucb-bar channel - https://github.com/ucb-bar/riscv-tools-feedstock
|
||||
- riscv-tools=1.0.3 # from ucb-bar channel - https://github.com/ucb-bar/riscv-tools-feedstock
|
||||
|
||||
Reference in New Issue
Block a user