From b4731adf820ab0f1b49d6a17778f158bd85d7258 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 9 Nov 2020 11:21:35 +0200 Subject: gnu: libngspice: Update source URI list. * gnu/packages/engineering.scm (libngspice)[source]: Add alternate source URI. --- gnu/packages/engineering.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 2e1ffa1355..acf048d2e5 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1537,8 +1537,12 @@ high-performance parallel differential evolution (DE) optimization algorithm.") (version "28") (source (origin (method url-fetch) - (uri (string-append "mirror://sourceforge/ngspice/ng-spice-rework/" - 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 "0rnz2rdgyav16w7wfn3sfrk2lwvvgz1fh0l9107zkcldijklz04l")) -- cgit v1.2.3 From dd012afde475e44cc71ccbf250e8ed0ee1e0e853 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Nov 2020 17:13:19 +0100 Subject: gnu: libfive: Update to 0-4.8ca1b86. * gnu/packages/engineering.scm (libfive): Update to 0-4.8ca1b86. [inputs]: Replace guile-2.2 with guile-3.0. --- gnu/packages/engineering.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index acf048d2e5..596b8a79ab 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -754,8 +754,8 @@ fonts to gEDA.") (license license:gpl2+)))) (define-public libfive - (let ((commit "6e39254e57c179459bb929df49ae96a6017a0ed6") - (revision "3")) + (let ((commit "8ca1b8685ef3fac7b64e66b10459b8421a3020c6") + (revision "4")) (package (name "libfive") (version (git-version "0" revision commit)) @@ -766,7 +766,7 @@ fonts to gEDA.") (commit commit))) (sha256 (base32 - "0ryv2hcbrwqc087w7rrs4a2irkcpmqync00g4dh8n7jn10w2jkim")) + "1c762cd70iv2b9av0l9lq0py9138y98wk3dirhdmil7jncdhvq98")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments @@ -784,7 +784,7 @@ fonts to gEDA.") ("libpng" ,libpng) ("qtbase" ,qtbase) ("eigen" ,eigen) - ("guile" ,guile-2.2))) + ("guile" ,guile-3.0))) (home-page "https://libfive.com") (synopsis "Tool for programmatic computer-aided design") (description -- cgit v1.2.3 From 4e9b2e8ba26dd601df67f112852237d5df2f3341 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 12 Nov 2020 17:14:00 +0100 Subject: gnu: inspekt3d: Build with Guile 3. * gnu/packages/engineering.scm (inspekt3d) [source]: Add snippet to allow building with Guile 3.0. [inputs]: Replace guile-2.2 with guile-3.0. [propagated-inputs]: Replace guile-opengl with guile3.0-opengl. --- gnu/packages/engineering.scm | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 596b8a79ab..3da11e3fed 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -810,7 +810,14 @@ language.") (file-name (git-file-name name version)) (sha256 (base32 - "0lan6930g5a9z4ack9jj0zdd0mb2s6q2xzpiwcjdc3pvl9b1nbw4")))) + "0lan6930g5a9z4ack9jj0zdd0mb2s6q2xzpiwcjdc3pvl9b1nbw4")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Allow builds with Guile 3.0. + (substitute* "configure.ac" + (("2\\.2") "3.0 2.2")) + #t)))) (build-system gnu-build-system) (arguments `(#:phases @@ -829,10 +836,10 @@ language.") ("pkg-config" ,pkg-config))) (inputs `(("mesa" ,mesa) - ("guile" ,guile-2.2))) + ("guile" ,guile-3.0))) (propagated-inputs `(("libfive" ,libfive) - ("guile-opengl" ,guile-opengl))) + ("guile-opengl" ,guile3.0-opengl))) (home-page "https://gitlab.com/kavalogic-inc/inspekt3d/") (synopsis "Lightweight 3D viewer for Libfive written in Guile Scheme") (description -- cgit v1.2.3 From b67bff22779c2d732f4aee03c096e59c01975296 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Tue, 21 May 2019 16:37:05 +0530 Subject: gnu: Add pcb2gcode. * gnu/packages/engineering.scm (pcb2gcode): New variable. --- gnu/packages/engineering.scm | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 3da11e3fed..6463fb73f1 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice ;;; Copyright © 2018 Clément Lassieur ;;; Copyright © 2018, 2019 Jonathan Brielmaier -;;; Copyright © 2018, 2019 Arun Isaac +;;; Copyright © 2018, 2019, 2020 Arun Isaac ;;; Copyright © 2019 Tim Stahel ;;; Copyright © 2019 Jovany Leandro G.C ;;; Copyright © 2019 Steve Sprang @@ -74,6 +74,7 @@ #:use-module (gnu packages freedesktop) #:use-module (gnu packages gcc) #:use-module (gnu packages gd) + #:use-module (gnu packages geo) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gl) @@ -2836,3 +2837,39 @@ GUI.") provides a full-fledged procedural, interactive programming language designed to describe data structures and to operate on them.") (license license:gpl3+)))) + +(define-public pcb2gcode + (package + (name "pcb2gcode") + (version "2.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pcb2gcode/pcb2gcode") + (commit (string-append "v" version)) + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0nzglcyh6ban27cc73j4l7w7r9k38qivq0jz8iwnci02pfalw4ry")))) + (build-system gnu-build-system) + (inputs + `(("boost" ,boost) + ("geos" ,geos) + ("gerbv" ,gerbv) + ("glibmm" ,glibmm) + ("gtkmm" ,gtkmm-2) + ("librsvg" ,librsvg))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (home-page "https://github.com/pcb2gcode/pcb2gcode") + (synopsis "Generate G-code for milling PCBs") + (description "pcb2gcode is a command-line program for isolation routing +and drilling of PCBs. It takes Gerber files as input and outputs G-code files +for the milling of PCBs. It also includes an autoleveller for the automatic +dynamic calibration of the milling depth.") + (license license:gpl3+))) -- cgit v1.2.3 From fc14661c7b23d93d4fd3e2eacbbfc8dbe10807c5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 25 Nov 2020 21:11:00 +0100 Subject: gnu: volk: Fetch from git repository. * gnu/packages/engineering.scm (volk)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/engineering.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 6463fb73f1..5a66d0a77c 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1080,11 +1080,13 @@ the 'showing the effect of'-style of operation.") (version "2.3.0") (source (origin - (method url-fetch) - (uri (string-append "https://www.libvolk.org/releases/volk-" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/gnuradio/volk") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "1pjxz3piwy49njj5y2zk437prwkv9lfs5g48577jj3kcsg766vi3")))) + (base32 "1jya1v1z1mq50n5fxhs755vcdjvwiv2iqjmycn2l1bx552vzh6cg")))) (build-system cmake-build-system) (arguments `(#:phases -- cgit v1.2.3 From 6a18f4c5dc6ee78e0b1f9ba757a3a70e0d9726d5 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 25 Nov 2020 22:05:50 +0100 Subject: gnu: volk: Update to 2.4.0. * gnu/packages/engineering.scm (volk): Update to 2.4.0. [source]: Clone recursively. --- gnu/packages/engineering.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 5a66d0a77c..99b1545b6d 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1077,16 +1077,17 @@ the 'showing the effect of'-style of operation.") (define-public volk (package (name "volk") - (version "2.3.0") + (version "2.4.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/gnuradio/volk") - (commit (string-append "v" version)))) + (commit (string-append "v" version)) + (recursive? #t))) ; for cpu_features git submodule (file-name (git-file-name name version)) (sha256 - (base32 "1jya1v1z1mq50n5fxhs755vcdjvwiv2iqjmycn2l1bx552vzh6cg")))) + (base32 "14y0988r5qi1h3yvkivx5ihccn8r15910lq30r8iy71ih190r5m9")))) (build-system cmake-build-system) (arguments `(#:phases -- cgit v1.2.3 From 8da64e9bf9cabb5cd159b66f697ed5e32de3f1f4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 25 Nov 2020 22:30:02 +0100 Subject: gnu: volk: Remove static library. * gnu/packages/engineering.scm (volk)[arguments]: Add a 'remove-static-libraries phase. --- gnu/packages/engineering.scm | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 99b1545b6d..558541dd5a 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1092,6 +1092,14 @@ the 'showing the effect of'-style of operation.") (arguments `(#:phases (modify-phases %standard-phases + (add-after 'install 'remove-static-libraries + ;; Remove libcpu_features.a (and any others that might appear). + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib"))) + (for-each delete-file (find-files lib "\\.a$" + #:fail-on-error? #t)) + #t))) (add-after 'install 'wrap-pythonpath (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3