Merge pull request #1941 from ucb-bar/remove-conda-lock-from-docs

Remove need for users to install conda-lock themselves
ucb-bar · Aug 2, 2024 · 27a3f9a · 27a3f9a
2 parents 1e3651b + 00b5c12
commit 27a3f9a
Show file tree

Hide file tree

Showing 6 changed files with 6,143 additions and 6,079 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,6 +17,7 @@ tags
 *~
 .bsp/
 .conda-env/
+.conda-lock-env/
 .#*
 first-clone-setup-fast-log
 .bloop/

diff --git a/conda-reqs/chipyard-base.yaml b/conda-reqs/chipyard-base.yaml
@@ -32,4 +32,6 @@ dependencies:
     - openjdk=20
     - dtc
     - verilator==5.022
-    - conda-lock=1.4
+
+    # used in build-setup.sh as well
+    - conda-lock=2.5.7
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,6 +17,7 @@ tags @@
     *~
     .bsp/
     .conda-env/
+    .conda-lock-env/
     .#*
     first-clone-setup-fast-log
     .bloop/
@@ Expand Down @@