From 856b67f3021d1c764ef30b5a166edfb4244d9cad Mon Sep 17 00:00:00 2001 From: Matthew James Kraai Date: Thu, 20 Oct 2022 20:16:00 -0700 Subject: gnu: s3cmd: Fix program name in output. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (s3cmd)[arguments]: Add a new 'hide-wrapping phase. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e3d1ac05fa7..c5ab9280eb2 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -16395,6 +16395,15 @@ the same purpose: to provide Python bindings for libmagic.") (sha256 (base32 "0rdgwwmmp8mdxc84bxq6k9a7v7z2qgc3df47djzs2b84gw81dglx")))) (build-system python-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'hide-wrapping + (lambda _ + (substitute* "S3/MultiPart.py" + (("sys\\.argv\\[0\\]") "\"s3cmd\"")) + (substitute* "s3cmd" + (("optparser\\.get_prog_name\\(\\)") "\"s3cmd\""))))))) (inputs (list python-dateutil python-magic)) -- cgit v1.3 From a4ea82b671c7841cdf1e3417723e27fdac26f598 Mon Sep 17 00:00:00 2001 From: Ontje Lünsdorf Date: Fri, 11 Nov 2022 21:09:21 +0100 Subject: gnu: python-check-manifest: Relax git security settings in tests. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/python-xyz.scm (python-check-manifest)[arguments]: Allow git submodule commands via file protocol during testing. Signed-off-by: Ludovic Courtès --- gnu/packages/python-xyz.scm | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c5ab9280eb2..975b6983741 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -25584,6 +25584,17 @@ also be usable with other GSSAPI mechanisms.") (build-system python-build-system) (native-inputs (list python-mock git)) + (arguments + `(#:phases + (modify-phases %standard-phases + ;; Tests use git submodule commands over the file transport, which + ;; has been disabled in git, see CVE-2022-39253. Enable these + ;; commands to allow checks to succeed. + (add-before 'check 'allow-git-submodule-add + (lambda _ + (setenv "HOME" "/tmp") + (invoke "git" "config" "--global" + "protocol.file.allow" "always")))))) (home-page "https://github.com/mgedmin/check-manifest") (synopsis "Check MANIFEST.in in a Python source package for completeness") (description "Python package can include a MANIFEST.in file to help with -- cgit v1.3 From 67da1426226f591cf4bec95aabf2e8b607e73d10 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Fri, 18 Nov 2022 09:13:16 +0100 Subject: gnu: Remove obsolete variable. * gnu/packages/python-xyz.scm (python-packaging-next): Remove variable. * gnu/packages/openstack.scm (python-oslo.utils)[propagated-inputs]: Change from PYTHON-PACKAGING-NEXT to PYTHON-PACKAGING. --- gnu/packages/openstack.scm | 2 +- gnu/packages/python-xyz.scm | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index dd13404c877..169df27f7c7 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -769,7 +769,7 @@ for debugging, and better support for mocking results.") python-netaddr python-netifaces python-pbr - python-packaging-next + python-packaging python-pyparsing python-pytz)) (native-inputs diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 975b6983741..f91662713c0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -20252,19 +20252,6 @@ while only declaring the test-specific fields.") ;; licenses. (license (list license:asl2.0 license:bsd-2)))) -;; TODO(staging): merge with python-packaging-bootstrap. -(define-public python-packaging-next - (package - (inherit python-packaging) - (version "21.3") - (source - (origin - (method url-fetch) - (uri (pypi-uri "packaging" version)) - (sha256 - (base32 - "1sygirdrqgv4f1ckh9nhpcw1yfidrh3qjl86wq8vk6nq4wlw8iyx")))))) - (define-public python-relatorio (package (name "python-relatorio") -- cgit v1.3 From 273988e94c6f87f554e552c11b09cab65897e081 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 19 Nov 2022 08:26:32 +0100 Subject: gnu: python-check-manifest: Use the 'fixed' git for tests. * gnu/packages/python-xyz.scm (python-check-manifest)[native-inputs]: Change from GIT to GIT-MINIMAL/FIXED. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f91662713c0..0daeb3c0fa5 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -25569,8 +25569,6 @@ also be usable with other GSSAPI mechanisms.") (base32 "0lk45ifdv2cpkl6ayfyix7jwmnxa1rha7xvb0ih5999k115wzqs4")))) (build-system python-build-system) - (native-inputs - (list python-mock git)) (arguments `(#:phases (modify-phases %standard-phases @@ -25582,6 +25580,8 @@ also be usable with other GSSAPI mechanisms.") (setenv "HOME" "/tmp") (invoke "git" "config" "--global" "protocol.file.allow" "always")))))) + (native-inputs + (list python-mock git-minimal/fixed)) (home-page "https://github.com/mgedmin/check-manifest") (synopsis "Check MANIFEST.in in a Python source package for completeness") (description "Python package can include a MANIFEST.in file to help with -- cgit v1.3 From a048eeef57e875759b0a8f707ab76356a701b9b8 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 19 Nov 2022 08:46:03 +0100 Subject: gnu: python-check-manifest: Update to 0.48.0. * gnu/packages/python-xyz.scm (python-check-manifest): Update to 0.48.0. [build-system]: Change to PYPROJECT-BUILD-SYSTEM. [arguments]: Add #:test-flags. [native-inputs]: Remove PYTHON-MOCK. Add PYTHON-PYTEST. [propagated-inputs]: Add PYTHON-PYPA-BUILD, PYTHON-SETUPTOOLS, and PYTHON-TOMLI. --- gnu/packages/python-xyz.scm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0daeb3c0fa5..93e17c3f1ac 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -25560,17 +25560,20 @@ also be usable with other GSSAPI mechanisms.") (define-public python-check-manifest (package (name "python-check-manifest") - (version "0.37") + (version "0.48") (source (origin (method url-fetch) (uri (pypi-uri "check-manifest" version)) (sha256 (base32 - "0lk45ifdv2cpkl6ayfyix7jwmnxa1rha7xvb0ih5999k115wzqs4")))) - (build-system python-build-system) + "0my6ammldi8mddrbq798qxbl90qr8nlk7gzliq3v7gp7mlfmymrv")))) + (build-system pyproject-build-system) (arguments - `(#:phases + '(;; This test requires setting up a venv which does not work + ;; properly in the build environment. + #:test-flags '("-k" "not test_build_sdist_pep517_isolated") + #:phases (modify-phases %standard-phases ;; Tests use git submodule commands over the file transport, which ;; has been disabled in git, see CVE-2022-39253. Enable these @@ -25581,7 +25584,9 @@ also be usable with other GSSAPI mechanisms.") (invoke "git" "config" "--global" "protocol.file.allow" "always")))))) (native-inputs - (list python-mock git-minimal/fixed)) + (list git-minimal/fixed python-pytest)) + (propagated-inputs + (list python-pypa-build python-setuptools python-tomli)) (home-page "https://github.com/mgedmin/check-manifest") (synopsis "Check MANIFEST.in in a Python source package for completeness") (description "Python package can include a MANIFEST.in file to help with -- cgit v1.3 From bd0ff2d39bc7d3b497d74c3431ef77a1cf2515c4 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 19 Nov 2022 18:06:36 +0100 Subject: gnu: Remove coin3D@3. * gnu/packages/graphics.scm (coin3D): Take the body from ... (coin3D-4): ... this now-deprecated variable. * gnu/packages/engineering.scm (freecad)[inputs]: Change from COIN3D-4 to COIN3D. * gnu/packages/python-xyz.scm (python-pivy)[inputs]: Likewise. * gnu/packages/qt.scm (soqt)[inputs]: Likewise. --- gnu/packages/engineering.scm | 2 +- gnu/packages/graphics.scm | 118 ++++++++++++++----------------------------- gnu/packages/python-xyz.scm | 2 +- gnu/packages/qt.scm | 2 +- 4 files changed, 40 insertions(+), 84 deletions(-) (limited to 'gnu/packages/python-xyz.scm') diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 6388c641017..21569b07c9f 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -2463,7 +2463,7 @@ comments."))) swig)) (inputs (list boost - coin3D-4 + coin3D double-conversion eigen fontconfig diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 54637fa55a6..60c6a979c59 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -134,6 +134,7 @@ #:use-module (guix hg-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix deprecation) #:use-module (guix utils)) (define-public mmm @@ -1799,102 +1800,57 @@ or by subtracting one shape from the other.") (license license:gpl2)))) (define-public coin3D - ;; The ‘4.0.0’ zip archive isn't stable, nor in fact a release. See: - ;; https://bitbucket.org/Coin3D/coin/issues/179/coin-400-srczip-has-been-modified - (let ((revision 1) - (changeset "ab8d0e47a4de3230a8137feb39c142d6ba45f97d")) - (package - (name "coin3D") - (version - (simple-format #f "3.1.3-~A-~A" revision (string-take changeset 7))) - (source - (origin - (method hg-fetch) - (uri (hg-reference - (url "https://bitbucket.org/Coin3D/coin") - (changeset changeset))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1ff44jz6lg4rylljvy69n1hcjh9y6achbv9jpn1cv2sf8cxn3r2j")) - (modules '((guix build utils))) - (snippet - '(begin - (for-each delete-file - '("cfg/csubst.exe" - "cfg/wrapmsvc.exe")) - #t)))) - (build-system cmake-build-system) - (native-inputs - (list doxygen graphviz)) - (inputs - (list boost freeglut glew)) - (arguments - `(#:configure-flags - (list - "-DCOIN_BUILD_DOCUMENTATION_MAN=ON" - (string-append "-DBOOST_ROOT=" - (assoc-ref %build-inputs "boost"))))) - (home-page "https://bitbucket.org/Coin3D/coin/wiki/Home") - (synopsis - "High-level 3D visualization library with Open Inventor 2.1 API") - (description - "Coin is a 3D graphics library with an Application Programming Interface -based on the Open Inventor 2.1 API. For those who are not familiar with -Open Inventor, it is a scene-graph based retain-mode rendering and model -interaction library, written in C++, which has become the de facto -standard graphics library for 3D visualization and visual simulation -software in the scientific and engineering community.") - (license license:bsd-3)))) - -(define-public coin3D-4 - (package + (package (name "coin3D") (version "4.0.0") (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/coin3d/coin") - (commit (string-append "Coin-" version)) - (recursive? #t))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1ayg0hl8wanhadahm5xbghghxw1qjwqbrs3dl3ngnff027hsyf8p")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Delete binaries - (for-each delete-file - '("cfg/csubst.exe" - "cfg/wrapmsvc.exe")) - ;; Delete references to packaging tool cpack. Otherwise the build - ;; fails with "add_subdirectory given source "cpack.d" which is not - ;; an existing directory." - (substitute* "CMakeLists.txt" - ((".*cpack.d.*") "")) - #t)))) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/coin3d/coin") + (commit (string-append "Coin-" version)) + (recursive? #t))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ayg0hl8wanhadahm5xbghghxw1qjwqbrs3dl3ngnff027hsyf8p")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Delete binaries + (for-each delete-file + '("cfg/csubst.exe" + "cfg/wrapmsvc.exe")) + ;; Delete references to packaging tool cpack. Otherwise the build + ;; fails with "add_subdirectory given source "cpack.d" which is not + ;; an existing directory." + (substitute* "CMakeLists.txt" + ((".*cpack.d.*") "")) + #t)))) (build-system cmake-build-system) (native-inputs - (list doxygen graphviz)) + (list doxygen graphviz)) (inputs - (list boost freeglut glew)) + (list boost freeglut glew)) (arguments - `(#:configure-flags - (list - "-DCOIN_BUILD_DOCUMENTATION_MAN=ON" - (string-append "-DBOOST_ROOT=" - (assoc-ref %build-inputs "boost"))))) + `(#:configure-flags + (list + "-DCOIN_BUILD_DOCUMENTATION_MAN=ON" + (string-append "-DBOOST_ROOT=" + (assoc-ref %build-inputs "boost"))))) (home-page "https://github.com/coin3d/coin") (synopsis - "High-level 3D visualization library with Open Inventor 2.1 API") + "High-level 3D visualization library with Open Inventor 2.1 API") (description - "Coin is a 3D graphics library with an Application Programming Interface + "Coin is a 3D graphics library with an Application Programming Interface based on the Open Inventor 2.1 API. For those who are not familiar with Open Inventor, it is a scene-graph based retain-mode rendering and model interaction library, written in C++, which has become the de facto standard graphics library for 3D visualization and visual simulation software in the scientific and engineering community.") - (license license:bsd-3))) + (license license:bsd-3))) + +(define-deprecated coin3D-4 coin3D) +(export coin3D-4) (define-public skia ;; Releases follow those of Chromium, about every 6 weeks. The release diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 93e17c3f1ac..b0bf16e3dab 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -28118,7 +28118,7 @@ used to retry a function a given number of times.") libice soqt glew - coin3D-4)) + coin3D)) (home-page "https://github.com/coin3d/pivy") (synopsis "Python bindings to Coin3D") (description diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 8ad9dd4cc0d..5ed8ec2c8ec 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -4234,7 +4234,7 @@ data.") (native-inputs (list pkg-config cmake)) (inputs - (list qtbase-5 coin3D-4)) + (list qtbase-5 coin3D)) (home-page "https://github.com/coin3d/soqt") (synopsis "Qt GUI component toolkit library for Coin") (description "SoQt is a Qt GUI component toolkit library for Coin. It is -- cgit v1.3