From b80f4b00e2edd7da039468a651c70d5700b9a055 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 21 Jan 2026 20:01:36 -0300 Subject: [PATCH] gnu: geda-gaf: Migrate to electronics. * gnu/packages/engineering.scm (geda-gaf): Move from here ... * gnu/packages/electronics.scm: ... to here. Change-Id: Ib64f35542a86714624fe8614a38dab6f8dd5cada --- gnu/packages/electronics.scm | 63 ++++++++++++++++++++++++++++++++++++ gnu/packages/engineering.scm | 62 ----------------------------------- 2 files changed, 63 insertions(+), 62 deletions(-) diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 1f06ccd8a6f..3dd0767dd7b 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2019 Arun Isaac ;;; Copyright © 2021, 2023, 2024 Efraim Flashner ;;; Copyright © 2021 Leo Famulari +;;; Copyright © 2021 Ludovic Courtès ;;; Copyright © 2022, 2023, 2025 Maxim Cournoyer ;;; Copyright © 2024 Juliana Sims ;;; Copyright © 2025, 2026 Cayetano Santos @@ -475,6 +476,68 @@ hardware designs in Verilog.") (home-page "https://github.com/ZipCPU/zipcpu/") (license license:lgpl3+)))) +(define-public geda-gaf + (package + (name "geda-gaf") + (version "1.10.2") + (source (origin + (method url-fetch) + (uri (string-append + "http://ftp.geda-project.org/geda-gaf/stable/v" + (version-major+minor version) "/" + version "/geda-gaf-" version ".tar.gz")) + (sha256 + (base32 + "19688b0671imy2i3jphcnq1120b8ymhr4wz2psiqylr82ljanqp8")))) + (build-system gnu-build-system) + (arguments + (list + #:phases + '(modify-phases %standard-phases + ;; tests require a writable HOME + (add-before 'check 'set-home + (lambda _ + (setenv "HOME" (getenv "TMPDIR")))) + (add-after 'unpack 'disable-failing-tests + (lambda _ + (substitute* "xorn/tests/Makefile.in" + (("-Werror") "")) + ;; This test returns its correct result in an unexpected order. + (substitute* "libgeda/scheme/unit-tests/t0402-config.scm" + (("\\(begin-config-test 'config-keys" m) + (string-append "#;" m)))))) + #:configure-flags + #~(let ((pcb #$(this-package-input "pcb"))) + (list (string-append "--with-pcb-datadir=" pcb "/share") + (string-append "--with-pcb-lib-path=" + pcb "/share/pcb/pcblib-newlib:" + pcb "/share/pcb/newlib"))))) + (inputs + (list gamin + gdk-pixbuf + glib + gtk+-2 + guile-2.0 + libxcrypt + shared-mime-info + m4 + pcb + python-2)) ; for xorn + (native-inputs + (list groff pkg-config desktop-file-utils perl)) ; for tests + (home-page "http://geda-project.org/") + (synopsis "Schematic capture, netlister, symbols, symbol checker, and utils") + (description + "Gaf stands for “gschem and friends”. It is a subset of the entire tool +suite grouped together under the gEDA name. gEDA/gaf is a collection of tools +which currently includes: gschem, a schematic capture program; gnetlist, a +netlist generation program; gsymcheck, a syntax checker for schematic symbols; +gattrib, a spreadsheet programme that manipulates the properties of symbols of +a schematic; libgeda, libraries for gschem gnetlist and gsymcheck; gsch2pcb, a +tool to forward annotation from your schematic to layout using PCB; some minor +utilities.") + (license license:gpl2+))) + (define-public gerbv (package (name "gerbv") diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 56868bff15c..ace168a700e 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -293,68 +293,6 @@ plans and designs.") @url{https://en.wikipedia.org/wiki/Modbus, ModBus} slave (RTU or TCP).") (license license:gpl3))) -(define-public geda-gaf - (package - (name "geda-gaf") - (version "1.10.2") - (source (origin - (method url-fetch) - (uri (string-append - "http://ftp.geda-project.org/geda-gaf/stable/v" - (version-major+minor version) "/" - version "/geda-gaf-" version ".tar.gz")) - (sha256 - (base32 - "19688b0671imy2i3jphcnq1120b8ymhr4wz2psiqylr82ljanqp8")))) - (build-system gnu-build-system) - (arguments - (list - #:phases - '(modify-phases %standard-phases - ;; tests require a writable HOME - (add-before 'check 'set-home - (lambda _ - (setenv "HOME" (getenv "TMPDIR")))) - (add-after 'unpack 'disable-failing-tests - (lambda _ - (substitute* "xorn/tests/Makefile.in" - (("-Werror") "")) - ;; This test returns its correct result in an unexpected order. - (substitute* "libgeda/scheme/unit-tests/t0402-config.scm" - (("\\(begin-config-test 'config-keys" m) - (string-append "#;" m)))))) - #:configure-flags - #~(let ((pcb #$(this-package-input "pcb"))) - (list (string-append "--with-pcb-datadir=" pcb "/share") - (string-append "--with-pcb-lib-path=" - pcb "/share/pcb/pcblib-newlib:" - pcb "/share/pcb/newlib"))))) - (inputs - (list gamin - gdk-pixbuf - glib - gtk+-2 - guile-2.0 - libxcrypt - shared-mime-info - m4 - pcb - python-2)) ; for xorn - (native-inputs - (list groff pkg-config desktop-file-utils perl)) ; for tests - (home-page "http://geda-project.org/") - (synopsis "Schematic capture, netlister, symbols, symbol checker, and utils") - (description - "Gaf stands for “gschem and friends”. It is a subset of the entire tool -suite grouped together under the gEDA name. gEDA/gaf is a collection of tools -which currently includes: gschem, a schematic capture program; gnetlist, a -netlist generation program; gsymcheck, a syntax checker for schematic symbols; -gattrib, a spreadsheet programme that manipulates the properties of symbols of -a schematic; libgeda, libraries for gschem gnetlist and gsymcheck; gsch2pcb, a -tool to forward annotation from your schematic to layout using PCB; some minor -utilities.") - (license license:gpl2+))) - (define-public lepton-eda (package (name "lepton-eda")