diff options
| -rw-r--r-- | gnu/packages/algebra.scm | 23 | ||||
| -rw-r--r-- | gnu/packages/audio.scm | 69 | ||||
| -rw-r--r-- | gnu/packages/avr-xyz.scm | 10 | ||||
| -rw-r--r-- | gnu/packages/cdrom.scm | 98 | ||||
| -rw-r--r-- | gnu/packages/cups.scm | 26 | ||||
| -rw-r--r-- | gnu/packages/emulators.scm | 10 | ||||
| -rw-r--r-- | gnu/packages/file-systems.scm | 87 | ||||
| -rw-r--r-- | gnu/packages/finance.scm | 123 | ||||
| -rw-r--r-- | gnu/packages/graphviz.scm | 11 | ||||
| -rw-r--r-- | gnu/packages/image-viewers.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/machine-learning.scm | 53 | ||||
| -rw-r--r-- | gnu/packages/mate.scm | 226 | ||||
| -rw-r--r-- | gnu/packages/maths.scm | 14 | ||||
| -rw-r--r-- | gnu/packages/music.scm | 23 | ||||
| -rw-r--r-- | gnu/packages/patches/dolphin-emu-unbundle-tinygltf.patch | 67 | ||||
| -rw-r--r-- | gnu/packages/patches/dolphin-emu-unbundle-watcher.patch | 56 | ||||
| -rw-r--r-- | gnu/packages/prolog.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/python-check.scm | 38 | ||||
| -rw-r--r-- | gnu/packages/python-compression.scm | 19 | ||||
| -rw-r--r-- | gnu/packages/python-crypto.scm | 31 | ||||
| -rw-r--r-- | gnu/packages/python-web.scm | 42 | ||||
| -rw-r--r-- | gnu/packages/python-xyz.scm | 81 | ||||
| -rw-r--r-- | gnu/packages/tls.scm | 112 | ||||
| -rw-r--r-- | gnu/packages/version-control.scm | 13 |
24 files changed, 644 insertions, 595 deletions
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 83572e2fc6..313bb36dd0 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -401,7 +401,7 @@ precision.") (define-public giac (package (name "giac") - (version "1.9.0-998") + (version "2.0.0-10") (source (origin (method url-fetch) @@ -413,7 +413,7 @@ precision.") "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/" "stable/main/source/giac_" version ".tar.gz")) (sha256 - (base32 "1r71kl21xxf3872r0q25r2b9wpg03zrp08rsnpyqrhajmxb0ljbz")))) + (base32 "1lzb0jjmkg5ml1qfl0m00qqng4sxgfqwrbq10gpkp4b301k2ckv1")))) (build-system gnu-build-system) (arguments (list @@ -428,12 +428,12 @@ precision.") (substitute* (cons "micropython-1.12/xcas/Makefile" (find-files "doc" "^Makefile")) (("/bin/cp") (which "cp"))))) - (add-after 'unpack 'disable-failing-test - ;; FIXME: Tests failing. Not sure why. - (lambda _ - (substitute* "check/Makefile.in" - (("chk_fhan(4|11)") "") - (("chk_fhan(14|21)") "")))) ;fail specifically on i686 + (replace 'bootstrap + (lambda _ + ;; XXX: Regenerate "src/mkjs" to avoid a build error because + ;; the default file is bogus in a Guix environment. + (delete-file "src/mkjs") + (invoke "autoreconf" "-vfi"))) (add-after 'install 'fix-doc (lambda _ ;; Most French documentation has a non-commercial license, so we @@ -454,7 +454,7 @@ precision.") ;; TODO: Unbundle "libmicropython.a". (list ao fltk-1.3 - glpk-4 + glpk gmp gsl libjpeg-turbo @@ -474,9 +474,12 @@ precision.") perl tcsh)) (native-inputs - (list bison + (list autoconf + automake + bison flex hevea + libtool python-wrapper readline (texlive-local-tree))) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 153eed9d9a..95c0de66eb 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -50,6 +50,7 @@ ;;; Copyright © 2024 mio <stigma@disroot.org> ;;; Copyright © 2024 Nikita Domnitskii <nikita@domnitskii.me> ;;; Copyright © 2024 Roman Scherer <roman@burningswell.com> +;;; Copyright © 2024 Sughosha <sughosha@disroot.org> ;;; Copyright © 2025 Junker <dk@junkeria.club> ;;; Copyright © 2025 Sughosha <sughosha@disroot.org> ;;; Copyright © 2025 Andrew Wong <wongandj@icloud.com> @@ -3473,16 +3474,28 @@ provided by Pipewire.") (define-public python-pyaudio (package (name "python-pyaudio") - (version "0.2.12") + (version "0.2.14") (source (origin (method url-fetch) (uri (pypi-uri "PyAudio" version)) (sha256 - (base32 "17pvc27pn2xbisbq7nibhidyw8h2kyms7g2xbyx7nlxwfbdzbpam")))) - (build-system python-build-system) - (inputs - (list portaudio)) + (base32 "11rgpnahh2kr3x4plr0r7kpccmbplm35cj669wglv6dlg4wgzpvq")))) + (build-system pyproject-build-system) + (arguments + (list + ;; XXX: Most tests require access to devices. + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? test-flags #:allow-other-keys) + (when tests? + (setenv "PYTHONPATH" (string-append (getcwd) "/tests")) + (apply invoke "python" test-flags))))))) + (native-inputs + (list python-numpy python-setuptools python-wheel)) + (inputs (list portaudio)) (home-page "https://people.csail.mit.edu/hubert/pyaudio/") (synopsis "Bindings for PortAudio v19") (description "This package provides bindings for PortAudio v19, the @@ -3673,6 +3686,52 @@ one-dimensional sample-rate conversion library.") files.") (license license:expat))) +(define-public python-wavefile + (package + (name "python-wavefile") + (version "1.6.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "wavefile" version)) + (sha256 + (base32 "120r003xy0cv6a4d4cjxv140im007klgkvzfgc57m70rcbnggi7p")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + #~(list "-k" (string-join + ;; Assertion fail to compare files. + (list "not test_allFormats" + "test_commonFormats" + "test_majorFormats" + "test_subtypeFormats") + " and not ")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-libsndfile-path + (lambda _ + (substitute* "wavefile/libsndfile.py" + (("'libsndfile") + (string-append "'" #$(this-package-input "libsndfile") + "/lib/libsndfile")))))))) + (native-inputs + (list python-pytest + python-pytest-cov + python-setuptools-next)) + (inputs + (list libsndfile + portaudio)) + (propagated-inputs + (list python-numpy + python-pyaudio)) + (home-page "https://github.com/vokimon/python-wavefile") + (synopsis "Pythonic audio file reader and writer") + (description + "This package provides pythonic libsndfile wrapper to read and write audio +files.") + (license license:gpl3+))) + (define-public audio-to-midi (package (name "audio-to-midi") diff --git a/gnu/packages/avr-xyz.scm b/gnu/packages/avr-xyz.scm index c684b6183b..4a3571175e 100644 --- a/gnu/packages/avr-xyz.scm +++ b/gnu/packages/avr-xyz.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> -;;; Copyright © 2022 Artyom V. Poptsov <poptsov.artyom@gmail.com> +;;; Copyright © 2022, 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. @@ -34,6 +34,7 @@ #:use-module (gnu packages bash) #:use-module (gnu packages check) #:use-module (gnu packages compression) + #:use-module (gnu packages gcc) #:use-module (gnu packages avr) #:use-module (gnu packages documentation) #:use-module (gnu packages elf) @@ -64,6 +65,13 @@ #:tests? #f #:phases #~(modify-phases %standard-phases (delete 'configure) + (add-after 'unpack 'disable-shared-library + (lambda _ + ;; XXX: "libsimavr.so"" fails to build due to a linker + ;; error. Disable the shared library for now. + (substitute* "simavr/Makefile" + (("ifeq \\(\\$\\{shell uname\\}, Linux\\)") + "ifeq (1, 0)")))) (replace 'check (lambda* (#:key tests? outputs #:allow-other-keys) (when tests? diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm index bcfdc26778..d20cbf31e0 100644 --- a/gnu/packages/cdrom.scm +++ b/gnu/packages/cdrom.scm @@ -717,69 +717,44 @@ from an audio CD.") (name "abcde") (version "2.9.3") (home-page "https://abcde.einval.com/") - (source (origin - (method url-fetch) - (uri (string-append home-page "/download/abcde-" - version ".tar.gz")) - (sha256 - (base32 - "091ip2iwb6b67bhjsj05l0sxyq2whqjycbzqpkfbpm4dlyxx0v04")) - (modules '((guix build utils))) - (snippet - '(begin - (substitute* "Makefile" - (("/usr/bin/install") - "install")))))) + (source + (origin + (method url-fetch) + (uri (string-append home-page "/download/abcde-" version ".tar.gz")) + (sha256 + (base32 "091ip2iwb6b67bhjsj05l0sxyq2whqjycbzqpkfbpm4dlyxx0v04")))) (build-system gnu-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'configure - (lambda* (#:key outputs inputs #:allow-other-keys) - (substitute* "Makefile" - (("^prefix = .*$") - (string-append "prefix = " - (assoc-ref outputs "out") - "\n")) - (("^sysconfdir = .*$") - (string-append "sysconfdir = " - (assoc-ref outputs "out") - "/etc/\n"))))) - (add-after 'install 'wrap - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((wget (assoc-ref inputs "wget")) - (vorbis (assoc-ref inputs "vorbis-tools")) - (parano (assoc-ref inputs "cdparanoia")) - (which (assoc-ref inputs "which")) - (discid (assoc-ref inputs "cd-discid")) - (perl-discid (assoc-ref inputs "perl-musicbrainz-discid")) - (perl-ws (assoc-ref inputs "perl-webservice-musicbrainz")) - (perl-mojo (assoc-ref inputs "perl-mojolicious")) - (flac (assoc-ref inputs "flac")) - (out (assoc-ref outputs "out"))) - (define (wrap file) - (wrap-program file - `("PATH" ":" prefix - (,(string-append out "/bin:" - wget "/bin:" - flac "/bin:" - which "/bin:" - vorbis "/bin:" - discid "/bin:" - parano "/bin"))) - `("PERL5LIB" ":" prefix - (,(string-append perl-discid - "/lib/perl5/site_perl:" - perl-ws - "/lib/perl5/site_perl:" - perl-mojo - "/lib/perl5/site_perl"))))) - - (for-each wrap - (find-files (string-append out "/bin") - ".*")))))) - #:tests? #f)) ; no test target - + (list + #:tests? #f ; No test target. + #:modules `((guix build gnu-build-system) + (guix build utils) + (srfi srfi-26)) + #:make-flags + #~(list (string-append "INSTALL=" + #$(this-package-native-input "coreutils-minimal") + "/bin/install -c") + (string-append "prefix = " #$output) + (string-append "sysconfdir = " #$output "/etc/")) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-after 'install 'wrap + (lambda* (#:key inputs #:allow-other-keys) + (for-each + (cut wrap-program <> + `("PATH" ":" prefix + ,(map (compose dirname (cut search-input-file inputs <>)) + (list "/bin/wget" + "/bin/flac" + "/bin/which" + "/bin/ogginfo" + "/bin/cd-discid" + "/bin/cdparanoia"))) + `("PERL5LIB" ":" prefix + (,(getenv "PERL5LIB")))) + (find-files (string-append #$output "/bin")))))))) + (native-inputs (list coreutils-minimal)) (inputs (list bash-minimal wget which @@ -793,7 +768,6 @@ from an audio CD.") ;; A couple of Python and Perl scripts are included. python perl)) - (synopsis "Command-line audio CD ripper") (description "abcde is a front-end command-line utility (actually, a shell script) diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 8322818b77..e448e68090 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm @@ -53,6 +53,7 @@ #:use-module (gnu packages polkit) #:use-module (gnu packages pretty-print) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages scanner) @@ -61,6 +62,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system meson) #:use-module (guix build-system python) + #:use-module (guix build-system pyproject) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix gexp) @@ -1078,20 +1080,24 @@ obtained and installed separately.") (define-public python-pycups (package (name "python-pycups") - (version "2.0.1") + (version "2.0.4") (source (origin - (method url-fetch) - (uri (pypi-uri "pycups" version ".tar.bz2")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/zdohnal/pycups") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "140c7073bkhx8w9qpaynllhynkkg0rzj3a4wjh9fnj15yvjlqhsp")))) - (build-system python-build-system) + (base32 "1fx2b04wr9mv87lxk8jpglkyaqwj7bhlj6hnai0dji3jm503dqlb")))) + (build-system pyproject-build-system) (arguments - '(;; Tests require CUPS to be running - #:tests? #f)) - (inputs - (list cups)) + (list + ;; XXX: Tests require CUPS to be running, a cups configuration, and + ;; access to associated printers. + #:tests? #f)) + (inputs (list cups)) + (native-inputs (list python-setuptools python-wheel)) (home-page "https://github.com/zdohnal/pycups") (synopsis "Python bindings for libcups") (description diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 7c8202dd71..b456507324 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -468,10 +468,10 @@ It aims to support Nintendo DSi and 3DS as well.") "rangeset" "rcheevos") ;submodule (with-directory-excursion "Externals" + ;; Note: Not copying implot sources here, which would + ;; introduce a top-level circular dependency. (copy-recursively #$dolphin-rcheevos-submodule - "rcheevos/rcheevos") - (copy-recursively #$(package-source implot) - "implot/implot")) + "rcheevos/rcheevos")) (for-each delete-file (find-files @@ -495,6 +495,10 @@ It aims to support Nintendo DSi and 3DS as well.") (guix build utils)) #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'copy-implot-source + (lambda _ + (copy-recursively #$(package-source implot) + "Externals/implot/implot"))) (add-before 'configure 'generate-fonts&hardcode-libvulkan-path (lambda* (#:key inputs #:allow-other-keys) (let ((fontfile diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 7408389b91..236cdbf960 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -2496,38 +2496,59 @@ filtering and ordering functionality. (license license:gpl3+))) (define-public watcher - (package - (name "watcher") - (version "0.13.6") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/e-dant/watcher") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1ikcdskb3z3wggxb12vi0y3rng2hcswl0fpk6sjqqlz34nvwijcr")))) - (build-system cmake-build-system) - (arguments - (list #:configure-flags - #~(list "-DBUILD_TESTING=ON" - ;; This is needed to find 'snitch' from the system. - "-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS") - #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (setenv "PATH" (string-append (getcwd) ":" (getenv "PATH"))) - (substitute* "../source/tool/test/.ctx" - (("../../out") - "../../../build") - (("which") "command -v")) - (invoke "../source/tool/test/all")))))) - (native-inputs (list jq snitch)) - (home-page "https://github.com/e-dant/watcher") - (synopsis "File system watcher program and library") - (description "Watcher may be used as a library or a program that can be + (let ((commit "0aff9ee86f0b62f17d7b0105cae6304ef1bcfbb2") + (revision "0")) + (package + (name "watcher") + (version (git-version "0.13.6" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/e-dant/watcher") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "10bwdqnhgpsk2w60331npspkqjvdgb0jh2by89g8d3hwfjibk3p4")))) + (build-system cmake-build-system) + (arguments + (list + ;; The test suite is currently flaky + ;; (see: https://github.com/e-dant/watcher/issues/85). + #:tests? #f + #:configure-flags + #~(list "-DBUILD_TESTING=ON" + ;; This is needed to find 'snitch' from the system. + "-DFETCHCONTENT_TRY_FIND_PACKAGE_MODE=ALWAYS") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-.pc-files-prefix + ;; There are some issues with the new .pc files (see: + ;; <https://github.com/e-dant/watcher/issues/82>). + (lambda _ + (substitute* "CMakeLists.txt" + (("\"\\$\\{CMAKE_INSTALL_LIBDIR}\"") + "\"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}\"") + (("\\$\\{CMAKE_INSTALL_INCLUDEDIR}/wtr") + "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/wtr")) + (substitute* "watcher.pc.in" + (("@PC_WATCHER_PREFIX@") + #$output)) + (substitute* "watcher-c/watcher-c.pc.in" + (("@PC_LIBWATCHER_C_PREFIX@") + #$output)))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "PATH" (string-append (getcwd) ":" (getenv "PATH"))) + (substitute* "../source/tool/test/.ctx" + (("../../out") + "../../../build")) + (invoke "../source/tool/test/all"))))))) + (native-inputs (list jq snitch)) + (home-page "https://github.com/e-dant/watcher") + (synopsis "File system watcher program and library") + (description "Watcher may be used as a library or a program that can be used to efficiently watch a file system for changes. This package provides the following components: @table @asis @@ -2540,4 +2561,4 @@ Command-line interface (CLI) @item @command{tw} Minimal, more human-readable CLI variant @end table") - (license license:expat))) + (license license:expat)))) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 205f252b7d..3da97f5b4b 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1001,28 +1001,35 @@ the Monero GUI client.") (license license:bsd-3))) (define-public python-bech32 - (package - (name "python-bech32") - (version "1.2.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "bech32" version)) - (sha256 - (base32 - "16fq5cfy5id9hp123ylhpl55pf38xwk0hv7sziqpig838qhvhvbx")))) - (build-system python-build-system) - (home-page "https://github.com/fiatjaf/bech32") - (synopsis "Reference implementation for Bech32 and Segwit addresses") - (description "This package provides a python reference implementation for + ;; XXX: No tags upstream. + (let ((commit "231e4d88b15f3dc8faf7d339f365b84f6ab5cbcc") + (revision "0")) + (package + (name "python-bech32") + (version (git-version "1.2.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fiatjaf/bech32") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0wq6q0yrw3x42d81v445xy4nh2qlrn7swsydgpv81dkay11kajrz")))) + (build-system pyproject-build-system) + (native-inputs (list python-setuptools python-wheel)) + (home-page "https://github.com/fiatjaf/bech32") + (synopsis "Reference implementation for Bech32 and Segwit addresses") + (description "This package provides a python reference implementation for Bech32 and segwit addresses.") - (license license:expat))) + (license license:expat)))) (define-public python-trezor-agent ;; It is called 'libagent' in pypi; i.e. this is the library as opposed to ;; the toplevel app called trezor-agent. (package (name "python-trezor-agent") - (version "0.14.7") + (version "0.15.0") (source (origin (method git-fetch) @@ -1031,22 +1038,21 @@ Bech32 and segwit addresses.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "04dds5bbw73nk36zm8d02qw6qr92nrlcf8r1cq8ba96mzi34jbk0")))) - (build-system python-build-system) + (base32 "09y55ys3x5krszh58yhl5gpdri0zrlhfld6psrmiyxfbp344asin")))) + (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'remove-requires-backports-shutil-which - ;; Remove requires on backport of shutil_which, as python 3.4+ has - ;; a built-in implementation supported in python-trezor-agent. - (lambda _ - (substitute* "setup.py" - (("'backports.shutil_which>=3.5.1',") "")))) - (delete 'check) - (add-after 'install 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest" "-v"))))))) + (list + #:test-flags + ;; XXX: Requires $HOME to be /run/user. + #~(list "-k" "not test_get_agent_sock_path") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-requires-backports-shutil-which + ;; Remove requires on backport of shutil_which, as python 3.4+ has + ;; a built-in implementation supported in python-trezor-agent. + (lambda _ + (substitute* "setup.py" + (("'backports.shutil_which>=3.5.1',") ""))))))) (propagated-inputs (list python-bech32 python-configargparse @@ -1064,7 +1070,9 @@ Bech32 and segwit addresses.") (native-inputs ; Only needed for running the tests (list gnupg python-mock - python-pytest)) + python-pytest + python-setuptools + python-wheel)) (home-page "https://github.com/romanz/trezor-agent") (synopsis "Use hardware wallets as SSH and GPG agent") (description @@ -1340,7 +1348,7 @@ the KeepKey Hardware Wallet.") (uri (origin-uri (package-source python-trezor-agent))) (file-name (git-file-name name version)) (sha256 - (base32 "04dds5bbw73nk36zm8d02qw6qr92nrlcf8r1cq8ba96mzi34jbk0")) + (base32 "09y55ys3x5krszh58yhl5gpdri0zrlhfld6psrmiyxfbp344asin")) (modules '((guix build utils) (ice-9 ftw) @@ -1360,45 +1368,40 @@ the KeepKey Hardware Wallet.") (scandir "./agents/trezor/" (negate (cut member <> '("." "..") string=)))) (delete-file-recursively "./agents") - ;; Without deleting ./contrib the sanity-check phase fails. Reported - ;; upstream as https://github.com/romanz/trezor-agent/issues/429. - (delete-file-recursively "./contrib") ;; Without deleting ./libagent setuptools complains as follows: ;; "error: Multiple top-level packages discovered in a flat-layout: ['contrib', 'libagent']." (delete-file-recursively "./libagent"))))) + (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'relax-requirements - (lambda _ - (substitute* "setup.py" - (("'trezor\\[hidapi]>=0.12.0,<0.13'") - "'trezor[hidapi]>=0.13'")))) - (add-after 'wrap 'fixup-agent-py - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out"))) - ;; The wrap phase also wraps trezor_agent.py (besides the - ;; public facing executable called trezor-agent). We need to - ;; undo that wrapping. The reason this is needed is that the - ;; python easy install generates a toplevel script (?) that - ;; messes with argv[0] and then re-opens the python - ;; module. This fails when the wrapped file is actually a shell - ;; script, not a python file. - (delete-file (string-append out "/bin/.trezor_agent.py-real")) - ;; Overwrite the wrapped one with the real thing. - (install-file "./trezor_agent.py" - (string-append out "/bin")))))))) - (build-system python-build-system) + (list + #:tests? #f ; No tests there. + #:phases + #~(modify-phases %standard-phases + (add-after 'wrap 'fixup-agent-py + (lambda _ + ;; The wrap phase also wraps trezor_agent.py (besides the public + ;; facing executable called trezor-agent). We need to undo that + ;; wrapping. The reason this is needed is that the python easy + ;; install generates a toplevel script (?) that messes with + ;; argv[0] and then re-opens the python module. This fails when + ;; the wrapped file is actually a shell script, not a python file. + (delete-file + (string-append #$output "/bin/.trezor_agent.py-real")) + ;; Overwrite the wrapped one with the real thing. + (install-file "./trezor_agent.py" + (string-append #$output "/bin"))))))) (inputs (list python-trezor python-trezor-agent)) (native-inputs ; Only needed for running the tests (list python-attrs python-bech32 - python-simple-rlp)) + python-simple-rlp + python-setuptools + python-wheel)) (home-page "https://github.com/romanz/trezor-agent") (synopsis "Using Trezor as hardware SSH/GPG agent") - (description "This package allows using Trezor as a hardware SSH/GPG -agent.") + (description + "This package allows using Trezor as a hardware SSH/GPG agent.") (license license:lgpl3))) (define-public keepkey-agent diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index 40a5cf7401..1e78a9de27 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -327,7 +327,7 @@ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(srcdir)/predicates_init.c \ (file-name (git-file-name name version)) (sha256 (base32 "1l34ahvcz90j3j7aspp9wqvxpq10mzgq7l0sanrj142ihdnbahvy")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments (list #:phases #~(modify-phases %standard-phases @@ -350,13 +350,12 @@ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(srcdir)/predicates_init.c \ (setenv "LD_LIBRARY_PATH" (dirname lib))))) ;; We wrap xdot, so that we don't propagate gtk+ and graphviz - (add-after 'install 'wrap + (replace 'wrap (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (graphviz (assoc-ref inputs "graphviz")) + (let ((graphviz (assoc-ref inputs "graphviz")) (gi-typelib-path (getenv "GI_TYPELIB_PATH")) (python-path (getenv "GUIX_PYTHONPATH"))) - (wrap-program (string-append out "/bin/xdot") + (wrap-program (string-append #$output "/bin/xdot") `("PATH" ":" prefix (,(string-append graphviz "/bin"))) `("GI_TYPELIB_PATH" ":" prefix @@ -381,6 +380,8 @@ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(srcdir)/predicates_init.c \ python-numpy python-pycairo python-pygobject + python-setuptools + python-wheel vulkan-loader)) (home-page "https://pypi.org/project/xdot/") (synopsis "Interactive viewer for graphviz dot files") diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index c06fb94bae..af80f441c7 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -1185,8 +1185,7 @@ synchronization of multiple instances.") (setenv "DISPLAY" ":0") (setenv "XDG_CACHE_HOME" (getcwd)) (setenv "HOME" (getcwd)) -; (invoke "xvfb-run" "python" "hydrus_test.py") - )) + (invoke "xvfb-run" "python" "hydrus_test.py"))) ;; XXX: program help files are not built. Updating ;; python-pymdown-extensions to its latest version might be the ;; solution, but this would require also packaging its new build diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 34dd73e32e..ea09fdb1be 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1501,37 +1501,25 @@ unsupervised text tokenizer.") (define-public python-sentence-transformers (package (name "python-sentence-transformers") - (version "3.0.1") + (version "5.1.0") (source (origin - (method url-fetch) - (uri (pypi-uri "sentence_transformers" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/UKPLab/sentence-transformers/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "1xmzbyrlp6wa7adf42n67c544db17nz95b10ri603lf4gi9jqgca")))) + (base32 + "1jkj77q25b21nxrdszvlw127jnx1m7x8czldiq2mfyj76yjk0ymj")))) (build-system pyproject-build-system) (arguments - (list - #:test-flags - '(list - ;; Missing fixture / train or test data. - ;; Requires internet access. - "--ignore=tests/test_sentence_transformer.py" - "--ignore=tests/test_train_stsb.py" - "--ignore=tests/test_compute_embeddings.py" - "--ignore=tests/test_cross_encoder.py" - "--ignore=tests/test_model_card_data.py" - "--ignore=tests/test_multi_process.py" - "--ignore=tests/test_pretrained_stsb.py" - "-k" (string-append - "not test_LabelAccuracyEvaluator" - " and not test_ParaphraseMiningEvaluator" - " and not test_cmnrl_same_grad" - " and not test_paraphrase_mining" - " and not test_simple_encode")))) + (list #:tests? #f)) ;network access is required (propagated-inputs (list python-huggingface-hub python-numpy python-pillow python-pytorch + python-typing-extensions python-scikit-learn python-scipy python-tqdm @@ -6669,22 +6657,25 @@ simple speech recognition.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/ideasman42/nerd-dictation") - (commit commit))) + (url "https://github.com/ideasman42/nerd-dictation") + (commit commit))) (file-name (git-file-name name version)) (sha256 (base32 "0frdpswv6w3cwj3c7wd5w8gj3s1hvpdwd48qhfhfxf7imahz9bqf")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ (chdir "package/python")))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "package/python")))))) + (native-inputs (list python-setuptools python-wheel)) (propagated-inputs (list python-vosk)) (home-page "https://github.com/ideasman42/nerd-dictation") (synopsis "Offline speech-to-text for desktop Linux") - (description "\ -This package provides simple access speech to text for using in + (description + "This package provides simple access speech to text for using in Linux without being tied to a desktop environment, using the @code{vosk-api}. The user configuration lets you manipulate text using Python string operations. It has zero overhead, as this relies on manual activation and diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index b0e9322b76..119fc5988a 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -27,13 +27,13 @@ (define-module (gnu packages mate) #:use-module ((guix licenses) #:prefix license:) - #:use-module (guix packages) + #:use-module (guix build-system glib-or-gtk) + #:use-module (guix build-system gnu) + #:use-module (guix build-system trivial) #:use-module (guix download) #:use-module (guix gexp) + #:use-module (guix packages) #:use-module (guix utils) - #:use-module (guix build-system gnu) - #:use-module (guix build-system glib-or-gtk) - #:use-module (guix build-system trivial) #:use-module (gnu packages) #:use-module (gnu packages attr) #:use-module (gnu packages autotools) @@ -61,12 +61,12 @@ #:use-module (gnu packages javascript) #:use-module (gnu packages libcanberra) #:use-module (gnu packages linux) - #:use-module (gnu packages multiprecision) #:use-module (gnu packages messaging) + #:use-module (gnu packages multiprecision) #:use-module (gnu packages nss) - #:use-module (gnu packages pkg-config) #:use-module (gnu packages pdf) #:use-module (gnu packages photo) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) @@ -74,8 +74,8 @@ #:use-module (gnu packages tex) #:use-module (gnu packages webkit) #:use-module (gnu packages xdisorg) - #:use-module (gnu packages xml) #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) (define-public mate-common @@ -167,37 +167,42 @@ actions.") (source (origin (method url-fetch) - (uri (string-append "mirror://mate/" (version-major+minor version) "/" - name "-" version ".tar.xz")) + (uri (string-append "mirror://mate/" + (version-major+minor version) + "/" + name + "-" + version + ".tar.xz")) (sha256 - (base32 - "000vr9cnbl2qlysf2gyg1lsjirqdzmwrnh6d3hyrsfc0r2vh4wna")))) + (base32 "000vr9cnbl2qlysf2gyg1lsjirqdzmwrnh6d3hyrsfc0r2vh4wna")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'autoconf - (lambda _ - (setenv "SHELL" (which "sh")) - (setenv "CONFIG_SHELL" (which "sh")) - (invoke "sh" "autogen.sh")))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'autoconf + (lambda _ + (setenv "SHELL" (which "sh")) + (setenv "CONFIG_SHELL" (which "sh")) + (invoke "sh" "autogen.sh")))))) (native-inputs ;; autoconf-wrapper is required due to the non-standard ;; 'autoconf phase. - `(("autoconf" ,autoconf-wrapper) - ("automake" ,automake) - ("intltool" ,intltool) - ("icon-naming-utils" ,icon-naming-utils) - ("libtool" ,libtool) - ("mate-common" ,mate-common) - ("pkg-config" ,pkg-config) - ("which" ,which))) + (list autoconf-wrapper + automake + intltool + icon-naming-utils + libtool + mate-common + pkg-config + which)) (home-page "https://mate-desktop.org/") (synopsis "MATE desktop environment icon theme faenza") (description - "Icon theme using Faenza and Faience icon themes and some -customized icons for MATE. Furthermore it includes some icons -from Mint-X-F and Faenza-Fresh icon packs.") + "Icon theme using Faenza and Faience icon themes and some customized +icons for MATE. Furthermore it includes some icons from Mint-X-F and +Faenza-Fresh icon packs.") (license license:gpl2+))) (define-public mate-themes @@ -262,39 +267,48 @@ desktop and the mate-about program.") (source (origin (method url-fetch) - (uri (string-append "mirror://mate/" (version-major+minor version) "/" - "libmateweather-" version ".tar.xz")) + (uri (string-append "mirror://mate/" + (version-major+minor version) + "/" + name + "-" + version + ".tar.xz")) (sha256 (base32 "1dfj68q3x9camd7h94pcwv8a5969cv5d4p979gcbk4xknpg76hsm")))) (build-system gnu-build-system) (arguments - '(#:configure-flags - (list (string-append "--with-zoneinfo-dir=/var/empty")) - #:phases - (modify-phases %standard-phases - (add-before 'check 'fix-tzdata-location - (lambda* (#:key inputs #:allow-other-keys) - (setenv "TZDIR" (search-input-directory inputs "/share/zoneinfo")) - (substitute* "data/check-timezones.sh" - (("/usr/share/zoneinfo/zone.tab") - (search-input-file inputs "/share/zoneinfo/zone.tab")) - ;; XXX: Ignore this test for now, which requires tzdata-2023c. - (("exit 1") "exit 0"))))))) + (list + #:configure-flags #~(list "--with-zoneinfo-dir=/var/empty") + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'fix-tzdata-location + (lambda* (#:key inputs #:allow-other-keys) + (setenv "TZDIR" + (search-input-directory inputs "/share/zoneinfo")) + (substitute* "data/check-timezones.sh" + (("/usr/share/zoneinfo/zone.tab") + (search-input-file inputs "/share/zoneinfo/zone.tab")) + ;; XXX: Ignore this test for now, which requires tzdata-2023c. + (("exit 1") + "exit 0"))))))) (native-inputs - `(("pkg-config" ,pkg-config) - ("intltool" ,intltool) - ("dconf" ,dconf) - ("glib:bin" ,glib "bin"))) + (list dconf + (list glib "bin") + intltool + pkg-config)) (inputs - (list gtk+ tzdata-for-tests)) + (list gtk+ + tzdata-for-tests)) (propagated-inputs - ;; both of these are requires.private in mateweather.pc - (list libsoup-minimal-2 libxml2)) + ;; both of these are requires.private in mateweather.pc + (list libsoup-minimal-2 + libxml2)) (home-page "https://mate-desktop.org/") (synopsis "MATE library for weather information from the Internet") (description - "This library provides access to weather information from the internet for -the MATE desktop environment.") + "This library provides access to weather information from the internet +for the MATE desktop environment.") (license license:lgpl2.1+))) (define-public mate-terminal @@ -807,24 +821,24 @@ hypertext navigation, and table-of-contents bookmarks.") "0ylm46wgg7linppid6pdfaixhdb8zgyrxl3lxz17x0am2k718c0y")))) (build-system glib-or-gtk-build-system) (arguments - `(#:configure-flags '("--disable-update-mimedb") - #:tests? #f ; tests fail even with display set - #:phases - (modify-phases %standard-phases - (add-before 'check 'pre-check - (lambda _ - ;; Tests require a running X server. - (system "Xvfb :1 &") - (setenv "DISPLAY" ":1") - ;; For the missing /etc/machine-id. - (setenv "DBUS_FATAL_WARNINGS" "0") - #t))))) + (list + #:tests? #f ; tests fail even with display set + #:configure-flags #~(list "--disable-update-mimedb") + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ + ;; Tests require a running X server. + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") + ;; For the missing /etc/machine-id. + (setenv "DBUS_FATAL_WARNINGS" "0")))))) (native-inputs - `(("pkg-config" ,pkg-config) - ("intltool" ,intltool) - ("glib:bin" ,glib "bin") - ("xorg-server" ,xorg-server) - ("gobject-introspection" ,gobject-introspection))) + (list pkg-config + intltool + (list glib "bin") + xorg-server + gobject-introspection)) (inputs (list exempi gtk+ @@ -837,8 +851,8 @@ hypertext navigation, and table-of-contents bookmarks.") startup-notification)) (native-search-paths (list (search-path-specification - (variable "CAJA_EXTENSIONDIR") - (files (list "lib/caja/extensions-2.0/**"))))) + (variable "CAJA_EXTENSIONDIR") + (files (list "lib/caja/extensions-2.0/**"))))) (home-page "https://mate-desktop.org/") (synopsis "File manager for the MATE desktop") (description @@ -914,6 +928,44 @@ applications associated with them. Caja is also responsible for handling the icons on the MATE desktop. It works on local and remote file systems.") (license license:gpl2+))) +(define-public python-caja + (package + (name "python-caja") + (version "1.28.0") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://mate/" + (version-major+minor version) + "/" + name + "-" + version + ".tar.xz")) + (sha256 + (base32 "1ml0yrkbly1mz5gmz1wynn3zff5900szncc4rk83xqyzvcww4mmh")))) + (build-system glib-or-gtk-build-system) + (arguments + (list + #:configure-flags + #~(list (string-append "--with-cajadir=" + #$output + "/lib/caja/extensions-2.0/")))) + (native-inputs + (list pkg-config + gettext-minimal + python-wrapper)) + (inputs + (list caja + gtk+ + python-pygobject)) + (home-page "https://mate-desktop.org/") + (synopsis "Python bindings for Caja components") + (description + "This package provides Python bindings to Caja, a file manager for the +MATE desktop.") + (license license:gpl2+))) + (define-public mate-control-center (package (name "mate-control-center") @@ -927,22 +979,22 @@ icons on the MATE desktop. It works on local and remote file systems.") (base32 "1g0lg4x3idilaxhwq1s90pajkvv9i012kzrnk0pxqj2jzl2cgwpb")))) (build-system glib-or-gtk-build-system) (arguments - '(#:phases (modify-phases %standard-phases - (add-before 'configure 'use-elogind-as-systemd - (lambda _ - (substitute* "configure" - (("systemd") "libelogind")))) - (add-before 'build 'fix-polkit-action - (lambda* (#:key outputs #:allow-other-keys) - ;; Make sure the polkit file refers to the right - ;; executable. - (let ((out (assoc-ref outputs "out"))) - (substitute* - '("capplets/display/org.mate.randr.policy.in" - "capplets/display/org.mate.randr.policy") - (("/usr/sbin") - (string-append out "/sbin"))) - #t)))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'use-elogind-as-systemd + (lambda _ + (substitute* "configure" + (("systemd") "libelogind")))) + (add-before 'build 'fix-polkit-action + (lambda _ + ;; Make sure the polkit file refers to the right + ;; executable. + (substitute* + '("capplets/display/org.mate.randr.policy.in" + "capplets/display/org.mate.randr.policy") + (("/usr/sbin") + (string-append #$output "/sbin")))))))) (native-inputs (list pkg-config intltool diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 7974a2f0b7..0c36a60948 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -829,20 +829,6 @@ translator for the language. In addition to the C library, a stand-alone LP/MIP solver is included in the package.") (license license:gpl3+))) -(define-public glpk-4 - (package - (inherit glpk) - (name "glpk") - (version "4.65") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://gnu/glpk/glpk-" - version ".tar.gz")) - (sha256 - (base32 - "040sfaa9jclg2nqdh83w71sv9rc1sznpnfiripjdyr48cady50a2")))))) - (define-public linasm (package (name "linasm") diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 7b4d0af1f7..982285299b 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -4205,17 +4205,22 @@ of tags.") (package (name "python-musicbrainzngs") (version "0.7.1") - (source (origin - (method url-fetch) - (uri (pypi-uri "musicbrainzngs" version)) - (sha256 - (base32 - "09z6k07pxncfgfc8clfmmxl2xqbd7h8x8bjzwr95hc0bzl00275b")))) - (build-system python-build-system) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/alastair/python-musicbrainzngs") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "05rv5wmasamwxkbs8v9lbp2js6y5hhqz6c58c2afz2b202yp932m")))) + (build-system pyproject-build-system) + (native-inputs (list python-setuptools python-wheel)) (home-page "https://python-musicbrainzngs.readthedocs.org/") (synopsis "Python bindings for MusicBrainz NGS webservice") - (description "Musicbrainzngs implements Python bindings of the MusicBrainz -web service. This library can be used to retrieve music metadata from the + (description + "Musicbrainzngs implements Python bindings of the MusicBrainz web +service. This library can be used to retrieve music metadata from the MusicBrainz database.") ;; 'musicbrainzngs/compat.py' is ISC licensed. (license (list license:bsd-2 license:isc)))) diff --git a/gnu/packages/patches/dolphin-emu-unbundle-tinygltf.patch b/gnu/packages/patches/dolphin-emu-unbundle-tinygltf.patch index 1c91823785..8c6e954926 100644 --- a/gnu/packages/patches/dolphin-emu-unbundle-tinygltf.patch +++ b/gnu/packages/patches/dolphin-emu-unbundle-tinygltf.patch @@ -1,46 +1,9 @@ Upstream-status: https://github.com/dolphin-emu/dolphin/pull/13824 -diff --git a/CMake/DolphinLibraryTools.cmake b/CMake/DolphinLibraryTools.cmake -index 4c395a8ef9..efa0d6a9e2 100644 ---- a/CMake/DolphinLibraryTools.cmake -+++ b/CMake/DolphinLibraryTools.cmake -@@ -1,14 +1,3 @@ --# like add_library(new ALIAS old) but avoids add_library cannot create ALIAS target "new" because target "old" is imported but not globally visible. on older cmake --# This can be replaced with a direct alias call once our minimum is cmake 3.18 --function(dolphin_alias_library new old) -- string(REPLACE "::" "" library_no_namespace ${old}) -- if (NOT TARGET _alias_${library_no_namespace}) -- add_library(_alias_${library_no_namespace} INTERFACE) -- target_link_libraries(_alias_${library_no_namespace} INTERFACE ${old}) -- endif() -- add_library(${new} ALIAS _alias_${library_no_namespace}) --endfunction() -- - # Makes an imported target if it doesn't exist. Useful for when find scripts from older versions of cmake don't make the targets you need - function(dolphin_make_imported_target_if_missing target lib) - if(${lib}_FOUND AND NOT TARGET ${target}) -@@ -85,7 +74,7 @@ function(dolphin_find_optional_system_library_pkgconfig library search alias bun - endif() - if(${library}_FOUND) - message(STATUS "Using system ${library}") -- dolphin_alias_library(${alias} PkgConfig::${library}) -+ add_library(${alias} ALIAS PkgConfig::${library}) - set(${library}_TYPE "System" PARENT_SCOPE) - else() - dolphin_add_bundled_library(${library} ${use_system} ${bundled_path}) diff --git a/CMakeLists.txt b/CMakeLists.txt -index c277e2a10a..67b72179f3 100644 +index 964a33ac13..7779cf2eac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -1,7 +1,7 @@ - ######################################## - # General setup - # --cmake_minimum_required(VERSION 3.13) -+cmake_minimum_required(VERSION 3.18) - - cmake_policy(SET CMP0079 NEW) # let target_link_libraries() link to a target defined in a different directory - cmake_policy(SET CMP0080 OLD) # allow using BundleUtilities at configure time @@ -657,7 +657,11 @@ add_subdirectory(Externals/glslang) if(WIN32 OR APPLE) add_subdirectory(Externals/spirv_cross) @@ -48,7 +11,7 @@ index c277e2a10a..67b72179f3 100644 -add_subdirectory(Externals/tinygltf) + +dolphin_find_optional_system_library(TinyGLTF Externals/tinygltf) -+if(NOT DEFINED tinygltf) ++if(NOT TARGET tinygltf) + add_library(tinygltf ALIAS tinygltf::tinygltf) # using system library +endif() @@ -65,6 +28,32 @@ index 0d86268bbe..9e6a99c6f8 100644 -target_include_directories(tinygltf INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(tinygltf INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/tinygltf) dolphin_disable_warnings(tinygltf) +diff --git a/Externals/tinygltf/exports.props b/Externals/tinygltf/exports.props +index 7e2fde81cf..09f43c1bae 100644 +--- a/Externals/tinygltf/exports.props ++++ b/Externals/tinygltf/exports.props +@@ -2,7 +2,7 @@ + <Project> + <ItemDefinitionGroup> + <ClCompile> +- <AdditionalIncludeDirectories>$(ExternalsDir)tinygltf;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <AdditionalIncludeDirectories>$(ExternalsDir)tinygltf\tinygltf;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <PreprocessorDefinitions>TINYGLTF_NOEXCEPTION;TINYGLTF_NO_EXTERNAL_IMAGE;TINYGLTF_USE_CPP14;%(PreprocessorDefinitions)</PreprocessorDefinitions> + </ClCompile> + </ItemDefinitionGroup> +diff --git a/Externals/tinygltf/tinygltf.vcxproj b/Externals/tinygltf/tinygltf.vcxproj +index e33d949e56..4995626f22 100644 +--- a/Externals/tinygltf/tinygltf.vcxproj ++++ b/Externals/tinygltf/tinygltf.vcxproj +@@ -17,7 +17,7 @@ + <PropertyGroup Label="UserMacros" /> + <ItemDefinitionGroup> + <ClCompile> +- <AdditionalIncludeDirectories>tinygltf;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <AdditionalIncludeDirectories>tinygltf\tinygltf;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + </ItemDefinitionGroup> + <ItemGroup> diff --git a/Source/Core/VideoCommon/Assets/MeshAsset.cpp b/Source/Core/VideoCommon/Assets/MeshAsset.cpp index bde8c8aab6..13eb2b4448 100644 --- a/Source/Core/VideoCommon/Assets/MeshAsset.cpp diff --git a/gnu/packages/patches/dolphin-emu-unbundle-watcher.patch b/gnu/packages/patches/dolphin-emu-unbundle-watcher.patch index c18a6c2ec4..d6046d440c 100644 --- a/gnu/packages/patches/dolphin-emu-unbundle-watcher.patch +++ b/gnu/packages/patches/dolphin-emu-unbundle-watcher.patch @@ -1,50 +1,30 @@ Upstream-status: https://github.com/dolphin-emu/dolphin/pull/13823 -diff --git a/CMake/DolphinLibraryTools.cmake b/CMake/DolphinLibraryTools.cmake -index 4c395a8ef9..fb806b1b90 100644 ---- a/CMake/DolphinLibraryTools.cmake -+++ b/CMake/DolphinLibraryTools.cmake -@@ -92,3 +92,30 @@ function(dolphin_find_optional_system_library_pkgconfig library search alias bun - set(${library}_TYPE "Bundled" PARENT_SCOPE) - endif() - endfunction() -+ -+# This can be used for header-only libraries that doesn't offer a -+# pkg-config or CMake file. It uses CMake's find_file. LIBRARY is the -+# name of the library providing it, INCLUDE is the header file name -+# without its installation prefix (e.g. "wtr/watcher.hpp") while -+# BUNDLED_PATH is the root directory of the bundled library. -+function(dolphin_find_optional_system_include library include bundled_path) -+ dolphin_optional_system_library(use_system ${library}) -+ string(TOUPPER ${library} upperlib) -+ if(use_system) -+ find_file(${library}_INCLUDE ${include}) -+ if((NOT ${library}_INCLUDE) AND (NOT ${use_system} STREQUAL "AUTO")) -+ message(FATAL_ERROR "No system ${library} headers found. \ -+Please install it or set USE_SYSTEM_${upperlib} to AUTO or OFF.") -+ endif() -+ endif() -+ if(${library}_INCLUDE) -+ message(STATUS "Using system ${library} headers") -+ set(${library}_TYPE "System" PARENT_SCOPE) -+ add_library(${library} INTERFACE IMPORTED GLOBAL) -+ set_target_properties(${library} PROPERTIES -+ INTERFACE_INCLUDE_DIRECTORIES ${${library}_INCLUDE}) -+ else() -+ dolphin_add_bundled_library(${library} ${use_system} ${bundled_path}) -+ set(${library}_TYPE "Bundled" PARENT_SCOPE) -+ endif() -+endfunction() diff --git a/CMakeLists.txt b/CMakeLists.txt -index c277e2a10a..12b1c36ef0 100644 +index c277e2a10a..9b9ec00f91 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -786,7 +786,7 @@ if (USE_RETRO_ACHIEVEMENTS) +@@ -786,7 +786,9 @@ if (USE_RETRO_ACHIEVEMENTS) add_subdirectory(Externals/rcheevos) endif() -add_subdirectory(Externals/watcher) -+dolphin_find_optional_system_include(watcher wtr/watcher.hpp Externals/watcher) ++dolphin_find_optional_system_library_pkgconfig( ++ WATCHER watcher watcher::watcher Externals/watcher ++) ######################################## # Pre-build events: Define configuration variables and write SCM info header +diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt +index ee738ba4e3..629c739c8d 100644 +--- a/Source/Core/Common/CMakeLists.txt ++++ b/Source/Core/Common/CMakeLists.txt +@@ -186,7 +186,7 @@ PRIVATE + FatFs + Iconv::Iconv + spng::spng +- watcher ++ watcher::watcher + ${VTUNE_LIBRARIES} + ) + diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm index 4d389179f9..e16cbc0e96 100644 --- a/gnu/packages/prolog.scm +++ b/gnu/packages/prolog.scm @@ -185,7 +185,7 @@ it.") (define-public trealla (package (name "trealla") - (version "2.82.6") + (version "2.82.9") (source (origin (method git-fetch) @@ -194,7 +194,7 @@ it.") (url "https://github.com/trealla-prolog/trealla") (commit (string-append "v" version)))) (sha256 - (base32 "1yfnavv1m5jgi28nzil4mmin3gq28ykpl6g4aqis7i9f9s638dp2")) + (base32 "15vah9mk81di4srd7rd8ggwl9k2hbzra9bmgkk73fdnmd9db3ryr")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index d5772b7716..f43b49163d 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -1249,18 +1249,10 @@ Python program.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 - "0fg8jflcf4c929gd4zbcrk73d08waaqjfjmdjrgnv54mzl35pjxl")))) - (build-system python-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest"))))))) + (base32 "0fg8jflcf4c929gd4zbcrk73d08waaqjfjmdjrgnv54mzl35pjxl")))) + (build-system pyproject-build-system) (native-inputs - (list python-numpy python-pytest)) + (list python-numpy python-pytest python-setuptools python-wheel)) (home-page "https://github.com/kaste/mockito-python") (synopsis "Mocking library for Python") (description "This package provides a Python implementation of the Java @@ -1268,7 +1260,6 @@ library of the same name. It eases monkey patching, for example to stub out side effects when unit testing.") (license license:expat))) - (define-public python-mypy (package (name "python-mypy") @@ -1979,18 +1970,21 @@ of the project to ensure it renders properly.") (version "1.0.2") (source (origin - (method url-fetch) - (uri - (pypi-uri "pytest_click" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/Stranger6667/pytest-click") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "1rcv4m850rl7djzdgzz2zhjd8g5ih8w6l0sj2f9hsynymlsq82xl")))) - (build-system python-build-system) - (propagated-inputs - (list python-click python-pytest)) + (base32 "197nvlqlyfrqpy5lrkmfh1ywpr6j9zipxl9d7syg2a2n7jz3a8rj")))) + (build-system pyproject-build-system) + (native-inputs (list python-setuptools python-wheel)) + (propagated-inputs (list python-click python-pytest)) (home-page "https://github.com/Stranger6667/pytest-click") - (synopsis "Py.test plugin for Click") - (description "This package provides a plugin to test Python click -interfaces with pytest.") + (synopsis "Pytest plugin for Click") + (description + "This package provides a plugin to test Python click interfaces with +pytest.") (license license:expat))) (define-public python-pytest-console-scripts diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index 8fd893cb8e..9166620f28 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -559,29 +559,26 @@ Python.") (define-public python-lzo (package (name "python-lzo") - (version "1.14") + (version "1.15") (source (origin (method url-fetch) (uri (pypi-uri "python-lzo" version)) (sha256 - (base32 "0315nq6r39n51n8qqamb7xv0ib0qrh76q7g3a1977172mbndijw3")))) - (build-system python-build-system) + (base32 "0jbv6853p8flk65ks0nw37f6f5v0ryi6nhppv5fm3863ql0alym5")))) + (build-system pyproject-build-system) (arguments (list - #:test-target "check" #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-setuppy - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (substitute* "setup.py" (("include_dirs.append\\(.*\\)") - (string-append "include_dirs.append('" - #$(this-package-input "lzo") - "/include/lzo" - "')")))))))) - (inputs - (list lzo)) + (format #f "include_dirs.append(~s)" + (search-input-directory inputs "include/lzo"))))))))) + (native-inputs (list python-pytest python-setuptools python-wheel)) + (inputs (list lzo)) (home-page "https://github.com/jd-boyd/python-lzo") (synopsis "Python bindings for the LZO data compression library") (description diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index a80da0d470..79bbf1b08b 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -917,23 +917,24 @@ Python.") (define-public python-josepy (package (name "python-josepy") - (version "1.13.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "josepy" version)) - (sha256 - (base32 - "1jaxqyp53paks2z8zyzr50gqvzfxbar7r2qf98kqak4aizrxlcc9")))) - (build-system python-build-system) - (arguments - ;; TODO: some test dependencies are missing (see pyproject.toml). - '(#:tests? #f)) - (propagated-inputs - (list python-cryptography python-pyopenssl)) + (version "2.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/certbot/josepy") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1zplnfrmc4nps9lgl3fz434ja7lmi9v8waydflzvpi75kf5fqxc1")))) + (build-system pyproject-build-system) + (native-inputs (list python-poetry-core python-pytest)) + (propagated-inputs (list python-cryptography)) (home-page "https://github.com/certbot/josepy") (synopsis "JOSE protocol implementation in Python") - (description "This package provides a Python implementation of the JOSE -protocol (Javascript Object Signing and Encryption).") + (description + "This package provides a Python implementation of the JOSE protocol +(Javascript Object Signing and Encryption).") (license license:asl2.0))) (define pycryptodome-unbundle-tomcrypt-snippet diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 1b8a718453..4f6a237ae0 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2663,20 +2663,13 @@ API, but uses asyncio to parallelise downloading the files.") (method url-fetch) (uri (pypi-uri "html2text" version)) (sha256 - (base32 - "1fvv4z6dblii2wk1x82981ag8yhxbim1v2ksgywxsndh2s7335p2")))) - (build-system python-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (invoke "pytest" "test/")))))) - (native-inputs - (list python-pytest)) + (base32 "1fvv4z6dblii2wk1x82981ag8yhxbim1v2ksgywxsndh2s7335p2")))) + (build-system pyproject-build-system) + (native-inputs (list python-pytest python-setuptools python-wheel)) (home-page "https://github.com/Alir3z4/html2text") (synopsis "Convert HTML into plain text") - (description "html2text takes HTML and converts it into plain ASCII text + (description + "html2text takes HTML and converts it into plain ASCII text which is also valid markdown. html2text was originally written by Aaron Swartz.") (license license:gpl3+))) @@ -8382,17 +8375,19 @@ association.") (define-public python-livereload (package (name "python-livereload") - (version "2.6.3") + (version "2.7.1") (source (origin - (method url-fetch) - (uri (pypi-uri "livereload" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/lepture/python-livereload") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0scqjnhg3ap81v36ghp0pik774dnfdkwqsx5j1jfbzarbs32yvvp")))) - (build-system python-build-system) - (propagated-inputs - (list python-six python-tornado)) + (base32 "19wkdd1grw6mcd4qi8iaw4jdr207h3m24951vgy69j7g904lynjq")))) + (build-system pyproject-build-system) + (native-inputs (list python-django python-setuptools python-wheel)) + (propagated-inputs (list python-tornado)) (home-page "https://github.com/lepture/python-livereload") (synopsis "Python LiveReload") (description @@ -9327,11 +9322,12 @@ using a pure Python implementation.") (uri (pypi-uri "pyjsparser" version)) (sha256 (base32 "0ycmf9fsvwliqmm1n6sfz7x71y7i2kbfgn39d8lsbiccfxmxlq5y")))) - (build-system python-build-system) + (build-system pyproject-build-system) + (native-inputs (list python-setuptools python-wheel)) (home-page "https://github.com/PiotrDabkowski/pyjsparser") (synopsis "Fast JavaScript parser") - (description "This package provides a fast JavaScript parser (based on -esprima.js)") + (description + "This package provides a fast JavaScript parser (based on esprima.js)") (license license:expat))) (define-public python-js2py diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d71d26b15f..2e6d67f7b8 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -189,7 +189,6 @@ #:use-module (gnu packages aidc) #:use-module (gnu packages algebra) #:use-module (gnu packages attr) - #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages backup) #:use-module (gnu packages base) @@ -262,7 +261,6 @@ #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) #:use-module (gnu packages protobuf) - #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) @@ -5850,36 +5848,6 @@ videos in a notebook.") audio playback capability for Python 3 on OSX, Windows, and Linux.") (license license:expat))) ; MIT license -(define-public python-wavefile - (package - (name "python-wavefile") - (version "1.6.2") - (source (origin - (method url-fetch) - (uri (pypi-uri "wavefile" version)) - (sha256 - (base32 - "04mdcxq7n1vnwb9y65j0cwpy91ik5rh9vki1f45xqnh4ygz91n75")))) - (build-system python-build-system) - (arguments - (list #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'patch-libsndfile-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "wavefile/libsndfile.py" - (("'libsndfile") - (string-append "'" (assoc-ref inputs "libsndfile") - "/lib/libsndfile")))))))) - (inputs - (list libsndfile portaudio)) - (propagated-inputs (list python-numpy python-pyaudio)) - (home-page "https://github.com/vokimon/python-wavefile") - (synopsis "Pythonic audio file reader and writer") - (description - "This package provides pythonic libsndfile wrapper to read and write audio -files.") - (license license:gpl3+))) - (define-public python-jsonalias (package (name "python-jsonalias") @@ -32316,17 +32284,20 @@ memoization.") (version "0.8") (source (origin - (method url-fetch) - (uri (pypi-uri "cson" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/avakar/pycson") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "00cyvigg4npbph39ghkg77xbxisa6plf75vii24igxfizik0337f")))) - (build-system python-build-system) - (propagated-inputs - (list python-speg)) + (base32 "0d2zbmak0hzsl1w71dgc8x4q4vdfbpk46vwyi9vvvqv7gdqj59fn")))) + (build-system pyproject-build-system) + (native-inputs (list python-pytest python-setuptools python-wheel)) + (propagated-inputs (list python-speg)) (home-page "https://github.com/avakar/pycson") (synopsis "Parser for Coffeescript Object Notation (CSON)") - (description "This package is a parser for Coffeescript Object -Notation (CSON).") + (description + "This package is a parser for Coffeescript Object Notation (CSON).") (license license:expat))) (define-public python-aionotify @@ -37335,18 +37306,30 @@ It implements advanced Python dictionaries with dot notation access.") (name "python-aspectlib") (version "1.5.2") (source - (origin - (method url-fetch) - (uri (pypi-uri "aspectlib" version)) - (sha256 - (base32 "1am4ycf292zbmgz791z393v63w7qrynf8q5p9db2wwf2qj1fqxfj")))) - (build-system python-build-system) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ionelmc/python-aspectlib") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1mfhflg33684gkp6ckkywshn4xa3vqaia521kcagaxgr3xm6c9pv")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + #~(list ;; XXX: Require more dependencies. + "--ignore=tests/test_integrations.py" + "--ignore=tests/test_integrations_py3.py" + ;; XXX: Unimportant warning errors. + "-k" (string-append "not test_story_empty_play_proxy_class" + " and not test_story_half_play_proxy_class")))) + (native-inputs (list python-pytest python-setuptools python-tornado python-wheel)) (propagated-inputs (list python-fields)) (home-page "https://github.com/ionelmc/python-aspectlib") - (synopsis - "Python monkey-patching and decorators") + (synopsis "Python monkey-patching and decorators") (description - "This package provides an aspect-oriented programming, monkey-patch + "This package provides an aspect-oriented programming, monkey-patch and decorators library. It is useful when changing behavior in existing code is desired. It includes tools for debugging and testing: simple mock/record and a complete capture/replay framework.") diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 7eefc31928..8dd820429c 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -50,6 +50,7 @@ #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system perl) + #:use-module (guix build-system pyproject) #:use-module (guix build-system python) #:use-module (guix build-system cmake) #:use-module (guix build-system trivial) @@ -77,6 +78,7 @@ #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) @@ -710,48 +712,48 @@ netcat implementation that supports TLS.") (package (name "python-acme") ;; Remember to update the hash of certbot when updating python-acme. - (version "2.3.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "acme" version)) - (sha256 - (base32 - "1z6293g4pyxvx5w7v07j8wnaxyr7srsqfqvgly888b8k52fq9ipa")))) - (build-system python-build-system) + (version "4.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "acme" version)) + (sha256 + (base32 "0h8ckyal5j8lkm24fd52dajy38mxa76zh4q022i28f6b3878rxhd")))) + (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'build 'build-documentation - (lambda _ - (invoke "make" "-C" "docs" "man" "info"))) - (add-after 'install 'install-documentation - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (man (string-append out "/share/man/man1")) - (info (string-append out "/info"))) - (install-file "docs/_build/texinfo/acme-python.info" info) - (install-file "docs/_build/man/acme-python.1" man)))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest" "-vv"))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'relax-requirements + (lambda _ + (substitute* "setup.py" + (("'PyOpenSSL.*',") + "'PyOpenSSL',")))) + (add-after 'build 'build-documentation + (lambda _ + (invoke "make" "-C" "docs" "man" "info"))) + (add-after 'install 'install-documentation + (lambda _ + (let ((man (string-append #$output "/share/man/man1")) + (info (string-append #$output "/info"))) + (install-file "docs/_build/texinfo/acme-python.info" info) + (install-file "docs/_build/man/acme-python.1" man))))))) (native-inputs (list python-pytest + python-pytest-xdist + python-setuptools + python-wheel ;; For documentation python-sphinx python-sphinxcontrib-programoutput python-sphinx-rtd-theme texinfo)) (propagated-inputs - (list python-chardet + (list python-cryptography python-josepy - python-requests - python-requests-toolbelt - python-pytz + python-pyopenssl python-pyrfc3339 - python-pyasn1 - python-cryptography - python-pyopenssl)) + python-requests)) (home-page "https://github.com/certbot/certbot") (synopsis "ACME protocol implementation in Python") (description "ACME protocol implementation in Python") @@ -763,30 +765,33 @@ netcat implementation that supports TLS.") ;; Certbot and python-acme are developed in the same repository, and their ;; versions should remain synchronized. (version (package-version python-acme)) - (source (origin - (method url-fetch) - (uri (pypi-uri "certbot" version)) - (sha256 - (base32 - "12nd9nmdj3bf1xlvhj1ln473xbyv4qzxf6qhz0djbca7jl59zlwk")))) - (build-system python-build-system) + (source + (origin + (method url-fetch) + (uri (pypi-uri "certbot" version)) + (sha256 + (base32 "0yy287h1sjdkm5cj4wazq316igwwla856yqcmi4yqaq7ib55c7pv")))) + (build-system pyproject-build-system) (arguments - `(,@(substitute-keyword-arguments (package-arguments python-acme) - ((#:phases phases) - `(modify-phases ,phases - (replace 'install-documentation - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (man1 (string-append out "/share/man/man1")) - (man7 (string-append out "/share/man/man7")) - (info (string-append out "/info"))) - (install-file "docs/_build/texinfo/Certbot.info" info) - (install-file "docs/_build/man/certbot.1" man1) - (install-file "docs/_build/man/certbot.7" man7) - #t)))))))) + (substitute-keyword-arguments (package-arguments python-acme) + ((#:test-flags flags '()) + ;; XXX: No time zone found with key Asia/Sanghai, pytz version? + #~(list "-k" "not test_add_time_interval")) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'install-documentation + (lambda* (#:key outputs #:allow-other-keys) + (let ((man1 (string-append #$output "/share/man/man1")) + (man7 (string-append #$output "/share/man/man7")) + (info (string-append #$output "/info"))) + (install-file "docs/_build/texinfo/Certbot.info" info) + (install-file "docs/_build/man/certbot.1" man1) + (install-file "docs/_build/man/certbot.7" man7)))))))) (native-inputs (list python-mock python-pytest + python-setuptools + python-wheel ;; For documentation python-sphinx python-sphinx-rtd-theme @@ -806,8 +811,9 @@ netcat implementation that supports TLS.") python-requests python-pytz)) (synopsis "Let's Encrypt client by the Electronic Frontier Foundation") - (description "Certbot automatically receives and installs X.509 certificates -to enable Transport Layer Security (TLS) on servers. It interoperates with the + (description + "Certbot automatically receives and installs X.509 certificates to enable +Transport Layer Security (TLS) on servers. It interoperates with the Let’s Encrypt certificate authority (CA), which issues browser-trusted certificates for free.") (home-page "https://certbot.eff.org/") diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 45f42f63d1..cb54059240 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -4847,7 +4847,7 @@ developer workflow, and project and release management.") (define-public hut (package (name "hut") - (version "0.6.0") + (version "0.7.0") (source (origin (method git-fetch) @@ -4856,16 +4856,7 @@ developer workflow, and project and release management.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "14cia976i2jdzyzw4wk9fhkh6zqgmb09ryf31ys24smmfcdfxyf1")) - (modules '((guix build utils))) - (snippet - #~(begin - ;; XXX: Module name has been changed upstream, it's already - ;; adjusted on master, consider to remove in the next refresh - ;; cycle. - (substitute* (find-files "." "\\.go$") - (("git.sr.ht/~emersion/go-scfg") - "codeberg.org/emersion/go-scfg")))))) + (base32 "0scw4nvm3qpg7l6anhljkixn3g36k03ikg6pl0hs76a3wkf89km5")))) (build-system go-build-system) (arguments (list |