2 files changed, 35 insertions(+), 31 deletions(-)

M gnu/packages/electronics.scm
M gnu/packages/engineering.scm

@@ 9,6 9,8 @@
 ;;; Copyright © 2025 Cayetano Santos <csantosb@inventati.org>
 ;;; Copyright © 2025 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2022 Konstantinos Agiannis <agiannis.kon@gmail.com>
+;;; Copyright © 2018-2021 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2015-2025 Ricardo Wurmus <rekado@elephly.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;


@@ 28,6 30,7 @@
 (define-module (gnu packages electronics)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system cmake)
+  #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system pyproject)
   #:use-module (guix download)


@@ 46,6 49,7 @@
   #:use-module (gnu packages cmake)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages documentation)
+  #:use-module (gnu packages engineering)
   #:use-module (gnu packages embedded)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages fontutils)


@@ 427,6 431,37 @@ such as:
 @end itemize")
     (license license:expat)))
 
+(define-public pcb-rnd
+  (package
+    (name "pcb-rnd")
+    (version "3.1.7b")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://repo.hu/projects/pcb-rnd/"
+                                  "releases/pcb-rnd-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1djsa0w53l6nvhwv28rlhpva55ir9n3xdvjgnjj8fgvcmrqlzrsl"))))
+    (build-system glib-or-gtk-build-system)
+    (arguments
+     (list
+      #:test-target "test"
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'configure
+            ;; The configure script doesn't tolerate most of our configure
+            ;; flags.
+            (lambda _
+              (setenv "CC" #$(cc-for-target))
+              (setenv "LIBRND_PREFIX" #$(this-package-input "librnd"))
+              (invoke "./configure" (string-append "--prefix=" #$output)))))))
+    (inputs (list librnd))
+    (home-page "http://repo.hu/projects/pcb-rnd/")
+    (synopsis "Modular layout editor")
+    (description "@code{Pcb-rnd} is a @acronym{Printed Circuit Board} layout
+editor, part of the RiNgDove EDA suite.")
+    (license license:gpl2+)))
+
 (define-public prjtrellis
   ;; The last release is 2 years old; use the latest commit for now.
   (let ((commit "898329dddf6ce6463299973081f109d645b9c55f")

@@ 654,37 654,6 @@ and design rule checking.  It also includes an autorouter and a trace
 optimizer; and it can produce photorealistic and design review images.")
     (license license:gpl2+)))
 
-(define-public pcb-rnd
-  (package
-    (name "pcb-rnd")
-    (version "3.1.7b")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "http://repo.hu/projects/pcb-rnd/"
-                                  "releases/pcb-rnd-" version ".tar.gz"))
-              (sha256
-               (base32
-                "1djsa0w53l6nvhwv28rlhpva55ir9n3xdvjgnjj8fgvcmrqlzrsl"))))
-    (build-system glib-or-gtk-build-system)
-    (arguments
-     (list
-      #:test-target "test"
-      #:phases
-      #~(modify-phases %standard-phases
-          (replace 'configure
-            ;; The configure script doesn't tolerate most of our configure
-            ;; flags.
-            (lambda _
-              (setenv "CC" #$(cc-for-target))
-              (setenv "LIBRND_PREFIX" #$(this-package-input "librnd"))
-              (invoke "./configure" (string-append "--prefix=" #$output)))))))
-    (inputs (list librnd))
-    (home-page "http://repo.hu/projects/pcb-rnd/")
-    (synopsis "Modular layout editor")
-    (description "@code{Pcb-rnd} is a @acronym{Printed Circuit Board} layout
-editor, part of the RiNgDove EDA suite.")
-    (license license:gpl2+)))
-
 (define-public fastcap
   (package
     (name "fastcap")