From b7a93ce80c77992403debe32d94df646ab15b9ba Mon Sep 17 00:00:00 2001 From: Cayetano Santos Date: Sun, 2 Nov 2025 08:39:43 +0100 Subject: [PATCH] gnu: gerbv: Move to electronics. * gnu/packages/engineering.scm (gerbv): Move from here ... * gnu/packages/electronics.scm: ... to here. Change-Id: I7f852d1f44b10f842a1502bd755e4c939cc8ea47 --- gnu/packages/electronics.scm | 53 +++++++++++++++++++++++++++++++++++- gnu/packages/engineering.scm | 49 --------------------------------- 2 files changed, 52 insertions(+), 50 deletions(-) diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 552cd256af5..6b8c73f8e06 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016, 2017, 2018 Theodoros Foradis ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Clément Lassieur -;;; Copyright © 2021, 2024 Efraim Flashner +;;; Copyright © 2021, 2023, 2024 Efraim Flashner ;;; Copyright © 2021 Leo Famulari ;;; Copyright © 2022, 2023, 2025 Maxim Cournoyer ;;; Copyright © 2024 Juliana Sims @@ -24,6 +24,8 @@ ;;; Copyright © 2025, Ekaitz Zarraga ;;; Copyright © 2021, 2022 Guillaume Le Vaillant ;;; Copyright © 2020, 2023 Marius Bakke +;;; Copyright © 2020 Vincent Legoll +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -466,6 +468,55 @@ hardware designs in Verilog.") (home-page "https://github.com/ZipCPU/zipcpu/") (license license:lgpl3+)))) +(define-public gerbv + (package + (name "gerbv") + (version "2.10.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/gerbv/gerbv") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "06bcm5zw7whsnnmfld3gl2j907lxc68gnsbzr2pc4w6qc923rgmj")))) + (build-system gnu-build-system) + (arguments + (list + #:configure-flags #~(list "CFLAGS=-O2 -g -fcommon") + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-version-generator + (lambda _ + (substitute* "utils/git-version-gen.sh" + (("/bin/bash") + (which "bash")))))))) + (native-inputs (list autoconf + automake + desktop-file-utils + gettext-minimal + ;; Version generator needs git to work properly: + ;; https://github.com/gerbv/gerbv/issues/244 + git-minimal/pinned + `(,glib "bin") + libtool + pkg-config)) + (inputs (list cairo + ;; As of 2.10.0 gerbv is still GTK+2 only. GTK 3/4 porting + ;; issue: https://github.com/gerbv/gerbv/issues/71. + gtk+-2)) + (home-page "https://gerbv.github.io/") + (synopsis "Gerber file viewer") + (description + "Gerbv is a viewer for files in the Gerber format (RS-274X only), which +is commonly used to represent printed circuit board (PCB) layouts. Gerbv lets +you load several files on top of each other, do measurements on the displayed +image, etc. Besides viewing Gerbers, you may also view Excellon drill files +as well as pick-place files.") + ;; This CVE has been fixed in version 2.10.0. + (properties '((lint-hidden-cve . ("CVE-2023-4508")))) + (license license:gpl2+))) + (define-public gtkwave ;; The last release is more than 2 years old, and there are improvements in ;; the master branch, such as GTK 4 support: pick the latest commit that diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index bc4a311d256..4863df1a4db 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -872,55 +872,6 @@ such as those made in pneumatics, hydraulics, process industries, electronics, and others.") (license license:gpl2+))) -(define-public gerbv - (package - (name "gerbv") - (version "2.10.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gerbv/gerbv") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "06bcm5zw7whsnnmfld3gl2j907lxc68gnsbzr2pc4w6qc923rgmj")))) - (build-system gnu-build-system) - (arguments - (list - #:configure-flags #~(list "CFLAGS=-O2 -g -fcommon") - #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'patch-version-generator - (lambda _ - (substitute* "utils/git-version-gen.sh" - (("/bin/bash") - (which "bash")))))))) - (native-inputs (list autoconf - automake - desktop-file-utils - gettext-minimal - ;; Version generator needs git to work properly: - ;; https://github.com/gerbv/gerbv/issues/244 - git-minimal/pinned - `(,glib "bin") - libtool - pkg-config)) - (inputs (list cairo - ;; As of 2.10.0 gerbv is still GTK+2 only. GTK 3/4 porting - ;; issue: https://github.com/gerbv/gerbv/issues/71. - gtk+-2)) - (home-page "https://gerbv.github.io/") - (synopsis "Gerber file viewer") - (description - "Gerbv is a viewer for files in the Gerber format (RS-274X only), which -is commonly used to represent printed circuit board (PCB) layouts. Gerbv lets -you load several files on top of each other, do measurements on the displayed -image, etc. Besides viewing Gerbers, you may also view Excellon drill files -as well as pick-place files.") - ;; This CVE has been fixed in version 2.10.0. - (properties '((lint-hidden-cve . ("CVE-2023-4508")))) - (license license:gpl2+))) - (define-public translate2geda ;; There has been no formal release yet. (let ((commit "2ec576e608a6f6eead5f6bc1952234d9874703c7")