Skip to content

Commit

Permalink
Merge pull request #147 from efabless/update-nix-eda
Browse files Browse the repository at this point in the history
Update tools and add Xyce for non-macOS
  • Loading branch information
mole99 authored Jan 23, 2025
2 parents 2ad0999 + cff51ba commit 8f9a04c
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci_nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ jobs:
- name: Smoke-Test Docker Image
run: echo TODO
- name: Upload Docker Artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: docker-image-${{ matrix.arch }}
path: ${{ env.IMAGE_PATH }}
Expand Down
19 changes: 16 additions & 3 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{
stdenv,
lib,
nix-gitignore,
buildPythonPackage,
Expand All @@ -25,6 +26,7 @@
volare,
xschem,
ngspice,
xyce,

# Python
matplotlib,
Expand Down Expand Up @@ -64,13 +66,24 @@
setuptools_scm
];

includedTools = [
includedTools = if stdenv.hostPlatform.isDarwin
then
([
klayout-gdsfactory
magic-vlsi
netgen
ngspice
xschem
];
])
else
([
klayout-gdsfactory
magic-vlsi
netgen
ngspice
xschem
xyce
]);

propagatedBuildInputs = [
# Python
Expand All @@ -83,7 +96,7 @@
rich
]
++ self.includedTools;

computed_PATH = lib.makeBinPath self.propagatedBuildInputs;

# Make PATH available to CACE subprocesses
Expand Down
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 8f9a04c

Please sign in to comment.