* [bug#31530] Fix qucs bug and update circuit simulators
@ 2018-05-19 18:43 Theodoros Foradis
2018-05-19 18:46 ` [bug#31530] [PATCH 1/6] gnu: qucs: Build from git to fix bug Theodoros Foradis
0 siblings, 1 reply; 7+ messages in thread
From: Theodoros Foradis @ 2018-05-19 18:43 UTC (permalink / raw)
To: 31530
Hello guix,
This patch series fixes a bug introduced to qucs with glibc-2.26, and
also updates a couple related packages.
gnu/packages/engineering.scm | 261 +++++++++---------------
gnu/packages/maths.scm | 13 ------------
2 files changed, 142 insertions(+), 132 deletions(-)
gnu: qucs-s: Update to 0.0.20.
gnu: lapack-3.5: Delete package.
gnu: xyce-serial: Update to 6.8.
gnu: trilinos-serial-xyce: Update to 12.12.1.
gnu: libngspice: Update to 27.
gnu: qucs: Build from git to fix bug.
--
Theodoros Foradis
^ permalink raw reply [flat|nested] 7+ messages in thread
* [bug#31530] [PATCH 1/6] gnu: qucs: Build from git to fix bug.
2018-05-19 18:43 [bug#31530] Fix qucs bug and update circuit simulators Theodoros Foradis
@ 2018-05-19 18:46 ` Theodoros Foradis
2018-05-19 18:46 ` [bug#31530] [PATCH 2/6] gnu: libngspice: Update to 27 Theodoros Foradis
` (4 more replies)
0 siblings, 5 replies; 7+ messages in thread
From: Theodoros Foradis @ 2018-05-19 18:46 UTC (permalink / raw)
To: 31530
* gnu/packages/engineering.scm (qucs): Add TODO comment.
[source]: Use git commit b4f27d9.
[arguments]: Add bootstrap phase.
[native-input]s: Add autoconf, automake, flex and bison.
---
gnu/packages/engineering.scm | 204 +++++++++++++++++++++++--------------------
1 file changed, 108 insertions(+), 96 deletions(-)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index f16ef2ceb..354051ccb 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -4,7 +4,7 @@
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 David Thompson <davet@gnu.org>
;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2016, 2017 Theodoros Foradis <theodoros@foradis.org>
+;;; Copyright © 2016, 2017, 2018 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
@@ -1509,104 +1509,116 @@ parallel computing platforms. It also supports serial execution.")
license:lgpl2.0+)))) ; freehdl's libraries
(define-public qucs
- (package
- (name "qucs")
- (version "0.0.19")
- (source (origin
- (method url-fetch)
- (uri
- (string-append
- "https://sourceforge.net/projects/qucs/files/qucs/" version
- "/qucs-" version ".tar.gz"))
- (sha256
- (base32
- "0giv9gfyfdizvjhq56x2pdncrlyv3k15lrsh6pk37i94vr7l7ij5"))))
- (build-system gnu-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-before 'configure 'patch-configure
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "qucs/configure"
- (("\\$QTDIR") (assoc-ref inputs "qt4")))
- #t))
- (add-after 'patch-configure 'patch-scripts
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (substitute* '("qucs/qucs/qucsdigi"
- "qucs/qucs/qucsdigilib"
- "qucs/qucs/qucsveri")
- (("\\$BINDIR")
- (string-append (assoc-ref outputs "out") "/bin"))
- (("freehdl-config")
- (string-append (assoc-ref inputs "freehdl") "/bin/freehdl-config"))
- (("freehdl-v2cc")
- (string-append (assoc-ref inputs "freehdl") "/bin/freehdl-v2cc"))
- (("cp ")
- (string-append (assoc-ref inputs "coreutils") "/bin/cp "))
- (("glibtool")
- (string-append (assoc-ref inputs "libtool") "/bin/libtool"))
- (("sed")
- (string-append (assoc-ref inputs "sed") "/bin/sed"))
- (("iverilog")
- (string-append (assoc-ref inputs "iverilog") "/bin/iverilog"))
- (("vvp")
- (string-append (assoc-ref inputs "iverilog") "/bin/vvp")))
- #t))
- (add-before 'check 'pre-check
- (lambda _
- ;; The test suite requires a running X server.
- (system "Xvfb :1 &")
- (setenv "DISPLAY" ":1")
- #t))
- (add-after 'install 'make-wrapper
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- ;; 'qucs' directly invokes gcc, hence this wrapping.
- (wrap-program (string-append out "/bin/qucs")
- `("CPLUS_INCLUDE_PATH" ":" prefix
- (,(string-append (assoc-ref inputs "gcc-toolchain")
- "/include")))
- `("PATH" ":" prefix
- (,(string-append (assoc-ref inputs "gcc-toolchain")
- "/bin")))
- `("LIBRARY_PATH" ":" prefix
- (,(string-append (assoc-ref inputs "gcc-toolchain")
- "/lib")))
- `("ADMSXMLBINDIR" ":" prefix
- (,(string-append (assoc-ref inputs "adms") "/bin")))
- `("ASCOBINDIR" ":" prefix
- (,(string-append (assoc-ref inputs "asco") "/bin")))
- `("QUCS_OCTAVE" ":" prefix
- (,(string-append (assoc-ref inputs "octave") "/bin/octave")))))
- #t)))
- #:parallel-build? #f ; race condition
- #:configure-flags '("--disable-doc"))) ; we need octave-epstk
- (native-inputs
- `(("gperf" ,gperf)
- ("libtool-native" ,libtool)
- ("python" ,python-2) ; for tests
- ("matplotlib" ,python2-matplotlib) ; for tests
- ("numpy" ,python2-numpy) ; for tests
- ("xorg-server" ,xorg-server))) ; for tests
- (inputs
- `(("adms" ,adms)
- ("asco" ,asco)
- ("coreutils" ,coreutils)
- ("freehdl" ,freehdl)
- ("gcc-toolchain" ,gcc-toolchain)
- ("iverilog" ,iverilog)
- ("libtool" ,libtool)
- ("octave" ,octave)
- ("qt4" ,qt-4)
- ("sed" ,sed)))
- (home-page "http://qucs.sourceforge.net/")
- (synopsis "Circuit simulator with graphical user interface")
- (description
- "Qucs is a circuit simulator with graphical user interface. The software
+ ;; Qucs 0.0.19 segfaults when using glibc-2.26. Temporarily build from git.
+ ;; TODO: When qucs-0.0.20 is released, revert the commit that introduced this
+ ;; comment and update the package.
+ (let ((commit "b4f27d9222568066cd59e4c387c51a35056c99d8")
+ (revision "0"))
+ (package
+ (name "qucs")
+ (version (git-version "0.0.19" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/Qucs/qucs")
+ (commit commit)))
+ (sha256
+ (base32 "10bclay9xhkffmsh4j4l28kj1qpxx0pnxja5vx6305cllnq4r3gb"))
+ (file-name (string-append name "-" version "-checkout"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-before 'configure 'patch-configure
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "qucs/configure"
+ (("\\$QTDIR") (assoc-ref inputs "qt4")))
+ #t))
+ (add-before 'patch-configure 'bootstrap
+ (lambda _
+ (invoke "./bootstrap")))
+ (add-after 'patch-configure 'patch-scripts
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (substitute* '("qucs/qucs/qucsdigi"
+ "qucs/qucs/qucsdigilib"
+ "qucs/qucs/qucsveri")
+ (("\\$BINDIR")
+ (string-append (assoc-ref outputs "out") "/bin"))
+ (("freehdl-config")
+ (string-append (assoc-ref inputs "freehdl") "/bin/freehdl-config"))
+ (("freehdl-v2cc")
+ (string-append (assoc-ref inputs "freehdl") "/bin/freehdl-v2cc"))
+ (("cp ")
+ (string-append (assoc-ref inputs "coreutils") "/bin/cp "))
+ (("glibtool")
+ (string-append (assoc-ref inputs "libtool") "/bin/libtool"))
+ (("sed")
+ (string-append (assoc-ref inputs "sed") "/bin/sed"))
+ (("iverilog")
+ (string-append (assoc-ref inputs "iverilog") "/bin/iverilog"))
+ (("vvp")
+ (string-append (assoc-ref inputs "iverilog") "/bin/vvp")))
+ #t))
+ (add-before 'check 'pre-check
+ (lambda _
+ ;; The test suite requires a running X server.
+ (system "Xvfb :1 &")
+ (setenv "DISPLAY" ":1")
+ #t))
+ (add-after 'install 'make-wrapper
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ ;; 'qucs' directly invokes gcc, hence this wrapping.
+ (wrap-program (string-append out "/bin/qucs")
+ `("CPLUS_INCLUDE_PATH" ":" prefix
+ (,(string-append (assoc-ref inputs "gcc-toolchain")
+ "/include")))
+ `("PATH" ":" prefix
+ (,(string-append (assoc-ref inputs "gcc-toolchain")
+ "/bin")))
+ `("LIBRARY_PATH" ":" prefix
+ (,(string-append (assoc-ref inputs "gcc-toolchain")
+ "/lib")))
+ `("ADMSXMLBINDIR" ":" prefix
+ (,(string-append (assoc-ref inputs "adms") "/bin")))
+ `("ASCOBINDIR" ":" prefix
+ (,(string-append (assoc-ref inputs "asco") "/bin")))
+ `("QUCS_OCTAVE" ":" prefix
+ (,(string-append (assoc-ref inputs "octave") "/bin/octave")))))
+ #t)))
+ #:parallel-build? #f ; race condition
+ #:configure-flags '("--disable-doc"))) ; we need octave-epstk
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("bison" ,bison)
+ ("flex" ,flex)
+ ("gperf" ,gperf)
+ ("libtool-native" ,libtool)
+ ("pkg-config" ,pkg-config)
+ ("python" ,python-2) ; for tests
+ ("matplotlib" ,python2-matplotlib) ; for tests
+ ("numpy" ,python2-numpy) ; for tests
+ ("xorg-server" ,xorg-server))) ; for tests
+ (inputs
+ `(("adms" ,adms)
+ ("asco" ,asco)
+ ("coreutils" ,coreutils)
+ ("freehdl" ,freehdl)
+ ("gcc-toolchain" ,gcc-toolchain)
+ ("iverilog" ,iverilog)
+ ("libtool" ,libtool)
+ ("octave" ,octave)
+ ("qt4" ,qt-4)
+ ("sed" ,sed)))
+ (home-page "http://qucs.sourceforge.net/")
+ (synopsis "Circuit simulator with graphical user interface")
+ (description
+ "Qucs is a circuit simulator with graphical user interface. The software
aims to support all kinds of circuit simulation types---e.g. DC, AC,
S-parameter, transient, noise and harmonic balance analysis. Pure digital
simulations are also supported.")
- (license license:gpl2+)))
+ (license license:gpl2+))))
(define-public qucs-s
(package
--
2.16.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#31530] [PATCH 2/6] gnu: libngspice: Update to 27.
2018-05-19 18:46 ` [bug#31530] [PATCH 1/6] gnu: qucs: Build from git to fix bug Theodoros Foradis
@ 2018-05-19 18:46 ` Theodoros Foradis
2018-05-19 18:46 ` [bug#31530] [PATCH 3/6] gnu: trilinos-serial-xyce: Update to 12.12.1 Theodoros Foradis
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Theodoros Foradis @ 2018-05-19 18:46 UTC (permalink / raw)
To: 31530
* gnu/packages/engineering.scm (libngspice): Update to 27.
---
gnu/packages/engineering.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 354051ccb..0cb2ceeec 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -1182,14 +1182,14 @@ high-performance parallel differential evolution (DE) optimization algorithm.")
;; See <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27344#236>.
(package
(name "libngspice")
- (version "26")
+ (version "27")
(source (origin
(method url-fetch)
(uri (string-append "mirror://sourceforge/ngspice/ng-spice-rework/"
version "/ngspice-" version ".tar.gz"))
(sha256
(base32
- "02019ndcl057nq9z41nxycqba7wxlb081ibvfj9jv010nz431qji"))
+ "15862npsy5sj56z5yd1qiv3y0fgicrzj7wwn8hbcy89fgbawf20c"))
(modules '((guix build utils)))
;; We remove the non-free cider and build without it.
(snippet
--
2.16.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#31530] [PATCH 3/6] gnu: trilinos-serial-xyce: Update to 12.12.1.
2018-05-19 18:46 ` [bug#31530] [PATCH 1/6] gnu: qucs: Build from git to fix bug Theodoros Foradis
2018-05-19 18:46 ` [bug#31530] [PATCH 2/6] gnu: libngspice: Update to 27 Theodoros Foradis
@ 2018-05-19 18:46 ` Theodoros Foradis
2018-05-19 18:46 ` [bug#31530] [PATCH 4/6] gnu: xyce-serial: Update to 6.8 Theodoros Foradis
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Theodoros Foradis @ 2018-05-19 18:46 UTC (permalink / raw)
To: 31530
* gnu/packages/engineering.scm (trilinos-serial-xyce): Update to 12.12.1.
[arguments]: Add delete-tribits phase.
[inputs]: Replace lapack-3.5 with lapack.
---
gnu/packages/engineering.scm | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 0cb2ceeec..e97714b40 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -1285,17 +1285,27 @@ an embedded event driven algorithm.")
;; TODO: Remove when we have modular Trilinos packages?
(package
(name "trilinos-serial-xyce")
- (version "12.6.3")
+ (version "12.12.1")
(source
(origin (method url-fetch)
(uri (string-append "https://trilinos.org/oldsite/download/files/trilinos-"
version "-Source.tar.gz"))
(sha256
(base32
- "07jd1qpsbf31cmbyyngr4l67xzwyan24dyx5wlcahgbw7x6my3wn"))))
+ "1zgrcksrcbmyy79mbdv0j4j4sh0chpigxk8vcrrwgaxyxwxxhrvw"))))
(build-system cmake-build-system)
(arguments
`(#:out-of-source? #t
+ #:phases
+ (modify-phases %standard-phases
+ ;; Delete unneeded tribits(build system) directory which makes validate-runpath
+ ;; phase to fail.
+ (add-before 'validate-runpath 'delete-tribits
+ (lambda* (#:key outputs #:allow-other-keys)
+ (delete-file-recursively
+ (string-append (assoc-ref outputs "out")
+ "/lib/cmake/tribits"))
+ #t)))
#:configure-flags
(list "-DCMAKE_CXX_FLAGS=-O3 -fPIC"
"-DCMAKE_C_FLAGS=-O3 -fPIC"
@@ -1328,7 +1338,7 @@ an embedded event driven algorithm.")
("swig" ,swig)))
(inputs
`(("boost" ,boost)
- ("lapack" ,lapack-3.5)
+ ("lapack" ,lapack)
("suitesparse" ,suitesparse)))
(home-page "https://trilinos.org")
(synopsis "Engineering and scientific problems algorithms")
--
2.16.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#31530] [PATCH 4/6] gnu: xyce-serial: Update to 6.8.
2018-05-19 18:46 ` [bug#31530] [PATCH 1/6] gnu: qucs: Build from git to fix bug Theodoros Foradis
2018-05-19 18:46 ` [bug#31530] [PATCH 2/6] gnu: libngspice: Update to 27 Theodoros Foradis
2018-05-19 18:46 ` [bug#31530] [PATCH 3/6] gnu: trilinos-serial-xyce: Update to 12.12.1 Theodoros Foradis
@ 2018-05-19 18:46 ` Theodoros Foradis
2018-05-19 18:46 ` [bug#31530] [PATCH 5/6] gnu: lapack-3.5: Delete package Theodoros Foradis
2018-05-19 18:46 ` [bug#31530] [PATCH 6/6] gnu: qucs-s: Update to 0.0.20 Theodoros Foradis
4 siblings, 0 replies; 7+ messages in thread
From: Theodoros Foradis @ 2018-05-19 18:46 UTC (permalink / raw)
To: 31530
* gnu/packages/engineering.scm (xyce-serial): Update to 6.8.
[inputs]: Replace lapack-3.5 with lapack.
* gnu/packages/engineering.scm (xyce-prallel):
[arguments]: Update configure flags to work with 6.8 version.
---
gnu/packages/engineering.scm | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index e97714b40..efb0865e8 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -1353,14 +1353,14 @@ unique design feature of Trilinos is its focus on packages.")
(define-public xyce-serial
(package
(name "xyce-serial")
- (version "6.7")
+ (version "6.8")
(source
(origin (method url-fetch)
(uri (string-append "https://archive.org/download/Xyce-"
version "/Xyce-" version ".tar.gz"))
(sha256
(base32
- "02k952mnvrnc5kv7r65fdrn7khwq1lbyhwyvd7jznafzdpsvgm4x"))))
+ "09flp1xywbb2laayd9rg8vd0fjsh115y6k1p71jacy0nrbdvvlcg"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f
@@ -1376,7 +1376,7 @@ unique design feature of Trilinos is its focus on packages.")
(inputs
`(("fftw" ,fftw)
("suitesparse" ,suitesparse)
- ("lapack" ,lapack-3.5)
+ ("lapack" ,lapack)
("trilinos" ,trilinos-serial-xyce)))
(home-page "https://xyce.sandia.gov/")
(synopsis "High-performance analog circuit simulator")
@@ -1411,8 +1411,6 @@ parallel computing platforms. It also supports serial execution.")
"CC=mpicc"
"F77=mpif77"
"--enable-mpi"
- "--enable-isorropia=no"
- "--enable-zoltan=no"
(string-append
"ARCHDIR="
(assoc-ref %build-inputs "trilinos")))))))
--
2.16.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#31530] [PATCH 5/6] gnu: lapack-3.5: Delete package.
2018-05-19 18:46 ` [bug#31530] [PATCH 1/6] gnu: qucs: Build from git to fix bug Theodoros Foradis
` (2 preceding siblings ...)
2018-05-19 18:46 ` [bug#31530] [PATCH 4/6] gnu: xyce-serial: Update to 6.8 Theodoros Foradis
@ 2018-05-19 18:46 ` Theodoros Foradis
2018-05-19 18:46 ` [bug#31530] [PATCH 6/6] gnu: qucs-s: Update to 0.0.20 Theodoros Foradis
4 siblings, 0 replies; 7+ messages in thread
From: Theodoros Foradis @ 2018-05-19 18:46 UTC (permalink / raw)
To: 31530
* gnu/packages/maths.scm (lapack-3.5): Delete package.
---
gnu/packages/maths.scm | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index c1ef67f3d..bd5d9bb77 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -523,19 +523,6 @@ problems in numerical linear algebra.")
(license (license:non-copyleft "file://LICENSE"
"See LICENSE in the distribution."))))
-(define-public lapack-3.5
- (package
- (inherit lapack)
- (version "3.5.0")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "http://www.netlib.org/lapack/lapack-"
- version ".tgz"))
- (sha256
- (base32
- "0lk3f97i9imqascnlf6wr5mjpyxqcdj73pgj97dj2mgvyg9z1n4s"))))))
-
(define-public scalapack
(package
(name "scalapack")
--
2.16.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#31530] [PATCH 6/6] gnu: qucs-s: Update to 0.0.20.
2018-05-19 18:46 ` [bug#31530] [PATCH 1/6] gnu: qucs: Build from git to fix bug Theodoros Foradis
` (3 preceding siblings ...)
2018-05-19 18:46 ` [bug#31530] [PATCH 5/6] gnu: lapack-3.5: Delete package Theodoros Foradis
@ 2018-05-19 18:46 ` Theodoros Foradis
4 siblings, 0 replies; 7+ messages in thread
From: Theodoros Foradis @ 2018-05-19 18:46 UTC (permalink / raw)
To: 31530
* gnu/packages/engineering.scm (qucs-s): Update to 0.0.20.
[arguments]: Modify patch-paths phase to work with version 0.0.20.
---
gnu/packages/engineering.scm | 29 ++++++++++++++++-------------
1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index efb0865e8..3d1043e32 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -1631,14 +1631,15 @@ simulations are also supported.")
(define-public qucs-s
(package
(name "qucs-s")
- (version "0.0.19S")
+ (version "0.0.20")
(source (origin
(method url-fetch)
- (uri (string-append "https://github.com/ra3xdh/qucs/releases/download/"
- version "/qucs-" version ".tar.gz"))
+ (uri (string-append "https://github.com/ra3xdh/qucs_s/archive/"
+ version ".tar.gz"))
+ (file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "1bhahvdqmayaw0306fxz1ghmjhd4fq05yk3rk7zi0z703w5imgjv"))))
+ "01dizf4rjciqc8x7bmv3kbhdlz90bm6n9m9fz7dbzqcwvszcs1hx"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; no tests
@@ -1673,19 +1674,21 @@ simulations are also supported.")
"\\+ \"qucsator\" \\+ executableSuffix"))
(string-append "}{ QucsSettings.Qucsator = \""
(assoc-ref inputs "qucs") "/bin/qucsator\""))
- (((string-append "else QucsSettings\\.XyceExecutable = "
- "\"/usr/local/Xyce-Release-6.2.0-OPENSOURCE/bin/runxyce"))
- (string-append "QucsSettings.XyceExecutable = \""
+ (((string-append "QucsSettings\\.XyceExecutable = "
+ "\"/usr/local/Xyce-Release-6.8.0-OPENSOURCE/bin/Xyce"))
+ (string-append "}{ QucsSettings.XyceExecutable = \""
(assoc-ref inputs "xyce-serial") "/bin/Xyce"))
- (((string-append "else QucsSettings\\.XyceParExecutable = \"/usr/local"
- "/Xyce-Release-6.2.0-OPENMPI-OPENSOURCE/bin/xmpirun"))
+ (((string-append "else QucsSettings\\.XyceParExecutable = "
+ "\"mpirun -np %p /usr/local"
+ "/Xyce-Release-6.8.0-OPENMPI-OPENSOURCE/bin/Xyce"))
(string-append "QucsSettings.XyceParExecutable = \""
- (assoc-ref inputs "mpi") "/bin/mpirun"))
- (("%p")
- (string-append "%p "(assoc-ref inputs "xyce-parallel") "/bin/Xyce"))
+ (assoc-ref inputs "mpi") "/bin/mpirun -np %p "
+ (assoc-ref inputs "xyce-parallel") "/bin/Xyce"))
(("else QucsSettings\\.NgspiceExecutable = \"ngspice\"")
(string-append "QucsSettings.NgspiceExecutable = " "\""
(assoc-ref inputs "ngspice") "/bin/ngspice\"")))
+ (substitute* "qucs/extsimkernels/ngspice.cpp"
+ (("share/qucs/xspice_cmlib") "share/qucs-s/xspice_cmlib"))
(substitute* "qucs/qucs_actions.cpp"
(("qucstrans")
(string-append (assoc-ref inputs "qucs") "/bin/qucstrans"))
@@ -1698,7 +1701,7 @@ simulations are also supported.")
(lambda* (#:key inputs outputs #:allow-other-keys)
(for-each
(lambda (script)
- (let ((file (string-append "../qucs-" ,version
+ (let ((file (string-append "../qucs_s-" ,version
"/qucs/" script))
(out (assoc-ref outputs "out")))
(install-file file (string-append out "/bin"))
--
2.16.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2018-05-19 18:57 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-19 18:43 [bug#31530] Fix qucs bug and update circuit simulators Theodoros Foradis
2018-05-19 18:46 ` [bug#31530] [PATCH 1/6] gnu: qucs: Build from git to fix bug Theodoros Foradis
2018-05-19 18:46 ` [bug#31530] [PATCH 2/6] gnu: libngspice: Update to 27 Theodoros Foradis
2018-05-19 18:46 ` [bug#31530] [PATCH 3/6] gnu: trilinos-serial-xyce: Update to 12.12.1 Theodoros Foradis
2018-05-19 18:46 ` [bug#31530] [PATCH 4/6] gnu: xyce-serial: Update to 6.8 Theodoros Foradis
2018-05-19 18:46 ` [bug#31530] [PATCH 5/6] gnu: lapack-3.5: Delete package Theodoros Foradis
2018-05-19 18:46 ` [bug#31530] [PATCH 6/6] gnu: qucs-s: Update to 0.0.20 Theodoros Foradis
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.