From d98a878fd1b671082ddbb303b1fb220bf78f139b Mon Sep 17 00:00:00 2001 From: Chetanya <95761876+chetanyagoyal@users.noreply.github.com> Date: Thu, 9 Nov 2023 10:25:30 +0530 Subject: [PATCH 1/4] Add ngspice installation commands --- docker/conda/Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker/conda/Dockerfile b/docker/conda/Dockerfile index 89a8eb8ad..ef0042161 100755 --- a/docker/conda/Dockerfile +++ b/docker/conda/Dockerfile @@ -29,3 +29,7 @@ RUN dpkg -i klayout_0.28.12-1_amd64.deb RUN strip --remove-section=.note.ABI-tag /usr/lib/x86_64-linux-gnu/libQt5Core.so.5 COPY ./scripts /scripts + +RUN git clone http://git.code.sf.net/p/ngspice/ngspice && \ + cd ngspice && \ + ./compile_linux.sh From f7a15ab277990ddf6ca626621aaac1908c6997f4 Mon Sep 17 00:00:00 2001 From: Chetanya <95761876+chetanyagoyal@users.noreply.github.com> Date: Thu, 9 Nov 2023 18:10:12 +0530 Subject: [PATCH 2/4] Update packages.txt to include ngspice reqs --- docker/conda/packages.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docker/conda/packages.txt b/docker/conda/packages.txt index 04d7597fc..a55890efb 100644 --- a/docker/conda/packages.txt +++ b/docker/conda/packages.txt @@ -17,3 +17,9 @@ libz-dev build-essential time git +bison +flex +libX11-devel +libX11 +libXaw-devel +readline-devel From c2ed4c1863ec56cce2310e1363094b3d360d691f Mon Sep 17 00:00:00 2001 From: Chetanya <95761876+chetanyagoyal@users.noreply.github.com> Date: Thu, 9 Nov 2023 18:11:38 +0530 Subject: [PATCH 3/4] Update packages.txt --- docker/conda/packages.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/conda/packages.txt b/docker/conda/packages.txt index a55890efb..bfe190315 100644 --- a/docker/conda/packages.txt +++ b/docker/conda/packages.txt @@ -19,7 +19,7 @@ time git bison flex -libX11-devel -libX11 -libXaw-devel -readline-devel +libx11-dev +libx11-6 +libxaw7-dev +libreadline6-dev From 300fe8e2e8f85c66ac0b275791e09f822ff96af3 Mon Sep 17 00:00:00 2001 From: Chetanya <95761876+chetanyagoyal@users.noreply.github.com> Date: Sat, 11 Nov 2023 20:35:36 +0530 Subject: [PATCH 4/4] remove ngspice from conda packages --- docker/conda/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/conda/Dockerfile b/docker/conda/Dockerfile index ef0042161..604ed4910 100755 --- a/docker/conda/Dockerfile +++ b/docker/conda/Dockerfile @@ -17,7 +17,6 @@ RUN conda install python=3.10 \ magic \ netgen \ openroad \ - ngspice \ -c litex-hub \ -c conda-forge \ -c anaconda \