From c3b0e81003c643464ec37fd673cbff359cd4f552 Mon Sep 17 00:00:00 2001 From: Cayetano Santos Date: Mon, 4 Aug 2025 21:04:53 +0200 Subject: [PATCH] gnu: qucsator-rf: Move to electronics. * gnu/packages/engineering.scm (qucsator-rf): Move from here ... * gnu/packages/electronics.scm: ... to here. Change-Id: Id6652d720134d72136f439a053e8faf81749bb2f Signed-off-by: Maxim Cournoyer --- gnu/packages/electronics.scm | 62 ++++++++++++++++++++++++++++++++++++ gnu/packages/engineering.scm | 61 +---------------------------------- 2 files changed, 63 insertions(+), 60 deletions(-) diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 56cbcc1e07e..89d8604c9d9 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -59,6 +59,7 @@ #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) + #:use-module (gnu packages gperf) #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) #:use-module (gnu packages libftdi) @@ -78,6 +79,7 @@ #:use-module (gnu packages sqlite) #:use-module (gnu packages stb) #:use-module (gnu packages swig) + #:use-module (gnu packages textutils) #:use-module (gnu packages tcl) #:use-module (gnu packages tls) #:use-module (gnu packages toolkits) @@ -911,6 +913,66 @@ design.") to enforce it.") (license license:gpl3+))) +(define-public qucsator-rf + (package + (name "qucsator-rf") + (version "1.0.6") ;required by qucs-s, keep in sync + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ra3xdh/qucsator_rf/") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fx0kzj6hn0094jnvn6b1zqwjnkmd79xdr0zdyz5lmsyixlmxmvk")))) + (build-system cmake-build-system) + (arguments + (list + #:tests? #f ;no tests + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'run-tests + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; Qucs-test is a collection of python scripts and data test + ;; cases. Its purpose is to test Qucs (GUI) and Qucsator; + ;; tests are under `testsuite` directory. + (copy-recursively + #$(origin + (method git-fetch) + (uri + ;; Using latest revision; refer to + ;; .github/workflows/cmake.yml to keep up to date. + (git-reference + (url "https://github.com/ra3xdh/qucs-test/") + (commit "ce69e05ceecab910175e6ea36b6e021a6d279947"))) + (sha256 + (base32 + (string-append "1r3hx43wvd0s11mzsvj1chylzv" + "0lk9qhaw7205j9x316ly03bl08")))) + "qucs-test") + (with-directory-excursion "qucs-test" + (invoke "python3" "run.py" "--qucsator" + (format #f "--prefix=~a/bin" #$output) + "--exclude=skip.txt")))))) + #:configure-flags + #~(list (format #f "-DBISON_DIR=~a/bin" + #$(this-package-native-input "bison")) + (format #f "-DADMSXML_DIR=~a/bin" + #$(this-package-native-input "adms"))))) + (native-inputs + (list adms bison dos2unix flex gperf python python-looseversion + python-numpy python-matplotlib)) + (synopsis "RF and microwave circuits simulator") + (description + "@code{Qucsator-rf} is a command line driven circuit simulator targeted +for RF and microwave circuits. It takes a network list in a certain format as +input and outputs an XML dataset.") + (home-page "https://ra3xdh.github.io//") + (license license:gpl2+))) + (define-public xschem (package (name "xschem") diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 1cbd256871a..d12059c05e8 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -102,6 +102,7 @@ #:use-module (gnu packages digest) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) + #:use-module (gnu packages electronics) #:use-module (gnu packages emacs-build) #:use-module (gnu packages emacs-xyz) #:use-module (gnu packages file) @@ -936,66 +937,6 @@ such as those made in pneumatics, hydraulics, process industries, electronics, and others.") (license license:gpl2+))) -(define-public qucsator-rf - (package - (name "qucsator-rf") - (version "1.0.7") ;required by qucs-s, keep in sync - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ra3xdh/qucsator_rf/") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1qyih418r0jcrpk1ja4p7v9v5iqvri8iszg7s3vaf1d2agwblzb4")))) - (build-system cmake-build-system) - (arguments - (list - #:tests? #f ;no tests - #:phases - #~(modify-phases %standard-phases - (add-after 'install 'run-tests - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - ;; Qucs-test is a collection of python scripts and data test - ;; cases. Its purpose is to test Qucs (GUI) and Qucsator; - ;; tests are under `testsuite` directory. - (copy-recursively - #$(origin - (method git-fetch) - (uri - ;; Using latest revision; refer to - ;; .github/workflows/cmake.yml to keep up to date. - (git-reference - (url "https://github.com/ra3xdh/qucs-test/") - (commit "ce69e05ceecab910175e6ea36b6e021a6d279947"))) - (sha256 - (base32 - (string-append "1r3hx43wvd0s11mzsvj1chylzv" - "0lk9qhaw7205j9x316ly03bl08")))) - "qucs-test") - (with-directory-excursion "qucs-test" - (invoke "python3" "run.py" "--qucsator" - (format #f "--prefix=~a/bin" #$output) - "--exclude=skip.txt")))))) - #:configure-flags - #~(list (format #f "-DBISON_DIR=~a/bin" - #$(this-package-native-input "bison")) - (format #f "-DADMSXML_DIR=~a/bin" - #$(this-package-native-input "adms"))))) - (native-inputs - (list adms bison dos2unix flex gperf python python-looseversion - python-numpy python-matplotlib)) - (synopsis "RF and microwave circuits simulator") - (description - "@code{Qucsator-rf} is a command line driven circuit simulator targeted -for RF and microwave circuits. It takes a network list in a certain format as -input and outputs an XML dataset.") - (home-page "https://ra3xdh.github.io//") - (license license:gpl2+))) - (define-public qucs-s (package (name "qucs-s")