[bug#72111] [PATCH 0/3] Update and improve ngspice package

[bug#72111] [PATCH 0/3] Update and improve ngspice package

[Vinicius Monego]

Vinicius Monego (3):
  gnu: libngspice, ngspice: Update to 43.
  gnu: libngspice, ngspice: Improve package style.
  gnu: ngspice: Enable tests.

 gnu/packages/engineering.scm | 87 ++++++++++++++----------------------
 1 file changed, 34 insertions(+), 53 deletions(-)


base-commit: bcd627f58e74ce44cc96a9aac37c6d9e9e3c0dcc
-- 
2.39.2

[bug#72111] [PATCH 1/3] gnu: libngspice, ngspice: Update to 43.

[Vinicius Monego]

* gnu/packages/engineering.scm (libngspice, ngspice): Update to 43.
(libngspice)[arguments]<#:phases>: Delete the 'patch-timestamps and
'delete-program-manuals phases.
(ngspice)[arguments]<#:phases>: Delete the 'delete-include-files phase.
Remove the line that deletes the now deleted 'delete-program-manuals phase.

These substitutions do not apply anymore.

Change-Id: Ie7ec8dd0998df38828e2e0af226158922e34ea09
---
 gnu/packages/engineering.scm | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index cc9020c6fd..2305a8ecf5 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -1979,7 +1979,7 @@ (define-public libngspice
   ;; See <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27344#236>.
   (package
     (name "libngspice")
-    (version "42")
+    (version "43")
     (source
      (origin
        (method url-fetch)
@@ -1990,7 +1990,7 @@ (define-public libngspice
                             "old-releases/" version
                             "/ngspice-" version ".tar.gz")))
        (sha256
-        (base32 "02p5ar1cqwn70dw5xzx5v3qhm1p1xgb1xpzs1ljklcxjda2f6zvk"))))
+        (base32 "169nn6bw5628m2k8cy77yd1vs22plj83grisq58j07sk11pnmp8l"))))
     (build-system gnu-build-system)
     (arguments
      `(;; No tests for libngspice exist.
@@ -1998,15 +1998,6 @@ (define-public libngspice
        #:tests? #f
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'patch-timestamps
-           (lambda _
-             (substitute* "configure"
-               (("`date`") "Thu Jan  1 00:00:01 UTC 1970"))))
-         (add-after 'unpack 'delete-program-manuals
-           (lambda _
-             (substitute* "man/man1/Makefile.in"
-               (("^man_MANS = ngspice\\.1 ngnutmeg\\.1 ngsconvert\\.1 ngmultidec\\.1")
-                "man_MANS = "))))
          (add-after 'install 'delete-scripts
            (lambda* (#:key outputs #:allow-other-keys)
              (delete-file-recursively
@@ -2044,12 +2035,6 @@ (define-public ngspice
                (delete "--with-ngshared" ,flags)))
        ((#:phases phases)
         `(modify-phases ,phases
-           (add-after 'unpack 'delete-include-files
-             (lambda _
-               (substitute* "src/Makefile.in"
-                 (("^SUBDIRS = misc maths frontend spicelib include/ngspice")
-                  "SUBDIRS = misc maths frontend spicelib"))))
-           (delete 'delete-program-manuals)
            (delete 'delete-scripts)))))
     (inputs
      (list libngspice readline))))
-- 
2.39.2

[bug#72111] [PATCH 2/3] gnu: libngspice, ngspice: Improve package style.

[Vinicius Monego]

* gnu/packages/engineering.scm (libngspice, ngspice): Reformat packages using
'guix style'.
[arguments]: Use G-Expressions.

Change-Id: I59efa6a78797c2dc2a960ce0be74b2a7381d6d4c
---
 gnu/packages/engineering.scm | 66 ++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 36 deletions(-)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 2305a8ecf5..e7850fc319 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -1983,35 +1983,28 @@ (define-public libngspice
     (source
      (origin
        (method url-fetch)
-       (uri (list
-             (string-append "mirror://sourceforge/ngspice/ng-spice-rework/"
-                            version "/ngspice-" version ".tar.gz")
-             (string-append "mirror://sourceforge/ngspice/ng-spice-rework/"
-                            "old-releases/" version
-                            "/ngspice-" version ".tar.gz")))
+       (uri (list (string-append
+                   "mirror://sourceforge/ngspice/ng-spice-rework/" version
+                   "/ngspice-" version ".tar.gz")
+                  (string-append
+                   "mirror://sourceforge/ngspice/ng-spice-rework/"
+                   "old-releases/" version "/ngspice-" version ".tar.gz")))
        (sha256
         (base32 "169nn6bw5628m2k8cy77yd1vs22plj83grisq58j07sk11pnmp8l"))))
     (build-system gnu-build-system)
     (arguments
-     `(;; No tests for libngspice exist.
-       ;; The transient tests for ngspice fail.
-       #:tests? #f
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'delete-scripts
-           (lambda* (#:key outputs #:allow-other-keys)
-             (delete-file-recursively
-              (string-append (assoc-ref outputs "out")
-                             "/share/ngspice/scripts")))))
-       #:configure-flags
-       (list "--enable-openmp"
-             "--enable-ciderlib"
-             "--enable-xspice"
-             "--with-ngshared")))
-    (native-inputs
-     (list bison flex))
-    (inputs
-     (list libxaw openmpi))
+     (list
+      #:tests? #f ;there are no tests for libngspice
+      #:phases #~(modify-phases %standard-phases
+                   (add-after 'install 'delete-scripts
+                     (lambda _
+                       (delete-file-recursively
+                        (string-append #$output
+                                       "/share/ngspice/scripts")))))
+      #:configure-flags #~(list "--enable-openmp" "--enable-ciderlib"
+                                "--enable-xspice" "--with-ngshared")))
+    (native-inputs (list bison flex))
+    (inputs (list libxaw openmpi))
     (home-page "https://ngspice.sourceforge.net/")
     (synopsis "Mixed-level/mixed-signal circuit simulator")
     (description
@@ -2019,25 +2012,26 @@ (define-public libngspice
 @code{Spice3f5}, a circuit simulator, and @code{Xspice}, an extension that
 provides code modeling support and simulation of digital components through
 an embedded event driven algorithm.")
-    (license (list license:lgpl2.0+ ; code in frontend/numparam
-                   (license:non-copyleft "file:///COPYING") ; spice3 bsd-style
-                   license:bsd-3 ; ciderlib
-                   license:public-domain)))) ; xspice
+    (license (list license:lgpl2.0+ ;code in frontend/numparam
+                   (license:non-copyleft "file:///COPYING") ;spice3 bsd-style
+                   license:bsd-3 ;ciderlib
+                   license:public-domain)))) ;xspice
 
 (define-public ngspice
   ;; The ngspice executables (see libngpsice above.)
-  (package (inherit libngspice)
+  (package
+    (inherit libngspice)
     (name "ngspice")
     (arguments
      (substitute-keyword-arguments (package-arguments libngspice)
        ((#:configure-flags flags)
-        `(cons "--with-readline=yes"
-               (delete "--with-ngshared" ,flags)))
+        #~(cons "--with-readline=yes"
+                (delete "--with-ngshared"
+                        #$flags)))
        ((#:phases phases)
-        `(modify-phases ,phases
-           (delete 'delete-scripts)))))
-    (inputs
-     (list libngspice readline))))
+        #~(modify-phases #$phases
+            (delete 'delete-scripts)))))
+    (inputs (list libngspice readline))))
 
 (define trilinos-serial-xyce
   ;; Note: This is a Trilinos containing only the packages Xyce needs, so we
-- 
2.39.2

[bug#72111] [PATCH 3/3] gnu: ngspice: Enable tests.

[Vinicius Monego]

* gnu/packages/engineering.scm (ngspice)[arguments]: Pass #t to #:tests?.
[native-inputs]: Add perl.

Change-Id: I209999b5685865e9c7a17106da8ffab9fad1367b
---
 gnu/packages/engineering.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index e7850fc319..e65eb6529a 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2024,6 +2024,7 @@ (define-public ngspice
     (name "ngspice")
     (arguments
      (substitute-keyword-arguments (package-arguments libngspice)
+       ((#:tests? _ #f) #t)
        ((#:configure-flags flags)
         #~(cons "--with-readline=yes"
                 (delete "--with-ngshared"
@@ -2031,6 +2032,7 @@ (define-public ngspice
        ((#:phases phases)
         #~(modify-phases #$phases
             (delete 'delete-scripts)))))
+    (native-inputs (list perl))
     (inputs (list libngspice readline))))
 
 (define trilinos-serial-xyce
-- 
2.39.2

bug#72111: [PATCH 0/3] Update and improve ngspice package

[Vinicius Monego]

Em dom, 2024-07-14 às 15:01 +0000, Vinicius Monego escreveu:
> Vinicius Monego (3):
>   gnu: libngspice, ngspice: Update to 43.
>   gnu: libngspice, ngspice: Improve package style.
>   gnu: ngspice: Enable tests.
> 
>  gnu/packages/engineering.scm | 87 ++++++++++++++--------------------
> --
>  1 file changed, 34 insertions(+), 53 deletions(-)
> 
> 
> base-commit: bcd627f58e74ce44cc96a9aac37c6d9e9e3c0dcc

Patches pushed.