From 78ad4749cffbdbc3ed610dfc326f9f4343453665 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 24 Mar 2022 22:26:05 +0100 Subject: gnu: prusa-slicer: Update to 2.4.1. * gnu/packages/engineering.scm (prusa-slicer): Update to 2.4.1. --- gnu/packages/engineering.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index c73cf937ef..cb721ddd2e 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3148,7 +3148,7 @@ visualization, matrix manipulation.") (define-public prusa-slicer (package (name "prusa-slicer") - (version "2.4.0") + (version "2.4.1") (source (origin (method git-fetch) @@ -3157,7 +3157,7 @@ visualization, matrix manipulation.") (url "https://github.com/prusa3d/PrusaSlicer") (commit (string-append "version_" version)))) (file-name (git-file-name name version)) - (sha256 (base32 "1mb7v0khrmsgy3inmh4mjn709jlhx422kvbnrhsqziph2wwak9bz")) + (sha256 (base32 "0q1m8fcz39s03r9csq411ss8vbbpjx45icj8vgkysy8hqgqz3gz0")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 90b53531327f4d15727ad0ad29c712ee4f876031 Mon Sep 17 00:00:00 2001 From: Peter Polidoro Date: Tue, 5 Apr 2022 13:43:26 -0400 Subject: gnu: kicad: Update to 6.0.4. * gnu/packages/engineering.scm (kicad, kicad-doc, kicad-symbols, kicad-footprints, kicad-packages3d, kicad-templates): Update to 6.0.4. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/engineering.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index cb721ddd2e..48954227a0 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -29,6 +29,7 @@ ;;; Copyright © 2021 Foo Chuan Wei ;;; Copyright © 2022 Evgeny Pisemsky ;;; Copyright © 2022 Olivier Dion +;;; Copyright © 2022 Peter Polidoro ;;; ;;; This file is part of GNU Guix. ;;; @@ -931,7 +932,7 @@ Emacs).") (define-public kicad (package (name "kicad") - (version "6.0.1") + (version "6.0.4") (source (origin (method git-fetch) (uri (git-reference @@ -939,7 +940,7 @@ Emacs).") (commit version))) (sha256 (base32 - "1vpcbhhw8844hm6vpk3kk405wak531pvcvcpc66z0b48iprk3imr")) + "0lki59ws0ncqkp9wxrhyni1ck2sx5z07mmpkjg0d9jpkync9hx9y")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments @@ -1046,7 +1047,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.") (file-name (git-file-name name version)) (sha256 (base32 - "0zaafa9ckvdgsim6nhp3flj4r2fzzmwn054lc3iijwgga82qy7il")))) + "0p3ypfs11ck2w7dmqiy763krpj0slan4jvpzxs6z1473gdpbzgbs")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DBUILD_FORMATS=html") @@ -1080,7 +1081,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.") (file-name (git-file-name name version)) (sha256 (base32 - "1azjx1bmxaz8bniyw75lq60mc8hvay00jn9qdc2zp7isy3c9ibp0")))) + "12lyc187337bf2frl3jvwqdwwnd69f7l414k3kxhccs3sa2mcf1y")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; no tests exist @@ -1109,7 +1110,7 @@ libraries.") (file-name (git-file-name name version)) (sha256 (base32 - "0mv9xs0mmmfn0yhzx1v55r5app13ckagb16249rabyiz3v5crdpb")))) + "0px2g9jansky0rvc0bdjylbmv8xwhc0q63g88hd2nzbknqli9f1y")))) (synopsis "Official KiCad footprint libraries") (description "This package contains the official KiCad footprint libraries."))) @@ -1126,7 +1127,7 @@ libraries.") (file-name (git-file-name name version)) (sha256 (base32 - "0vwcbzq42hzjl4f0zjaswmiff1x59hv64g5n00mx1gl0gwngnyla")))) + "0ms9py93qyihxrhh9wm2ziycmdn88m36r8adx22ynjnxixw1f9ja")))) (synopsis "Official KiCad 3D model libraries") (description "This package contains the official KiCad 3D model libraries."))) -- cgit v1.2.3 From 390d68c95660986769da556affbda9b04ea7aa7d Mon Sep 17 00:00:00 2001 From: Malte Frank Gerdes Date: Thu, 7 Apr 2022 15:25:05 +0200 Subject: gnu: Add libarcus. * gnu/packages/engineering.scm (libarcus): New variable. Co-authored-by: Guillaume Le Vaillant --- gnu/packages/engineering.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 48954227a0..1580671555 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -30,6 +30,7 @@ ;;; Copyright © 2022 Evgeny Pisemsky ;;; Copyright © 2022 Olivier Dion ;;; Copyright © 2022 Peter Polidoro +;;; Copyright © 2022 Malte Frank Gerdes ;;; ;;; This file is part of GNU Guix. ;;; @@ -117,6 +118,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pretty-print) + #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-xyz) @@ -3246,3 +3248,44 @@ connector pinouts. It takes plain text, YAML-formatted files as input and produces beautiful graphical output thanks to GraphViz. It handles automatic BOM creation and has a lot of extra features.") (license license:gpl3))) + +(define-public libarcus + (package + (name "libarcus") + (version "4.13.0") ; Should same version as Cura package. + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Ultimaker/libArcus") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "19fi0y0lk45cyampczgh3kz2swai4zcgzkffp0xf5h55rxxrdpvk")))) + (build-system cmake-build-system) + (inputs + (list protobuf + python + python-sip-4)) + (arguments + `(#:tests? #f + #:configure-flags '("-DBUILD_EXAMPLES=OFF") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-python-sitearch + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "cmake/FindSIP.cmake" + (("\\$\\{_process_output\\} Python3_SITEARCH") + (string-append (assoc-ref outputs "out") + "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages" + " Python3_SITEARCH")))))))) + (home-page "https://github.com/Ultimaker/libArcus") + (synopsis "Communication library for Ultimaker software components") + (description "This library contains C++ code and Python3 bindings for +creating a socket in a thread and using this socket to send and receive +messages based on the Protocol Buffers library. It is designed to +facilitate the communication between Cura and its backend and similar code.") + (license license:lgpl3+))) -- cgit v1.2.3 From 742a7d897f26797b705a32f72628f2f3b2770940 Mon Sep 17 00:00:00 2001 From: Malte Frank Gerdes Date: Thu, 7 Apr 2022 15:40:47 +0200 Subject: gnu: Add cura-engine. * gnu/packages/engineering.scm (cura-engine): New variable. Co-authored-by: Guillaume Le Vaillant --- gnu/packages/engineering.scm | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 1580671555..36695fcb92 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -127,6 +127,7 @@ #:use-module (gnu packages ruby) #:use-module (gnu packages serialization) #:use-module (gnu packages sqlite) + #:use-module (gnu packages stb) #:use-module (gnu packages swig) #:use-module (gnu packages tbb) #:use-module (gnu packages tcl) @@ -3289,3 +3290,45 @@ creating a socket in a thread and using this socket to send and receive messages based on the Protocol Buffers library. It is designed to facilitate the communication between Cura and its backend and similar code.") (license license:lgpl3+))) + +(define-public cura-engine + (package + (name "cura-engine") + (version "4.13.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Ultimaker/CuraEngine") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xp2r0m5wwfsh9wdb3biqzvfqfz5jsmyw4bww93aksw0rgli07bp")))) + (build-system cmake-build-system) + (native-inputs + (list googletest pkg-config)) + (inputs + (list libarcus protobuf stb-image)) + (arguments + `(#:configure-flags '("-DBUILD_TESTS=ON") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "../source/cmake/FindStb.cmake" + (("/usr/include") + (string-append (assoc-ref inputs "stb-image") + "/include")) + (("stb/stb_image_resize.h") + "stb_image.h")) + (substitute* + "../source/src/infill/ImageBasedDensityProvider.cpp" + (("stb/stb_image.h") + "stb_image.h"))))))) + (home-page "https://github.com/Ultimaker/CuraEngine") + (synopsis "Cura slicing engine") + (description "CuraEngine is a powerful, fast and robust engine for +processing 3D models into 3D printing instruction for Ultimaker and other +GCode based 3D printers. It is part of the larger open source project called +Cura.") + (license license:agpl3+))) -- cgit v1.2.3 From 8d2493dda175213801741704e3c0e00d85edce07 Mon Sep 17 00:00:00 2001 From: Malte Frank Gerdes Date: Thu, 7 Apr 2022 15:53:35 +0200 Subject: gnu: Add cura-binary-data. * gnu/packages/engineering.scm (cura-binary-data): New variable. Co-authored-by: Guillaume Le Vaillant --- gnu/packages/engineering.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 36695fcb92..d8370f0cb0 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3332,3 +3332,32 @@ processing 3D models into 3D printing instruction for Ultimaker and other GCode based 3D printers. It is part of the larger open source project called Cura.") (license license:agpl3+))) + +(define-public cura-binary-data + (package + (name "cura-binary-data") + (version "4.13.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Ultimaker/cura-binary-data") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "11dra399adky7jxpaqqk1swrg5y3cc1086l54c3injg3ccgrvwik")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Remove Windows executables and prebuilt firmware files. + (delete-file-recursively "cura/resources/firmware") + (delete-file-recursively "windows"))))) + (build-system cmake-build-system) + (arguments + `(#:tests? #f ; No test suite. + #:configure-flags '("-DENABLE_FIRMWARE_INSTALL=OFF"))) + (home-page "https://github.com/Ultimaker/cura-binary-data") + (synopsis "Binary data for Cura, like compiled translations") + (description "This package contains binary data for Cura releases, like +compiled translations. Prebuilt Firmware files are removed.") + (license license:agpl3))) -- cgit v1.2.3 From f14d43b367c52c31e63266539547b3daaf3fa7c8 Mon Sep 17 00:00:00 2001 From: Malte Frank Gerdes Date: Thu, 7 Apr 2022 17:15:28 +0200 Subject: gnu: Add uranium. * gnu/packages/engineering.scm (uranium): New variable. Co-authored-by: Guillaume Le Vaillant --- gnu/packages/engineering.scm | 69 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index d8370f0cb0..0fadf3e1d1 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -120,7 +120,10 @@ #:use-module (gnu packages pretty-print) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) + #:use-module (gnu packages python-check) #:use-module (gnu packages python-crypto) + #:use-module (gnu packages python-science) + #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages readline) @@ -3361,3 +3364,69 @@ Cura.") (description "This package contains binary data for Cura releases, like compiled translations. Prebuilt Firmware files are removed.") (license license:agpl3))) + +(define-public uranium + (package + (name "uranium") + (version "4.13.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Ultimaker/Uranium") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1nyxm3fdyrsisqkxbqld66bljd852wnc1yc6i1lyvncwvzn8ai32")))) + (build-system cmake-build-system) + (native-inputs + (list doxygen + gettext-minimal + graphviz + pkg-config + python-pytest + python-mypy + python-certifi + python-twisted)) + (propagated-inputs + (list cura-binary-data + libarcus + python + python-cryptography + python-numpy + python-pyqt + python-scipy + python-shapely + python-trimesh + python-zeroconf + qtbase + qtdeclarative + qtgraphicaleffects + qtquickcontrols + qtquickcontrols2 + qtsvg)) + (arguments + `(;; FIXME: tests are disabled, because they cause an infinite loop. + #:tests? #f + #:configure-flags + ,#~(list (string-append "-DGETTEXT_MSGINIT_EXECUTABLE=" + #$(this-package-native-input "gettext-minimal") + "/bin/msginit") + (string-append "-DCURA_BINARY_DATA_DIRECTORY=" + #$(this-package-input "cura-binary-data"))) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-uranium-plugin-path + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "UM/Application.py" + (("app_root =.*$") + (string-append "app_root = \"" + (assoc-ref outputs "out") "\"\n")) + (("app_root, \"share\", \"uranium\", \"plugins\"") + "app_root, \"lib\", \"uranium\", \"plugins\""))))))) + (home-page "https://github.com/Ultimaker/Uranium") + (synopsis "Python framework for building desktop applications") + (description "Uranium is a Python Framework for building 3D printing +related desktop applications using PyQt5. It belongs to the Cura project +from Ultimaker.") + (license license:lgpl3+))) -- cgit v1.2.3 From 79b50d5d5b465504511d9fbd735e7b3ddb6eb1de Mon Sep 17 00:00:00 2001 From: Malte Frank Gerdes Date: Thu, 7 Apr 2022 17:21:13 +0200 Subject: gnu: Add libcharon. * gnu/packages/engineering.scm (libcharon): New variable. Co-authored-by: Guillaume Le Vaillant --- gnu/packages/engineering.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 0fadf3e1d1..040c2a3ef0 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3430,3 +3430,27 @@ compiled translations. Prebuilt Firmware files are removed.") related desktop applications using PyQt5. It belongs to the Cura project from Ultimaker.") (license license:lgpl3+))) + +(define-public libcharon + (package + (name "libcharon") + (version "4.13.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Ultimaker/libCharon") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ibv15y7lfxs09k6rbc3kiaz13gq3v9vqxrk20rqp6bdclk3izff")))) + (build-system cmake-build-system) + (native-inputs + (list python-pytest)) + (inputs + (list python)) + (home-page "https://github.com/Ultimaker/libCharon") + (synopsis "File metadata and streaming library") + (description "LibCharon is a Python file metadata and streaming library. It +belongs to the Cura project from Ultimaker.") + (license license:lgpl3+))) -- cgit v1.2.3 From 21594c06b1b63b9e7b9a5c95ea5f063c34233eed Mon Sep 17 00:00:00 2001 From: Malte Frank Gerdes Date: Thu, 7 Apr 2022 17:28:35 +0200 Subject: gnu: Add libsavitar. * gnu/packages/engineering.scm (libsavitar): New variable. Co-authored-by: Guillaume Le Vaillant --- gnu/packages/engineering.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 040c2a3ef0..0bf4681ea1 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3454,3 +3454,41 @@ from Ultimaker.") (description "LibCharon is a Python file metadata and streaming library. It belongs to the Cura project from Ultimaker.") (license license:lgpl3+))) + +(define-public libsavitar + (package + (name "libsavitar") + (version "4.13.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Ultimaker/libSavitar") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1cq85x0xizsjwf9nl7v7x4i9vl335mgv2lda3q2c9fcwrndsc3wk")))) + (build-system cmake-build-system) + (inputs + (list python python-sip-4)) + (arguments + `(#:tests? #f ; No test suite. + #:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-python-sitearch + (lambda* (#:key outputs #:allow-other-keys) + (let ((path (string-append (assoc-ref outputs "out") + "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages"))) + (substitute* "cmake/FindSIP.cmake" + (("\\$\\{_process_output\\} Python3_SITEARCH") + (string-append path " Python3_SITEARCH")) + (("\\$\\{_process_output\\} Python3_SITELIB") + (string-append path " Python3_SITELIB"))))))))) + (home-page "https://github.com/Ultimaker/libSavitar") + (synopsis "C++ implementation of 3mf loading with SIP python bindings") + (description "LibSavitar is a C++ implementation of 3mf loading with SIP +python bindings. It belongs to the Cura project from Ultimaker.") + (license license:lgpl3+))) -- cgit v1.2.3 From ace3a7ad89b1cc5c16cf2455248014b222b0f945 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 7 Apr 2022 22:01:22 +0200 Subject: gnu: Add libnest2d-for-cura. * gnu/packages/engineering.scm (libnest2d-for-cura): New variable. --- gnu/packages/engineering.scm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 0bf4681ea1..a1f96771a1 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -76,6 +76,7 @@ #:use-module (gnu packages cmake) #:use-module (gnu packages commencement) #:use-module (gnu packages compression) + #:use-module (gnu packages cpp) #:use-module (gnu packages curl) #:use-module (gnu packages dejagnu) #:use-module (gnu packages digest) @@ -3431,6 +3432,37 @@ related desktop applications using PyQt5. It belongs to the Cura project from Ultimaker.") (license license:lgpl3+))) +(define-public libnest2d-for-cura + ;; Cura uses a custom fork of the libnest2d library. + (package + (name "libnest2d-for-cura") + (version "4.12.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Ultimaker/libnest2d") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1wk7cv8sqnxy7srq61scrr18dz2i0l4s4slmjfh4890iy0wf9i7n")))) + (build-system cmake-build-system) + (inputs + (list boost clipper nlopt)) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-clipper-detection + (lambda* (#:key inputs #:allow-other-keys) + (setenv "CLIPPER_PATH" (assoc-ref inputs "clipper"))))))) + (home-page "https://github.com/Ultimaker/libnest2d") + (synopsis "2D irregular bin packaging and nesting library") + (description + "Libnest2D is a library and framework for the 2D bin packaging +problem. It was inspired from the SVGNest Javascript library.") + (license license:lgpl3))) + (define-public libcharon (package (name "libcharon") -- cgit v1.2.3 From 4926c104760c62609b5ad32fff80b28070ec24e7 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 7 Apr 2022 22:12:58 +0200 Subject: gnu: Add python-pynest2d. * gnu/packages/engineering.scm (python-pynest2d): New variable. --- gnu/packages/engineering.scm | 48 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index a1f96771a1..ff528af8fb 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3463,6 +3463,54 @@ from Ultimaker.") problem. It was inspired from the SVGNest Javascript library.") (license license:lgpl3))) +(define-public python-pynest2d + (package + (name "python-pynest2d") + (version "4.12.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Ultimaker/pynest2d") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0jhqfylg6vzlbz9rqs981bg6y8s18iklw1p8hmax72xq2c7561s1")))) + (build-system cmake-build-system) + (native-inputs + (list pkg-config)) + (inputs + (list boost + clipper + libnest2d-for-cura + nlopt + python + python-sip-4)) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-clipper-detection + (lambda* (#:key inputs #:allow-other-keys) + (setenv "CLIPPER_PATH" (assoc-ref inputs "clipper")))) + (add-before 'configure 'fix-python-sitearch + (lambda* (#:key outputs #:allow-other-keys) + (let ((path (string-append (assoc-ref outputs "out") + "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages"))) + (substitute* "cmake/FindSIP.cmake" + (("\\$\\{_process_output\\} Python3_SITEARCH") + (string-append path " Python3_SITEARCH")) + (("\\$\\{_process_output\\} Python3_SITELIB") + (string-append path " Python3_SITELIB"))))))))) + (home-page "https://github.com/Ultimaker/pynest2d") + (synopsis "Python bindings for libnest2d") + (description + "This package contains CPython bindings for libnest2d-for-cura.") + (license license:lgpl3+))) + (define-public libcharon (package (name "libcharon") -- cgit v1.2.3 From b74932988831461e420a69e66d6a0f95fb5a5d44 Mon Sep 17 00:00:00 2001 From: Malte Frank Gerdes Date: Thu, 7 Apr 2022 17:42:45 +0200 Subject: gnu: Add cura. * gnu/packages/engineering.scm (cura): New variable. Co-authored-by: Guillaume Le Vaillant --- gnu/packages/engineering.scm | 59 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index ff528af8fb..17f554df72 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -3572,3 +3572,62 @@ belongs to the Cura project from Ultimaker.") (description "LibSavitar is a C++ implementation of 3mf loading with SIP python bindings. It belongs to the Cura project from Ultimaker.") (license license:lgpl3+))) + +(define-public cura + (package + (name "cura") + (version "4.13.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Ultimaker/Cura") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0yg17pcrj5gm02aqcjfk40ynvpb9r9aaq9rj108dkpki1is15ks7")))) + (build-system qt-build-system) + (native-inputs + (list python-certifi + python-mypy + python-pytest + python-requests)) + (inputs + (list cura-engine + libcharon + libsavitar + python + python-keyring + python-pynest2d + python-pyserial + python-sentry-sdk + python-sip + uranium)) + (arguments + `(;; TODO: Fix tests. + #:tests? #f + #:configure-flags '("-DURANIUM_SCRIPTS_DIR=") + #:phases + (modify-phases %standard-phases + (add-after 'install 'link-to-CuraEngine + (lambda* (#:key inputs outputs #:allow-other-keys) + (symlink (string-append (assoc-ref inputs "cura-engine") + "/bin/CuraEngine") + (string-append (assoc-ref outputs "out") + "/bin/CuraEngine")))) + (add-after 'link-to-CuraEngine 'wrap-pythonpath + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/cura") + (list "GUIX_PYTHONPATH" + 'prefix (list (string-append out + "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages") + (getenv "GUIX_PYTHONPATH")))))))))) + (home-page "https://github.com/Ultimaker/Cura") + (synopsis "Slicer for 3D printers") + (description "Cura is a slicing software from Ultimaker. A @emph{slicer} +generates G-Code for 3D printers.") + (license license:lgpl3+))) -- cgit v1.2.3 From 1885f8035a41b2f92cf904d11506ac105f90a8a9 Mon Sep 17 00:00:00 2001 From: Olivier Dion Date: Thu, 7 Apr 2022 09:40:43 -0400 Subject: gnu: Add librseq. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/engineering.scm (librseq): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/engineering.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 17f554df72..1c945eb07b 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1156,6 +1156,34 @@ libraries.") (description "This package contains the official KiCad project and worksheet templates."))) +(define-public librseq + ;; There's no release. + (let ((commit "170f840b498e1aff068b90188727a656111bfc2f") + (revision "1")) + (package + (name "librseq") + (version (git-version "0.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/compudj/librseq.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0rdx59y8y9x8cfmmx5gl66gibkzpk3kw5lrrqhrxan8zr37a055y")))) + (build-system gnu-build-system) + (native-inputs (list autoconf automake libtool)) + (home-page "https://github.com/compudj/librseq") + (synopsis "Userspace library for restartable sequences") + (description "A restartable sequence is a critical region delimited by a +program where if its execution is preempted or interrupted, the kernel will +divert the program control flow to a defined abort handler. They are a good +alternative to atomic operations for critical fast paths and are usually used +in the context of per-cpu data. The library offers ABI headers to interface +with the kernel and various utilities such as per-cpu counters.") + (license (list license:lgpl2.1 license:expat))))) + (define-public linsmith (package (name "linsmith") -- cgit v1.2.3 From f49b1a10f3d13ee9597b8ef230828606f7cac99f Mon Sep 17 00:00:00 2001 From: Konstantinos Agiannis Date: Tue, 26 Apr 2022 14:27:51 +0300 Subject: gnu: Add xschem. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/engineering.scm (xschem): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/engineering.scm | 45 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 1c945eb07b..0ef1870a50 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -31,6 +31,7 @@ ;;; Copyright © 2022 Olivier Dion ;;; Copyright © 2022 Peter Polidoro ;;; Copyright © 2022 Malte Frank Gerdes +;;; Copyright © 2022 Konstantinos Agiannis ;;; ;;; This file is part of GNU Guix. ;;; @@ -78,6 +79,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages cpp) #:use-module (gnu packages curl) + #:use-module (gnu packages gawk) #:use-module (gnu packages dejagnu) #:use-module (gnu packages digest) #:use-module (gnu packages docbook) @@ -3659,3 +3661,46 @@ python bindings. It belongs to the Cura project from Ultimaker.") (description "Cura is a slicing software from Ultimaker. A @emph{slicer} generates G-Code for 3D printers.") (license license:lgpl3+))) + +(define-public xschem + (let ((commit "f574539e21b297fa3bcebd52114555e162a5fc56") + (revision "1")) + (package + (name "xschem") + (version (git-version "3.0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/StefanSchippers/xschem") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "129kj8m3wcf62plp74kml6pqwld4lnfmxy070a82lvj0rfiy77hb")))) + (native-inputs (list flex bison pkg-config)) + (inputs (list gawk + tcl + tk + libxpm + cairo + libxrender + libxcb)) ; Last 3 are optional, but good to have. + (build-system gnu-build-system) + (arguments + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'setenv + (lambda* (#:key outputs #:allow-other-keys) + (setenv "CC" ,(cc-for-target)) + (invoke "./configure" + (string-append "--prefix=" + (assoc-ref outputs "out")))))))) + (synopsis "Hierarchical schematic editor") + (description + "Xschem is an X11 schematic editor written in C and focused on +hierarchical and parametric design. It can generate VHDL, Verilog or Spice +netlists from the drawn schematic, allowing the simulation of the circuit.") + (home-page "https://xschem.sourceforge.io/stefan/index.html") + (license license:gpl2+)))) -- cgit v1.2.3 From fda20f14f0e14f0a5b70408ac8419889c133d5d4 Mon Sep 17 00:00:00 2001 From: Peter Polidoro Date: Wed, 4 May 2022 16:10:23 -0400 Subject: gnu: kicad: Update to 6.0.5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/engineering.scm (kicad): Update to 6.0.5. Signed-off-by: Ludovic Courtès --- gnu/packages/engineering.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 0ef1870a50..95313daa63 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -941,7 +941,7 @@ Emacs).") (define-public kicad (package (name "kicad") - (version "6.0.4") + (version "6.0.5") (source (origin (method git-fetch) (uri (git-reference @@ -949,7 +949,7 @@ Emacs).") (commit version))) (sha256 (base32 - "0lki59ws0ncqkp9wxrhyni1ck2sx5z07mmpkjg0d9jpkync9hx9y")) + "19mg672h1gjdvnkp13cpkhk67xpwms72y4gd6g8983fcsxr8nq23")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments @@ -1056,7 +1056,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.") (file-name (git-file-name name version)) (sha256 (base32 - "0p3ypfs11ck2w7dmqiy763krpj0slan4jvpzxs6z1473gdpbzgbs")))) + "190pnrf2cy06wnnskyb4fqj4a4nfmz17i3y79rnrz3j62h3fmg0w")))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DBUILD_FORMATS=html") @@ -1090,7 +1090,7 @@ electrical diagrams), gerbview (viewing Gerber files) and others.") (file-name (git-file-name name version)) (sha256 (base32 - "12lyc187337bf2frl3jvwqdwwnd69f7l414k3kxhccs3sa2mcf1y")))) + "1dhgdp08ah08fc5nvwkqmgpl2any9vgy1gykmyzsd4dl8hhvznh5")))) (build-system cmake-build-system) (arguments `(#:tests? #f)) ; no tests exist @@ -1119,7 +1119,7 @@ libraries.") (file-name (git-file-name name version)) (sha256 (base32 - "0px2g9jansky0rvc0bdjylbmv8xwhc0q63g88hd2nzbknqli9f1y")))) + "0sxzd4dr1g12ck8b2wsyg9r2s1j3472nksrjrwpzjdyfc8rqbjai")))) (synopsis "Official KiCad footprint libraries") (description "This package contains the official KiCad footprint libraries."))) @@ -1136,7 +1136,7 @@ libraries.") (file-name (git-file-name name version)) (sha256 (base32 - "0ms9py93qyihxrhh9wm2ziycmdn88m36r8adx22ynjnxixw1f9ja")))) + "00i6mybg3pprzb283b26z5b2g7a8sbghlvc0fwk9gwrp3wz1yqzc")))) (synopsis "Official KiCad 3D model libraries") (description "This package contains the official KiCad 3D model libraries."))) -- cgit v1.2.3 From 0932e97637c785010bc69411a261655a2f38ba72 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 3 May 2022 16:31:25 +0000 Subject: gnu: poke: Update to 2.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/engineering.scm (poke): Update to 2.3. Signed-off-by: Ludovic Courtès --- gnu/packages/engineering.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 95313daa63..fe9e06e05a 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -32,6 +32,7 @@ ;;; Copyright © 2022 Peter Polidoro ;;; Copyright © 2022 Malte Frank Gerdes ;;; Copyright © 2022 Konstantinos Agiannis +;;; Copyright © 2022 Greg Hogan ;;; ;;; This file is part of GNU Guix. ;;; @@ -2803,13 +2804,13 @@ GUI.") (define-public poke (package (name "poke") - (version "2.1") + (version "2.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/poke/poke-" version ".tar.gz")) (sha256 - (base32 "0w168jcjahl3jawkhnh0dc10mcw4nwv4yawwc8xhqm5w3dn8wlnd")) + (base32 "0rn7ph7fvbwasf7jhai122sniqjkw81p0kvbxjlv6z6s2q8wz41n")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From b1cfd39d0164bcbd6aa97672eb87bad234de6ca4 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Wed, 18 May 2022 18:31:25 +0200 Subject: gnu: freecad: Fix build. * gnu/packages/engineering.scm (freecad)[inputs]: Add fontconfig. --- gnu/packages/engineering.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index fe9e06e05a..7d44789578 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2468,6 +2468,7 @@ comments."))) coin3D double-conversion eigen + fontconfig freetype gl2ps glew -- cgit v1.2.3 From 362be0b7f8715c259f144f24d498b0b99ffc75e4 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 May 2022 02:00:03 +0200 Subject: gnu: asco: Update to 0.4.11. * gnu/packages/engineering.scm (asco): Update to 0.4.11. [arguments]: Don't explicitly return #t from phases. --- gnu/packages/engineering.scm | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 7d44789578..47422dd97d 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1732,14 +1732,14 @@ it suitable for security research and analysis.") (define-public asco (package (name "asco") - (version "0.4.10") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/asco/asco/" version "/ASCO-" - version ".tar.gz")) - (sha256 - (base32 - "119rbc2dc8xzwxvykgji0v0nrzvymjmlizr1bc2mihspj686kxsl")))) + (version "0.4.11") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/asco/asco/" version "/ASCO-" + version ".tar.gz")) + (sha256 + (base32 "0ggxv0p1zmfbvd1k17p2j1cskbjsa83fansz8ihxn7ax9qdicljv")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests @@ -1756,8 +1756,7 @@ it suitable for security research and analysis.") (("nice") (string-append coreutils "/bin/nice"))) (substitute* "Makefile" - (("/bin/mpicc") (which "mpicc"))) - #t))) + (("/bin/mpicc") (which "mpicc")))))) (replace 'install ; no install target (lambda* (#:key outputs #:allow-other-keys) (for-each (lambda (file) @@ -1765,8 +1764,7 @@ it suitable for security research and analysis.") (assoc-ref outputs "out") "/bin"))) '("asco" "asco-mpi" "asco-test" - "tools/alter/alter" "tools/log/log")) - #t))))) + "tools/alter/alter" "tools/log/log"))))))) (native-inputs `(("mpi" ,openmpi))) (inputs -- cgit v1.2.3 From 182956b99d1263385e10cc0d43c8b10a2e0ff9c6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 May 2022 02:00:03 +0200 Subject: gnu: asco: Use SEARCH-INPUT-FILE. * gnu/packages/engineering.scm (asco)[arguments]: Use SEARCH-INPUT-FILE. --- 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 47422dd97d..d19fde7ca4 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1751,10 +1751,10 @@ it suitable for security research and analysis.") (lambda* (#:key inputs #:allow-other-keys) (let ((coreutils (assoc-ref inputs "coreutils-minimal"))) (substitute* '("errfunc.c" "asco.c") - (("cp ") - (string-append coreutils "/bin/cp ")) - (("nice") - (string-append coreutils "/bin/nice"))) + (("(cp|nice) " _ command) + (string-append + (search-input-file inputs (string-append "bin/" command)) + " "))) (substitute* "Makefile" (("/bin/mpicc") (which "mpicc")))))) (replace 'install ; no install target -- cgit v1.2.3 From a170622d200fba766f36ec1dfd78bbbfe69ca287 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 22 May 2022 02:00:01 +0200 Subject: gnu: libngspice: Update to 37. * gnu/packages/engineering.scm (libngspice): Update to 37. [arguments]: Remove old "--with-readline=no" work-around from #:configure-flags. --- gnu/packages/engineering.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index d19fde7ca4..dc902ef40f 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1782,7 +1782,7 @@ high-performance parallel differential evolution (DE) optimization algorithm.") ;; See . (package (name "libngspice") - (version "36") + (version "37") (source (origin (method url-fetch) @@ -1793,7 +1793,7 @@ high-performance parallel differential evolution (DE) optimization algorithm.") "old-releases/" version "/ngspice-" version ".tar.gz"))) (sha256 - (base32 "133za6m9grpnnlb46sijkda7ky41mrbvfdb60i0m695sxy3q50ag")))) + (base32 "1gpcic6b6xk3g4956jcsqljf33kj5g43cahmydq6m8rn39sadvlv")))) (build-system gnu-build-system) (arguments `(;; No tests for libngspice exist. @@ -1819,10 +1819,7 @@ high-performance parallel differential evolution (DE) optimization algorithm.") (list "--enable-openmp" "--enable-ciderlib" "--enable-xspice" - "--with-ngshared" - ;; Readline must be disabled to build KiCad with ngspice 34. See - ;; https://bugs.archlinux.org/task/70563 for reference. - "--with-readline=no"))) + "--with-ngshared"))) (native-inputs (list bison flex)) (inputs -- cgit v1.2.3 From 766af488846fdb9ba44641a15758b46d4ea2fb0d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 29 Apr 2022 17:33:33 -0400 Subject: gnu: Remove python2-capstone. * gnu/packages/engineering.scm (python2-capstone): Delete variable. --- gnu/packages/engineering.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/engineering.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index dc902ef40f..6b11fc54f0 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -1647,9 +1647,6 @@ bindings for Python, Java, OCaml and more.") (string-append "'" (assoc-ref %build-inputs "capstone") "/lib',\n"))) #t))))))) -(define-public python2-capstone - (package-with-python2 python-capstone)) - (define-public python-esptool-3.0 (package -- cgit v1.2.3