diff options
Diffstat (limited to 'gnu')
170 files changed, 6064 insertions, 6051 deletions
diff --git a/gnu/home/services.scm b/gnu/home/services.scm index d194d02fd4..2e51a983cb 100644 --- a/gnu/home/services.scm +++ b/gnu/home/services.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021-2023 Andrew Tropin <andrew@trop.in> ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz> -;;; Copyright © 2022-2023 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2022-2023, 2025 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2023 Carlo Zancanaro <carlo@zancanaro.id.au> ;;; ;;; This file is part of GNU Guix. @@ -58,6 +58,7 @@ with-shell-quotation-bindings environment-variable-shell-definitions + shell-variable-definitions home-files-directory xdg-configuration-files-directory xdg-data-files-directory @@ -241,6 +242,27 @@ ensures variable values are properly quoted." "\n"))) variables)))) +(define (shell-variable-definitions variables) + "Return a gexp that evaluates to a list of POSIX shell statements defining +VARIABLES, a list of variable name/value pairs, as shell variables (not +environment variables). The returned code ensures variable values are +properly quoted." + (with-shell-quotation-bindings + #~(string-append + #$@(map (match-lambda + ((key . (or (? string? value) + (? file-like? value) + (? gexp? value))) + #~(string-append #$key "=" + (shell-double-quote #$value) + "\n")) + ((key . (? literal-string? value)) + #~(string-append #$key "=" + (shell-single-quote + #$(literal-string-value value)) + "\n"))) + variables)))) + (define (environment-variables->setup-environment-script vars) "Return a file that can be sourced by a POSIX compliant shell which initializes the environment. The file will source the home diff --git a/gnu/home/services/shells.scm b/gnu/home/services/shells.scm index 969a3eb8dc..a218fdb0a2 100644 --- a/gnu/home/services/shells.scm +++ b/gnu/home/services/shells.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2021 Andrew Tropin <andrew@trop.in> ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz> ;;; Copyright © 2023 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2025 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -121,6 +122,9 @@ service type can be extended with a list of file-like objects."))) (define (serialize-posix-env-vars field-name val) (environment-variable-shell-definitions val)) +(define (serialize-shell-variables field value) + (shell-variable-definitions value)) + ;;; ;;; Zsh. @@ -347,6 +351,13 @@ rules for the @code{home-environment-variables-service-type} apply here (@pxref{Essential Home Services}). The contents of this field will be added after the contents of the @code{bash-profile} field." (serializer serialize-posix-env-vars)) + (variables + (alist '()) + "Bash variables (not to be confused with environment variables) to be set +in @file{.bashrc} for use by interactive shells. A typical example of such +variables is @code{HISTSIZE} and related history variables (@pxref{Bash +Variables,,, bash, Bash Reference Manual})." + (serializer serialize-shell-variables)) (aliases (alist %default-bash-aliases) "Association list of aliases to set for the Bash session. The aliases will be @@ -425,10 +436,12 @@ if [ -f ~/.bashrc ]; then source ~/.bashrc; fi ,@(list (file-if-not-empty 'bashrc - (if (home-bash-configuration-guix-defaults? config) - (list (plain-file-content %default-bashrc) "\n" - (serialize-field 'aliases)) - (list (serialize-field 'aliases)))) + (let ((user-settings (list (serialize-field 'variables) "\n" + (serialize-field 'aliases)))) + (if (home-bash-configuration-guix-defaults? config) + (cons* (plain-file-content %default-bashrc) "\n" + user-settings) + user-settings))) (file-if-not-empty 'bash-logout))))) (define (add-bash-packages config) @@ -440,6 +453,10 @@ if [ -f ~/.bashrc ]; then source ~/.bashrc; fi "Additional environment variables to set. These will be combined with the environment variables from other extensions and the base service to form one coherent block of environment variables.") + (variables + (alist '()) + "Extra Bash variables (not to be confused with environment variables) to be +set in @file{.bashrc} for use by interactive shells.") (aliases (alist '()) "Additional aliases to set. These will be combined with the aliases from @@ -459,13 +476,17 @@ with text blocks from other extensions and the base service.")) (define (home-bash-extensions original-config extension-configs) (match-record original-config <home-bash-configuration> - (environment-variables aliases bash-profile bashrc bash-logout) + (environment-variables variables aliases bash-profile bashrc bash-logout) (home-bash-configuration (inherit original-config) (environment-variables (append environment-variables (append-map home-bash-extension-environment-variables extension-configs))) + (variables + (append variables + (append-map + home-bash-extension-variables extension-configs))) (aliases (append aliases (append-map diff --git a/gnu/installer/services.scm b/gnu/installer/services.scm index b208a20138..3e47caf4c2 100644 --- a/gnu/installer/services.scm +++ b/gnu/installer/services.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2021 Leo Famulari <leo@famulari.name> ;;; Copyright © 2023 Denys Nykula <vegan@libre.net.ua> +;;; Copyright © 2025 Florian Pelz <pelzflorian@pelzflorian.de> ;;; ;;; This file is part of GNU Guix. ;;; @@ -194,8 +195,11 @@ (if (target-hurd?) '%base-services/hurd '%base-services))) - (native-console-font (match (getenv "LANGUAGE") - ((or "be" "bg" "el" "eo" "kk" "ky" + (native-console-font (match (false-if-exception + (string-take (getenv "LANGUAGE") 2)) + ((or "el" ;easier with more complete Greek font + ;; These need Cyrillic: + "be" "bg" "kk" "ky" "mk" "mn" "ru" "sr" "tg" "uk") "LatGrkCyr-8x16") (_ #f))) diff --git a/gnu/local.mk b/gnu/local.mk index 555891779c..2d65107586 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1278,6 +1278,7 @@ dist_patch_DATA = \ %D%/packages/patches/ffmpeg-jami-remove-mjpeg-log.patch \ %D%/packages/patches/ffmpeg-jami-screen-sharing-x11-fix.patch \ %D%/packages/patches/ffmpeg-4-binutils-2.41.patch \ + %D%/packages/patches/fgallery-also-look-for-7z.patch \ %D%/packages/patches/fifengine-boost-compat.patch \ %D%/packages/patches/fifengine-python-3.9-compat.patch \ %D%/packages/patches/fifengine-swig-compat.patch \ @@ -1435,30 +1436,26 @@ dist_patch_DATA = \ %D%/packages/patches/glib-appinfo-watch.patch \ %D%/packages/patches/glib-skip-failing-test.patch \ %D%/packages/patches/glibc-2.33-riscv64-miscompilation.patch \ + %D%/packages/patches/glibc-2.35-CVE-2023-4911.patch \ + %D%/packages/patches/glibc-2.37-hurd-clock_t_centiseconds.patch \ + %D%/packages/patches/glibc-2.37-versioned-locpath.patch \ + %D%/packages/patches/glibc-2.38-ldd-x86_64.patch \ %D%/packages/patches/glibc-2.39-git-updates.patch \ %D%/packages/patches/glibc-2.40-dl-cache.patch \ - %D%/packages/patches/glibc-CVE-2019-7309.patch \ - %D%/packages/patches/glibc-CVE-2019-9169.patch \ - %D%/packages/patches/glibc-CVE-2019-19126.patch \ - %D%/packages/patches/glibc-2.35-CVE-2023-4911.patch \ + %D%/packages/patches/glibc-2.41-bootstrap-system.patch \ + %D%/packages/patches/glibc-2.41-hurd-local-clock_gettime_MONOTONIC.patch \ + %D%/packages/patches/glibc-2.41-ldd-x86_64.patch \ %D%/packages/patches/glibc-allow-kernel-2.6.32.patch \ - %D%/packages/patches/glibc-boot-2.16.0.patch \ %D%/packages/patches/glibc-boot-2.2.5.patch \ + %D%/packages/patches/glibc-boot-2.16.0.patch \ %D%/packages/patches/glibc-bootstrap-system-2.2.5.patch \ %D%/packages/patches/glibc-bootstrap-system-2.16.0.patch \ %D%/packages/patches/glibc-bootstrap-system.patch \ - %D%/packages/patches/glibc-2.41-bootstrap-system.patch \ %D%/packages/patches/glibc-cross-objcopy.patch \ %D%/packages/patches/glibc-cross-objdump.patch \ %D%/packages/patches/glibc-dl-cache.patch \ %D%/packages/patches/glibc-hidden-visibility-ldconfig.patch \ %D%/packages/patches/glibc-hurd-clock_gettime_monotonic.patch \ - %D%/packages/patches/glibc-2.31-hurd-clock_gettime_monotonic.patch \ - %D%/packages/patches/glibc-2.37-hurd-clock_t_centiseconds.patch \ - %D%/packages/patches/glibc-2.41-hurd-local-clock_gettime_MONOTONIC.patch \ - %D%/packages/patches/glibc-2.37-versioned-locpath.patch \ - %D%/packages/patches/glibc-2.38-ldd-x86_64.patch \ - %D%/packages/patches/glibc-2.41-ldd-x86_64.patch \ %D%/packages/patches/glibc-hurd-clock_t_centiseconds.patch \ %D%/packages/patches/glibc-hurd-getauxval.patch \ %D%/packages/patches/glibc-hurd-gettyent.patch \ @@ -1473,12 +1470,9 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-ldd-powerpc.patch \ %D%/packages/patches/glibc-ldd-x86_64.patch \ %D%/packages/patches/glibc-locales.patch \ - %D%/packages/patches/glibc-locales-2.28.patch \ %D%/packages/patches/glibc-reinstate-prlimit64-fallback.patch \ - %D%/packages/patches/glibc-skip-c++.patch \ - %D%/packages/patches/glibc-versioned-locpath.patch \ - %D%/packages/patches/glibc-2.29-supported-locales.patch \ %D%/packages/patches/glibc-supported-locales.patch \ + %D%/packages/patches/glibc-versioned-locpath.patch \ %D%/packages/patches/gmime-disable-tests.patch \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \ %D%/packages/patches/gmp-faulty-test.patch \ @@ -1580,7 +1574,6 @@ dist_patch_DATA = \ %D%/packages/patches/highlight-gui-data-dir.patch \ %D%/packages/patches/hplip-usb-timeout.patch \ %D%/packages/patches/http-parser-CVE-2020-8287.patch \ - %D%/packages/patches/htslib-for-stringtie.patch \ %D%/packages/patches/hubbub-sort-entities.patch \ %D%/packages/patches/hueplusplus-mbedtls.patch \ %D%/packages/patches/hugs-fix-build.patch \ @@ -2003,14 +1996,10 @@ dist_patch_DATA = \ %D%/packages/patches/orpheus-cast-errors-and-includes.patch \ %D%/packages/patches/ots-no-include-missing-file.patch \ %D%/packages/patches/owncloud-disable-updatecheck.patch \ - %D%/packages/patches/p7zip-CVE-2016-9296.patch \ - %D%/packages/patches/p7zip-CVE-2017-17969.patch \ %D%/packages/patches/pnet-fix-line-number-info.patch \ %D%/packages/patches/pnet-fix-off-by-one.patch \ %D%/packages/patches/pnet-newer-libgc-fix.patch \ %D%/packages/patches/pnet-newer-texinfo-fix.patch \ - %D%/packages/patches/p7zip-fix-build-with-gcc-11.patch \ - %D%/packages/patches/p7zip-remove-unused-code.patch \ %D%/packages/patches/pam-krb5-CVE-2020-10595.patch \ %D%/packages/patches/pango-skip-libthai-test.patch \ %D%/packages/patches/password-store-tree-compat.patch \ @@ -2470,6 +2459,7 @@ dist_patch_DATA = \ %D%/packages/patches/xfce4-settings-defaults.patch \ %D%/packages/patches/xgboost-use-system-dmlc-core.patch \ %D%/packages/patches/xiphos-glib.patch \ + %D%/packages/patches/xlispstat-fix-compilation-with-modern-gcc.patch \ %D%/packages/patches/xmonad-dynamic-linking.patch \ %D%/packages/patches/xplanet-1.3.1-cxx11-eof.patch \ %D%/packages/patches/xplanet-1.3.1-libdisplay_DisplayOutput.cpp.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index e48e4102cb..8cee618c53 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -583,14 +583,14 @@ interface and is based on GNU Guile.") (define-public shepherd-1.0 (package (inherit shepherd-0.10) - (version "1.0.7") + (version "1.0.8") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/shepherd/shepherd-" version ".tar.gz")) (sha256 (base32 - "15vmfbnah4p978zs4j95fl7m3sy98z1brgyz2m8s30zfh5srnnij")))) + "1xbzf7vmanb36hfb0kc9a240x7xnkynsfs6hcz2kj0xzf19h1srv")))) (arguments (substitute-keyword-arguments (package-arguments shepherd-0.10) ((#:configure-flags flags #~'()) diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 4ee152d1e7..7f033fcc97 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -237,7 +237,7 @@ the real span of the lattice.") (inputs (list fplll gmp mpfr pari-gp)) (propagated-inputs - (list python-cysignals python-cython-3 python-flake8 python-numpy)) + (list python-cysignals python-cython python-flake8 python-numpy)) (home-page "https://github.com/fplll/fpylll") (synopsis "Python interface for fplll") (description "fpylll is a Python wrapper for fplll.") @@ -550,7 +550,7 @@ fast arithmetic.") (native-inputs (list meson-python pkg-config - python-cython-3 + python-cython python-pytest)) (inputs (list gmp diff --git a/gnu/packages/arcan.scm b/gnu/packages/arcan.scm index c38c70d51d..1eaff7e934 100644 --- a/gnu/packages/arcan.scm +++ b/gnu/packages/arcan.scm @@ -316,5 +316,5 @@ as a window under Arcan.") (license (list license:bsd-3 license:expat)))) ;; Package was merged into arcan in upstream. -(define-public arcan-wayland - (deprecated-package "arcan-wayland" arcan)) +(define-deprecated-package arcan-wayland + arcan) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index 735d670ab2..7f68b110aa 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -645,8 +645,8 @@ accurately in real time at any rate desired.") @end itemize") (license license:gpl2+)))) -(define-public celestia-gtk - (deprecated-package "celestia-gtk" celestia)) +(define-deprecated-package celestia-gtk + celestia) (define-public cfitsio (package @@ -1045,8 +1045,8 @@ viewer: panning and zooming windows, star catalog access, cuts, star pick/FWHM, thumbnails, etc.") (license license:bsd-3))) -(define-public ginga-qt5 - (deprecated-package "ginga-qt5" ginga)) +(define-deprecated-package ginga-qt5 + ginga) (define-public glnemo2 (package @@ -2893,7 +2893,7 @@ constraints (i.e., altitude, airmass, moon separation/illumination, etc.) (native-inputs (list nss-certs-for-test pkg-config - python-cython-3 + python-cython python-extension-helpers python-objgraph python-pytest @@ -3051,7 +3051,7 @@ celestial-to-terrestrial coordinate transformations.") (native-inputs (list nss-certs-for-test pkg-config - python-cython-3 + python-cython python-extension-helpers python-setuptools-scm)) (propagated-inputs @@ -3155,7 +3155,7 @@ online Astronomical data. Each web service has its own sub-package.") (make-file-writable "astroscrappy/_compiler.c") (invoke "python" "setup.py" "build_ext" "--inplace")))))) (native-inputs - (list python-cython-3 + (list python-cython python-extension-helpers python-pytest-astropy python-scipy @@ -4798,7 +4798,7 @@ default) to world coordinates.") (setenv "HOME" "/tmp") (apply invoke "pytest" "-vv" test-flags)))))))) (native-inputs - (list python-cython-3 + (list python-cython python-extension-helpers python-pytest python-pytest-astropy @@ -4884,7 +4884,7 @@ sensitivity or energy density (native-inputs (list nss-certs-for-test pkg-config - python-cython-3 + python-cython python-pytest python-pytest-astropy-header python-pytest-cython @@ -5538,7 +5538,7 @@ quantification of galaxies, quasar-host galaxy decomposition and much more.") (setenv "TEMPO2_PREFIX" tempo2) (setenv "TEMPO2" tempo2-runtime))))))) (native-inputs - (list python-cython-3 + (list python-cython python-numpy python-pytest python-setuptools @@ -5607,7 +5607,7 @@ emission lines in 1-D spectra, especially galaxy and quasar spectra.") (arguments (list #:tests? #f)) ; no tests provided (native-inputs - (list python-cython-3 + (list python-cython python-setuptools python-wheel)) (propagated-inputs @@ -5649,7 +5649,7 @@ solutions generated by NDPPP.") ;; <.github/workflows/python.yml>. (invoke "python" "tools/losoto_test.py"))))))) (native-inputs - (list python-cython-3 + (list python-cython python-setuptools python-wheel)) (propagated-inputs @@ -5962,7 +5962,7 @@ photometry, segmentations, Petrosian profiling, and Sérsic fitting.") (with-directory-excursion "/tmp" (apply invoke "pytest" "-vv" test-flags)))))))) (native-inputs - (list python-cython-3 + (list python-cython python-extension-helpers python-pytest-astropy python-pytest-xdist @@ -7082,7 +7082,7 @@ Virtual observatory (VO) using Python.") python-unyt python-yt)) (native-inputs - (list python-cython-3 + (list python-cython python-setuptools python-setuptools-scm python-wheel)) @@ -7302,7 +7302,7 @@ solar physics.") python-scipy python-shapely)) (native-inputs - (list python-cython-3 + (list python-cython python-extension-helpers python-pytest-arraydiff python-pytest-astropy @@ -7404,7 +7404,7 @@ setup(ext_modules=get_extensions())"))))) python-shapely python-zarr)) (native-inputs - (list python-cython-3 + (list python-cython python-extension-helpers python-asdf python-gwcs @@ -7889,7 +7889,7 @@ framework of lens modelling software lenstronomy.") (invoke "python" "setup.py" "build_ext" "--inplace")))))) (native-inputs (list ;; python-iminuit ; not packed, optional - python-cython-3 + python-cython python-pytest python-pytest-astropy python-setuptools @@ -7950,7 +7950,7 @@ to make such analysis both as flexible and clear as possible.") " and not ")))) (native-inputs (list nss-certs-for-test - python-cython-3 + python-cython python-poetry-core python-pytest)) (propagated-inputs @@ -8497,7 +8497,7 @@ and CAS statistics), as well as fitting 2D Sérsic profiles.") ;; might not set the version correctly. ((".*opencv-python-headless.*") ""))))))) (native-inputs - (list python-cython-3 + (list python-cython python-psutil python-pytest python-pytest-xdist @@ -9496,9 +9496,9 @@ between image and reference catalogs. Currently only aligning images with @url{https://aeolus.services, Aeolus}") (license license:expat))) -(define-public python-webbpsf - ;; See <https://github.com/spacetelescope/webbpsf/pull/951> - (deprecated-package "python-webbpsf" python-stpsf)) +;; See <https://github.com/spacetelescope/webbpsf/pull/951> +(define-deprecated-package python-webbpsf + python-stpsf) (define-public python-wiimatch (package @@ -9565,7 +9565,7 @@ using (multivariate) polynomials.") (invoke "python" "setup.py" "build_ext" "--inplace")))))) (native-inputs (list nss-certs-for-test - python-cython-3 + python-cython python-pyaml python-pytest python-pytest-mpl diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index b03d2d4fe5..ee15f82098 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -57,6 +57,7 @@ ;;; Copyright © 2025 Kjartan Oli Agustsson <kjartanoli@outlook.com> ;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2025 Antoine Côté <antoine.cote@posteo.net> +;;; Copyright © 2025 Isidor Zeuner <guix@quidecco.pl> ;;; ;;; This file is part of GNU Guix. ;;; @@ -5623,6 +5624,42 @@ encoder used for an MPEG Layer III (MP3) file, as well as scan any MPEG audio file (any layer) and print a lot of useful information.") (license license:lgpl2.1+))) +(define-public mp3cat + (package + (name "mp3cat") + (version "0.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tomclegg/mp3cat") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0n6hjg2wgd06m561zc3ib5w2m3pwpf74njv2b2w4sqqh5md2ymfr")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ;upstream defines no tests + #:make-flags + #~(list (string-append "PREFIX=" + #$output)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'patch-makefile + (lambda _args + (substitute* "Makefile" + (("cc") + #$(cc-for-target)))))))) + (home-page "http://tomclegg.net/mp3cat") + (synopsis "MP3 stream copier and concatenator") + (description + "Copies a stream, skipping everything except MP3 frames with valid +headers. This can be used to copy and concatenate streams, even if +they contain extra garbage.") + (license license:gpl2+))) + (define-public shntool (package (name "shntool") @@ -7210,7 +7247,7 @@ Rate} 3600x2250 bit/s vocoder used in various radio systems.") (propagated-inputs ;; This is because include/ableton/platforms/asio/AsioWrapper.hpp ;; contains '#include <asio.hpp>'. - (list asio)) + (list asio-1.28)) (arguments `(#:configure-flags '("-DLINK_BUILD_QT_EXAMPLES=ON" diff --git a/gnu/packages/axoloti.scm b/gnu/packages/axoloti.scm index 3b554f05ee..2241344805 100644 --- a/gnu/packages/axoloti.scm +++ b/gnu/packages/axoloti.scm @@ -662,5 +662,5 @@ with some layout changes and added features. This package provides the patcher application."))) -(define-public axoloti-patcher-next - (deprecated-package "axoloti-patcher-next" ksoloti-patcher)) +(define-deprecated-package axoloti-patcher-next + ksoloti-patcher) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 602158687f..a9e97e0371 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1354,124 +1354,6 @@ with the Linux kernel.") ;; This phase fails trying to create /etc/ld.so.cache (delete 'install-utf8-c-locale))))))) -(define-public glibc-2.32 - (package - (inherit glibc-2.35) - (version "2.32") - (source (origin - (inherit (package-source glibc)) - (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz")) - (sha256 - (base32 - "0di848ibffrnwq7g2dvgqrnn4xqhj3h96csn69q4da51ymafl9qn")) - (patches (search-patches - "glibc-skip-c++.patch" - "glibc-ldd-powerpc.patch" - "glibc-ldd-x86_64.patch" - "glibc-dl-cache.patch" - "glibc-hidden-visibility-ldconfig.patch" - "glibc-versioned-locpath.patch" - "glibc-allow-kernel-2.6.32.patch" - "glibc-reinstate-prlimit64-fallback.patch" - "glibc-supported-locales.patch" - "glibc-hurd-clock_t_centiseconds.patch" - "glibc-2.31-hurd-clock_gettime_monotonic.patch" - "glibc-hurd-signal-sa-siginfo.patch" - "glibc-hurd-mach-print.patch" - "glibc-hurd-gettyent.patch")) - #; - (patches (search-patches "glibc-ldd-x86_64.patch" - "glibc-hidden-visibility-ldconfig.patch" - "glibc-versioned-locpath.patch" - "glibc-allow-kernel-2.6.32.patch" - "glibc-reinstate-prlimit64-fallback.patch" - "glibc-supported-locales.patch" - "glibc-hurd-clock_t_centiseconds.patch" - "glibc-hurd-clock_gettime_monotonic.patch" - "glibc-hurd-signal-sa-siginfo.patch")))) - - (arguments - (substitute-keyword-arguments (package-arguments glibc) - ((#:make-flags flags '()) - ;; Arrange so that /etc/rpc & co. go to $out/etc. - `(list (string-append "sysconfdir=" - (assoc-ref %outputs "out") - "/etc"))) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'configure 'set-etc-rpc-installation-directory - (lambda* (#:key outputs #:allow-other-keys) - ;; Install the rpc data base file under `$out/etc/rpc'. - (let ((out (assoc-ref outputs "out"))) - (substitute* "sunrpc/Makefile" - (("^\\$\\(inst_sysconfdir\\)/rpc(.*)$" _ suffix) - (string-append out "/etc/rpc" suffix "\n")) - (("^install-others =.*$") - (string-append "install-others = " out "/etc/rpc\n")))))))))))) - -(define-public glibc-2.31 - (package - (inherit glibc-2.35) - (version "2.31") - (source (origin - (inherit (package-source glibc)) - (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz")) - (sha256 - (base32 - "05zxkyz9bv3j9h0xyid1rhvh3klhsmrpkf3bcs6frvlgyr2gwilj")) - (patches (search-patches - "glibc-skip-c++.patch" - "glibc-ldd-powerpc.patch" - "glibc-ldd-x86_64.patch" - "glibc-dl-cache.patch" - "glibc-hidden-visibility-ldconfig.patch" - "glibc-versioned-locpath.patch" - "glibc-allow-kernel-2.6.32.patch" - "glibc-reinstate-prlimit64-fallback.patch" - "glibc-supported-locales.patch" - "glibc-hurd-clock_t_centiseconds.patch" - "glibc-2.31-hurd-clock_gettime_monotonic.patch" - "glibc-hurd-signal-sa-siginfo.patch" - "glibc-hurd-mach-print.patch" - "glibc-hurd-gettyent.patch")))) - (arguments - (substitute-keyword-arguments (package-arguments glibc) - ((#:phases phases) - `(modify-phases ,phases - (add-before 'configure 'set-etc-rpc-installation-directory - (lambda* (#:key outputs #:allow-other-keys) - ;; Install the rpc data base file under `$out/etc/rpc'. - (let ((out (assoc-ref outputs "out"))) - (substitute* "sunrpc/Makefile" - (("^\\$\\(inst_sysconfdir\\)/rpc(.*)$" _ suffix) - (string-append out "/etc/rpc" suffix "\n")) - (("^install-others =.*$") - (string-append "install-others = " out "/etc/rpc\n")))))))))))) - -(define-public glibc-2.30 - (package - (inherit glibc-2.31) - (version "2.30") - (native-inputs - ;; This fails with a build error in libc-tls.c when using GCC 10. Use an - ;; older compiler. - (modify-inputs (package-native-inputs glibc) - (prepend gcc-8))) - (source (origin - (inherit (package-source glibc)) - (uri (string-append "mirror://gnu/glibc/glibc-" version ".tar.xz")) - (sha256 - (base32 - "1bxqpg91d02qnaz837a5kamm0f43pr1il4r9pknygywsar713i72")) - (patches (search-patches "glibc-skip-c++.patch" - "glibc-ldd-x86_64.patch" - "glibc-CVE-2019-19126.patch" - "glibc-hidden-visibility-ldconfig.patch" - "glibc-versioned-locpath.patch" - "glibc-allow-kernel-2.6.32.patch" - "glibc-reinstate-prlimit64-fallback.patch" - "glibc-2.29-supported-locales.patch")))))) - (define-public (make-gcc-libc base-gcc libc) "Return a GCC that targets LIBC." (package (inherit base-gcc) @@ -1492,14 +1374,7 @@ with the Linux kernel.") (inherit glibc) (name "glibc-locales") (source (origin (inherit (package-source glibc)) - ;; The patch for glibc 2.28 and earlier replaces the same - ;; content, but the context in the patch is different - ;; enough to fail to merge. - (patches (cons (search-patch - (if (version>=? (package-version glibc) - "2.29") - "glibc-locales.patch" - "glibc-locales-2.28.patch")) + (patches (cons (search-patch "glibc-locales.patch") (origin-patches (package-source glibc)))))) (synopsis "All the locales supported by the GNU C Library") (description @@ -1653,15 +1528,6 @@ test environments.") (define-public glibc-locales-2.33 (package (inherit (make-glibc-locales glibc-2.33)) (name "glibc-locales-2.33"))) -(define-public glibc-locales-2.32 - (package (inherit (make-glibc-locales glibc-2.32)) - (name "glibc-locales-2.32"))) -(define-public glibc-locales-2.31 - (package (inherit (make-glibc-locales glibc-2.31)) - (name "glibc-locales-2.31"))) -(define-public glibc-locales-2.30 - (package (inherit (make-glibc-locales glibc-2.30)) - (name "glibc-locales-2.30"))) (define-public which (package diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm index 91e3f32837..735ba60b24 100644 --- a/gnu/packages/benchmark.scm +++ b/gnu/packages/benchmark.scm @@ -902,3 +902,31 @@ user-provided Lua scripts. aspects of Vulkan performance. The way in which each scene is rendered is configurable through a set of options.") (license license:lgpl2.1+)))) + +(define-public osu-micro-benchmarks + (package + (name "osu-micro-benchmarks") + (version "7.5.1") + (source + (origin + (method url-fetch) + (uri (string-append + "https://mvapich.cse.ohio-state.edu/download/mvapich/" name "-" + version ".tar.gz")) + (sha256 + (base32 "08ifql3q8kv22xncvp6asfqp62dvfnc7w96b1r925c1w7ig0s38n")))) + (build-system gnu-build-system) + (inputs (list openmpi)) + (arguments + (list + #:configure-flags + #~(list (string-append + "CC=" #$(this-package-input "openmpi") "/bin/mpicc") + (string-append + "CXX=" #$(this-package-input "openmpi") "/bin/mpicxx")))) + (home-page "https://mvapich.cse.ohio-state.edu/benchmarks/") + (synopsis "Benchmarking suite from the MVAPICH project") + (description + "Microbenchmarks suite to evaluate MPI and PGAS (OpenSHMEM, UPC, and +UPC++) libraries for CPUs and GPUs.") + (license license:bsd-3))) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index eac62ffcc1..9f0fbd0135 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -350,40 +350,6 @@ transparently with both VCFs and BCFs, both uncompressed and BGZF-compressed.") ;; The sources are dual MIT/GPL, but becomes GPL-only when USE_GPL=1. (license (list license:gpl3+ license:expat)))) -(define-public bcftools-1.12 - (package/inherit bcftools - (version "1.12") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/samtools/bcftools/" - "releases/download/" - version "/bcftools-" version ".tar.bz2")) - (sha256 - (base32 - "1x94l1hy2pi3lbz0sxlbw0g6q5z5apcrhrlcwda94ns9n4r6a3ks")) - (modules '((guix build utils))) - (snippet '(begin - ;; Delete bundled htslib. - (delete-file-recursively "htslib-1.12"))))) - (native-inputs (list htslib-1.12 perl)))) - -(define-public bcftools-1.10 - (package/inherit bcftools - (version "1.10") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/samtools/bcftools/" - "releases/download/" - version "/bcftools-" version ".tar.bz2")) - (sha256 - (base32 - "10xgwfdgqb6dsmr3ndnpb77mc3a38dy8kh2c6czn6wj7jhdp4dra")) - (modules '((guix build utils))) - (snippet '(begin - ;; Delete bundled htslib. - (delete-file-recursively "htslib-1.10"))))) - (native-inputs (list htslib-1.10 perl)))) - (define-public bedops (package (name "bedops") @@ -2900,8 +2866,8 @@ biological activities from omics data within a unified framework.") (license license:bsd-3))) ;; See: <https://github.com/scverse/decoupler/blob/main/CHANGELOG.md#200> -(define-public python-decoupler-py - (deprecated-package "python-decoupler-py" python-decoupler)) +(define-deprecated-package python-decoupler-py + python-decoupler) (define-public python-demuxem (package @@ -2964,7 +2930,7 @@ demultiplexing step.") (list python-anndata python-ipywidgets python-leidenalg - python-vtraag-louvain + python-louvain-igraph python-matplotlib python-numpy python-pandas @@ -6027,8 +5993,8 @@ subgroups.") (description "muon is a multimodal omics Python framework.") (license license:bsd-3))) -(define-public python-pyega3 - (deprecated-package "python-pyega3" python-ega-download-client)) +(define-deprecated-package python-pyega3 + python-ega-download-client) (define-public python-pysam (package @@ -6121,79 +6087,6 @@ also includes an interface for tabix.") UCSC genome browser.") (license license:artistic2.0))) -(define-public python-plastid - (package - (name "python-plastid") - (version "0.6.1") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/joshuagryphon/plastid") - (commit "d97f239d73b3a7c2eff46f71928b777431891f90"))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0iccpywlpf1ws46279z9rl0l29pil0rj0g2j5nvqq7jfbnq581cf")))) - (build-system pyproject-build-system) - (arguments - (list - #:test-flags - '(list "plastid/test" - ;; These four failures look like errors in the test wrapper - ;; class. - "-k" (string-append "not test_chrom_sizes" - " and not test_no_crash_if_file_not_exist" - " and not test_fiveprime_variable" - " and not test_fiveprime_variable_from_file")) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'unpack-test-data - (lambda* (#:key inputs #:allow-other-keys) - (invoke "tar" "-C" "plastid/test" - "-xf" (assoc-ref inputs "test-data")) - ;; This one requires bowtie-build - (delete-file "plastid/test/functional/test_crossmap.py"))) - (add-after 'unpack 'patch-for-python-3.10 - (lambda _ - ;; Some classes were moved from collections to collections.abc - ;; in Python 3.10. - (substitute* "plastid/readers/bigbed.pyx" - ((", Iterable") - "\nfrom collections.abc import Iterable")))) - (add-before 'check 'build-extensions - (lambda _ - ;; Cython extensions have to be built before running the tests. - (invoke "python3" "setup.py" "build_ext" "--inplace")))))) - (propagated-inputs - (list python-numpy - python-scipy - python-pandas - python-pysam - python-matplotlib - python-biopython - python-twobitreader - python-termcolor)) - (inputs - (list openssl)) - (native-inputs - `(("python-cython" ,python-cython) - ("python-pytest" ,python-pytest) - ("python-setuptools" ,python-setuptools) - ("python-wheel" ,python-wheel) - ("test-data" - ,(origin - (method url-fetch) - (uri "https://www.dropbox.com/s/np3wlfvp6gx8tb8/2022-05-04.plastid-test-data.tar.bz2?dl=1") - (file-name "plastid-test-data-2022-05-04.tar.bz2") - (sha256 - (base32 "1szsji06m2r21flnvxg84jnj5zmlk6z10c9651v9ag71nxj9rbzn")))))) - (home-page "https://github.com/joshuagryphon/plastid") - (synopsis "Python library for genomic analysis") - (description - "plastid is a Python library for genomic analysis – in particular, -high-throughput sequencing data – with an emphasis on simplicity.") - (license license:bsd-3))) - (define-public tetoolkit (package (name "tetoolkit") @@ -9706,48 +9599,6 @@ data. It also provides the @command{bgzip}, @command{htsfile}, and ;; the rest is released under the Expat license (license (list license:expat license:bsd-3)))) -(define-public htslib-1.19 - (package - (inherit htslib) - (version "1.19") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/samtools/htslib/releases/download/" - version "/htslib-" version ".tar.bz2")) - (sha256 - (base32 - "0dh79lwpspwwfbkmllrrhbk8nkvlfc5b5ib4d0xg5ld79w6c8lc7")) - (snippet - #~(begin - (use-modules (guix build utils)) - (delete-file-recursively "htscodecs"))))) - (build-system gnu-build-system) - ;; Let htslib translate "gs://" and "s3://" to regular https links with - ;; "--enable-gcs" and "--enable-s3". For these options to work, we also - ;; need to set "--enable-libcurl". - (arguments - `(#:configure-flags '("--enable-gcs" - "--enable-libcurl" - "--enable-s3" - "--with-external-htscodecs"))) - (inputs - (list bzip2 curl openssl xz)) - ;; This is referred to in the pkg-config file as a required library. - (propagated-inputs - (list htscodecs zlib)) - (native-inputs - (list perl)) - (home-page "https://www.htslib.org") - (synopsis "C library for reading/writing high-throughput sequencing data") - (description - "HTSlib is a C library for reading/writing high-throughput sequencing -data. It also provides the @command{bgzip}, @command{htsfile}, and -@command{tabix} utilities.") - ;; Files under cram/ are released under the modified BSD license; - ;; the rest is released under the Expat license - (license (list license:expat license:bsd-3)))) - (define-public htslib-1.14 (package/inherit htslib (version "1.14") @@ -9767,37 +9618,6 @@ data. It also provides the @command{bgzip}, @command{htsfile}, and (modify-inputs (package-propagated-inputs htslib) (delete "htscodecs"))))) -(define-public htslib-1.12 - (package/inherit htslib - (version "1.12") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/samtools/htslib/releases/download/" - version "/htslib-" version ".tar.bz2")) - (sha256 - (base32 - "1jplnvizgr0fyyvvmkfmnsywrrpqhid3760vw15bllz98qdi9012")))) - (arguments - (substitute-keyword-arguments (package-arguments htslib) - ((#:configure-flags cf #~'()) - #~(delete "--with-external-htscodecs" #$cf)))) - (propagated-inputs - (modify-inputs (package-propagated-inputs htslib) - (delete "htscodecs"))))) - -(define-public htslib-1.10 - (package/inherit htslib - (version "1.10") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/samtools/htslib/releases/download/" - version "/htslib-" version ".tar.bz2")) - (sha256 - (base32 - "0wm9ay7qgypj3mwx9zl1mrpnr36298b1aj5vx69l4k7bzbclvr3s")))))) - (define-public htslib-1.9 (package/inherit htslib (version "1.9") @@ -9823,41 +9643,6 @@ data. It also provides the @command{bgzip}, @command{htsfile}, and (base32 "1rja282fwdc25ql6izkhdyh8ppw8x2fs0w0js78zgkmqjlikmma9")))))) -(define htslib-for-samtools-1.2 - (package/inherit htslib - (version "1.2.1") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/samtools/htslib/releases/download/" - version "/htslib-" version ".tar.bz2")) - (sha256 - (base32 - "1c32ssscbnjwfw3dra140fq7riarp2x990qxybh34nr1p5r17nxx")))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-tests - (lambda _ - (substitute* "test/test.pl" - (("/bin/bash") (which "bash")))))))) - (inputs - `(("zlib" ,zlib))) - (native-inputs - `(("perl" ,perl))))) - -(define htslib-for-stringtie - (package - (inherit htslib-1.12) - (source (origin - (inherit (package-source htslib-1.12)) - (patches - (search-patches "htslib-for-stringtie.patch")))) - (arguments - `(#:configure-flags '("--with-libdeflate"))) - (inputs - (list bzip2 libdeflate openssl)))) - (define-public idr (package (name "idr") @@ -10204,7 +9989,7 @@ sequencing tag position and orientation.") python-scikit-learn python-scipy)) (native-inputs - (list python-cython-3 + (list python-cython python-pytest python-setuptools python-wheel @@ -11309,145 +11094,6 @@ variant calling (in conjunction with bcftools), and a simple alignment viewer.") (license license:expat))) -(define-public samtools-1.14 - (package/inherit samtools - (version "1.14") - (source - (origin - (method url-fetch) - (uri - (string-append "mirror://sourceforge/samtools/samtools/" - version "/samtools-" version ".tar.bz2")) - (sha256 - (base32 - "0x3xdda78ac5vx66b3jdsv9sfhyz4npl4znl1zbaf3lbm6xdlhck")) - (modules '((guix build utils))) - (snippet '(begin - ;; Delete bundled htslib. - (delete-file-recursively "htslib-1.14"))))) - (native-inputs (list pkg-config)) - (inputs - (list htslib-1.14 ncurses perl python zlib)))) - -(define-public samtools-1.12 - (package/inherit samtools - (version "1.12") - (source - (origin - (method url-fetch) - (uri - (string-append "mirror://sourceforge/samtools/samtools/" - version "/samtools-" version ".tar.bz2")) - (sha256 - (base32 - "1jrdj2idpma5ja9cg0rr73b565vdbr9wyy6zig54bidicc2pg8vd")) - (modules '((guix build utils))) - (snippet '(begin - ;; Delete bundled htslib. - (delete-file-recursively "htslib-1.12"))))) - (arguments - (substitute-keyword-arguments (package-arguments samtools) - ((#:modules _ #f) - '((ice-9 ftw) - (ice-9 regex) - (guix build gnu-build-system) - (guix build utils))) - ((#:phases phases) - `(modify-phases ,phases - (add-after 'install 'install-library - (lambda* (#:key outputs #:allow-other-keys) - (let ((lib (string-append (assoc-ref outputs "out") "/lib"))) - (install-file "libbam.a" lib)))) - (add-after 'install 'install-headers - (lambda* (#:key outputs #:allow-other-keys) - (let ((include (string-append (assoc-ref outputs "out") - "/include/samtools/"))) - (for-each (lambda (file) - (install-file file include)) - (scandir "." (lambda (name) - (string-match "\\.h$" name))))))))))) - (native-inputs (list pkg-config)) - (inputs - (list htslib-1.12 ncurses perl python zlib)))) - -(define-public samtools-1.10 - (package (inherit samtools) - (name "samtools") - (version "1.10") - (source - (origin - (method url-fetch) - (uri - (string-append "mirror://sourceforge/samtools/samtools/" - version "/samtools-" version ".tar.bz2")) - (sha256 - (base32 - "119ms0dpydw8dkh3zc4yyw9zhdzgv12px4l2kayigv31bpqcb7kv")) - (modules '((guix build utils))) - (snippet '(begin - ;; Delete bundled htslib. - (delete-file-recursively "htslib-1.10") - #t)))) - (inputs - (list htslib-1.10 ncurses perl python zlib)))) - -(define-public samtools-1.2 - (package (inherit samtools) - (name "samtools") - (version "1.2") - (source - (origin - (method url-fetch) - (uri - (string-append "mirror://sourceforge/samtools/samtools/" - version "/samtools-" version ".tar.bz2")) - (sha256 - (base32 - "1akdqb685pk9xk1nb6sa9aq8xssjjhvvc06kp4cpdqvz2157l3j2")) - (modules '((guix build utils))) - (snippet - ;; Delete bundled htslib and Windows binaries - '(for-each delete-file-recursively (list "win32" "htslib-1.2.1"))))) - (arguments - `(#:make-flags - ,#~(list (string-append "prefix=" #$output) - (string-append "BGZIP=" - #$(this-package-input "htslib") - "/bin/bgzip") - (string-append "HTSLIB=" - #$(this-package-input "htslib") - "/lib/libhts.so") - (string-append "HTSDIR=" - #$(this-package-input "htslib") - "/include")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-makefile-curses - (lambda _ - (substitute* "Makefile" - (("-lcurses") "-lncurses") - (("include \\$\\(HTSDIR.*") "")))) - (add-after 'unpack 'patch-tests - (lambda _ - (substitute* "test/test.pl" - ;; The test script calls out to /bin/bash - (("/bin/bash") (which "bash")) - ;; There are two failing tests upstream relating to the "stats" - ;; subcommand in test_usage_subcommand ("did not have Usage" - ;; and "usage did not mention samtools stats"), so we disable - ;; them. - (("(test_usage_subcommand\\(.*\\);)" cmd) - (string-append "unless ($subcommand eq 'stats') {" cmd "};"))) - ;; This test fails because the grep output doesn't look as - ;; expected; it is correct, though. - (substitute* "test/mpileup/mpileup.reg" - (("P 52.out.*") "")))) - (delete 'configure)))) - (native-inputs - (list grep gawk pkg-config)) - (inputs - (list htslib-for-samtools-1.2 ncurses perl python zlib)))) - (define-public samtools-0.1 ;; This is the most recent version of the 0.1 line of samtools. The input ;; and output formats differ greatly from that used and produced by samtools @@ -12794,14 +12440,14 @@ against local background noises.") (define-public stringtie (package (name "stringtie") - (version "2.2.0") + (version "3.0.2") (source (origin (method url-fetch) (uri (string-append "http://ccb.jhu.edu/software/stringtie/dl/" "stringtie-" version ".tar.gz")) (sha256 (base32 - "08w3ish4y9kf9acp7k38iwi8ixa6j51m6qyf0vvfj7yz78a3ai3x")) + "1mrqcvnhxbidyhf521naywb5ci579160ydqnl5kb4hqjqvm01mn2")) ;; This package bundles an annoying amount of third party source ;; code. (modules '((guix build utils))) @@ -12827,7 +12473,7 @@ against local background noises.") (let ((bin (string-append (assoc-ref outputs "out") "/bin/"))) (install-file "stringtie" bin))))))) (inputs - (list bzip2 htslib-for-stringtie libdeflate zlib)) + (list bzip2 htslib libdeflate zlib)) (home-page "https://ccb.jhu.edu/software/stringtie/") (synopsis "Transcript assembly and quantification for RNA-Seq data") (description @@ -17461,8 +17107,8 @@ lowly expressed transcripts.") mapped paired-end sequencing reads.") (license license:gpl3+))) -(define-public fanc - (deprecated-package "fanc" python-fanc)) +(define-deprecated-package fanc + python-fanc) (define-public python-genomic-regions (package @@ -18714,8 +18360,8 @@ report will provide an intuitive visual overview about the development of variant abundance over time and location.") (license license:gpl3+))) -(define-public pigx-sars-cov2-ww - (deprecated-package "pigx-sars-cov2-ww" pigx-sars-cov-2)) +(define-deprecated-package pigx-sars-cov2-ww + pigx-sars-cov-2) (define-public pigx (package @@ -20178,26 +19824,31 @@ set.") (define-public instrain (package (name "instrain") - (version "1.9.0") + ;; Git repository does not tag releases, use the latest commit from master + ;; branch. + (properties '((commit . "6180be7b49a61b7e1ffe9f1489da5c6aa2ff9ac3") + (revision . "0"))) + (version (git-version "1.10.0" + (assoc-ref properties 'revision) + (assoc-ref properties 'commit))) (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/MrOlm/instrain") - ;; There are no tags. - (commit "168f3f777b45139a9f6099f68974105b45e2d8ba"))) + (url "https://github.com/MrOlm/instrain") + (commit (assoc-ref properties 'commit)))) (file-name (git-file-name name version)) (sha256 - (base32 - "1wc69ggyiacm1slb678239lqmf1g5dlb4alwsbp14gi6393gj9fg")))) + (base32 "1njsxjf3248121yw3q1ig6asf6b3wa5fgjfyc6dkgk6nd4ih8wni")))) (build-system pyproject-build-system) (arguments (list ;; Tests assume that test files exist (they don't) and are located in - ;; the developer's home directory. + ;; the developer's home directory, see: + ;; <https://github.com/MrOlm/inStrain/issues/218>. #:tests? #false #:phases - '(modify-phases %standard-phases + #~(modify-phases %standard-phases (add-after 'unpack 'patch-relative-imports (lambda _ (substitute* (find-files "test/tests" "test_.*\\.py") @@ -20208,7 +19859,11 @@ set.") (("from s3_utils") "from .s3_utils") (("from job_utils") - "from .job_utils"))))))) + "from .job_utils")))) + (add-after 'unpack 'relax-requirements + (lambda _ + (substitute* "setup.py" + ((".*pytest.*") ""))))))) (propagated-inputs (list python-biopython-1.73 python-h5py @@ -20222,10 +19877,7 @@ set.") python-seaborn python-tqdm)) (native-inputs - (list python-boto3 - python-pytest - python-setuptools - python-wheel)) + (list python-setuptools)) (home-page "https://github.com/MrOlm/inStrain") (synopsis "Calculation of strain-level metrics") (description @@ -20404,7 +20056,7 @@ bgzipped text file that contains a pair of genomic coordinates per line.") (propagated-inputs (list python-archspec)) (native-inputs (list cmake-minimal - python-cython-3 + python-cython python-scikit-build-core)) (home-page "https://github.com/althonos/pyrodigal") (synopsis "Cython bindings and Python interface for Prodigal") @@ -21511,46 +21163,6 @@ filtered first. If no annotation entry remains, the entire variant is deleted.") (license license:expat))) -(define-public python-velocyto - (package - (name "python-velocyto") - (version "0.17.17") - (source - (origin - (method url-fetch) - (uri (pypi-uri "velocyto" version)) - (sha256 - (base32 "0fgygyzqgrq32dv6a00biq1p1cwi6kbl5iqblxq1kklj6b2mzmhs")) - (modules '((guix build utils))) - ;; Delete generated C files. - (snippet '(for-each delete-file - (find-files "." "\\.c"))))) - (build-system pyproject-build-system) - (arguments - '(#:phases (modify-phases %standard-phases - ;; Numba needs a writable dir to cache functions. - (add-before 'check 'set-numba-cache-dir - (lambda _ - (setenv "NUMBA_CACHE_DIR" "/tmp")))))) - (native-inputs (list python-joblib python-setuptools python-wheel)) - (propagated-inputs (list python-click - python-cython - python-h5py - python-loompy - python-matplotlib - python-numba - python-numpy - python-pandas - python-pysam - python-scikit-learn - python-scipy)) - (home-page "https://github.com/velocyto-team/velocyto.py") - (synopsis "RNA velocity analysis for single cell RNA-seq data") - (description - "Velocyto is a library for the analysis of RNA velocity. Velocyto -includes a command line tool and an analysis pipeline.") - (license license:bsd-2))) - (define-public arriba (package (name "arriba") @@ -23528,15 +23140,16 @@ The output is in SAM format.") (define-public libsbml (package (name "libsbml") - (version "5.18.0") + (version "5.20.5") (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/sbml/libsbml/" - version "/stable/libSBML-" - version "-core-src.tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/sbmlteam/libsbml") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "0slkagrk3nfi2qsksv6b1brj6zhx4bj4bkib2sdycvrcd10ql2lh")))) + "1bzsgwblh5l15xxy7kpdwiya5kwm26sj6daqr9i93h04manpqmfw")))) (build-system cmake-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm index c2d2fe0ff2..9f260067fd 100644 --- a/gnu/packages/bittorrent.scm +++ b/gnu/packages/bittorrent.scm @@ -224,18 +224,19 @@ of the Transmission BitTorrent client, using its HTTP RPC protocol.") (define-public libtorrent (package (name "libtorrent") - (version "0.13.8") + (version "0.16.1") (source (origin - (method url-fetch) - (uri (string-append - "http://rtorrent.net/downloads/libtorrent-" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/rakshasa/libtorrent/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "10z9i1rc41cmmi7nx8k7k1agsx6afv09g9cl7g9zr35fyhl5l4gd")))) + "1rk5y27r2v3x2v1gngxfw8kj1i8n93dpkvda6idbid6yxvv9slkm")))) (build-system gnu-build-system) - (inputs (list openssl zlib)) - (native-inputs (list pkg-config cppunit)) + (inputs (list curl openssl zlib)) + (native-inputs (list autoconf automake cppunit libtool pkg-config)) (synopsis "BitTorrent library of rtorrent") (description "LibTorrent is a BitTorrent library used by and developed in parallel @@ -247,15 +248,16 @@ speed and efficiency.") (define-public rtorrent (package (name "rtorrent") - (version "0.9.8") + (version "0.16.1") (source (origin - (method url-fetch) - (uri (string-append - "http://rtorrent.net/downloads/rtorrent-" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/rakshasa/rtorrent/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1bs2fnf4q7mlhkhzp3i1v052v9xn8qa7g845pk9ia8hlpw207pwy")))) + "0azpqclksczh1j7kpkwqh68xp3p9rayf9dym1c2iif56fm960mgh")))) (build-system gnu-build-system) (inputs (list libtorrent ncurses @@ -263,7 +265,7 @@ speed and efficiency.") cyrus-sasl openssl zlib)) - (native-inputs (list pkg-config cppunit)) + (native-inputs (list autoconf automake cppunit libtool pkg-config)) (synopsis "BitTorrent client with ncurses interface") (description "rTorrent is a BitTorrent client with an ncurses interface. It supports @@ -564,8 +566,8 @@ features.") (modify-inputs (package-inputs base) (delete "qtsvg")))))) -(define-public qbittorrent-nox - (deprecated-package "qbittorrent-nox" qbittorrent-no-x)) +(define-deprecated-package qbittorrent-nox + qbittorrent-no-x) (define-public qbittorrent-enhanced (package @@ -602,8 +604,8 @@ the following features: (arguments (package-arguments qbittorrent-no-x)) (inputs (package-inputs qbittorrent-no-x)))) -(define-public qbittorrent-enhanced-nox - (deprecated-package "qbittorrent-enhanced-nox" qbittorrent-enhanced-no-x)) +(define-deprecated-package qbittorrent-enhanced-nox + qbittorrent-enhanced-no-x) (define-public deluge (package diff --git a/gnu/packages/boost.scm b/gnu/packages/boost.scm index a30cebd3b2..b41b911d08 100644 --- a/gnu/packages/boost.scm +++ b/gnu/packages/boost.scm @@ -226,8 +226,8 @@ across a broad spectrum of applications.") (base32 "13iviiwk1srpw9dmiwabkxv56v0pl0zggjp8zxy1419k5zzfsy34"))))))) -(define-public boost-with-python3 - (deprecated-package "boost-with-python3" boost)) +(define-deprecated-package boost-with-python3 + boost) (define-public boost-static (package diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index 0480212087..957cd5dc56 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -371,7 +371,7 @@ resembles Python.") (list meson ninja/pinned python-colorama - python-cython-3 + python-cython python-pyproject-metadata python-tomli python-typing-extensions @@ -381,7 +381,7 @@ resembles Python.") git-minimal/pinned patchelf pkg-config - python-cython-3 + python-cython python-gitpython python-pytest python-pytest-cov @@ -1298,5 +1298,5 @@ The Waf Book and in the API docs ;; waf is the final program no need to prefix it with "python-", the same way ;; as meson or ninja which are written in Python as well. -(define-public python-waf - (deprecated-package "python-waf" waf)) +(define-deprecated-package python-waf + waf) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 5bc6db0632..822a3da219 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -3093,30 +3093,29 @@ backported from Python 2.7 for Python 2.4+.") (define-public behave (package (name "behave") - ;; The 1.2.6 release from 2018 has several problems with newer Python - ;; versions, so we package a recent snapshot. - (version "1.2.7.dev5") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/behave/behave") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "14162pclfvy4wy2az4v9gkgb3v0b338zxrb2ikqcqifckrmk8nhv")))) + (version "1.3.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/behave/behave") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1fxj51kailsdakqi7qbw700k258n7r3lv75mgxs45ld5xh2jfyxh")))) (build-system pyproject-build-system) (native-inputs - (list python-mock - python-assertpy - python-pathpy + (list python-assertpy + python-chardet + python-mock + python-path python-pyhamcrest python-pytest python-pytest-html - python-setuptools - python-wheel)) + python-setuptools)) (propagated-inputs (list python-colorama + python-cucumber-expressions python-cucumber-tag-expressions python-parse python-parse-type)) diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm index 6dda1bbd20..0111dbc513 100644 --- a/gnu/packages/code.scm +++ b/gnu/packages/code.scm @@ -1134,5 +1134,5 @@ requirements is not met.") (properties '((lint-hidden-cpe-vendors . ("vmware")))) (license license:expat))) -(define-public python-xenon - (deprecated-package "python-xenon" xenon)) +(define-deprecated-package python-xenon + xenon) diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm index 64680c59ab..b6e9e7e7a0 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -67,6 +67,7 @@ #:use-module (guix git-download) #:use-module (guix build-system ant) #:use-module (guix build-system cmake) + #:use-module (guix build-system copy) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system go) @@ -1460,74 +1461,87 @@ for most inputs, but the resulting compressed files are anywhere from 20% to (license license:asl2.0) (properties '((cpe-vendor . "google"))))) -(define-public p7zip +(define-public 7zip (package - (name "p7zip") - (version "16.02") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/" name "/" name "/" - version "/" name "_" version - "_src_all.tar.bz2")) - (sha256 - (base32 - "07rlwbbgszq8i7m8jh3x6j2w2hc9a72dc7fmqawnqkwlwb00mcjy")) - (modules '((guix build utils))) - (snippet - '(begin - ;; Remove non-free source files - (for-each delete-file - (append - (find-files "CPP/7zip/Compress" "Rar.*") - (find-files "CPP/7zip/Crypto" "Rar.*") - (find-files "DOC/unRarLicense.txt") - (find-files "Utils/file_Codecs_Rar_so.py"))) - (delete-file-recursively "CPP/7zip/Archive/Rar") - (delete-file-recursively "CPP/7zip/Compress/Rar") - ;; Fix FTBFS with gcc-10. - (substitute* "CPP/Windows/ErrorMsg.cpp" - (("switch\\(errorCode\\) \\{") - "switch(static_cast<HRESULT>(errorCode)) {")))) - (patches (search-patches "p7zip-CVE-2016-9296.patch" - "p7zip-CVE-2017-17969.patch" - "p7zip-fix-build-with-gcc-11.patch" - "p7zip-remove-unused-code.patch")))) - (build-system gnu-build-system) + (name "7zip") + (version "25.01") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ip7z/7zip") + (commit version))) + (sha256 + (base32 "01jg1fkc2zsdngv3ag3pwq4x8i5x01hjxsk30n78ffwiv2ps4rmq")) + (file-name (git-file-name name version)) + (modules '((guix build utils) + (ice-9 regex))) + (snippet #~(begin + (for-each + delete-file + (append (find-files "CPP/7zip/Compress" "^Rar.*") + (find-files "DOC/unRarLicense.txt"))))))) + (build-system copy-build-system) (arguments - `(#:make-flags - (list (string-append "DEST_HOME=" (assoc-ref %outputs "out")) "all3") - #:phases - (modify-phases %standard-phases - (replace 'configure - (lambda _ - (copy-file - ,(cond ((target-x86-64?) - "makefile.linux_amd64_asm") - ((target-x86-32?) - "makefile.linux_x86_asm_gcc_4.X") - (else - "makefile.linux_any_cpu_gcc_4.X")) - "makefile.machine"))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "make" "test") - (invoke "make" "test_7z") - (invoke "make" "test_7zr"))))))) - (native-inputs - (cond ((target-x86-64?) - (list yasm)) - ((target-x86-32?) - (list nasm)) - (else '()))) - (home-page "https://p7zip.sourceforge.net/") - (synopsis "Command-line file archiver with high compression ratio") - (description "p7zip is a command-line port of 7-Zip, a file archiver that -handles the 7z format which features very high compression ratios.") + (list + #:install-plan + #~'(("DOC/" "share/doc/7zip") + ("CPP/7zip/UI/Console/_o/7z" "bin/") + ("CPP/7zip/Bundles/Format7zF/_o/7z.so" "lib/") + ("CPP/7zip/Bundles/SFXCon/_o/7zCon" "lib/7zCon.sfx")) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (delete 'check) + (add-after 'unpack 'patch-sources + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib"))) + (substitute* "CPP/7zip/UI/Client7z/Client7z.cpp" + (("if \\(!lib\\.Load\\(dllPrefix + FTEXT\\(kDllName\\)\\)\\)") + (string-append "if (!lib.Load(FTEXT(\"" lib + "\") + FTEXT(kDllName)) || " + "!lib.Load(dllPrefix + FTEXT(kDllName)))"))) + (substitute* "CPP/7zip/UI/Common/ArchiveCommandLine.cpp" + (("s = FTEXT\\(\"\\.\"\\)") + (string-append "s = FTEXT(\"" lib "\")")) + (("s = fas2fs\\(g_ModuleDirPrefix\\)") + (string-append "s = FTEXT(\"" lib "\") " + "FSTRING_PATH_SEPARATOR")))))) + (add-before 'install 'build + (lambda* _ + (define make-flags + '#$(list "DISABLE_RAR=1" + (string-append "CC=" (cc-for-target)) + (string-append "CXX=" (cxx-for-target)) + (string-append "PLATFORM=" + (cond + ((target-x86-64?) "x64") + ((target-x86-32?) "x86") + ((target-arm32?) "arm") + ((target-aarch64?) "arm64") + (#t ""))))) + (with-directory-excursion "CPP/7zip/" + (for-each + (lambda (dir) + (with-directory-excursion dir + (apply invoke "make" "-f" "makefile.gcc" make-flags))) + '("UI/Console" + "Bundles/Format7zF" + "Bundles/SFXCon")))))))) + (home-page "https://7-zip.org") + (synopsis "7-zip file archiver") + (description + "7-zip is a command-line file compressor that supports a number +of archive formats and features self-extracting archives.") (license (list license:lgpl2.1+ - license:gpl2+ + license:bsd-2 + license:bsd-3 license:public-domain)))) +(define-public p7zip + (deprecated-package "p7zip" 7zip)) + (define-public gzstream (package (name "gzstream") @@ -2423,8 +2437,8 @@ with @code{deflate} but offers more dense compression. The specification of the Brotli Compressed Data Format is defined in RFC 7932.") (license license:expat))) -(define-public google-brotli - (deprecated-package "google-brotli" brotli)) +(define-deprecated-package google-brotli + brotli) (define-public java-brotli (package diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 4bfaac6a7e..7f124ed095 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -1263,8 +1263,8 @@ data transfer object.") intuitive syntax and trivial integration.") (license license:expat))) -(define-public json-modern-cxx - (deprecated-package "json-modern-cxx" nlohmann-json)) +(define-deprecated-package json-modern-cxx + nlohmann-json) (define-public jthread (let ((commit "0fa8d394254886c555d6faccd0a3de819b7d47f8") diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9fae9575e8..7d975d22e8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -11060,13 +11060,13 @@ matrix) for the double-truncated multinormal case.") (define-public r-rvest (package (name "r-rvest") - (version "1.0.4") + (version "1.0.5") (source (origin (method url-fetch) (uri (cran-uri "rvest" version)) (sha256 - (base32 "19lw0jk8d8x88z247hz761gwbx9f5n3yqnv63mn7pkwl55mpqw3x")))) + (base32 "005wadzdhxf6hgr8vl4nl0nfi2crj6467mhwbccqfy26njh38z0y")))) (build-system r-build-system) (arguments (list @@ -39633,8 +39633,8 @@ integrative non-negative matrix factorization to identify shared and dataset-specific factors.") (license license:gpl3))) -(define-public r-liger - (deprecated-package "r-liger" r-rliger)) +(define-deprecated-package r-liger + r-rliger) (define-public r-harmony (package @@ -50195,8 +50195,8 @@ other R users.") (license license:gpl3))) ;; This is for r-seurat5 -(define-public r-seurat5object - (deprecated-package "r-seurat5object" r-seuratobject)) +(define-deprecated-package r-seurat5object + r-seuratobject) (define-public r-seurat (package @@ -50276,8 +50276,8 @@ discovery of differentially expressed genes and markers.") ;; Seurat5 is only available via the seurat5 branch. It will replace r-seurat ;; eventually once it has been released to CRAN. -(define-public r-seurat5 - (deprecated-package "r-seurat5" r-seurat)) +(define-deprecated-package r-seurat5 + r-seurat) (define-public r-seuratdisk (let ((commit "877d4e18ab38c686f5db54f8cd290274ccdbe295") diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index a6114427c8..e65c0ce2a0 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -1367,8 +1367,8 @@ API.") (home-page "https://matrix.org/docs/projects/other/olm/") (license license:asl2.0))) -(define-public libolm - (deprecated-package "libolm" olm)) +(define-deprecated-package libolm + olm) (define-public python-olm (package diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index db3e508348..49602318a8 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -179,7 +179,8 @@ tunneling, and so on.") (license (license:non-copyleft "file://COPYING" "See COPYING in the distribution.")))) -(define-public gnurl (deprecated-package "gnurl" curl)) +(define-deprecated-package gnurl + curl) (define-public curl-ssh (package/inherit curl diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 57013f2646..35306d062c 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -828,7 +828,7 @@ the API, and provides features such as: #:tests? #f #:build-backend "setuptools.build_meta")) (native-inputs - (list python-cython-3 + (list python-cython python-setuptools python-wheel)) (propagated-inputs @@ -2085,8 +2085,8 @@ supports editing, navigation, and querying of recutils database files including field and record folding.") (license license:gpl3+))) -(define-public emacs-recutils - (deprecated-package "emacs-recutils" emacs-rec-mode)) +(define-deprecated-package emacs-recutils + emacs-rec-mode) (define-public rocksdb (package @@ -4772,7 +4772,7 @@ with the @code{psycopg} PostgreSQL driver.") (invoke "psql" "-h" dbdir "-d" "postgres" "-c" "CREATE DATABASE nixbld;")))))))) (native-inputs - (list python-cython-3 + (list python-cython python-mypy python-psycopg-pool python-pytest @@ -5038,8 +5038,8 @@ reasonable substitute.") "This package provides a Python interface to the Redis key-value store.") (license license:expat))) -(define-public python-aioredis - (deprecated-package "python-aioredis" python-redis)) +(define-deprecated-package python-aioredis + python-redis) (define-public python-rq (package @@ -5582,7 +5582,7 @@ __version_tuple__ = version_tuple = (~a)~%" version version-tuple)))))) (native-inputs (list cmake ;needs 3.25 pkg-config - python-cython-3 + python-cython python-pytest python-pytest-runner python-setuptools-scm)) diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm index f244107841..b4e94be811 100644 --- a/gnu/packages/debug.scm +++ b/gnu/packages/debug.scm @@ -686,6 +686,7 @@ conditions.") (base32 "1mpzjaksc2qg2hzqflf39pl06p53qam2dn3hkhkcv6p00d2n4kx3")))) (build-system gnu-build-system) + (native-inputs (list gcc-13)) (home-page "https://github.com/samhocevar/zzuf") (synopsis "Transparent application input fuzzer") (description "Zzuf is a transparent application input fuzzer. It works by diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 9504cf548e..ae5e9d7e83 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -1052,8 +1052,8 @@ a card with a smaller capacity than stated.") (description "This package provides @code{parted} bindings for Python.") (license license:gpl2+))) -(define-public python-parted - (deprecated-package "python-parted" python-pyparted)) +(define-deprecated-package python-parted + python-pyparted) (define-public duperemove (package diff --git a/gnu/packages/django.scm b/gnu/packages/django.scm index 0fe8e96287..586c18829c 100644 --- a/gnu/packages/django.scm +++ b/gnu/packages/django.scm @@ -1655,8 +1655,8 @@ Django projects, which allows association of a number of tags with any provides features like a Web-browsable API and authentication policies.") (license license:bsd-2))) -(define-public python-djangorestframework - (deprecated-package "python-djangorestframework" python-django-rest-framework)) +(define-deprecated-package python-djangorestframework + python-django-rest-framework) (define-public python-django-sekizai (package diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index deb8a7de7b..16cdf98aa0 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -642,18 +642,18 @@ BIND and djbdns---whilst using relatively little memory.") (define-public unbound (package (name "unbound") - (version "1.24.0") + (version "1.24.1") (source (origin (method url-fetch) (uri (string-append "https://www.unbound.net/downloads/unbound-" version ".tar.gz")) (sha256 - (base32 "11jh8qkjxgry4mlv5lyjzycziz2vhjrm3qh722i8l0677jc24yql")))) + (base32 "1azfl6dkab043jjs7r8fxkh3mwxhg1wgc9q5mqcrch1rw8ricavz")))) (build-system gnu-build-system) (outputs '("out" "python")) (native-inputs - (list flex swig python-wrapper)) + (list flex pkg-config swig python-wrapper)) (inputs (list expat libevent diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index b18e62e3db..06dbd4973c 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm @@ -410,7 +410,7 @@ the Net to search for documents which are not on the local system.") (define-public zeal (package (name "zeal") - (version "0.7.1") + (version "0.7.2") (source (origin (method git-fetch) @@ -419,10 +419,11 @@ the Net to search for documents which are not on the local system.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1yz9zz18rh1d67w40ib4pna70vqkwa9i9nyj423rjysv5rdj2pzp")))) + (base32 "1slq3asssszim9y4lvqx08svilmyisk3cl35mmb676fsx7pningn")))) (build-system qt-build-system) (arguments (list + #:qtbase qtbase #:tests? #f)) ;no tests (native-inputs (list extra-cmake-modules pkg-config)) @@ -430,12 +431,10 @@ the Net to search for documents which are not on the local system.") (list bash-minimal libarchive sqlite - qtbase-5 - qtdeclarative-5 - qtwayland-5 - qtwebchannel-5 - qtwebengine-5 - qtquickcontrols-5 + qtdeclarative + qtwayland + qtwebchannel + qtwebengine qtx11extras xcb-util-keysyms)) (home-page "https://zealdocs.org/") diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 8deb82aa40..ddb2ec3a55 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -68,6 +68,7 @@ #:use-module (gnu packages language) #:use-module (gnu packages libreoffice) #:use-module (gnu packages libusb) + #:use-module (gnu packages machine-learning) #:use-module (gnu packages music) #:use-module (gnu packages pantheon) #:use-module (gnu packages pdf) @@ -136,14 +137,14 @@ with Microsoft Compiled HTML (CHM) files") (define-public calibre (package (name "calibre") - (version "8.4.0") + (version "8.13.0") (source (origin (method url-fetch) (uri (string-append "http://download.calibre-ebook.com/" version "/calibre-" version ".tar.xz")) (sha256 - (base32 "1s9m80nakclxvsw0lax9bak23qipnia74xpy9sv061jvidqb3rz6")) + (base32 "092zv9s0w87vwb5n54ps7lawjmwjqpmk93yp6lslnphpb6hqal6z")) (modules '((guix build utils))) (snippet '(begin @@ -164,29 +165,30 @@ with Microsoft Compiled HTML (CHM) files") (build-system python-build-system) (native-inputs (list bash-minimal + cmake pkg-config python-flake8 python-pyqt-builder qtbase ; for qmake - xdg-utils - cmake)) + xdg-utils)) (inputs - (list libxkbcommon + (list bash-minimal + espeak-ng ffmpeg - uchardet - bash-minimal - fontconfig font-liberation + fontconfig glib hunspell hyphen icu4c - libmtp - libpng libjpeg-turbo libjxr + libmtp + libpng libstemmer libusb + libxkbcommon + onnxruntime openssl optipng podofo @@ -217,15 +219,16 @@ with Microsoft Compiled HTML (CHM) files") python-pychm python-pycryptodome python-pygments + python-pykakasi python-pyqt-6 python-pyqtwebengine-6 - python-pykakasi python-regex python-xxhash - speech-dispatcher python-zeroconf qtwebengine - sqlite)) + speech-dispatcher + sqlite + uchardet)) (arguments (list ;; Calibre is using setuptools by itself, but the setup.py is not @@ -255,6 +258,11 @@ with Microsoft Compiled HTML (CHM) files") (substitute* "setup/plugins_mirror.py" (("href=\"//calibre-ebook.com/favicon.ico\"") "href=\"favicon.ico\"")))) + (add-after 'unpack 'skip-7z-test ;FIXME: require py7zr >= 1.0 + (lambda _ + (substitute* "src/calibre/utils/seven_zip.py" + (("(def test_basic\\(\\).*)" line) + (string-append line "\n return True\n"))))) (add-before 'build 'configure (lambda* (#:key inputs #:allow-other-keys) (substitute* "setup/build.py" diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index df4b188519..66864176df 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2017-2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr> -;;; Copyright © 2018-2024 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2018-2025 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2020 Robert Smith <robertsmith@posteo.net> ;;; Copyright © 2020 Guy Fleury Iteriteka <gfleury@disroot.org> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> @@ -560,7 +560,7 @@ a pen-tablet display and a beamer.") (define-public fet (package (name "fet") - (version "6.28.4") + (version "7.5.4") (source (origin (method url-fetch) @@ -569,7 +569,7 @@ a pen-tablet display and a beamer.") (list (string-append directory base) (string-append directory "old/" base)))) (sha256 - (base32 "11mcbgi8lima4fng78lqdkd5km212drkk5l4bkzz1pz1k7wcykfn")))) + (base32 "0vjjvr9vs3vxncrikchmk60qa99d5wyxja6b3p46vgfaziv1nj31")))) (build-system gnu-build-system) (arguments (list @@ -596,7 +596,7 @@ algorithm. Usually, FET is able to solve a complicated timetable in maximum 5-20 minutes. For extremely difficult timetables, it may take a longer time, a matter of hours.") - (license license:agpl3+))) + (license license:agpl3))) (define-public klavaro (package diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 56cae54c14..5a5726e016 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2022, 2024, 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org> ;;; Copyright © 2019 Amin Bandali <bandali@gnu.org> -;;; Copyright © 2020 Vinicius Monego <monego@posteo.net> +;;; Copyright © 2020, 2021, 2022, 2023, 2024, 2025 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2021 Andrew Miloradovsky <andrew@interpretmath.pw> ;;; Copyright © 2022 Christian Gelinek <cgelinek@radlogic.com.au> ;;; Copyright © 2022 jgart <jgart@dismail.de> @@ -21,6 +21,8 @@ ;;; Copyright © 2024 Jakob Kirsch <jakob.kirsch@web.de> ;;; Copyright © 2025 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2022, 2025 Evgeny Pisemsky <mail@pisemsky.site> +;;; Copyright © 2025, Ekaitz Zarraga <ekaitz@elenq.tech> +;;; Copyright © 2021, 2022 Guillaume Le Vaillant <glv@posteo.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -92,6 +94,7 @@ #:use-module (gnu packages maths) #:use-module (gnu packages m4) #:use-module (gnu packages maths) + #:use-module (gnu packages mpi) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -620,6 +623,48 @@ used in the declarative section of design units.") (native-inputs '())))) +(define-public libngspice + ;; Note: The ngspice's build system does not allow us to build both the + ;; library and the executables in one go. Thus, we have two packages. + ;; See <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27344#236>. + (package + (name "libngspice") + (version "44.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.code.sf.net/p/ngspice/ngspice") + (commit (string-append "ngspice-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1vp27149kx8l7397bv5p708jqph1kma8rb9bl7ckgmbr9sw9cn3q")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ;there are no tests for libngspice + #:phases #~(modify-phases %standard-phases + (add-after 'install 'delete-scripts + (lambda _ + (delete-file-recursively + (string-append #$output + "/share/ngspice/scripts"))))) + #:configure-flags #~(list "--enable-openmp" "--enable-cider" + "--enable-xspice" "--with-ngshared"))) + (native-inputs (list autoconf automake bison flex libtool)) + (inputs (list openmpi)) + (home-page "https://ngspice.sourceforge.io/") + (synopsis "Mixed-level/mixed-signal circuit simulator") + (description + "Ngspice is a mixed-level/mixed-signal circuit simulator. It includes +@code{Spice3f5}, a circuit simulator, and @code{Xspice}, an extension that +provides code modeling support and simulation of digital components through +an embedded event driven algorithm.") + (license (list license:lgpl2.0+ ;code in frontend/numparam + (license:non-copyleft "file:///COPYING") ;spice3 bsd-style + license:bsd-3 ;ciderlib + license:public-domain)))) ;xspice + (define librnd (package (name "librnd") @@ -1006,8 +1051,27 @@ which allows one to install the M8 firmware on any Teensy.") (synopsis (string-append (package-synopsis nextpnr) " Cli only version.")))) -(define-public nextpnr-ice40 - (deprecated-package "nextpnr-ice40" nextpnr)) +(define-deprecated-package nextpnr-ice40 + nextpnr) + +(define-public ngspice + ;; The ngspice executables (see libngpsice above.) + (package + (inherit libngspice) + (name "ngspice") + (arguments + (substitute-keyword-arguments (package-arguments libngspice) + ;; Tests require a X server running, so we keep them disabled + ((#:configure-flags flags) + #~(cons* "--enable-rpath" "--with-x" "--with-readline=yes" + (delete "--with-ngshared" #$flags))) + ((#:phases phases) + #~(modify-phases #$phases + (delete 'delete-scripts))))) + (native-inputs + (modify-inputs (package-native-inputs libngspice) + (append perl))) + (inputs (list libngspice readline libxaw libx11)))) (define-public nvc (package @@ -1518,6 +1582,35 @@ verification.") #~(modify-phases #$phases (delete 'fix-scripts))))))) +(define-public python-pyucis + (package + (name "python-pyucis") + (version "0.1.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fvutils/pyucis/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "19bxmhqkdmhbibkbzcjqvzvcni1kzg28nqz9vh6zj73hl26lf2ij")))) + (build-system pyproject-build-system) + (native-inputs + (list python-pytest + python-setuptools)) + (propagated-inputs + (list python-jsonschema-objects + python-lxml + python-pyyaml)) + (home-page "https://fvutils.github.io/pyucis//") + (synopsis "Python interface to UCIS data") + (description + "The code{PyUCIS} library provides two APIs for creating and accessing +coverage data via the @acronym{UCIS, Unified Coverage Interoperability +Standard} data mode.") + (license license:asl2.0))) + (define-public python-cocotb (package (name "python-cocotb") diff --git a/gnu/packages/elm.scm b/gnu/packages/elm.scm index a74d294ae5..50e48156d9 100644 --- a/gnu/packages/elm.scm +++ b/gnu/packages/elm.scm @@ -174,8 +174,8 @@ such as @command{elm make} and @command{elm repl}.") (license license:bsd-3))) ;; The 'elm' package used to be called 'elm-compiler'. -(define-public elm-compiler - (deprecated-package "elm-compiler" elm)) +(define-deprecated-package elm-compiler + elm) (define-public elm-core (package diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 92eae83f37..f24141b6bb 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -70,7 +70,7 @@ ;;; Copyright © 2020 Jérémy Korwin-Zmijowski <jeremy@korwin-zmijowski.fr> ;;; Copyright © 2020 Alberto Eleuterio Flores Guerrero <barbanegra+guix@posteo.mx> ;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> -;;; Copyright © 2020, 2022, 2023 pinoaffe <pinoaffe@gmail.com> +;;; Copyright © 2020, 2022, 2023, 2025 pinoaffe <pinoaffe@gmail.com> ;;; Copyright © 2020, 2021, 2022 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2020 Ryan Desfosses <rdes@protonmail.com> ;;; Copyright © 2020 Marcin Karpezo <sirmacik@wioo.waw.pl> @@ -2015,7 +2015,7 @@ while the ones that are not being actively edited will be reduced to a smaller size.") (license license:expat)))) -(define-public emacs-zoom +(define-public emacs-zoom (package (name "emacs-zoom") (version "0.3.0") @@ -3355,8 +3355,8 @@ of tasks, including version control, task management, and regex-based replacement.") (license license:gpl3+)))) -(define-deprecated/public emacs-unpackaged-el emacs-unpackaged - (deprecated-package "emacs-unpackaged-el" emacs-unpackaged)) +(define-deprecated-package emacs-unpackaged-el + emacs-unpackaged) (define-public emacs-haskell-mode (let ((commit "e9c356739310332afe59b10ffa2e6c3e76f124e3") @@ -5924,8 +5924,8 @@ searches. Unlike @code{emacs-wiki.el}, it can be combined with any format.") (home-page "https://github.com/hexmode/mediawiki-el") (license license:gpl3+))) -(define-deprecated/public emacs-mediawiki-el emacs-mediawiki - (deprecated-package "emacs-mediawiki-el" emacs-mediawiki)) +(define-deprecated-package emacs-mediawiki-el + emacs-mediawiki) (define-public emacs-bm (package @@ -6184,8 +6184,8 @@ Language (CSL), an XML-based, open format to describe the formatting of bibliographic references.") (license license:gpl3+))) -(define-deprecated/public emacs-citeproc-el emacs-citeproc - (deprecated-package "emacs-citeproc-el" emacs-citeproc)) +(define-deprecated-package emacs-citeproc-el + emacs-citeproc) (define-public emacs-corfu (package @@ -6466,7 +6466,7 @@ local LLM capabilities from Emacs.") (define-public emacs-org-fc (package (name "emacs-org-fc") - (version "0.6.2") + (version "0.7.0") (source (origin (method git-fetch) @@ -6475,7 +6475,7 @@ local LLM capabilities from Emacs.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1pq6l1crjfybn3bd9qp23vddplv0j05l3al0715glr925s0i4cy3")))) + (base32 "1bch6dlw3f8zxvfazsndmilizvxvxpcfgrv89nk6id966y3czrpl")))) (build-system emacs-build-system) (arguments (list @@ -6499,14 +6499,7 @@ local LLM capabilities from Emacs.") (substitute* "org-fc-awk.el" (("\"find ") (string-append "\"" find " ")) (("\"gawk ") (string-append "\"" gawk " ")) - (("\"xargs ") (string-append "\"" xargs " ")))))) - (add-after 'unpack 'disable-failing-tests - (lambda _ - (substitute* (find-files "tests/" "\\.el$") - (("\\(ert-deftest org-fc-test-card-rate-(normal|double) .*" all) - (string-append all "(skip-unless nil)\n")) - (("\\(ert-deftest org-fc-test-review-data-update .*" all) - (string-append all "(skip-unless nil)\n")))))))) + (("\"xargs ") (string-append "\"" xargs " "))))))))) (native-inputs (list emacs-el-mock)) (inputs (list findutils gawk)) (propagated-inputs (list emacs-hydra)) @@ -8925,8 +8918,8 @@ If you are using Guix shell with @file{manifest.scm}, the (description "This package lets you switch Ruby versions using chruby.") (license license:gpl3+)))) -(define-deprecated/public emacs-chruby-el emacs-chruby - (deprecated-package "emacs-chruby-el" emacs-chruby)) +(define-deprecated-package emacs-chruby-el + emacs-chruby) ;; Package has no release. Version is extracted from "Version:" keyword in ;; main file. @@ -13943,8 +13936,8 @@ It is built on top of the custom theme support in Emacs 24 or later.") variants.") (license license:gpl3+))) -(define-deprecated/public emacs-moe-theme-el emacs-moe-theme - (deprecated-package "emacs-moe-theme-el" emacs-moe-theme)) +(define-deprecated-package emacs-moe-theme-el + emacs-moe-theme) (define-public emacs-color-theme-sanityinc-tomorrow (package @@ -16798,8 +16791,8 @@ unique file names you need this package here.") individual file buffers.") (license license:gpl3+))) -(define-deprecated/public emacs-undohist-el emacs-undohist - (deprecated-package "emacs-undohist-el" emacs-undohist)) +(define-deprecated-package emacs-undohist-el + emacs-undohist) (define-public emacs-eprime (let ((commit "17a481af26496be91c07139a9bfc05cfe722506f")) @@ -21470,8 +21463,8 @@ This is based on Frank Terbeck's @code{gnus-article-treat-patch.el} but has been adapted to also work with mu4e.") (license license:gpl3+)))) -(define-public emacs-mu4e-patch - (deprecated-package "emacs-mu4e-patch" emacs-message-view-patch)) +(define-deprecated-package emacs-mu4e-patch + emacs-message-view-patch) (define-public emacs-pretty-mode (package @@ -21498,7 +21491,7 @@ been adapted to also work with mu4e.") (define-public emacs-tempel (package (name "emacs-tempel") - (version "1.6") + (version "1.7") (source (origin (method git-fetch) (uri (git-reference @@ -21507,7 +21500,7 @@ been adapted to also work with mu4e.") (file-name (git-file-name name version)) (sha256 (base32 - "1a5pk000cy4zgh73hdpw08cwf1qr7cgw4hpj5n0dkprwbw5hhm8s")))) + "1ly38zv73z8y3pwa3wqabxy6qv84w72yqzxywcqpyqfxmzg42dg3")))) (build-system emacs-build-system) (arguments (list @@ -22312,8 +22305,8 @@ DefaultEncrypt, please refer to the home page or read the comments in the source file, @file{jl-encrypt.el}.") (license license:gpl3+))) -(define-public emacs-default-encrypt - (deprecated-package "emacs-default-encrypt" emacs-defaultencrypt)) +(define-deprecated-package emacs-default-encrypt + emacs-defaultencrypt) (define-public emacs-deflate (package @@ -26156,8 +26149,8 @@ buffer, and, by virtue of this extension, do so using the Emacs formatting rules for that language.") (license license:bsd-2))) -(define-deprecated/public emacs-scratch-el emacs-scratch - (deprecated-package "emacs-scratch-el" emacs-scratch)) +(define-deprecated-package emacs-scratch-el + emacs-scratch) (define-public emacs-kv (package @@ -28561,8 +28554,8 @@ mode.") for operating over the contents of Emacs buffers.") (license license:gpl3+)))) -(define-deprecated/public emacs-m-buffer-el emacs-m-buffer - (deprecated-package "emacs-m-buffer-el" emacs-m-buffer)) +(define-deprecated-package emacs-m-buffer-el + emacs-m-buffer) (define-public emacs-let-alist (package @@ -29748,8 +29741,8 @@ repository, @code{magit-org-todos} will create a section in your Magit status buffer with each of your todos.") (license license:gpl3+))) -(define-deprecated/public emacs-magit-org-todos-el emacs-magit-org-todos - (deprecated-package "emacs-magit-org-todos-el" emacs-magit-org-todos)) +(define-deprecated-package emacs-magit-org-todos-el + emacs-magit-org-todos) (define-public emacs-vcsh (package @@ -29830,8 +29823,8 @@ Magit.") @end itemize\n") (license license:gpl3+))) -(define-deprecated/public emacs-lice-el emacs-lice - (deprecated-package "emacs-lice-el" emacs-lice)) +(define-deprecated-package emacs-lice-el + emacs-lice) (define-public emacs-academic-phrases (let ((commit "0823ed8c24b26c32f909b896a469833ec4d7b656")) @@ -31178,6 +31171,49 @@ availability of shell commands to do the hard work for us. These commands can be changed by customizing the appropriate variables.") (license license:gpl3+)))) +(define-public emacs-filechooser + ;; no tags + (let ((commit "e55c5ea294bbb2c67ab5c51d9489922a83c22456") + (revision "0")) + (package + (name "emacs-filechooser") + (version (git-version "0.2.4" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/rahguzar/filechooser") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0gkqyh0zwqsgqixg7y94axmk00n349iq3cwv9z9vf4zjbmj9sfc4")))) + (build-system emacs-build-system) + (arguments + (list + #:tests? #f ; no tests + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'install-more-stuff + (lambda _ + (substitute* "emacs.portal" + ;; enable by default in exwm + (("UseIn=") "UseIn=exwm;")) + (install-file + "emacs.portal" + (string-append #$output "/share/xdg-desktop-portal/portals")) + (install-file + "org.gnu.Emacs.FileChooser.service" + (string-append #$output "/share/dbus-1/services"))))))) + (propagated-inputs + (list emacs-compat)) + (home-page "https://codeberg.org/rahguzar/filechooser") + (synopsis "Backend implementation for xdg-desktop-portal using Emacs") + (description "This package provides a backend implementation +for xdg-desktop-portal that uses Emacs. It allows you to use Emacs' file and +path selection facilities in graphical programs that use the +xdg-desktop-portal dbus interface.") + (license license:gpl3+)))) + (define-public emacs-org-caldav (let ((commit "44a6d463cee3c3be8acf7511db785ab55519b375") (revision "0")) @@ -32868,8 +32904,8 @@ In addition to its predecessor, it offers the following features: combinations to perform Cargo tasks within Rust projects.") (license license:gpl3+)))) -(define-deprecated/public emacs-cargo-el emacs-cargo - (deprecated-package "emacs-cargo-el" emacs-cargo)) +(define-deprecated-package emacs-cargo-el + emacs-cargo) (define-public emacs-ztree ;; Upstream provides no tag, but the commit below matches latest release. @@ -34974,8 +35010,8 @@ It provides integration with multiple built-in modes, as well as providing an interface to attach and interact with the processes.") (license license:gpl3+))) -(define-public emacs-dtache - (deprecated-package "emacs-dtache" emacs-detached)) +(define-deprecated-package emacs-dtache + emacs-detached) (define-public emacs-dtrt-indent (package @@ -36361,8 +36397,8 @@ subsequent committal of a chain of @code{undo} commands as a single edit in the @code{undo} history.") (license license:gpl3+)))) -(define-deprecated/public emacs-undo-propose-el emacs-undo-propose - (deprecated-package "emacs-undo-propose-el" emacs-undo-propose)) +(define-deprecated-package emacs-undo-propose-el + emacs-undo-propose) (define-public emacs-elisp-docstring-mode (let ((commit "f512e509dd690f65133e55563ebbfd2dede5034f") @@ -36507,8 +36543,8 @@ buffers.") JavaScript.") (license license:gpl3+))) -(define-deprecated/public emacs-js2-refactor-el emacs-js2-refactor - (deprecated-package "emacs-js2-refactor-el" emacs-js2-refactor)) +(define-deprecated-package emacs-js2-refactor-el + emacs-js2-refactor) (define-public emacs-jsdoc (package @@ -36656,8 +36692,8 @@ done using Helm, Ido or Ivy.") Lisp functions that call themselves in tail position.") (license license:gpl3+)))) -(define-deprecated/public emacs-tco-el emacs-tco - (deprecated-package "emacs-tco-el" emacs-tco)) +(define-deprecated-package emacs-tco-el + emacs-tco) (define-public emacs-equake ;; Upstream provides no tagged releases, but the commit below matches an @@ -36980,8 +37016,8 @@ screensaver activation in EXWM.") (description "This package provides a GUI for defining and monitoring services.") (license license:gpl3+))) -(define-public emacs-prodigy-el - (deprecated-package "emacs-prodigy-el" emacs-prodigy)) +(define-deprecated-package emacs-prodigy-el + emacs-prodigy) (define-public emacs-web-server (package @@ -37170,8 +37206,8 @@ support JSX syntax.") expanding regions of text without modifying the actual contents.") (license license:expat)))) -(define-deprecated/public emacs-origami-el emacs-origami - (deprecated-package "emacs-origami-el" emacs-origami)) +(define-deprecated-package emacs-origami-el + emacs-origami) (define-public emacs-peep-dired (let ((commit "c88a9a3050197840edfe145f11e0bb9488de32f4") @@ -37561,16 +37597,16 @@ all of your projects, then override or add variables on a per-project basis.") user interfaces for various built-in modes.") (license license:gpl3+))) -(define-public emacs-casual-calc - (deprecated-package "emacs-casual-calc" emacs-casual)) -(define-public emacs-casual-dired - (deprecated-package "emacs-casual-dired" emacs-casual)) -(define-public emacs-casual-info - (deprecated-package "emacs-casual-info" emacs-casual)) -(define-public emacs-casual-lib - (deprecated-package "emacs-casual-lib" emacs-casual)) -(define-public emacs-casual-avy - (deprecated-package "emacs-casual-avy" emacs-casual)) +(define-deprecated-package emacs-casual-calc + emacs-casual) +(define-deprecated-package emacs-casual-dired + emacs-casual) +(define-deprecated-package emacs-casual-info + emacs-casual) +(define-deprecated-package emacs-casual-lib + emacs-casual) +(define-deprecated-package emacs-casual-avy + emacs-casual) (define-public emacs-calibredb (package @@ -37847,8 +37883,8 @@ needing to write the result into the buffer.") well as an option for visually flashing evaluated s-expressions.") (license license:gpl3+))) -(define-deprecated/public emacs-eval-sexp-fu-el emacs-eval-sexp-fu - (deprecated-package "emacs-eval-sexp-fu-el" emacs-eval-sexp-fu)) +(define-deprecated-package emacs-eval-sexp-fu-el + emacs-eval-sexp-fu) (define-public emacs-counsel-tramp (package @@ -38129,8 +38165,8 @@ functions (e.g. @code{webfeeder-title-function}).") end of a line and increment or decrement it.") (license license:gpl3+)))) -(define-public emacs-janpath-evil-numbers - (deprecated-package "emacs-janpath-evil-numbers" emacs-evil-numbers)) +(define-deprecated-package emacs-janpath-evil-numbers + emacs-evil-numbers) (define-public emacs-rotate-text (package @@ -40205,11 +40241,10 @@ other @code{helm-type-file} sources such as @code{helm-locate}.") (license license:gpl3+))) (define-public emacs-telega-server - (let ((commit "879a8c7afc8967942613b6b898d9ea8c1f3641bf") - (revision "0")) + (let ((commit "f5b48d2a605c1383ddb8522ed315b625115f16a6")) (package (name "emacs-telega-server") - (version (git-version "0.8.2" revision commit)) + (version "0.8.5") (source (origin (method git-fetch) @@ -40217,7 +40252,7 @@ other @code{helm-type-file} sources such as @code{helm-locate}.") (url "https://github.com/zevlg/telega.el") (commit commit))) (sha256 - (base32 "1ic14hzzgjxpky1r3mz4v72si9hw8cw72420a9lnpdaiw99l8q7h")) + (base32 "12h4jvqzw2s30c1wxd26qa9m8fhpb2nc1ijh05781fkxd7sqrdkr")) (file-name (git-file-name "emacs-telega" version)))) (build-system gnu-build-system) (arguments @@ -40252,11 +40287,10 @@ service, and connect it with Emacs via inter-process communication.") (license license:gpl3+)))) (define-public emacs-telega - (let ((commit "1cedc1a8c838102b342d537a742e5eab3dfad3ce") - (revision "0")) + (let ((commit "50eea5dea4fdfb9fff46d71e3c3bcc6dbf09f26a")) (package (name "emacs-telega") - (version (git-version "0.8.522" revision commit)) + (version "0.8.554") (source (origin (method git-fetch) @@ -40264,7 +40298,7 @@ service, and connect it with Emacs via inter-process communication.") (url "https://github.com/zevlg/telega.el") (commit commit))) (sha256 - (base32 "036k7vnh6i6la1sa854f4l8phx5ymvgqrx6qqpnsssr5yd0a7drb")) + (base32 "1w0hpiaaj6p5nlmdi99psc0lmvmy65d27pz2vv3gafp2la4dplgx")) (file-name (git-file-name "emacs-telega" version)) (patches (search-patches "emacs-telega-path-placeholder.patch" @@ -42698,6 +42732,8 @@ comments or emails.") (file-name (git-file-name name version)) (sha256 (base32 "1sv5p2f0i4zhfrh8pv39p5aaa9wnbzxkb58p9qslw7qli1wax2l0")))) + (arguments + (list #:tests? #false)) ;no tests (build-system emacs-build-system) (home-page "https://github.com/matsl/sv-kalender-namnsdagar") (synopsis "Swedish name day calendar") @@ -43534,8 +43570,8 @@ supports Japanese and has the following features: @end itemize\n") (license license:gpl2+))) -(define-deprecated/public emacs-spamfilter-el emacs-spamfilter - (deprecated-package "emacs-spamfilter-el" emacs-spamfilter)) +(define-deprecated-package emacs-spamfilter-el + emacs-spamfilter) (define-public emacs-promise ;; XXX: Last stable release fails to build with "(wrong-number-of-arguments @@ -44701,8 +44737,8 @@ with the ed editor.") audio volume via amixer.") (license license:gpl3+))) -(define-deprecated/public emacs-alsamixer-el emacs-alsamixer - (deprecated-package "emacs-alsamixer-el" emacs-alsamixer)) +(define-deprecated-package emacs-alsamixer-el + emacs-alsamixer) (define-public emacs-fennel-mode (package @@ -44899,13 +44935,13 @@ on the chosen style.")))) hacker.") (license license:expat)))) -(define-deprecated/public emacs-straight-el emacs-straight - (deprecated-package "emacs-straight-el" emacs-straight)) +(define-deprecated-package emacs-straight-el + emacs-straight) (define-public emacs-osm (package (name "emacs-osm") - (version "1.7") + (version "1.8") (source (origin (method git-fetch) (uri (git-reference @@ -44914,10 +44950,11 @@ hacker.") (file-name (git-file-name name version)) (sha256 (base32 - "0fw0hgi2542ivc05dbq07ybr8c2mf8ja0z3f07lnslvn7vn5xp9i")))) + "1azydrknczkn9gvy9ynxr4dk7xy5cwrg985fx8bz2apmalfvmpzw")))) (build-system emacs-build-system) (arguments - (list #:phases #~(modify-phases %standard-phases + (list #:tests? #f ;no tests + #:phases #~(modify-phases %standard-phases (add-after 'unpack 'set-curl-file-name (lambda* (#:key inputs #:allow-other-keys) (substitute* "osm.el" @@ -45724,7 +45761,7 @@ in Emacs.") (define-public emacs-vertico-posframe (package (name "emacs-vertico-posframe") - (version "0.8.0") + (version "0.9.0") (source (origin (method url-fetch) (uri (string-append @@ -45732,7 +45769,7 @@ in Emacs.") ".tar")) (sha256 (base32 - "0iqy8m1cf819x7ln5sp8b3sh4dk291k9sril35hxsxkiyjal1rqk")))) + "16vnacmz52d1rwdmddsr1rm1zki1p3bw10ngpw39a3dszbwqkl3m")))) (build-system emacs-build-system) (propagated-inputs (list emacs-posframe emacs-vertico)) (arguments (list #:tests? #f)) ; there are no tests diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 567e7a7426..f360284f3e 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -711,8 +711,8 @@ editor (with wide ints)" ) (define-public emacs-next (emacs->emacs-next emacs)) (define-public emacs-next-pgtk (emacs->emacs-next emacs-pgtk)) (define-public emacs-next-pgtk-xwidgets (emacs->emacs-next emacs-pgtk-xwidgets)) -(define-public emacs-next-tree-sitter - (deprecated-package "emacs-next-tree-sitter" emacs-next)) +(define-deprecated-package emacs-next-tree-sitter + emacs-next) (define-public guile-emacs (let ((upstream-version "31.0.50") diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 362e38a231..998b92c710 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -2078,8 +2078,8 @@ metadata about each known libretro core. The snapshot is taken from the @url{https://github.com/libretro/libretro-super, libretro-super} repository.") (license license:expat))) -(define-public retroarch-core-info - (deprecated-package "retroarch-core-info" libretro-core-info)) +(define-deprecated-package retroarch-core-info + libretro-core-info) (define-public libretro-database (package @@ -4653,14 +4653,14 @@ device contains a @code{exec} port to interface with the host system.") (sha256 (base32 "1xahdr6bh3dw5swrc2r8kqa8ljhqlb7k2kxv5mrw5rhcmcnzcyig")))) (build-system pyproject-build-system) - (arguments - (list #:tests? #f)) ;no tests in PyPI archive + ;; Tests either require kstool, or Python 2, or are 10 years old and fail. + (arguments (list #:tests? #f)) ; no tests (native-inputs (list cmake-minimal - python-setuptools - python-wheel)) + python-setuptools)) (home-page "https://www.keystone-engine.org") - (synopsis "Lightweight multi-platform, multi-architecture assembler framework") + (synopsis + "Lightweight multi-platform, multi-architecture assembler framework") (description "Keystone is a lightweight multi-platform, multi-architecture assembler framework. It supports a wide-range of different architectures diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 719a861f84..cf62fe433f 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -105,6 +105,7 @@ #:use-module (gnu packages digest) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) + #:use-module (gnu packages electronics) #:use-module (gnu packages emacs-build) #:use-module (gnu packages emacs-xyz) #:use-module (gnu packages file) @@ -1166,24 +1167,32 @@ Emacs).") `("PATH" ":" prefix (,(string-append python "/bin:")))))))))) (native-search-paths + ;; Currently, KiCad environment variables are single-valued + ;; (see https://gitlab.com/kicad/code/kicad/-/issues/14792). (list (search-path-specification (variable "KICAD") ;to find kicad-doc - (files '(""))) + (files '("")) + (separator #f)) (search-path-specification (variable "KICAD9_TEMPLATE_DIR") - (files '("share/kicad/template"))) + (files '("share/kicad/template")) + (separator #f)) (search-path-specification (variable "KICAD9_SYMBOL_DIR") - (files '("share/kicad/symbols"))) + (files '("share/kicad/symbols")) + (separator #f)) (search-path-specification (variable "KICAD9_FOOTPRINT_DIR") - (files '("share/kicad/footprints"))) + (files '("share/kicad/footprints")) + (separator #f)) (search-path-specification (variable "KICAD9_3DMODEL_DIR") - (files '("share/kicad/3dmodels"))) + (files '("share/kicad/3dmodels")) + (separator #f)) (search-path-specification (variable "KICAD_STOCK_DATA_HOME") - (files '("share/kicad"))))) + (files '("share/kicad")) + (separator #f)))) (native-inputs (list boost desktop-file-utils gettext-minimal @@ -2263,67 +2272,6 @@ and a fallback for environments without libc for Zydis.") high-performance parallel differential evolution (DE) optimization algorithm.") (license license:gpl2+))) -(define-public libngspice - ;; Note: The ngspice's build system does not allow us to build both the - ;; library and the executables in one go. Thus, we have two packages. - ;; See <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27344#236>. - (package - (name "libngspice") - (version "44.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://git.code.sf.net/p/ngspice/ngspice") - (commit (string-append "ngspice-" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1vp27149kx8l7397bv5p708jqph1kma8rb9bl7ckgmbr9sw9cn3q")))) - (build-system gnu-build-system) - (arguments - (list - #:tests? #f ;there are no tests for libngspice - #:phases #~(modify-phases %standard-phases - (add-after 'install 'delete-scripts - (lambda _ - (delete-file-recursively - (string-append #$output - "/share/ngspice/scripts"))))) - #:configure-flags #~(list "--enable-openmp" "--enable-cider" - "--enable-xspice" "--with-ngshared"))) - (native-inputs (list autoconf automake bison flex libtool)) - (inputs (list openmpi)) - (home-page "https://ngspice.sourceforge.io/") - (synopsis "Mixed-level/mixed-signal circuit simulator") - (description - "Ngspice is a mixed-level/mixed-signal circuit simulator. It includes -@code{Spice3f5}, a circuit simulator, and @code{Xspice}, an extension that -provides code modeling support and simulation of digital components through -an embedded event driven algorithm.") - (license (list license:lgpl2.0+ ;code in frontend/numparam - (license:non-copyleft "file:///COPYING") ;spice3 bsd-style - license:bsd-3 ;ciderlib - license:public-domain)))) ;xspice - -(define-public ngspice - ;; The ngspice executables (see libngpsice above.) - (package - (inherit libngspice) - (name "ngspice") - (arguments - (substitute-keyword-arguments (package-arguments libngspice) - ;; Tests require a X server running, so we keep them disabled - ((#:configure-flags flags) - #~(cons* "--enable-rpath" "--with-x" "--with-readline=yes" - (delete "--with-ngshared" #$flags))) - ((#:phases phases) - #~(modify-phases #$phases - (delete 'delete-scripts))))) - (native-inputs - (modify-inputs (package-native-inputs libngspice) - (append perl))) - (inputs (list libngspice readline libxaw libx11)))) - (define trilinos-serial-xyce ;; Note: This is a Trilinos containing only the packages Xyce needs, so we ;; keep it private. See @@ -3870,10 +3818,10 @@ executables, shared libraries and core dumps. It supports many architectures and extensions.") (license license:gpl3+))) -(define-public emacs-poke - ;; The 'emacs-poke' name may eventually refer to 'poke' from ELPA, which is - ;; a different beast. - (deprecated-package "emacs-poke" poke)) +;; The 'emacs-poke' name may eventually refer to 'poke' from ELPA, which is +;; a different beast. +(define-deprecated-package emacs-poke + poke) (define-public pcb2gcode ;; XXX: The latest release was on <2022-09-12>, but master branch contains a diff --git a/gnu/packages/fediverse.scm b/gnu/packages/fediverse.scm index 6cad92f38e..8d993624fe 100644 --- a/gnu/packages/fediverse.scm +++ b/gnu/packages/fediverse.scm @@ -218,8 +218,8 @@ native interface that allows you to integrate Mastodon's social experience seamlessly with your desktop environment.") (license license:gpl3))) -(define-public tootle - (deprecated-package "tootle" tuba)) +(define-deprecated-package tootle + tuba) (define-public python-mastodon-py (package diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index b39747fccb..ef2bff1f7d 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -2060,11 +2060,16 @@ that allows you to run services and through them access the Bitcoin Cash network (arguments (list #:test-flags - #~(list "-k" (string-append - ;; ModuleNotFoundError: No module named 'pytest' - "not test_parse_stdin" - ;; AssertionError: 5 not greater than 20 - " and not test_setup")) + #~(list + ;; These tests require network. + "--ignore=beancount/web/web_test.py" + "-k" (string-join + (list "not test_parse_stdin" ; ModuleNotFoundError: 'pytest' + "test_setup" ; AssertionError: 5 not greater than 20 + ;; Require network + "test_bake_archive__known" + "test_bake_directory") + " and not ")) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'relax-requirements @@ -2380,7 +2385,7 @@ trading, and risk management in real-life.") (define-public optionmatrix (package (name "optionmatrix") - (version "1.4.3") + (version "1.4.4") (source (origin (method url-fetch) @@ -2388,7 +2393,7 @@ trading, and risk management in real-life.") "mirror://sourceforge/optionmatrix/optionmatrix-" version ".tar.xz")) (sha256 - (base32 "1zd0pfiphnijh1l94swb3mjrpmjsn37z11mklamd7zw6h2d4zh4d")))) + (base32 "0ijwj798jli5rw1dj8dkz6sqbsa4hia407imicrk3djqmhn1ky3z")))) (build-system gnu-build-system) (inputs (list gsl gtk+ ncurses)) @@ -2432,7 +2437,7 @@ interactive controls. This package provides a GTK+ graphical user interface (invoke "make" "cython")))))) (inputs (list ta-lib)) (propagated-inputs (list python-numpy)) - (native-inputs (list python-cython-3 + (native-inputs (list python-cython python-pandas python-pytest python-setuptools diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 0b37502321..35902eb501 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -1253,8 +1253,8 @@ Virtual Machines. OVMF contains a sample UEFI firmware for QEMU and KVM.") (install-file "RISCV_VIRT_CODE.fd" fmw) (install-file "RISCV_VIRT_VARS.fd" fmw)))))))))))) -(define-public ovmf - (deprecated-package "ovmf" ovmf-x86-64)) +(define-deprecated-package ovmf + ovmf-x86-64) (define* (make-arm-trusted-firmware platform #:key (triplet "aarch64-linux-gnu") @@ -1634,6 +1634,7 @@ corresponding layout." layout)) gnu-make grep python + python-appdirs python-dotty-dict python-hid python-hjson diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 1ba2a8c9b5..737628a40f 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1991,8 +1991,8 @@ well in user interface (UI) environments.") (license license:silofl1.1))) ;; https://github.com/adobe-fonts/source-sans/issues/192 -(define-public font-adobe-source-sans-pro - (deprecated-package "font-adobe-source-sans-pro" font-adobe-source-sans)) +(define-deprecated-package font-adobe-source-sans-pro + font-adobe-source-sans) (define-public font-adobe-source-serif (package @@ -2018,8 +2018,8 @@ family.") (license license:silofl1.1))) ;; https://github.com/adobe-fonts/source-serif/issues/77 -(define-public font-adobe-source-serif-pro - (deprecated-package "font-adobe-source-serif-pro" font-adobe-source-serif)) +(define-deprecated-package font-adobe-source-serif-pro + font-adobe-source-serif) (define-public font-microsoft-cascadia (package @@ -2929,8 +2929,8 @@ characters mostly intact.") constraint of usability at small point sizes.") (license (list license:silofl1.1)))) -(define-public font-iosevka-comfy - (deprecated-package "font-iosevka-comfy" font-aporetic)) +(define-deprecated-package font-iosevka-comfy + font-aporetic) (define-public font-junicode (package @@ -3653,8 +3653,8 @@ and legible typeface suitable for web pages and applications.") (license license:silofl1.1))) ;; https://github.com/rastikerdar/vazirmatn/blob/master/CHANGELOG.md#3200 -(define-public font-vazir - (deprecated-package "font-vazir" font-vazirmatn)) +(define-deprecated-package font-vazir + font-vazirmatn) (define-public font-victor-mono (package diff --git a/gnu/packages/fontutils.scm b/gnu/packages/fontutils.scm index 9394c80236..31c35bedfb 100644 --- a/gnu/packages/fontutils.scm +++ b/gnu/packages/fontutils.scm @@ -1184,8 +1184,8 @@ stroke fonts with C++11/Qt.") ;; Dual-licensed, either license applies. (license (list license:asl2.0 license:expat)))) -(define-public fontobene-qt5 - (deprecated-package "fontobene-qt5" fontobene-qt)) +(define-deprecated-package fontobene-qt5 + fontobene-qt) (define-public ttfautohint (package diff --git a/gnu/packages/gambas.scm b/gnu/packages/gambas.scm index 76a8b0cc9e..f7b3862bb8 100644 --- a/gnu/packages/gambas.scm +++ b/gnu/packages/gambas.scm @@ -55,7 +55,7 @@ (define-public gambas (package (name "gambas") - (version "3.20.2") + (version "3.21.0") (source (origin (method git-fetch) @@ -64,7 +64,7 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "060f8w19jf78mappqgy11873ss3h97gi47ga3c1ws1bazix9x7rk")))) + (base32 "0lkm4fbxqmkqpk2f2z660m77xshhmvj4pnlv0z43zrarsij8l6gf")))) (build-system gnu-build-system) (arguments (list diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 394903ee2a..656df34789 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -1684,7 +1684,7 @@ developed mainly for Ren'py.") (setenv "SDL_AUDIODRIVER" "disk")))))) (native-inputs (list meson-python pkg-config - python-cython-3 + python-cython python-numpy python-pytest python-setuptools)) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 72b26faedd..08e920ef3d 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -1187,14 +1187,14 @@ popular puzzle games for one player.") (define-public bzflag (package (name "bzflag") - (version "2.4.26") + (version "2.4.30") (source (origin (method url-fetch) (uri (string-append "https://download.bzflag.org/bzflag/source/" version "/bzflag-" version ".tar.bz2")) (sha256 - (base32 "050h933lmcdf4bw9z3c6g3k8c9sch9f6kq57jp2ivb96zw2h90q1")))) + (base32 "0kc9ag8yq3iqmwlrdwhbqp3sqjcan1mr0ddx25yamrxwwx8bfy5v")))) (build-system gnu-build-system) (arguments (list @@ -2817,51 +2817,6 @@ map formats, MAPINFO support, full controller support, debug and scripting features, rewinding, and a strict mode for speedrunning.") (license license:gpl2+))) -(define-public prboom-plus - (package - (name "prboom-plus") - (version "2.5.1.4") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/prboom-plus/prboom-plus/" - version "/prboom-plus-" version ".tar.gz")) - (sha256 - (base32 "151v6nign86m1a2vqz27krsccpc9m4d1jax4y43v2fa82wfj9qp0")) - (modules '((guix build utils))) - (snippet - '(begin - (substitute* "src/version.c" - (("__DATE__") "") - (("__TIME__") "")) - #t)))) - (build-system gnu-build-system) - (arguments - '(#:configure-flags '("--disable-cpu-opt" "CFLAGS=-fcommon") - #:make-flags `(,(string-append "gamesdir=" - (assoc-ref %outputs "out") "/bin")) - #:phases - (modify-phases %standard-phases - (add-after 'set-paths 'set-sdl'paths - (lambda* (#:key inputs #:allow-other-keys) - (setenv "CPATH" - (string-append - (search-input-directory inputs "/include/SDL") - ":" (or (getenv "CPATH") "")))))))) - (inputs - (list fluidsynth - glu - libmad - libpng - libvorbis - pcre - portmidi - (sdl-union (list sdl sdl-image sdl-mixer sdl-net)))) - (home-page "https://prboom-plus.sourceforge.net/") - (synopsis "Version of the classic 3D shoot'em'up game Doom") - (description - "PrBoom+ is a Doom source port developed from the original PrBoom project.") - (license license:gpl2+))) - (define-public redeal (let ((commit "e2e81a477fd31ae548a340b5f0f380594d3d0ad6") (revision "1")) @@ -3410,7 +3365,7 @@ Superfluous Returnz.") (define-public sosage (package (name "sosage") - (version "1.6.0") + (version "1.6.1") (source (origin (method git-fetch) @@ -3419,7 +3374,7 @@ Superfluous Returnz.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0xgk3r18aj9xvrrqr9qdrr6800hkv6lhfcnmm5z21g8kbfh9x4jm")) + (base32 "029mcnx2r86gc7chzd0avga4x7gm1yxl2wi3wqxmzhlh51q0p44x")) (modules '((guix build utils))) (snippet #~(begin @@ -10569,7 +10524,7 @@ game field is extended to 4D space, which has to filled up by the gamer with (modify-phases %standard-phases (add-after 'unpack 'fix-install-helper-paths (lambda* (#:key inputs #:allow-other-keys) - (let ((p7zip (assoc-ref inputs "p7zip")) + (let ((7zip (assoc-ref inputs "7zip")) (innoextract (assoc-ref inputs "innoextract")) (wget (assoc-ref inputs "wget")) (zenity (assoc-ref inputs "zenity"))) @@ -10581,11 +10536,11 @@ game field is extended to 4D space, which has to filled up by the gamer with (("else innoextract") (string-append "else " innoextract "/bin/innoextract")) (("for _extract_zip_sz in 7za 7z") - (string-append "for _extract_zip_sz in " p7zip "/bin/7za")) + (string-append "for _extract_zip_sz in " 7zip "/bin/7z")) (("else if have 7z") - (string-append "else if have " p7zip "/bin/7za")) + (string-append "else if have " 7zip "/bin/7z")) (("7z x -tiso") - (string-append p7zip "/bin/7z x -tiso")) + (string-append 7zip "/bin/7z x -tiso")) (("if have wget") (string-append "if have " wget "/bin/wget")) (("wget -O") @@ -10614,7 +10569,7 @@ game field is extended to 4D space, which has to filled up by the gamer with glm freetype ;; The following are only needed by the arx-install-data script. - p7zip ; Install-helper uses it to extract ISO and .cab archives. + 7zip ; Install-helper uses it to extract ISO and .cab archives. zenity ; GUI for install-helper. wget ; Used by the install-helper to download the patch. ;; The install-helper needs it to extract the patch. @@ -11416,8 +11371,8 @@ across many levels and collect all the coaches to win.") ;; license. Desktop file is licensed under CC0 terms. (license (list license:gpl2 license:gpl3 license:cc0)))) -(define-public ri-li - (deprecated-package "ri-li" li-ri)) +(define-deprecated-package ri-li + li-ri) (define-public freeorion (package @@ -11736,7 +11691,7 @@ Xjump game, using SDL instead of Xlib.") (define-public xmoto (package (name "xmoto") - (version "0.6.2") + (version "0.6.3") (source (origin (method git-fetch) @@ -11745,7 +11700,7 @@ Xjump game, using SDL instead of Xlib.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "14z3yqpiyv4y5l37b12kf8ipgsmb9krb4b5d9adlrry0j43hd7wz")) + (base32 "08yi6sgz349s7wa07dyrlbhpkmi25arz0c849qgpsj65vr8n7n8c")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 36d1ec1d49..02152d6719 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1094,7 +1094,7 @@ for seismology.") (invoke "python" "setup.py" "build_ext" "--inplace")))))) (propagated-inputs (list python-certifi python-numpy python-packaging)) (inputs (list gdal)) - (native-inputs (list python-cython-3 + (native-inputs (list python-cython python-pytest python-pytest-cov python-setuptools @@ -2043,7 +2043,7 @@ extension.") (with-directory-excursion #$output (apply invoke "pytest" "-vv" test-flags))))))) (native-inputs - (list python-cython-3 + (list python-cython python-pytest python-setuptools python-setuptools-scm diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm index 723651a817..0e618768cb 100644 --- a/gnu/packages/ghostscript.scm +++ b/gnu/packages/ghostscript.scm @@ -408,8 +408,8 @@ Ghostscript. It currently includes the 35 standard PostScript fonts.") (license license:gpl2) (home-page "https://sourceforge.net/projects/gs-fonts/"))) -(define-public gs-fonts - (deprecated-package "gs-fonts" font-ghostscript)) +(define-deprecated-package gs-fonts + font-ghostscript) (define-public libspectre (package diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 89fa08ca31..77e5c57837 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -504,8 +504,8 @@ that is extensible via a plugin system.") shared-mime-info))))) (define-public gimp gimp-3) -(define-public gimp-next - (deprecated-package "gimp-next" gimp-3)) +(define-deprecated-package gimp-next + gimp-3) (define-public gimp-fourier (package diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 02951473df..6391641f01 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -686,8 +686,8 @@ from software emulation to complete hardware acceleration for modern GPUs.") ;;; ICD was part of the Gallium (Clover) OpenCL driver, which was replaced ;;; with Rusticl. -(define-public mesa-opencl-icd - (deprecated-package "mesa-opencl-icd" mesa-opencl)) +(define-deprecated-package mesa-opencl-icd + mesa-opencl) (define-public mesa-headers (package/inherit mesa diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 332e00509f..a51670d5c1 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -1221,9 +1221,8 @@ copies you now want to paste.") shell, including panels, corners, workspaces.") (license license:gpl3))) -(define-public gnome-shell-extension-vertical-overview - (deprecated-package "gnome-shell-extension-vertical-overview" - gnome-shell-extension-v-shell)) +(define-deprecated-package gnome-shell-extension-vertical-overview + gnome-shell-extension-v-shell) (define-public gnome-shell-extension-burn-my-windows (package diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8e627ff4f8..bb58b9b372 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -82,6 +82,7 @@ ;;; Copyright © 2024 Justin Veilleux <terramorpha@cock.li> ;;; Copyright © 2025 Noé Lopez <noelopez@free.fr> ;;; Copyright © 2025 Ashvith Shetty <ashvithshetty0010@zohomail.in> +;;; Copyright © 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -2966,8 +2967,8 @@ GNOME and KDE desktops to the icon names proposed in the specification.") (description "Icons for the GNOME desktop.") (license license:lgpl3))) ; or Creative Commons BY-SA 3.0 -(define-public gnome-icon-theme - (deprecated-package "gnome-icon-theme" adwaita-icon-theme)) +(define-deprecated-package gnome-icon-theme + adwaita-icon-theme) (define-public tango-icon-theme (package @@ -7405,8 +7406,8 @@ programs via D-Bus. It also ships a library for integration into development environments.") (license license:gpl2+))) -(define-public d-feet - (deprecated-package "d-feet" d-spy)) +(define-deprecated-package d-feet + d-spy) (define-public yelp-xsl (package @@ -10616,8 +10617,8 @@ Aegis (encrypted / plain-text), andOTP, Google Authenticator @end itemize") (license license:gpl3+))) -(define-public authenticator - (deprecated-package "authenticator" gnome-authenticator)) +(define-deprecated-package authenticator + gnome-authenticator) (define-public gsound (package @@ -11263,6 +11264,18 @@ is suitable as a default application in a Desktop environment.") `(,gtk+ "bin") intltool pkg-config)) (inputs (list gtk+ gtksourceview-4 libsm)) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-configure + (lambda _ + ;; xpad fails to build due to gettext version mismatch, so + ;; we force it to use gettext 0.23. + (substitute* "configure.ac" + (("AM_GNU_GETTEXT_VERSION.*") + (string-append + "AM_GNU_GETTEXT_VERSION([0.23])\n" + "AM_GNU_GETTEXT_REQUIRE_VERSION([0.23])\n")))))))) (home-page "https://wiki.gnome.org/Apps/Xpad") (synopsis "Virtual sticky note") (description @@ -11896,8 +11909,8 @@ format. It integrates perfectly with the GNOME desktop and provides an easy and uncluttered interface for the management of password databases.") (license license:gpl3+))) -(define-public passwordsafe - (deprecated-package "passwordsafe" secrets)) +(define-deprecated-package passwordsafe + secrets) (define-public sound-juicer (package @@ -12660,8 +12673,8 @@ versions of Adwaita, Adwaita-dark and HighContrast themes. It also provides index files needed for Adwaita to be used outside of GNOME.") (license license:lgpl2.1+))) -(define-public gnome-themes-standard - (deprecated-package "gnome-themes-standard" gnome-themes-extra)) +(define-deprecated-package gnome-themes-standard + gnome-themes-extra) (define-public gnote (package diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index a45546b62c..b483f620c0 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -193,7 +193,7 @@ authentication and support for SSL3 and TLS.") (define-public gnunet (package (name "gnunet") - (version "0.25.1") + (version "0.25.2") (source (origin (method url-fetch) @@ -201,7 +201,7 @@ authentication and support for SSL3 and TLS.") ".tar.gz")) (sha256 (base32 - "0p4gcv67rh9832vgi5k31pgpq6hmv6198dfmbyfizyaprlb6qcr1")))) + "1rn24rm6z5p0vnk5lwq0jihnbh956n24yd5nmmgv2firbp1nzdza")))) (build-system meson-build-system) (inputs (list bluez diff --git a/gnu/packages/golang-apps.scm b/gnu/packages/golang-apps.scm index 00cdfaf0e2..d261221726 100644 --- a/gnu/packages/golang-apps.scm +++ b/gnu/packages/golang-apps.scm @@ -1,4 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2023 JOULAUD François <Francois.JOULAUD@radiofrance.com> ;;; Copyright © 2025 Maxim Cournoyer <maxim@guixotic.coop> ;;; Copyright © 2025 Tomas Volf <~@wolfsden.cz> ;;; Copyright © 2025 Sharlatan Hellseher <sharlatanus@gmail.com> @@ -110,6 +111,39 @@ special case for no-op or fake fxevent.Loggers, it ignores implementations that handle none of the event types.") (license license:expat))) +(define-public go-jsonnet + (package + (name "go-jsonnet") + (version "0.21.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/google/go-jsonnet") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0d05f16qxabfhaj0l3da3x7zl5g8jbvkcyn39bidd2a278sb3p97")))) + (build-system go-build-system) + (arguments + (list + #:install-source? #f + #:import-path "github.com/google/go-jsonnet/cmd/jsonnet" + #:unpack-path "github.com/google/go-jsonnet")) + (native-inputs + (list go-github-com-fatih-color + go-github-com-sergi-go-diff + go-golang-org-x-crypto + go-sigs-k8s-io-yaml)) + (home-page "https://github.com/google/go-jsonnet") + (synopsis "Go implementation of Jsonnet") + (description + "This package provides an implementation of the @url{http://jsonnet.org/, +Jsonnet} data templating language in Go. It is a feature-complete, +production-ready implementation, compatible with the original Jsonnet +C++implementation.") + (license license:asl2.0))) + (define-public godef (package (name "godef") diff --git a/gnu/packages/golang-crypto.scm b/gnu/packages/golang-crypto.scm index cfca020347..a8a25da7dd 100644 --- a/gnu/packages/golang-crypto.scm +++ b/gnu/packages/golang-crypto.scm @@ -3165,8 +3165,8 @@ Go.") "\nThis package provides a command line interface (CLI) tools.")))) -(define-public age-keygen - (deprecated-package "age-keygen" age)) +(define-deprecated-package age-keygen + age) (define-public go-imohash (package/inherit go-github-com-kalafut-imohash diff --git a/gnu/packages/golang-web.scm b/gnu/packages/golang-web.scm index 7f3bd4fc9c..4d14b1fcbe 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -598,6 +598,36 @@ required dependencies. The HTTP response contains the aggregated health result and details about the health status of each component.") (license license:expat))) +(define-public go-github-com-aliyun-aliyun-oss-go-sdk + (package + (name "go-github-com-aliyun-aliyun-oss-go-sdk") + (version "3.0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/aliyun/aliyun-oss-go-sdk") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1s9c3if0is8m52hvb1czh4rb7ck4vk654wbzyq44iq1rqfr6y1ly")))) + (build-system go-build-system) + (arguments + (list + ;; XXX: Tests require more packages. + #:tests? #f + #:import-path "github.com/aliyun/aliyun-oss-go-sdk")) + ;; (native-inputs (list + ;; go-github-com-go-check-check + ;; go-github-com-aliyun-alibaba-cloud-sdk-go)) + (propagated-inputs (list go-golang-org-x-time)) + (home-page "https://github.com/aliyun/aliyun-oss-go-sdk") + (synopsis "Alibaba cloud OSS SDK for Go") + (description + "This package provides a Go SDK based on the official +APIs of Alibaba Cloud @acronym{OSS, Object Storage Service}.") + (license license:expat))) + (define-public go-github-com-anacrolix-envpprof (package (name "go-github-com-anacrolix-envpprof") @@ -1983,6 +2013,45 @@ API. See the full Circonus API Documentation at browser window.") (license license:bsd-2))) +(define-public go-github-com-cncf-xds-go + (package + (name "go-github-com-cncf-xds-go") + (version "0.0.0-20250501225837-2ac532fd4443") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cncf/xds") + (commit (go-version->git-ref version #:subdir "go")))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0snccl7rrx2f07131s0n8z3d1p5v2nvcg7v3dhq1a5sl46b1x78b")))) + (build-system go-build-system) + (arguments + (list + #:skip-build? #t + #:import-path "github.com/cncf/xds/go" + #:unpack-path "github.com/cncf/xds")) + (propagated-inputs + (list go-cel-dev-expr + go-github-com-envoyproxy-protoc-gen-validate + go-google-golang-org-genproto-googleapis-api + go-google-golang-org-grpc + go-google-golang-org-protobuf)) + (home-page "https://github.com/cncf/xds") + (synopsis "Universal data-plane API using the xDS protocol in Golang") + (description + "This package provides a set of APIs implementing the de facto standard +for L4/L7 data plane configuration, similar to the role played by OpenFlow at +L2/L3/L4 in @acronym{Software-defined networking, SDN}. + +The xDS transport protocol provides a low latency versioned streaming gRPC +delivery of xDS resources. The data model covers common data plane concerns +such as service discovery, load balancing assignments, routing discovery, +listener configuration, secret discovery, load reporting, health check +delegation, etc.") + (license license:asl2.0))) + (define-public go-github-com-cockroachdb-errors (package (name "go-github-com-cockroachdb-errors") @@ -2133,6 +2202,73 @@ Wasm}. @end itemize") (license license:isc))) +(define-public go-github-com-containerd-containerd-api + (package + (name "go-github-com-containerd-containerd-api") + (version "1.9.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/containerd/containerd") + (commit (go-version->git-ref version + #:subdir "api")))) + (file-name (git-file-name name version)) + (sha256 + (base32 "06pl08p1f86z70hy9si5h7p2bgassqjsy625pvzxazxix35ggq6x")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/containerd/containerd/api" + #:unpack-path "github.com/containerd/containerd")) + (propagated-inputs + (list go-github-com-containerd-ttrpc + go-github-com-containerd-typeurl-v2 + go-github-com-opencontainers-image-spec + go-google-golang-org-genproto-googleapis-rpc + go-google-golang-org-grpc + go-google-golang-org-protobuf)) + (home-page "https://github.com/containerd/containerd") + (synopsis "Go package for gRPC API for containerd") + (description + "This Go package provides the gRPC API for containerd.") + (license license:asl2.0))) + +(define-public go-github-com-containerd-ttrpc + (package + (name "go-github-com-containerd-ttrpc") + (version "1.2.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/containerd/ttrpc") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0fcd9nqkj1iz95h16i8ygiiazvbzmgrawpnvqcpbfhjwkx3sc1m1")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/containerd/ttrpc")) + (propagated-inputs + (list go-github-com-containerd-log + go-github-com-gogo-protobuf + go-github-com-golang-protobuf + go-github-com-prometheus-procfs + go-golang-org-x-sys + go-google-golang-org-genproto-googleapis-rpc + go-google-golang-org-grpc + go-google-golang-org-protobuf)) + (home-page "https://github.com/containerd/ttrpc") + (synopsis "Go package for gRPC for low-memory environments") + (description + "Package ttrpc defines and implements a low level simple transfer protocol +optimized for low latency and reliable connections between processes on the +same host. The protocol uses simple framing for sending requests, responses, +and data using multiple streams.") + (license license:asl2.0))) + (define-public go-github-com-containerd-typeurl (package (name "go-github-com-containerd-typeurl") @@ -12636,6 +12772,38 @@ go.opentelemetry.io/otel, go.opentelemetry.io/otel/metric and go.opentelemetry.io/otel/trace.") (license license:asl2.0))) +(define-public go-go-opentelemetry-io-otel-exporters-jaeger + (package + (name "go-go-opentelemetry-io-otel-exporters-jaeger") + (version "1.17.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/open-telemetry/opentelemetry-go") + (commit (go-version->git-ref version + #:subdir "exporters/jaeger")))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0241rgx3wf4gfk9q0s0r378kv6hs8dii1d2zgp09941dgk59zmp9")))) + (build-system go-build-system) + (arguments + (list + #:import-path "go.opentelemetry.io/otel/exporters/jaeger" + #:unpack-path "go.opentelemetry.io/otel")) + (native-inputs + (list go-github-com-stretchr-testify)) + (propagated-inputs + (list go-github-com-go-logr-logr + go-github-com-go-logr-stdr + go-github-com-google-go-cmp + go-golang-org-x-sys)) + (home-page "https://pkg.go.dev/go.opentelemetry.io/otel") + (synopsis "OpenTelemetry-Go Jaeger Exporter") + (description + "Package jaeger contains an OpenTelemetry tracing exporter for Jaeger.") + (license license:asl2.0))) + (define-public go-go-opentelemetry-io-otel-exporters-otlp-otlptrace (package (name "go-go-opentelemetry-io-otel-exporters-otlp-otlptrace") @@ -13425,6 +13593,44 @@ the standard @code{context} package to store request-scoped values.") generate Go code.") (license license:asl2.0))) +(define-public go-google-golang-org-grpc-security-advancedtls + (package + (name "go-google-golang-org-grpc-security-advancedtls") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/grpc/grpc-go") + (commit (go-version->git-ref version + #:subdir "security/advancedtls")))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1xkqjian41falr0h8sicx2vdajf1zxcrkqiz5p2g7mmm8gcb6l4w")))) + (build-system go-build-system) + (arguments + (list + #:import-path "google.golang.org/grpc/security/advancedtls" + #:unpack-path "google.golang.org/grpc" + #:test-flags + #~(list "-vet=off" + "-skip" "Test/ClientServerHandshake"))) + (native-inputs + (list go-google-golang-org-genproto-googleapis-rpc + go-golang-org-x-net)) + (propagated-inputs + (list go-github-com-google-go-cmp + go-golang-org-x-crypto + go-google-golang-org-protobuf)) + (home-page "https://google.golang.org/grpc") + (synopsis "Go package for gRPC transport credentials") + (description + "Package advancedtls provides gRPC transport credentials that allow easy +configuration of advanced TLS features. For example, periodic credential +reloading,support for certificate revocation lists, and customizable +certificate verification behaviors.") + (license license:asl2.0))) + ;; This to satisfy alternative import path, some of the projects still use it ;; in go.mod. (define-public go-gopkg-in-evanphx-json-patch-v4 @@ -13930,12 +14136,10 @@ protocol.") and concepts from Philipp Winter's ScrambleSuit protocol.") (license (list license:bsd-2 license:bsd-3)))) -(define-public go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird - ;; This is a final command, no need for a full name of the go.mod module path - ;; style. The same is suggested in project's README and Makefile. - (deprecated-package - "go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird" - lyrebird)) +;; This is a final command, no need for a full name of the go.mod module path +;; style. The same is suggested in project's README and Makefile. +(define-deprecated-package go-gitlab-torproject-org-tpo-anti-censorship-pluggable-transports-lyrebird + lyrebird) (define-public go-jose-util (package diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index e465eb175e..3c95cf279b 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -95,7 +95,7 @@ #:use-module (guix packages) #:use-module (guix utils) #:use-module (gnu packages) - #:use-module (gnu packages cmake) + #:use-module (gnu packages base) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gcc) #:use-module (gnu packages glib) @@ -4752,6 +4752,55 @@ a HTTP context way.") (license license:asl2.0))) +(define-public go-github-com-containerd-go-runc + (package + (name "go-github-com-containerd-go-runc") + (version "1.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/containerd/go-runc") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03f6a44j24g64x0zwx6daqbssbka0wcvj3fkjz4rvqx5dz3n7xhf")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/containerd/go-runc" + #:test-flags #~(list "-skip" "TestRuncStarted") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs import-path #:allow-other-keys) + (substitute* (string-append "src/" import-path "/runc_test.go") + (("Command: \"/bin/true\",") + (string-append "Command: \"" + (search-input-file inputs "/bin/true") + "\",\n")) + (("Command: \"/bin/false\",") + (string-append "Command: \"" + (search-input-file inputs "/bin/false") + "\",\n"))) + (substitute* (string-append "src/" import-path "/runc.go") + (("return -1, err") + "fmt.Errorf(\"Achou\")\n return -1, err"))))))) + (inputs + (list coreutils)) + (propagated-inputs + (list go-github-com-containerd-console + go-github-com-opencontainers-runtime-spec + go-github-com-sirupsen-logrus + go-golang-org-x-sys)) + (home-page "https://github.com/containerd/go-runc") + (synopsis "Runc bindings for Golang") + (description + "This package implements a functionality for consuming the @code{runc} + binary in Go applications. It tries to expose all the settings and features +of the @code{runc} CLI.") + (license license:asl2.0))) + (define-public go-github-com-containerd-log (package (name "go-github-com-containerd-log") @@ -8305,8 +8354,8 @@ while callers can implement logging with whatever backend is appropriate.") standard log package.") (license license:asl2.0))) -(define-public go-github-com-go-md2man - (deprecated-package "go-github-com-go-md2man" go-github-com-cpuguy83-go-md2man-v2)) +(define-deprecated-package go-github-com-go-md2man + go-github-com-cpuguy83-go-md2man-v2) (define-public go-github-com-go-openapi-inflect (package @@ -9508,6 +9557,30 @@ provides a buffered io.Writer that is flushed at a timed interval.") according @@url{https://rfc-editor.org/rfc/rfc8785.html, RFC 8785}.") (license license:asl2.0))) +(define-public go-github-com-grafana-regexp + (package + (name "go-github-com-grafana-regexp") + (version "0.0.0-20240518133315-a468a5bfb3bc") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/grafana/regexp") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0vhncrr5n8f150rg0q01i7yc58b0jpcci2h7zgiwv9wr5k0yaqs2")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/grafana/regexp")) + (home-page "https://github.com/grafana/regexp") + (synopsis "Alternative implementation of Go's std @code{regexp} package") + (description + "This package provides an alternative implementation of @code{regexp}, + with some code optimisations to make it run faster.") + (license license:bsd-3))) + (define-public go-github-com-guptarohit-asciigraph (package (name "go-github-com-guptarohit-asciigraph") @@ -9792,6 +9865,38 @@ single @code{Tree} implementation, optimized for sparse nodes.") (replace "go-github-com-hashicorp-golang-lru" go-github-com-hashicorp-golang-lru-v2))))) +(define-public go-github-com-hashicorp-go-memdb + (package + (name "go-github-com-hashicorp-go-memdb") + (version "1.3.5") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/hashicorp/go-memdb") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1faz0sr9f82zz0vgxsh131b7swi6a3yrsgbw72y45cm2k8bxviad")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/hashicorp/go-memdb")) + (propagated-inputs + (list go-github-com-hashicorp-go-immutable-radix)) + (home-page "https://github.com/hashicorp/go-memdb") + (synopsis "Golang in-memory database built on immutable radix trees") + (description + "This package implements a simple in-memory database built on immutable +@url{https://en.wikipedia.org/wiki/Radix_tree, radix trees}. The database +provides Atomicity, Consistency and Isolation from ACID. Being that it is +in-memory, it does not provide durability. The database is instantiated with +a schema that specifies the tables and indices that exist and allows +transactions to be executed. The database provides the following: +@acronym{Multi-Version Concurrency Control, MVCC}, transaction support, rich +indexing, watches.") + (license license:mpl2.0))) + (define-public go-github-com-hashicorp-go-msgpack-v2 (package (name "go-github-com-hashicorp-go-msgpack-v2") @@ -14745,6 +14850,30 @@ to help free up more global locks to handle other tasks.") names.") (license license:asl2.0))) +(define-public go-github-com-moby-pubsub + (package + (name "go-github-com-moby-pubsub") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/moby/pubsub") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1di8wyipxjxg9v28klzjna6a9zg5n2g5wyn1qy3klp428zzknbyw")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/moby/pubsub")) + (home-page "https://github.com/moby/pubsub") + (synopsis "Publish–subscribe pattern in Golang") + (description "This package implements a +@url{https://en.wikipedia.org/wiki/Publish%E2%80%93subscribe_pattern, +publish–subscribe pattern}.") + (license license:asl2.0))) + (define-public go-github-com-moby-spdystream (package (name "go-github-com-moby-spdystream") @@ -16818,16 +16947,21 @@ specification-runtime-spec.") (define-public go-github-com-opencontainers-runtime-tools (package (name "go-github-com-opencontainers-runtime-tools") - (version "0.9.0") + ;; XXX: See: <https://github.com/opencontainers/runtime-tools/issues/792>. + (properties '((commit . "0ea5ed0382a279b30530acccafaf070fefeddafd") + (revision . "0"))) + (version (git-version "0.9.0" + (assoc-ref properties 'revision) + (assoc-ref properties 'commit))) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/opencontainers/runtime-tools") - (commit (string-append "v" version)))) + (commit (assoc-ref properties 'commit)))) (file-name (git-file-name name version)) (sha256 - (base32 "1pli3jb1rq9lkzzz83f7jw788vijg7x6ly3vgasdlwri7kiph1sa")) + (base32 "1385hh25ysni83wp5xdn4zajzavmnbrgz9mrpqsj3byk33xqyh3z")) (snippet #~(begin (use-modules (guix build utils)) (delete-file-recursively "vendor"))))) @@ -16835,8 +16969,6 @@ specification-runtime-spec.") (arguments (list #:skip-build? #t - ;; XXX: See: <https://github.com/opencontainers/runtime-tools/issues/792>. - #:tests? #f #:import-path "github.com/opencontainers/runtime-tools" #:build-flags #~(list (format #f "-ldflags=-X ~s" @@ -16850,14 +16982,15 @@ specification-runtime-spec.") go-github-com-stretchr-testify go-github-com-urfave-cli)) (propagated-inputs - (list go-github-com-blang-semver + (list go-github-com-blang-semver-v4 + go-github-com-google-uuid go-github-com-hashicorp-go-multierror + go-github-com-moby-sys-capability + go-github-com-moby-sys-mountinfo go-github-com-mrunalp-fileutils go-github-com-opencontainers-runtime-spec go-github-com-opencontainers-selinux - go-github-com-satori-go-uuid go-github-com-sirupsen-logrus - go-github-com-syndtr-gocapability go-github-com-xeipuuv-gojsonschema go-golang-org-x-sys)) (home-page "https://github.com/opencontainers/runtime-tools") @@ -20564,6 +20697,82 @@ structures using selector strings. It's similar to @code{jq}/@code{yq}, but supports JSON, YAML, TOML, XML and CSV with zero runtime dependencies.") (license license:expat))) +(define-public go-github-com-tonistiigi-go-csvvalue + (package + (name "go-github-com-tonistiigi-go-csvvalue") + (version "0.0.0-20240814133006-030d3b2625d0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tonistiigi/go-csvvalue") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "128i7fmxyf08q80b1i6hgb3sbx2nsa56p2kr6vcdyijazhqnrn0p")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/tonistiigi/go-csvvalue")) + (home-page "https://github.com/tonistiigi/go-csvvalue") + (synopsis "Efficient parser for a single line CSV value in Golang") + (description + "Package csvvalue provides an efficient parser for a single line CSV +value. It is more efficient than the standard library csv package for parsing +many small values. For multi-line CSV parsing, the standard library is +recommended.") + (license license:expat))) + +(define-public go-github-com-tonistiigi-units + (package + (name "go-github-com-tonistiigi-units") + (version "0.0.0-20180711220420-6950e57a87ea") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tonistiigi/units") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1w8rgmlg6pim4vchg4qfpdf6niqmsp0a4f6bafgwd1gnwxi71zkf")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/tonistiigi/units")) + (native-inputs + (list go-github-com-stretchr-testify)) + (home-page "https://github.com/tonistiigi/units") + (synopsis "Simple byte size formatting") + (description "This package provides a simple byte size formatting in Go.") + (license license:expat))) + +(define-public go-github-com-tonistiigi-vt100 + (package + (name "go-github-com-tonistiigi-vt100") + (version "0.0.0-20240514184818-90bafcd6abab") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tonistiigi/vt100") + (commit (go-version->git-ref version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1vjk3yam610kc600h3hd3glsygr3m863765m9q7c0gsaj0vd38y0")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/tonistiigi/vt100")) + (native-inputs + (list go-github-com-stretchr-testify)) + (home-page "https://github.com/tonistiigi/vt100") + (synopsis "Raw-mode vt100 screen reader in Golang") + (description + "Package vt100 implements a quick-and-dirty programmable ANSI terminal +emulator.") + (license license:expat))) + (define-public go-github-com-twpayne-go-shell (package (name "go-github-com-twpayne-go-shell") @@ -22002,8 +22211,9 @@ common sequence} values from two arbitrary arrays.") (build-system go-build-system) (arguments (list - #:go go-1.23 #:import-path "github.com/yuin/gopher-lua" + #:test-flags + #~(list "-vet=off") ;Go@1.24 forces vet, but tests are not ready yet. #:phases #~(modify-phases %standard-phases ;; FIXME: "ls" needs to be substituted in _glua-tests/issues.lua and @@ -24311,22 +24521,21 @@ recognizers) at run time.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mvdan/editorconfig") - (commit (string-append "v" version)))) + (url "https://github.com/mvdan/editorconfig") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 "0mi1cp6fyaknjn7smvaas4lj03fws5qib5vbi4mrz3qrmvmhh9l4")))) (build-system go-build-system) (arguments (list - #:import-path "mvdan.cc/editorconfig")) - (native-inputs - (list cmake-minimal)) + #:import-path "mvdan.cc/editorconfig" + #:test-flags #~(list "-skip" "TestViaCmake"))) (home-page "https://github.com/mvdan/editorconfig") (synopsis "EditorConfig support in Go") (description - "Package editorconfig allows parsing and using @code{EditorConfig} files, as -defined in @url{https://editorconfig.org/,https://editorconfig.org/}.") + "Package editorconfig allows parsing and using @code{EditorConfig} +files, as defined in https://editorconfig.org/.") (license license:bsd-3))) (define-public go-mvdan-cc-gofumpt @@ -24905,15 +25114,23 @@ library.") ;;; (define-public glua - (package - (inherit go-github-com-yuin-gopher-lua) + (package/inherit go-github-com-yuin-gopher-lua (name "glua") (arguments - (list - #:tests? #f - #:install-source? #f - #:import-path "github.com/yuin/gopher-lua/cmd/glua" - #:unpack-path "github.com/yuin/gopher-lua")))) + (substitute-keyword-arguments + (package-arguments go-github-com-yuin-gopher-lua) + ((#:tests? _ #t) #f) + ((#:install-source? _ #t) #f) + ((#:import-path _) "github.com/yuin/gopher-lua/cmd/glua") + ((#:unpack-path _ "") "github.com/yuin/gopher-lua") + ((#:phases %standard-phases) + #~(modify-phases %standard-phases + (delete 'disable-failing-tests))))) + (native-inputs + (append (package-native-inputs go-github-com-yuin-gopher-lua) + (package-propagated-inputs go-github-com-yuin-gopher-lua))) + (propagated-inputs '()) + (inputs '()))) (define-public go-asmfmt (package @@ -24978,39 +25195,6 @@ correctly."))) (string-append (package-description go-zgo-at-jfmt) " This package provides a command line interface (CLI) tool.")))) -(define-public go-jsonnet - (package - (name "go-jsonnet") - (version "0.20.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/google/go-jsonnet") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1qfr6yvhj33rhx1icxh99bbpngh5kwq1x7r39315y53bw216vbrz")))) - (build-system go-build-system) - (arguments - (list - #:install-source? #f - #:import-path "github.com/google/go-jsonnet/cmd/jsonnet" - #:unpack-path "github.com/google/go-jsonnet")) - (native-inputs - (list go-github-com-fatih-color - go-github-com-sergi-go-diff - go-gopkg-in-yaml-v2 - go-sigs-k8s-io-yaml)) - (home-page "https://github.com/google/go-jsonnet") - (synopsis "Go implementation of Jsonnet") - (description - "This package provides an implementation of the @url{http://jsonnet.org/, -Jsonnet} data templating language in Go. It is a -feature-complete,production-ready implementation, compatible with the original -Jsonnet C++implementation.") - (license license:asl2.0))) - (define-public go-ifacemaker (package/inherit go-github-com-vburenin-ifacemaker (name "go-ifacemaker") diff --git a/gnu/packages/graph.scm b/gnu/packages/graph.scm index bff0af6814..be542f5b10 100644 --- a/gnu/packages/graph.scm +++ b/gnu/packages/graph.scm @@ -434,8 +434,8 @@ millions of nodes (as long as they can fit in memory). The core function is algorithm for a number of different methods.") (license license:gpl3+))) -(define-public python-vtraag-louvain - (deprecated-package "python-vtraag-louvain" python-louvain-igraph)) +(define-deprecated-package python-vtraag-louvain + python-louvain-igraph) (define-public python-pygsp (package diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index d1ada9ec37..ac861f1ef6 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -2219,7 +2219,10 @@ improve the thumbnail cutting region, so that faces are always centered.") "fgallery-" version ".zip")) (sha256 (base32 - "0zf6r88m2swgj1ylgh3qa1knzb4if501hzvga37h9psy8k179w8n")))) + "0zf6r88m2swgj1ylgh3qa1knzb4if501hzvga37h9psy8k179w8n")) + ;; TODO: Remove this patch when updating the package. + ;; Merged upstream at https://gitlab.com/wavexx/fgallery/-/commit/67b4a41de3f788e77ca619658950bae0e33b277b. + (patches (search-patches "fgallery-also-look-for-7z.patch")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no tests @@ -2255,7 +2258,7 @@ improve the thumbnail cutting region, so that faces are always centered.") "zip" "jpegoptim" "pngcrush" - "p7zip"))) + "7zip"))) `("PERL5LIB" ":" prefix (,perl5lib))))))))) (native-inputs (list unzip)) @@ -2272,7 +2275,7 @@ improve the thumbnail cutting region, so that faces are always centered.") perl-image-exiftool jpegoptim pngcrush - p7zip)) + 7zip)) (home-page "https://www.thregr.org/~wavexx/software/fgallery/") (synopsis "Static photo gallery generator") (description diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 12404b57ba..f5ae7b94de 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -896,11 +896,11 @@ is part of the GNOME accessibility project.") (properties (alist-delete 'hidden? (package-properties at-spi2-core))))) -(define-public at-spi2-atk - (deprecated-package "at-spi2-atk" at-spi2-core)) +(define-deprecated-package at-spi2-atk + at-spi2-core) -(define-public atk - (deprecated-package "atk" at-spi2-core)) +(define-deprecated-package atk + at-spi2-core) (define-public gtk+-2 (package diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 9f393ef82d..026fc3622f 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1102,7 +1102,7 @@ tables.") (package (name "guile-fibers") (version "1.3.1") - (home-page "https://codeberg.org/fibers/fibers") + (home-page "https://codeberg.org/guile/fibers") (source (origin (method git-fetch) (uri (git-reference @@ -4524,7 +4524,7 @@ from @code{tree-il}.") (define-public guile-hoot (package (name "guile-hoot") - (version "0.6.1") + (version "0.7.0") (source (origin (method url-fetch) (uri (string-append "https://spritely.institute/files/releases" @@ -4532,7 +4532,7 @@ from @code{tree-il}.") version ".tar.gz")) (sha256 (base32 - "0bpcni900sh2rp8j8ixjs0cipmvgygh1srnli686vf12n61hw0kz")))) + "0f762mwz6lk5vwl1srjq9frqm3s2baa17gbn5pl70ri5x0iywyxi")))) (build-system gnu-build-system) (arguments '(#:make-flags '("GUILE_AUTO_COMPILE=0"))) diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 87a1649970..c7c04dd4cf 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -902,9 +902,9 @@ manipulate repositories of the Git version control system.") (define-public guile2.2-git (package-for-guile-2.2 guile-git)) -(define-public guile2.0-git - ;; Guile-Git 0.8.0 no longer supports Guile 2.0. - (deprecated-package "guile2.0-git" guile2.2-git)) +;; Guile-Git 0.8.0 no longer supports Guile 2.0. +(define-deprecated-package guile2.0-git + guile2.2-git) (define-public guile-zlib (package diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 0f8f5e7809..5df8768dd8 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -304,8 +304,8 @@ sharing.") (license license:gpl2))) ;; Added on 2025-09-24. -(define-public barrier - (deprecated-package "barrier" deskflow)) +(define-deprecated-package barrier + deskflow) (define-public hw-probe (package diff --git a/gnu/packages/haskell-check.scm b/gnu/packages/haskell-check.scm index e668706959..f21b1f22d4 100644 --- a/gnu/packages/haskell-check.scm +++ b/gnu/packages/haskell-check.scm @@ -920,8 +920,8 @@ configuration. This library provides the common bits for writing custom (license license:bsd-3))) ;; Deprecated. Don’t use. -(define-public ghc-cabal-doctest - (deprecated-package "ghc-cabal-doctest" cabal-doctest)) +(define-deprecated-package ghc-cabal-doctest + cabal-doctest) (define-public ghc-testing-type-modifiers (package diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm index 4a613264dc..0af7ce87ed 100644 --- a/gnu/packages/haskell-xyz.scm +++ b/gnu/packages/haskell-xyz.scm @@ -14611,7 +14611,7 @@ parts.") ghc-data-default-class ghc-blaze-markup ghc-blaze-html)) - (native-inputs (list ghc-hspec ghc-hunit ghc-doctest ghc-cabal-doctest)) + (native-inputs (list ghc-hspec ghc-hunit ghc-doctest cabal-doctest)) (home-page "https://github.com/snoyberg/xml") (synopsis "Utilities for dealing with XML with the conduit package") (description @@ -16272,7 +16272,7 @@ Documentation is at (build-system haskell-build-system) (properties '((upstream-name . "pcg-random"))) (inputs (list ghc-primitive ghc-random ghc-entropy)) - (native-inputs (list ghc-doctest ghc-cabal-doctest)) + (native-inputs (list ghc-doctest cabal-doctest)) (arguments `(#:cabal-revision ("1" "1f8h0lv34cmqaxccg2yf6q4s8r5g2s8q8s9kql212iggd2l3vv77"))) diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 6f57c3a557..8899272d33 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -1025,6 +1025,7 @@ recalculates.") (build-system qt-build-system) (arguments (list + #:qtbase qtbase #:build-type "Release" ; 542 MiB in release mode #:tests? #f ; Downloads test data #:configure-flags @@ -1173,6 +1174,7 @@ recalculates.") libtiff libxcursor libxml2 + libxslt libxt lz4 lzip @@ -1190,15 +1192,13 @@ recalculates.") python-mpi4py python-numpy python-wrapper - qtbase-5 - qtdeclarative-5 - qtmultimedia-5 - qtsvg-5 - qttools-5 - qtwebchannel-5 - qtwebengine-5 - qtx11extras - qtxmlpatterns-5 + qt5compat + qtdeclarative + qtmultimedia + qtsvg + qttools + qtwebchannel + qtwebengine sdl2 sqlite tbb @@ -2061,14 +2061,15 @@ processing pipelines.") (native-inputs (list python-pytest python-pytest-qt - xorg-server-for-tests - python-wheel)) + python-setuptools + xorg-server-for-tests)) (propagated-inputs (list python-imgviz python-matplotlib python-natsort python-numpy python-pillow + python-pyqt python-pyyaml python-qtpy python-termcolor)) diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 8d31719ff8..fd69dfe779 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -1318,8 +1318,8 @@ workspaces. @end itemize") (license license:gpl3+))) -(define-public python-ueberzug - (deprecated-package "python-ueberzug" ueberzug)) +(define-deprecated-package python-ueberzug + ueberzug) (define-public vv (package diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 04c06bd902..8a7ce10138 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -36,10 +36,12 @@ ;;; Copyright © 2022 ( <paren@disroot.org> ;;; Copyright © 2022-2023 Bruno Victal <mirai@makinata.eu> ;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> -;;; Copyright © 2023-2024 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2023-2025 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2023, 2025 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; Copyright © 2024 chris <chris@bumblehead.com> ;;; Copyright © 2025 Josep Bigorra <jjbigorra@gmail.com> +;;; Copyright © 2025 Jake Forster <jakecameron.forster@gmail.com> +;;; Copyright © 2025 Ghislain Vaillant <ghislain.vaillant@inria.fr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -128,7 +130,7 @@ (define-public converseen (package (name "converseen") - (version "0.12.2.5") + (version "0.15.1.0") (source (origin (method git-fetch) (uri (git-reference @@ -137,7 +139,7 @@ (file-name (git-file-name name version)) (sha256 (base32 - "03jsf5418kk1j8mk0gjzxb79lv44yy1wsycn6g6fmvg4zhl2cls3")))) + "05nm6h4d2rq0kcf2maz95zvx8hd811wdqxxbzwahq1m2az1b11cn")))) (build-system cmake-build-system) (arguments (list @@ -2023,49 +2025,92 @@ and decompress to 32-bit and big-endian pixel buffers (RGBX, XBGR, etc.).") (base32 "1kyhczwa17qp8ik3v876yjqsf4zrjj0z3464j04fak269cii404g")))))) +(define-public nifticlib + ;; Warning: The version of the test data may not match the package version. + (let* ((nifti-test-data-version "3.0.2") + (nifti-test-data-file (git-file-name "nifti-test-data" + nifti-test-data-version))) + (package + (name "nifticlib") + (version "3.0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/NIFTI-Imaging/nifti_clib") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0hamm6nvbjdjjd5md4jahzvn5559frigxaiybnjkh59ckxwb1hy4")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags + #~(append + (list "-DBUILD_SHARED_LIBS=ON" + "-DDOWNLOAD_TEST_DATA=OFF" + ;; Test data directory must be writeable. + (string-append "-Dfetch_testing_data_SOURCE_DIR=" + (canonicalize-path ".") "/source/test-data") + "-DUSE_CIFTI_CODE=ON") + ;; Unable to generate manual pages via help2man when cross-compiling. + (if #$(%current-target-system) + '() + (list "-DNIFTI_INSTALL_NO_DOCS=FALSE"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-version + (lambda _ + (substitute* "CMakeLists.txt" + (("0.0.0.0") #$version)))) + (add-after 'unpack 'prepare-test-data + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (copy-recursively #$(this-package-native-input + nifti-test-data-file) + "test-data")))) + (add-after 'unpack 'patch-tests + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (substitute* (string-append "nifti2/nifti_regress_test/" + "cmake_testscripts/" + "install_linking_test.sh") + (("real_easy") "source/real_easy"))))) + (delete 'check) + (add-after 'install 'check + (lambda args + ;; The 'install_linking' test invokes this package's binaries. + (setenv "PATH" (string-append (getenv "PATH") ":" + #$output "/bin")) + (apply (assoc-ref %standard-phases 'check) args)))))) + (inputs (list expat zlib)) + (native-inputs + (append + (list + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/NIFTI-Imaging/nifti-test-data") + (commit (string-append "v" nifti-test-data-version)))) + (file-name nifti-test-data-file) + (sha256 + (base32 "0jdm8amix7pvfb1zmrb89f7izji2s8fpbfncgamczsngc11yfgcp")))) + (if (%current-target-system) + '() + (list help2man)))) + (synopsis + "C libraries for reading and writing files in @acronym{NIfTI, Neuroimaging +Informatics Technology Initiative} formats") + (description + "@code{Nifti_clib} is a set of I/O libraries for reading and writing files +in the nifti-1, nifti-2, and (to some degree) cifti file formats. These are +binary file formats for storing medical image data, e.g. @acronym{MRI, magnetic +resonance imaging} and @acronym{fMRI, functional MRI} brain images.") + (home-page "https://github.com/NIFTI-Imaging/nifti_clib") + (license license:public-domain)))) + (define-public niftilib - (package - (name "niftilib") - (version "2.0.0") - (source (origin - (method url-fetch) - (uri (list (string-append "mirror://sourceforge/niftilib/" - "nifticlib/nifticlib_" - (string-join (string-split version #\.) "_") - "/nifticlib-" version ".tar.gz"))) - (sha256 - (base32 "123z9bwzgin5y8gi5ni8j217k7n683whjsvg0lrpii9flgk8isd3")))) - (build-system gnu-build-system) - (arguments - '(#:tests? #f ; there is no test target - #:parallel-build? #f ; not supported - #:make-flags - (list "SHELL=bash" - (string-append "ZLIB_INC=" - (assoc-ref %build-inputs "zlib") "/include") - ;; Append "-fPIC" to CFLAGS. - (string-append "CFLAGS=" - "-Wall -ansi -pedantic -fPIC")) - #:phases - (modify-phases %standard-phases - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (for-each - (lambda (dir) - (copy-recursively dir (string-append out "/" dir))) - '("bin" "lib" "include"))) - #t)) - (delete 'configure)))) - (inputs - (list zlib)) - (synopsis "Library for reading and writing files in the nifti-1 format") - (description "Niftilib is a set of i/o libraries for reading and writing -files in the nifti-1 data format - a binary file format for storing -medical image data, e.g. magnetic resonance image (MRI) and functional MRI -(fMRI) brain images.") - (home-page "https://niftilib.sourceforge.net") - (license license:public-domain))) + (deprecated-package "niftilib" nifticlib)) (define-public mini (package diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index c0c0e01428..566f08abad 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -2578,8 +2578,8 @@ interface as simple as the HTTP web, but with permanence built in. You can also mount the world at @code{/ipfs}.") (license license:expat))) -(define-public go-ipfs - (deprecated-package "go-ipfs" kubo)) +(define-deprecated-package go-ipfs + kubo) (define-public spritely-libp2p-daemon (let ((version "0.1") diff --git a/gnu/packages/jupyter.scm b/gnu/packages/jupyter.scm index ec0f7872d7..e484e1b7f2 100644 --- a/gnu/packages/jupyter.scm +++ b/gnu/packages/jupyter.scm @@ -1399,13 +1399,13 @@ analyzing Jupyter Notebooks.") (define-public python-qtconsole (package (name "python-qtconsole") - (version "5.6.1") + (version "5.7.0") (source (origin (method url-fetch) (uri (pypi-uri "qtconsole" version)) (sha256 - (base32 "1r8bznf8mlajh8rcrhikp694naq653nx4zw58f0yzlvmdiz1rbaw")))) + (base32 "0w9i0s70dm39cxgn3vh4wcaxdywzp9j0ac7f49q4qmggx4f3fcqd")))) (build-system pyproject-build-system) (arguments (list @@ -1423,22 +1423,23 @@ analyzing Jupyter Notebooks.") #~(modify-phases %standard-phases (add-before 'check 'pre-check (lambda _ - (setenv "PYTEST_QT_API" "pyqt5") - (setenv "QT_LIB" "pyqt5") + (setenv "PYTEST_QT_API" "pyqt6") + (setenv "QT_LIB" "pyqt6") (setenv "QT_QPA_PLATFORM" "offscreen") (system "Xvfb :1 -screen 0 640x480x24 &") (setenv "DISPLAY" ":1") (setenv "HOME" "/tmp")))))) (native-inputs (list python-flaky - python-pyqt + python-pyqt-6 python-pytest + python-pytest-asyncio python-pytest-qt python-setuptools - python-wheel xorg-server-for-tests)) (propagated-inputs (list python-ipykernel + python-ipython-pygments-lexers python-jupyter-client python-jupyter-core python-packaging diff --git a/gnu/packages/kde-education.scm b/gnu/packages/kde-education.scm index 5415d2c400..0e4a0a10db 100644 --- a/gnu/packages/kde-education.scm +++ b/gnu/packages/kde-education.scm @@ -187,6 +187,7 @@ Currently available boards include: (build-system qt-build-system) (arguments (list + #:qtbase qtbase #:tests? #f #:phases #~(modify-phases %standard-phases @@ -211,7 +212,6 @@ Currently available boards include: kxmlgui libplasma ncurses - qtbase qtdeclarative qtsvg qtwayland diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 3367834775..f1b0233c10 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1618,7 +1618,7 @@ protocols used in KDE Plasma.") (define-public kwayland (package (name "kwayland") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1626,7 +1626,7 @@ protocols used in KDE Plasma.") version ".tar.xz")) (sha256 (base32 - "1wr8akxaan279ljg26j0mn6hsgjk251zyhrlgpcw9fn5gjg5v1qb")))) + "1h979cyaa1m26gq262md2iam4g9c3ihj3g40dp8w97kdcfayrdv0")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config @@ -4201,7 +4201,8 @@ notifications which can be embedded in your application.") "1n2hwgpkq32xprg4dgirb22rijplvp4rf6brllgz98y09xm3pp6d")))) (build-system qt-build-system) (arguments - (list #:phases + (list #:qtbase qtbase + #:phases #~(modify-phases %standard-phases (add-after 'unpack 'disable-partloader-test (lambda _ @@ -4222,8 +4223,7 @@ notifications which can be embedded in your application.") kitemviews ki18n kjobwidgets - kwidgetsaddons - qtbase)) + kwidgetsaddons)) (home-page "https://community.kde.org/Frameworks") (synopsis "Plugin framework for user interface components") (description "This library implements the framework for KDE parts, which are @@ -4244,6 +4244,9 @@ widgets with a user-interface defined in terms of actions.") (sha256 (base32 "0czrlqh5cxnj1mlbz839c7hifhnpzl476d92lv4hxji50wnjlfqr")))) + (arguments + (substitute-keyword-arguments (package-arguments kparts) + ((#:qtbase _ #f) qtbase-5))) (propagated-inputs (list kio-5 ktextwidgets-5 kxmlgui-5)) (native-inputs diff --git a/gnu/packages/kde-games.scm b/gnu/packages/kde-games.scm index 4ca8a17d62..26cde3a2eb 100644 --- a/gnu/packages/kde-games.scm +++ b/gnu/packages/kde-games.scm @@ -416,7 +416,7 @@ This package is part of the KDE games module.") ki18n libkmahjongg python - python-pyqt + python-pyqt-6 python-twisted python-qtpy python-zope-interface diff --git a/gnu/packages/kde-graphics.scm b/gnu/packages/kde-graphics.scm index b2edf3947f..bc54a521b7 100644 --- a/gnu/packages/kde-graphics.scm +++ b/gnu/packages/kde-graphics.scm @@ -472,10 +472,9 @@ illustrate project schedules.") (sha256 (base32 "0s9b3q7wvrbz52d500mcaflkrfjwhbzh5bsf5gxzgxjdzdiywaw7")))) - (build-system cmake-build-system) + (build-system qt-build-system) (inputs - (list qtbase - boost + (list boost graphviz ki18n kiconthemes @@ -485,7 +484,9 @@ illustrate project schedules.") qtwayland)) (native-inputs (list pkg-config extra-cmake-modules kdoctools)) - (arguments (list #:tests? #f)) + (arguments + (list #:qtbase qtbase + #:tests? #f)) (home-page "https://apps.kde.org/kgraphviewer/") (synopsis "Graphviz dot graph viewer for KDE") (description "KGraphViewer is a Graphviz DOT graph file viewer, aimed to @@ -557,8 +558,7 @@ painting, image manipulating and icon editing.") gettext-minimal kitemmodels pkg-config - qwt - vc)) + qwt)) (inputs (list bash-minimal boost diff --git a/gnu/packages/kde-internet.scm b/gnu/packages/kde-internet.scm index 17c012041a..79cb263661 100644 --- a/gnu/packages/kde-internet.scm +++ b/gnu/packages/kde-internet.scm @@ -187,6 +187,8 @@ different notification systems.") (base32 "0lqirjirjxin4b2bkf9raalygvjp35qs1r51ydmgf97gjk6nhzzv")))) (build-system qt-build-system) + (arguments + (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules pkg-config qttools)) (inputs diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index 2e48ac6db3..07bfbef772 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -548,7 +548,6 @@ This package is part of the KDE multimedia module.") kwindowsystem kxmlgui breeze-icons ; default icon set - qtbase qtmultimedia qtsvg qtwayland @@ -894,10 +893,13 @@ autoloading of subtitle files for use while playing video.") (inputs (list gstreamer gst-plugins-base + gst-plugins-bad + gst-plugins-good-qt kconfig ki18n kio kirigami + kitemmodels knotifications kparts breeze-icons ; default icon set diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 497d1f0e10..b351a02b0a 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -2414,7 +2414,7 @@ transport data and for performing public transport journey queries.") "/src/libgravatar-" version ".tar.xz")) (sha256 (base32 "1rn1dc994xff9bha59155ardib0mshj18h9jj1dhf8qhs0nv1nrb")))) - (build-system qt-build-system) + (build-system cmake-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kconfig ki18n @@ -2427,8 +2427,7 @@ transport data and for performing public transport journey queries.") kwidgetsaddons qtbase)) (arguments - (list #:qtbase qtbase - #:tests? #f)) ;; 2/7 tests fail (due to network issues?) + (list #:tests? #f)) ;; 2/7 tests fail (due to network issues?) (home-page "https://invent.kde.org/pim/libgravatar") (synopsis "Online avatar lookup library") (description "This library retrieves avatar images based on a diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index adef8a1c0f..d2e637fa99 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -109,7 +109,7 @@ (define-public libplasma (package (name "libplasma") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -117,7 +117,7 @@ version ".tar.xz")) (sha256 (base32 - "0921kh0a8xwxjza1zkxyhbb9c83hly14x1jmdc7hhmpcrxa6qnwl")))) + "1s3cgf1rc1z519z88njzsnd5sv2hj09qzl4kgphrf4kk8i4q37xw")))) (build-system qt-build-system) (propagated-inputs (list kpackage kwindowsystem)) @@ -135,7 +135,6 @@ kirigami kio ki18n - kcmutils ksvg kglobalaccel knotifications @@ -148,20 +147,23 @@ libxkbcommon)) (arguments (list #:qtbase qtbase + #:test-exclude + (string-append "(" + (string-join '("plasma-dialogstatetest" + "plasma-iconitemtest" + "plasma-dialogqmltest" + "plasma-themetest" + "iconitemhidpitest" + "bug485688test" + "dialognativetest") + "|") + ")") #:phases #~(modify-phases %standard-phases - (replace 'check + (add-before 'check 'check-setup (lambda* (#:key tests? #:allow-other-keys) (when tests? - (setenv "HOME" (getcwd)) - (invoke "ctest" "-E" - (string-append "(plasma-dialogstatetest" - "|plasma-iconitemtest" - "|plasma-dialogqmltest" - "|plasma-themetest" - "|iconitemhidpitest" - "|bug485688test" - "|dialognativetest)")))))))) + (setenv "HOME" (getcwd)))))))) (home-page "https://invent.kde.org/plasma/libplasma") (synopsis "Libraries, components and tools of Plasma workspaces") (description "The plasma framework provides QML components, libplasma and @@ -169,17 +171,53 @@ script engines.") ;; dual licensed (license (list license:gpl2+ license:lgpl2.1+)))) +(define-public aurorae + (package + (name "aurorae") + (version "6.5.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/plasma/" version "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0nzvn21fx0d6mj6sci40cgpw338m7rdbb52f7cjhfg2dvzrfclcf")))) + (build-system qt-build-system) + (arguments + (list #:qtbase qtbase + #:tests? #f)) + (native-inputs + (list extra-cmake-modules qttools)) + (inputs + (list kcmutils + kcolorscheme + kconfig + kdecoration + ki18n + knewstuff + kpackage + ksvg + qtdeclarative)) + (synopsis "Themeable window decoration for KWin") + (description + "Aurorae is a themeable window decoration for KWin. It supports theme +files consisting of several SVG files for decoration and buttons. Themes can +be installed and selected directly in the configuration module of KWin +decorations.") + (home-page "https://invent.kde.org/plasma/aurorae") + (license license:gpl2+))) + (define-public bluedevil (package (name "bluedevil") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "07nphj557qyrqk96y3yp31xgv595xf63pl1az5awv059kv3hffpv")))) + "164dpdlqjfqncgc5dvp072zwn8hhkk4kyx5y8x2jhm0gy49bsr9p")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase #:tests? #f)) @@ -210,14 +248,14 @@ script engines.") (define-public breeze (package (name "breeze") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1d6qsrdyf3j1inb57w4qlvr25vg5zalc3j7lb1lm84cm74yl7f6w")))) + "0sgk9npf7kfy56rkwvwf9dnmpcfgdzz4j8djf3gjhw12f715pbs9")))) (build-system qt-build-system) ;; TODO: Check whether is makes sence splitting into several outputs. (native-inputs @@ -248,7 +286,7 @@ the Plasma Desktop. Breeze is the default theme for the KDE Plasma desktop.") (define-public breeze-gtk (package (name "breeze-gtk") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -256,7 +294,7 @@ the Plasma Desktop. Breeze is the default theme for the KDE Plasma desktop.") "-" version ".tar.xz")) (sha256 (base32 - "161sy18w6cg2wm3jd3vy4vmbg215p8kznda2bwplf6j23758h7kp")))) + "0w0lr1ym458881jngi7bab4ifl6cl5x1vd8ag7hdk0p311xhapxs")))) (build-system qt-build-system) (arguments (list @@ -306,7 +344,7 @@ Breeze is the default theme for the KDE Plasma desktop.") (define-public discover (package (name "discover") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -318,7 +356,7 @@ Breeze is the default theme for the KDE Plasma desktop.") ".tar.xz")) (sha256 (base32 - "0xl55ybkp67yvx7c3i4fi49il1v1vqgb1lvwvb8lrbnjgbix824j")))) + "0g981wxfcmv4f87jg9bxd91fdnjglh00yvfc9v5i6iywdprkpr4k")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase @@ -464,7 +502,7 @@ games, and tools.") (define-public kactivitymanagerd (package (name "kactivitymanagerd") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -472,7 +510,7 @@ games, and tools.") version ".tar.xz")) (sha256 (base32 - "0954nyd3y4xiqjhqav2m0limbcs5lg6nyc97cf5bbvhvj25m2lny")))) + "161yg136hm17p6xiakzyywbckvmzxcama8wlnjq23vg8pl6262x3")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase #:tests? #f)) @@ -541,7 +579,7 @@ desktop.") (define-public krdp (package (name "krdp") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -549,7 +587,7 @@ desktop.") version ".tar.xz")) (sha256 (base32 - "0i8ak6zijxihl3wabbi5896y0ai7r7284mb5f4njvdmnbl12q71q")))) + "12xm2902g2f52m13kchgsf2d0g483szwaaafw9md7bdf8avmq1ki")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase #:tests? #f @@ -569,20 +607,22 @@ desktop.") ;; for wayland-scanner wayland)) (inputs (list + freerdp-3 kconfig + kcmutils + kcoreaddons kcrash kdbusaddons - kcmutils + kguiaddons ki18n - kcoreaddons - kstatusnotifieritem kpipewire + kstatusnotifieritem + linux-pam openssl plasma-wayland-protocols - freerdp-3 - qtwayland qtdeclarative qtkeychain-qt6 + qtwayland wayland-protocols wayland)) (synopsis "Library and examples for creating an RDP server") @@ -594,14 +634,14 @@ RDP server.") (define-public kde-gtk-config (package (name "kde-gtk-config") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/kde-gtk-config-" version ".tar.xz")) (sha256 (base32 - "1hhfi31k5wx4s43x804nzhybifw4n7yrkaa0qs6616skzlg1ra7p")))) + "03if8vz046mslbagkw39hff6da26hrxpj2yyvzjxydvpq2x5ixzd")))) (build-system qt-build-system) (arguments (list @@ -636,14 +676,14 @@ applications.") (define-public kdecoration (package (name "kdecoration") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/kdecoration-" version ".tar.xz")) (sha256 (base32 - "0k2axz2hdfwpjyi9pdi2bifj65gpg9rwf25wn2ijawfgar1frlzr")))) + "06wwicrc1aa2iq7bfa1w7qjxj2ia6vazlgk5r394d9hzwm7ikbpr")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase)) (native-inputs @@ -660,7 +700,7 @@ manager which re-parents a Client window to a window decoration frame.") (define-public kde-cli-tools (package (name "kde-cli-tools") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -668,7 +708,7 @@ manager which re-parents a Client window to a window decoration frame.") (patches (search-patches "kde-cli-tools-delay-mime-db.patch")) (sha256 (base32 - "09kv4xm9a8yb5l3iqmy8fac99mkl8qih047kk1kwwqzx1r3jghrw")))) + "0ba1zrg5zn4j2krd4sr4y5h90ld6xscwky5mhdl91rb2lfghz8ny")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase @@ -708,27 +748,25 @@ KDE Frameworks 5 to better interact with the system.") (define-public kdeplasma-addons (package (name "kdeplasma-addons") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1kkvny9420jr9cd82valn45f3p7zyxvj3h767cf23xmvj8ldrnsb")))) + "02xrjdkanwgc8smy9j3hqdk9zfmahb1jx2y02g010lbx6145s2nc")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase + #:test-exclude "converterrunnertest" #:phases #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? inputs #:allow-other-keys) + (add-before 'check 'check-setup + (lambda* (#:key inputs #:allow-other-keys) - (when tests? - (setenv "TZDIR" - (search-input-directory - inputs "share/zoneinfo")) - (invoke "ctest" "-E" - "(converterrunnertest)"))))))) + (setenv "TZDIR" + (search-input-directory + inputs "share/zoneinfo"))))))) (native-inputs (list extra-cmake-modules tzdata-for-tests)) (inputs (list karchive kauth @@ -745,6 +783,7 @@ KDE Frameworks 5 to better interact with the system.") knotifications krunner kservice + ksvg kunitconversion knewstuff libplasma @@ -763,7 +802,7 @@ KDE Frameworks 5 to better interact with the system.") (define-public kgamma (package (name "kgamma") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -771,7 +810,7 @@ KDE Frameworks 5 to better interact with the system.") version ".tar.xz")) (sha256 (base32 - "05mvgbr9w1dk9lmdik0vzfrkif69ljfyrnckqbnli0jhpxhbsvlr")))) + "1wqbv9a0zr8nmwyxkd2ypfjnani3zbdkdvpdwmyypm5mgqp3b062")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase @@ -792,7 +831,7 @@ KDE Frameworks 5 to better interact with the system.") (define-public kglobalacceld (package (name "kglobalacceld") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -800,7 +839,7 @@ KDE Frameworks 5 to better interact with the system.") version ".tar.xz")) (sha256 (base32 - "0wyd6961m7lpwgpz81yipk7xbrzjj8ngwyb9xcpjjq39m3vx24m7")))) + "1mbmdyn08scakzn28b9cs7pjkv4s3wiyplplrf720a8mg112vjsx")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase #:phases @@ -837,14 +876,14 @@ functionality") (define-public kinfocenter (package (name "kinfocenter") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "02v6f783y0ls17y1qn362j4x5halidhpmkc0pnfmwv2gw9ysh9vc")))) + "0fyq73z7hj2v7g1n13ckshrpsinmmcvnjbxhpmzaqr8smnivsg6w")))) (build-system qt-build-system) (arguments (list @@ -946,7 +985,7 @@ computer's hardware.") (define-public kmenuedit (package (name "kmenuedit") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -954,7 +993,7 @@ computer's hardware.") ".tar.xz")) (sha256 (base32 - "0bwlr048yzha22q5x9jxvzq3m2xj268cwcbw5a763h967b6hf3v1")))) + "0f2yc163ssm8a5ipmz9y6w2bki5lb239q4phgwvzr0b9548raqas")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase #:tests? #f)) @@ -975,6 +1014,34 @@ computer's hardware.") (home-page "https://invent.kde.org/plasma/kmenuedit") (license license:gpl2+))) +(define-public knighttime + (package + (name "knighttime") + (version "6.5.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://kde/stable/plasma/" + version "/" name "-" version + ".tar.xz")) + (sha256 + (base32 + "1bxss7ail0ini8y7nk7y3hgirn1xf9cdfjf8f7y9p88wl1lg2ymc")))) + (build-system qt-build-system) + (arguments (list #:qtbase qtbase)) + (native-inputs (list extra-cmake-modules qttools)) + (inputs (list kconfig + kcoreaddons + kdbusaddons + kholidays + ki18n + qtpositioning)) + (synopsis "Helpers for scheduling the dark-light cycle") + (description "KNightTime provides helpers for scheduling the dark-light +cycle. It can be used to implement features such as adjusting the screen color +temperature based on time of day, etc.") + (home-page "https://invent.kde.org/plasma/knighttime") + (license license:lgpl3+))) + (define-public koi (package (name "koi") @@ -1055,14 +1122,14 @@ to automatically switch between light and dark themes.") (define-public kpipewire (package (name "kpipewire") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "14hsdd5hj4cy13lzszajmfkf2ijfphr9rffnynsbbv9hl2k099yh")))) + "19qb4az64cq3511jq18z4905fwj6mcql98h89zmf7zv273mbhl86")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules pkg-config)) (propagated-inputs (list qtbase qtdeclarative @@ -1092,7 +1159,7 @@ PipeWire in Qt projects.") (define-public kscreen (package (name "kscreen") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1100,7 +1167,7 @@ PipeWire in Qt projects.") ".tar.xz")) (sha256 (base32 - "0dqh8grmzzqx06r2kwgzcix08q5sifxb3i0wabbg7rxi721dwaxr")))) + "17hxfgg95jga655g12m0dgy3mqk8s0sw5dkj76m5a5h1yzq35swi")))) (build-system cmake-build-system) (arguments ;; TODO: All tests fail @@ -1109,28 +1176,29 @@ PipeWire in Qt projects.") wayland wayland-protocols qtwayland)) - (inputs (list kconfig + (inputs (list kcmutils + kconfig + kcoreaddons + kcrash kdbusaddons kdeclarative kglobalaccel ki18n - kwindowsystem kiconthemes - kcoreaddons - kcrash - kcmutils + kimageformats + ksvg + kwindowsystem kxmlgui layer-shell-qt libkscreen + libplasma libxi libxkbcommon - ksvg plasma-wayland-protocols - qtsensors qtbase + qtsensors qtwayland - xcb-util - libplasma)) + xcb-util)) (home-page "https://invent.kde.org/plasma/kscreen") (synopsis "Screen management software") (description "This package provides the screen management software for @@ -1140,14 +1208,14 @@ KDE Plasma Workspaces.") (define-public ksshaskpass (package (name "ksshaskpass") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/ksshaskpass-" version ".tar.xz")) (sha256 (base32 - "1njlwd8azhn08c5higqxxnbvzidzz5gxbhsmjy8n37076wcs2bav")))) + "0jfszq2gdhway3cds8gx2cjx24nfwgc5hh35c732n7c7pynbhs9i")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase @@ -1167,7 +1235,7 @@ call it if it is not associated to a terminal.") (define-public ksystemstats (package (name "ksystemstats") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1175,15 +1243,11 @@ call it if it is not associated to a terminal.") version ".tar.xz")) (sha256 (base32 - "1lj99bhgnzkx2jx9bx67pcffxsa5hz1s6ksvhb591zdb767jhnvi")))) + "1sk0cd4v4q7fmlqg18d4pz0m0wl4s0dw4a2xjpf0fi8s5y8dimn0")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase - #:phases #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "ctest" "-E" "ksystemstatstest"))))))) + #:test-exclude "ksystemstatstest")) (native-inputs (list extra-cmake-modules pkg-config)) (inputs (list glib kcoreaddons @@ -1209,14 +1273,14 @@ the running system.") (define-public layer-shell-qt (package (name "layer-shell-qt") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/layer-shell-qt-" version ".tar.xz")) (sha256 (base32 - "15bf97hk4fjcij1014fl3yww6agffl03z7q2i6pkiw0l47ialszg")))) + "1xx2n6fj61mfav5psfvz4pls9v5gvinv6ljbk8wfwiws24zij3vj")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase @@ -1237,14 +1301,14 @@ the running system.") (define-public kscreenlocker (package (name "kscreenlocker") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/kscreenlocker-" version ".tar.xz")) (sha256 (base32 - "0389ny32hz8ypdla1m7gbp8p26a7iz185sqgx439pjv37pazki7s")))) + "0ay35snrgyrb9ssqk36jh3x5mxjxj5vaw24vkvh8cz746d57vi0f")))) (build-system qt-build-system) (arguments (list #:tests? #f ;TODO: make tests pass @@ -1299,18 +1363,19 @@ the running system.") (define-public libkscreen (package (name "libkscreen") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 - (base32 "1d72ng2jpm8r4106my8lgkjk8852a167hi4glwahyibbclknxlk8")))) + (base32 "0b6cc68ywv1wp89ncyy9mi90ycfwznd71142jy0s9flvm9zmfhlw")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase + #:test-exclude "kscreen-testqscreenbackend" #:phases #~(modify-phases %standard-phases (add-before 'check 'check-env-setup @@ -1326,7 +1391,11 @@ the running system.") "verifyOutputs" ;; also fail on upstream "testEdidParser" - "testEnv")))))))))) + "testEnv" + "testPreferredBackend" + "testFallback" + "testModeSwitching" + "verifyConfig")))))))))) (native-inputs (list extra-cmake-modules pkg-config @@ -1347,14 +1416,14 @@ basic needs and easy to configure for those who want special setups.") (define-public libksysguard (package (name "libksysguard") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/libksysguard-" version ".tar.xz")) (sha256 - (base32 "03saav38hgga4vym5hijz58ahrsr2gqqja663lh1krd1y398rky7")))) + (base32 "118wjwbcisjs9r3ciwm1yh8n833c5gz013bh3djph1fvdhj9671g")))) (native-inputs (list bash-minimal extra-cmake-modules pkg-config qttools)) (inputs @@ -1392,7 +1461,7 @@ with a ksysguardd daemon, which may also run on a remote system.") (define-public kwallet-pam (package (name "kwallet-pam") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1400,7 +1469,7 @@ with a ksysguardd daemon, which may also run on a remote system.") ".tar.xz")) (sha256 (base32 - "0gipn5apnwhykd20avs18mqrdwc20kfcbp4rzhma76ny8b6g3ywg")))) + "1k6ypynrg6irg5g0fsk4kvw4zc0sqwj46hwrs951phnpkv39fqrk")))) (build-system qt-build-system) (arguments (list @@ -1425,7 +1494,7 @@ you login.") (define-public kwayland-integration (package (name "kwayland-integration") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1433,7 +1502,7 @@ you login.") version ".tar.xz")) (sha256 (base32 - "00ymvq1l7lmqw7isdds18ahp7b9hhc2q4mwy1hvvsfvnacqdcazx")))) + "1fim63sbdpcmjl704v9y35lvz6hbdwzzw85z6avda56dhrsadbf2")))) (build-system qt-build-system) (arguments (list #:phases #~(modify-phases %standard-phases @@ -1444,8 +1513,7 @@ you login.") (setenv "HOME" (getcwd)) (setenv "XDG_RUNTIME_DIR" (getcwd)) (setenv "QT_QPA_PLATFORM" "offscreen") - ;; https://bugs.gentoo.org/668872 - (invoke "ctest" "-E" "(idleTest-kwayland-test)")))) + (invoke "ctest")))) (add-before 'check-after-install 'check-setup (lambda* (#:key outputs #:allow-other-keys) (setenv "QT_PLUGIN_PATH" @@ -1471,7 +1539,7 @@ KDE Frameworks components.") (define-public kwin (package (name "kwin") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1480,11 +1548,59 @@ KDE Frameworks components.") (patches (search-patches "kwin-unwrap-executable-name-for-dot-desktop-search.patch")) (sha256 (base32 - "1xsiq5m9a2wgfn2jdj1m8wqjziwp9zzyfs57xp3qbhi7j6virkyy")))) + "10prbkvcad4xi0d4w7gq35lpf1l2izqwj59dwdzy4vr6h1wsdsp0")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase + #:test-exclude + (string-append "(" + (string-join + '(;; Fails on an Apple M1 (aarch64) with the following error: + ;; TestColorspaces::roundtripConversion fails + "kwin-testColorspaces" + + "kwin-testDrm" ;; require Drm + "kwin-testInputMethod" + "kwin-testPlasmaWindow" ;; require plasma-workspace qml module. + "kwin-testButtonRebind" + "kwin-testDecorationInput" + "kwin-testPointerInput" + "kwin-testXdgShellWindow" + "kwin-testXdgShellWindow-waylandonly" + "kwin-testSceneOpenGLES" + "kwin-testSceneOpenGLES-waylandonly" + "kwin-testNightColor" + "kwin-testNightColor-waylandonly" + "kwin-testScriptedEffects" + "kwayland-testServerSideDecoration" + "kwayland-testWaylandSurface" + + "kwin-testLibinputDevice" + "kwin-testLockScreen" + "kwin-testTabBox" + "kwin-testKeyboardInput" + "kwin-testKeyboardLayout" + "kwin-testQuickTiling" + "kwin-testDbusInterface" + "kwin-testX11KeyRead" + "kwin-testVirtualKeyboardDBus" + "kwin-testGlobalShortcuts" + "kwin-testKWinBindings" + "kwin-testMinimizeAllScript" + "kwin-testLibinputDevice" + "kwin-testX11Window" + "kwin-testXwaylandInput" + "kwin-testWindowRules" + + "kwin-testXdgShellWindowRules" + "kwin-testStickyKeys" + "kwin-testFractionalRepaint" + "kwin-testDrmLegacy" + "kwin-testInputCapture" + "kwin-testMockDrm") + "|") + ")") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch @@ -1516,7 +1632,7 @@ KDE Frameworks components.") (("/usr/share") (string-append #$(this-package-input "hwdata") "/share"))))) (replace 'check - (lambda* (#:key tests? #:allow-other-keys) + (lambda* (#:key tests? (test-exclude "") #:allow-other-keys) (when tests? (setenv "XDG_RUNTIME_DIR" (getcwd)) (setenv "HOME" (getcwd)) @@ -1530,48 +1646,7 @@ KDE Frameworks components.") (setenv "DISPLAY" ":1") (system "Xvfb :1 &") (sleep 5) - (invoke "dbus-launch" - "ctest" - "-E" - (string-join - (list - ;; Fails on an Apple M1 (aarch64) with the following error: - ;; TestColorspaces::roundtripConversion fails - "kwin-testColorspaces" - - "kwin-testDrm" ;; require Drm - "kwin-testInputMethod" - "kwin-testPlasmaWindow" ;; require plasma-workspace qml module. - "kwin-testButtonRebind" - "kwin-testDecorationInput" - "kwin-testPointerInput" - "kwin-testXdgShellWindow" - "kwin-testXdgShellWindow-waylandonly" - "kwin-testSceneOpenGLES" - "kwin-testSceneOpenGLES-waylandonly" - "kwin-testNightColor" - "kwin-testNightColor-waylandonly" - "kwin-testScriptedEffects" - "kwayland-testServerSideDecoration" - "kwayland-testWaylandSurface" - - "kwin-testLibinputDevice" - "kwin-testLockScreen" - "kwin-testTabBox" - "kwin-testKeyboardInput" - "kwin-testKeyboardLayout" - "kwin-testQuickTiling" - "kwin-testDbusInterface" - "kwin-testX11KeyRead" - "kwin-testVirtualKeyboardDBus" - "kwin-testGlobalShortcuts" - "kwin-testKWinBindings" - "kwin-testMinimizeAllScript" - "kwin-testLibinputDevice" - "kwin-testX11Window" - "kwin-testXwaylandInput" - "kwin-testWindowRules") - "|")))))))) + (invoke "dbus-launch" "ctest" "-E" test-exclude))))))) (native-inputs (list extra-cmake-modules dbus kdoctools @@ -1583,17 +1658,16 @@ KDE Frameworks components.") python-minimal ;; for QtWaylandScanner qtwayland)) - (inputs (list breeze + (inputs (list aurorae + breeze eudev fontconfig freetype - hwdata - plasma-activities + kauth kcmutils kcompletion kconfig - kconfigwidgets kcoreaddons kcrash kdbusaddons @@ -1601,12 +1675,14 @@ KDE Frameworks components.") kdecoration kglobalaccel kglobalacceld + kguiaddons ki18n kiconthemes kidletime kio kirigami knewstuff + knighttime knotifications kpackage kpipewire @@ -1617,17 +1693,18 @@ KDE Frameworks components.") kwindowsystem kxmlgui ksvg - kauth - kguiaddons - libqaccessibilityclient lcms libcanberra libcap + libdisplay-info + libei libepoxy libinput + libplasma + libqaccessibilityclient libxkbcommon pipewire - libplasma + plasma-activities plasma-wayland-protocols qt5compat qtdeclarative @@ -1643,7 +1720,6 @@ KDE Frameworks components.") xcmsdb xinput ;XXX: Says disabled in configure phase xorg-server-xwayland - libdisplay-info zlib)) ;; Runtime-only dependency needed for mapping monitor hardware vendor IDs to full names ;; * QtQuick.Controls-QMLModule, QML module 'QtQuick.Controls' is a runtime dependency. @@ -1660,7 +1736,7 @@ conjunction with the KDE Plasma Desktop.") (define-public kwrited (package (name "kwrited") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1668,7 +1744,7 @@ conjunction with the KDE Plasma Desktop.") version ".tar.xz")) (sha256 (base32 - "1l805a4i6j4rxlldmgfg6g9x8pgby8krqlbxr51gb0542nqq6js3")))) + "1sriss9x3ky3hzh6m81bk8flbk5kj2944slilr9683s37g721wr0")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kcoreaddons ki18n kpty knotifications)) @@ -1684,7 +1760,7 @@ conjunction with the KDE Plasma Desktop.") (define-public milou (package (name "milou") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1692,7 +1768,7 @@ conjunction with the KDE Plasma Desktop.") version ".tar.xz")) (sha256 (base32 - "038hmb6k70gdw5bqzg01wa5wx6pl8nhckvqfd9pskhxg0n5frbhf")))) + "07w1lz7axpxlgsv5g3khs8cac4bjrpq1mydjfqc5v4bsdyhsmrff")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kcoreaddons @@ -1716,7 +1792,7 @@ on top of Baloo.") (define-public qqc2-breeze-style (package (name "qqc2-breeze-style") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1724,7 +1800,7 @@ on top of Baloo.") version ".tar.xz")) (sha256 (base32 - "1zrpf34z0c23g3rgb7x9b8784xq8gd2hx9z4g304c66x8glpadfz")))) + "1n96yrzfbcac45f617zxfvzdgkn4wsnvh4gr4a1cl5zwn2jf47b7")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase @@ -1732,7 +1808,7 @@ on top of Baloo.") (native-inputs (list extra-cmake-modules)) (inputs (list qtdeclarative - kiconthemes kguiaddons kconfig kirigami kcoreaddons + kiconthemes kguiaddons kconfig kirigami kcolorscheme kquickcharts)) (home-page "https://invent.kde.org/plasma/qqc2-breeze-style") (synopsis "Breeze inspired Qt Quick Controls Style") @@ -1742,7 +1818,7 @@ on top of Baloo.") (define-public oxygen-sounds (package (name "oxygen-sounds") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1750,7 +1826,7 @@ on top of Baloo.") version ".tar.xz")) (sha256 (base32 - "0ar2hmvqjb9jcl3ijflb9kjx185ir0lw0nzypv9chpi0fbwaj3qx")))) + "0vy253w0xrxlwjkklf8i7495r5pmf9whwmyq4q7fvcjp2gbn84jw")))) (build-system cmake-build-system) (arguments (list #:tests? #f)) (native-inputs (list extra-cmake-modules)) @@ -1762,7 +1838,7 @@ on top of Baloo.") (define-public ocean-sound-theme (package (name "ocean-sound-theme") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1770,7 +1846,7 @@ on top of Baloo.") version ".tar.xz")) (sha256 (base32 - "09gs2qq93128bldf17qc8qv68rax3872d98x0b0l97y6is8k8pjz")))) + "03jssxlvgkwz4019ngdnqcyrl2wjy5wkc9iahkll4r4260wya4n9")))) (build-system cmake-build-system) (arguments (list #:tests? #f)) (native-inputs (list extra-cmake-modules)) @@ -1783,14 +1859,14 @@ on top of Baloo.") (define-public xdg-desktop-portal-kde (package (name "xdg-desktop-portal-kde") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1qnfxncqfy57892979df0q6dn0zlnvbkbh39hc42dwxvh824zq4z")))) + "1dqr4sb3xmv1m7klxc15xjqq8vgzigp8l0r8hs58bl76n99li97m")))) (build-system qt-build-system) (arguments (list #:tests? #f ;; colorschemetest test fail, because require dbus. @@ -1930,7 +2006,7 @@ for xdg-desktop-portal that is using Qt/KF5.") (define-public plasma-activities (package (name "plasma-activities") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1938,13 +2014,12 @@ for xdg-desktop-portal that is using Qt/KF5.") version ".tar.xz")) (sha256 (base32 - "0sc11kymw58nrhplj20nhzm83ng11bg2bbyksqp3rgwpds227b9h")))) + "0gw8p027m8ldpypsl7j0815g856ccjrwa6avwqpx515aasy75f0d")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs - (list boost - kconfig + (list kconfig kcoreaddons kwindowsystem qtdeclarative @@ -1966,7 +2041,7 @@ with other frameworks.") (define-public plasma-activities-stats (package (name "plasma-activities-stats") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -1974,7 +2049,7 @@ with other frameworks.") version ".tar.xz")) (sha256 (base32 - "0c0c925s6bjq32acl40jjx3vwxngvr4lh4znfybgjl059ir4ziim")))) + "05gmcg8ffs46mpf44s0sg5hk4fsbykl7w29g2pbdwk0xmhc27mv1")))) (build-system cmake-build-system) (arguments (list #:tests? #f)) (native-inputs @@ -1992,29 +2067,17 @@ by which applications, and what documents have been linked to which activity.") (define-public plasma5support (package (name "plasma5support") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0hpr9l7mm4lgnvn0qydsly6vmnmmrgiv256m6nyzfflf5z4gpzdc")))) + "1np3172xn92dfqvm5nhmmvzzhi5npvsy1m3r4jj4j7z2x1b7falp")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase - - #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? parallel-tests? #:allow-other-keys) - (invoke "ctest" - "-E" - ;; also fail in upstream. - "(pluginloadertest)" - "-j" - (if parallel-tests? - (number->string (parallel-job-count)) - "1"))))))) + #:tests? #f)) ;no tests (native-inputs (list extra-cmake-modules pkg-config)) (propagated-inputs (list kcoreaddons)) (inputs (list @@ -2023,8 +2086,10 @@ by which applications, and what documents have been linked to which activity.") kio kidletime kguiaddons + kholidays knotifications kservice + kunitconversion libksysguard networkmanager-qt plasma-activities @@ -2039,14 +2104,14 @@ KF5/Qt5 to KF6/Qt6") (define-public plasma-browser-integration (package (name "plasma-browser-integration") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "12wxmxnfxkgf55sx62h908ncc1y1b8pdqysigg2zvn9i3vng94md")))) + "1zwxf0qs6arj349b6frvjla2vngvr3lm8n4qnq7w7b2b1754608z")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config)) ;; TODO: Figure out how to integrate this package into web browsers @@ -2080,14 +2145,14 @@ the KDE Plasma 6 desktop.") (define-public plasma-desktop (package (name "plasma-desktop") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1dvvl757fi2v61gkzwdafw4n6i6kmfmbjsvjarvmpgycqz3y8lkm")))) + "0hnyvva5g20fvj9xpp13si74fd4qkc171k0vl9vklj4m4z0w4zf2")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules dbus @@ -2102,7 +2167,6 @@ the KDE Plasma 6 desktop.") (inputs (list packagekit-qt6 signon-plugin-oauth2 signond-qt6 - icu4c attica appstream-qt6 baloo @@ -2194,6 +2258,14 @@ the KDE Plasma 6 desktop.") (propagated-inputs (list iso-codes/pinned kirigami kcmutils plasma-workspace)) (arguments (list #:qtbase qtbase + #:test-exclude + (string-append "(" + (string-join '("positionertest" + "kcm-keyboard-keyboard_memory_\ +persister_test" + "foldermodeltest") + "|") + ")") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-wallpaper @@ -2210,14 +2282,12 @@ the KDE Plasma 6 desktop.") (string-append "\"" (search-input-directory inputs "/share/xml/iso-codes") "\""))))) - (replace 'check + (add-before 'check 'check-setup (lambda* (#:key tests? #:allow-other-keys) (when tests? (setenv "HOME" (getcwd)) (setenv "XDG_RUNTIME_DIR" (getcwd)) - (setenv "XDG_CACHE_HOME" (getcwd)) - (setenv "QT_QPA_PLATFORM" "offscreen") - (invoke "ctest" "-E" "(positionertest|kcm-keyboard-keyboard_memory_persister_test|foldermodeltest)"))))))) + (setenv "XDG_CACHE_HOME" (getcwd)))))))) (home-page "https://kde.org/plasma-desktop/") (synopsis "Plasma for the Desktop") (description @@ -2232,7 +2302,7 @@ activities effectively, without being distracting.") (define-public plasma-disks (package (name "plasma-disks") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -2240,7 +2310,7 @@ activities effectively, without being distracting.") version ".tar.xz")) (sha256 (base32 - "1wzya67q4sfx259w0750fr1av52iz11m7cym24ys2l68zd4wf5w0")))) + "1ypq7im5wsdcx1zsi2i9fn5xkmvx0xa72n42xz16qp7j45lf3978")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase @@ -2275,7 +2345,7 @@ activities effectively, without being distracting.") (define-public plasma-firewall (package (name "plasma-firewall") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -2283,7 +2353,7 @@ activities effectively, without being distracting.") version ".tar.xz")) (sha256 (base32 - "0k433ndj518b66mgahyhyyvgmj8bqnjz9nczr5hdb403rs4z5j45")))) + "1jzmj15m1h7zx1sgz5wwksvdk8ibswfn6ccki4r5jz131rf5xxpd")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules)) @@ -2303,7 +2373,7 @@ activities effectively, without being distracting.") (define-public plasma-integration (package (name "plasma-integration") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -2311,22 +2381,12 @@ activities effectively, without being distracting.") version ".tar.xz")) (sha256 (base32 - "0b3vq6lcmdxwjxpz4avlwj2ll2ccbsncqs8b8hrqhv523zg73qn3")))) + "03hfsayi05n71h8nqvwwsbbhjldsp4q9csqkyz397akbwnyf19q2")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase #:configure-flags #~(list "-DBUILD_QT5=OFF") - #:tests? #f ;TODO: Failing tests - #:phases #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "HOME" (getcwd)) - (setenv "XDG_RUNTIME_DIR" (getcwd)) - (setenv "XDG_CACHE_HOME" (getcwd)) - (setenv "QT_QPA_PLATFORM" "offscreen") - (invoke "ctest" "-E" - "(frameworkintegration-kdeplatformtheme_unittest|frameworkintegration-kfontsettingsdata_unittest|frameworkintegration-kfiledialog_unittest|qmltests|frameworkintegration-kfiledialogqml_unittest"))))))) + #:tests? #f)) ;TODO: Failing tests (native-inputs (list extra-cmake-modules pkg-config)) (inputs (list breeze kconfig @@ -2362,14 +2422,14 @@ integration of Qt applications when running on a KDE Plasma workspace.") (define-public plasma-nano (package (name "plasma-nano") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/plasma-nano-" version ".tar.xz")) (sha256 (base32 - "0qf2nq7hh34riml7x8ibpwvfla27j5pakzkmq6byz8ys9wzibwy4")))) + "05ni5g9mmzlbcssxhczhlzv35pmhib4m0flmf4r0qs60llbn248s")))) (build-system cmake-build-system) (native-inputs (list extra-cmake-modules pkg-config qttools)) (inputs (list qtbase @@ -2391,7 +2451,7 @@ integration of Qt applications when running on a KDE Plasma workspace.") (define-public plasma-nm (package (name "plasma-nm") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -2399,7 +2459,7 @@ integration of Qt applications when running on a KDE Plasma workspace.") ".tar.xz")) (sha256 (base32 - "05jx0550zynymb2f39inj7b1w4s8cpzfcka4vvp9g5cfd2b24zaa")))) + "15a1540a86rl7ji04m7wkygsrjmx4069ziy6nqdz4p11i2m4g2k4")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase)) @@ -2439,14 +2499,14 @@ connections.") (define-public plasma-mobile (package (name "plasma-mobile") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/plasma-mobile-" version ".tar.xz")) (sha256 (base32 - "1rcbzds23s774vn1lrrdrqf00kk9vjhmyf9g87gl6a4sv3dghg57")))) + "019mb14gs45nkkmrx1rfa9amnv415s92xhkx0mp64i7rpgnn9gr1")))) (build-system cmake-build-system) (arguments (list #:tests? #f)) ;only small add-hoc test scripts (native-inputs (list extra-cmake-modules pkg-config qttools)) @@ -2508,7 +2568,7 @@ customizable platform for mobile devices.") (define-public plasma-pa (package (name "plasma-pa") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -2516,7 +2576,7 @@ customizable platform for mobile devices.") version ".tar.xz")) (sha256 (base32 - "06hv8kjcwdfxhxrw5d8mnhmrgck85h3bawbvim90n77hy37vmhhl")))) + "131552j7kfiq3b5kg2p40bggdg2b6058mznlp2jq91jlspr5imr4")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase ;; test require selenium-webdriver-at-spi-run @@ -2560,7 +2620,7 @@ PulseAudio.") (commit commit))) (sha256 (base32 - "0wp69ylhcqhy4l282fns0grhpf20w8jrhj2jmv7gdmhxnpnh9lk9")) + "1hfwpnyijkmm05rq9yyq0bzh0ls1d3wcg68ssy69qm3xf6b0g1qf")) (file-name (git-file-name name version)))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -2614,19 +2674,18 @@ adding, modifying and removing contacts.") (define-public plasma-vault (package (name "plasma-vault") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1xbhxzzj9ns3aslgbvipjlpahigyzjk7x1iqa0a262azk6z0al9s")))) + "1528mg9py8cwr8vk0wd00i1wll2dpbmj953xc2cykc58lvq1lsds")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config)) (inputs (list kio ki18n - kconfigwidgets kconfig plasma-activities kdbusaddons @@ -2677,14 +2736,14 @@ vaults.") (define-public plasma-systemmonitor (package (name "plasma-systemmonitor") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0gacdbwz32icswdbb25bcvg2flfwzlmijy31966zks5a8winayri")))) + "1d25jdmh4vspzlv9s329aqnscgbwhvr9gixhgwc5gq9y5gldfm80")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list ki18n @@ -2719,7 +2778,7 @@ sensors, process information and other system resources.") (define-public plasma-welcome (package (name "plasma-welcome") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" @@ -2728,7 +2787,7 @@ sensors, process information and other system resources.") version ".tar.xz")) (sha256 (base32 - "02fnzrchpqkvq1529s8s4n2cvp38wdcb4vchklx2ca6mnmbvpkjp")))) + "1dl5rg7r0mmkdd8dh9985c6ghggsrhglad9pidz6ni0whddjbhad")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config)) @@ -2768,14 +2827,14 @@ sensors, process information and other system resources.") (define-public plasma-workspace (package (name "plasma-workspace") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1yqh55ijxbznvaa164idjp5g4lcdp0cl01x7bca3kxbl6nzrx68r")))) + "081gdyb31s7z3i014jbvb1si1y8i9a4dddm7qz2kalxwzbxym4b4")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules kdoctools pkg-config qtsvg qttools @@ -2813,7 +2872,7 @@ sensors, process information and other system resources.") kidletime kio lsof - xdotool + xdotool ;for X11 qqc2-desktop-style qcoro-qt6 kirigami-addons @@ -2833,7 +2892,6 @@ sensors, process information and other system resources.") kscreenlocker ktexteditor ktextwidgets - kunitconversion kuserfeedback kwallet kwayland @@ -3005,14 +3063,14 @@ hardware management, and a high degree of customizability.") (define-public plasma-workspace-wallpapers (package (name "plasma-workspace-wallpapers") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "1gwgq03pm4040dm6smspg6qfb0ip9qj1c078p7mw9l0jfwqksfxl")))) + "0zf9yjv3zn2ws2rpfz133nv4ai8zh69a8gs3agdz95aq2nhc3h9j")))) (build-system cmake-build-system) (arguments (list #:tests? #f)) (native-inputs (list extra-cmake-modules)) @@ -3025,14 +3083,14 @@ hardware management, and a high degree of customizability.") (define-public print-manager (package (name "print-manager") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/print-manager-" version ".tar.xz")) (sha256 - (base32 "1jj2l89nxdmyhlr9arkcjsqxbm8qp7h2rg8lqnswh2nij81gsf72")))) + (base32 "1krvpk8izwyyn2r4nv167jig2l266jlggn25aqhyqnfil23pcx0g")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) @@ -3043,7 +3101,6 @@ hardware management, and a high degree of customizability.") kconfigwidgets kcoreaddons kdbusaddons - kiconthemes kirigami ki18n kio @@ -3065,14 +3122,14 @@ hardware management, and a high degree of customizability.") (define-public polkit-kde-agent (package (name "polkit-kde-agent") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-1-" version ".tar.xz")) (sha256 (base32 - "00c360qwbl4anv4x14qqgk6wj73w24zcpzaslsar487mc0b7fpav")))) + "1cg6ihh5majd8a4486m43a024wggh4y8bh3q3g8mh5wmxaqppcm4")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase #:tests? #f)) @@ -3098,14 +3155,14 @@ UI for Plasma") (define-public powerdevil (package (name "powerdevil") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "0j1fv3xvsl1i08hwydxl5zn4xvb6161l774wmvnx9bmq6dprr3ma")))) + "11y13y9mk090fdlm2vszfgfcrrfx5cwy6041w5fmrhdgckmdprzp")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules qttools pkg-config)) (inputs (list bluez-qt @@ -3158,24 +3215,18 @@ of a Plasma shell.") (define-public spectacle (package (name "spectacle") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/spectacle-" version ".tar.xz")) (sha256 - (base32 "1rs0anx22fhglasgvfsg6m4a43iawgkgd3h8c6vcgif0jc2nz9a2")))) + (base32 "1wfwy3msjv48mlnvqhkandy4cpr1p39by5grjqvqllzjy735fip1")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase - #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "ctest" "-E" - "filename_test"))))))) + #:tests? #f)) ;no tests (native-inputs (list extra-cmake-modules kdoctools)) (inputs @@ -3216,14 +3267,14 @@ of a Plasma shell.") (define-public system-settings (package (name "system-settings") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri (string-append "mirror://kde/stable/plasma/" version "/systemsettings-" version ".tar.xz")) (sha256 (base32 - "13xs5bzz4ivhfgnx5vs3xh7iviwlbfjdnk12fq040ym7y6bz1mwh")))) + "17157plapd012hfc9202pbhf400vwyhh14wwpa40pap86g6d0rdv")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules)) (inputs (list kaccounts-integration @@ -3264,7 +3315,7 @@ of a Plasma shell.") (define-public wacomtablet (package (name "wacomtablet") - (version "6.4.5") + (version "6.5.0") (source (origin (method url-fetch) (uri @@ -3272,18 +3323,24 @@ of a Plasma shell.") "/wacomtablet-" version ".tar.xz")) (sha256 (base32 - "0a37h9lb6j3lnzmip5582p5pcjfxizvh7iawf0gk8adxlp05riz0")))) + "05r4k28jcsyvdsj5zv224nx6z7dqvjpb42g9124sajb4vm0crb4f")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase - #:phases #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "dbus-launch" "ctest" "-E" - "(Test.KDED.DBusTabletService\ -|Test.KDED.TabletHandler|Test.KDED.XInputAdaptor|\ -Test.KDED.XsetWacomAdaptor)"))))))) + #:test-exclude + (string-append "(" + (string-join '("Test.KDED.DBusTabletService" + "Test.KDED.TabletHandler" + "Test.KDED.XInputAdaptor" + "Test.KDED.XsetWacomAdaptor") + "|") + ")") + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? (test-exclude "") #:allow-other-keys) + (when tests? + (invoke "dbus-launch" "ctest" "-E" test-exclude))))))) (native-inputs (list dbus extra-cmake-modules kdoctools pkg-config)) (inputs (list kcoreaddons ki18n diff --git a/gnu/packages/kde-systemtools.scm b/gnu/packages/kde-systemtools.scm index 5c306190e2..b007ab1f13 100644 --- a/gnu/packages/kde-systemtools.scm +++ b/gnu/packages/kde-systemtools.scm @@ -227,6 +227,8 @@ unmount drives and view them in a file manager.") (sha256 (base32 "1nmhg3v73p8yapmvp3chac3vi6jpjwmc0jj28ksbmdrp952yaygb")))) (build-system qt-build-system) + (arguments + (list #:qtbase qtbase)) (native-inputs (list extra-cmake-modules kdoctools perl)) (inputs @@ -244,7 +246,6 @@ unmount drives and view them in a file manager.") kwindowsystem libxml2 breeze-icons ;; default icon set - qtbase xapian qtwayland qtwebengine)) diff --git a/gnu/packages/kodi.scm b/gnu/packages/kodi.scm index 73417fabe2..dec1a6f998 100644 --- a/gnu/packages/kodi.scm +++ b/gnu/packages/kodi.scm @@ -30,6 +30,7 @@ #:use-module (guix utils) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) @@ -525,7 +526,7 @@ plug-in system.") (revision "1")) ; `$HOME/.kodirc'. (package (name "kodi-cli") - (version (string-append "1.1-" revision "." (string-take commit 7))) + (version (git-version "1.1" revision commit)) (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/nawar/kodi-cli") @@ -533,29 +534,30 @@ plug-in system.") (sha256 (base32 "1xjhasc5gngfxpr1dlzy6q24w0wpdfjx12p43fanjppxw4i49n5p")) - (file-name (string-append name "-" version "-checkout")))) + (file-name (git-file-name name version)))) (build-system trivial-build-system) (inputs - (list bash curl mps-youtube)) + (list bash-minimal curl python-yewtube)) (arguments - `(#:modules ((guix build utils)) - #:builder - (begin - (use-modules (guix build utils)) - (copy-recursively (assoc-ref %build-inputs "source") ".") - (substitute* "kodi-cli" - (("/bin/bash") - (search-input-file %build-inputs "/bin/bash")) - (("output=\\$\\((curl)" all curl) - (string-append "output=$(" - (assoc-ref %build-inputs "curl") - "/bin/" curl)) - (("play_youtube `(mpsyt)" all mpsyt) - (string-append "play_youtube `" - (assoc-ref %build-inputs "mps-youtube") - "/bin/" mpsyt))) - (install-file "kodi-cli" (string-append %output "/bin")) - #t))) + (list + #:modules '((guix build utils)) + #:builder + #~(begin + (use-modules (guix build utils)) + (copy-recursively (assoc-ref %build-inputs "source") ".") + (substitute* "kodi-cli" + (("/bin/bash") + (search-input-file %build-inputs "/bin/bash")) + (("output=\\$\\((curl)" all curl) + (string-append "output=$(" + #$(this-package-input "curl") + "/bin/" curl)) + ;; Executable is just called yt with yewtube. + (("play_youtube `mpsyt") + (string-append "play_youtube `" + #$(this-package-input "python-yewtube") + "/bin/yt"))) + (install-file "kodi-cli" (string-append %output "/bin"))))) (home-page "https://github.com/nawar/kodi-cli") (synopsis "Control Kodi from the command line") (description "@code{kodi-cli} is a tool for sending commands to a Kodi diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index d8bb55dfc0..c8753c3b17 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -374,6 +374,58 @@ wrapper for accessing libusb-1.0.") "PyUSB aims to be an easy to use Python module to access USB devices.") (license license:bsd-3))) +(define-public python-capablerobot-usbhub + (package + (name "python-capablerobot-usbhub") + (version "0.5.0") + (source + (origin + ;; PyPI tarball fails to build. + (method git-fetch) + (uri (git-reference + (url "https://github.com/CapableRobot/CapableRobot_USBHub_Driver") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1nfd12612z9a9hby5dxg7lfqw5jcv3wcyqqagbg5izragni646mc")) + (modules '((guix build utils))) + (snippet + ;; Remove bundled libraries. + '(begin + (delete-file-recursively "capablerobot_usbhub/windows/"))))) + (build-system pyproject-build-system) + (arguments + (list + #:tests? #f ;No tests provided. + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'use-poetry-core + (lambda _ + ;; Patch to use the core poetry API. + (substitute* "pyproject.toml" + (("poetry.masonry.api") + "poetry.core.masonry.api")))) + (add-after 'install 'install-udev-rules + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (udevdir "/lib/udev/rules.d/") + (udevrules "50-capablerobot-usbhub.rules")) + (mkdir-p (string-append out udevdir)) + (copy-file udevrules + (string-append out udevdir udevrules)))))))) + (native-inputs (list python-poetry-core)) + (propagated-inputs (list python-click python-construct python-pyusb + python-pyyaml)) + (home-page "https://github.com/CapableRobot/CapableRobot_USBHub_Driver") + (synopsis "Host side driver for the Capable Robot Programmable USB Hub") + (description + "This package provides access to the internal state of the Capable Robot +USB Hub, allowing you to monitor and control the Hub from an upstream +computer. It also creates a transparent CircuitPython Bridge, allowing +unmodified CircuitPython code to run on the host computer and interact with +I2C and SPI devices attached to the USB Hub.") + (license license:expat))) + (define-public ideviceinstaller (package (name "ideviceinstaller") diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 49dfdb2153..461382d617 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2295,8 +2295,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588-mnt-pocket-reform.dtb"))))))))))) `(("CONFIG_OVERLAY_FS" . m)) (default-extra-linux-options linux-libre-version)))) -(define-public linux-libre-with-bpf - (deprecated-package "linux-libre-with-bpf" linux-libre)) +(define-deprecated-package linux-libre-with-bpf + linux-libre) ;;; @@ -8066,7 +8066,7 @@ from the ntfs-3g package. It is meant to be used in initrds.") (define-public rdma-core (package (name "rdma-core") - (version "54.0") + (version "59.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/linux-rdma/rdma-core" @@ -8074,7 +8074,7 @@ from the ntfs-3g package. It is meant to be used in initrds.") version ".tar.gz")) (sha256 (base32 - "0q1gd4wrn7sb1l6qj6mqqlf8k4pk865b96cfnbgfxbgfs9q4jjm5")))) + "1rbw0nxn7h9984r44pcwvnbdz2ycdn5wsmzrbwxxr31i7fqnkhg2")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;no tests @@ -10055,63 +10055,62 @@ Currently the Linux driver itself is missing from this package.") (license license:gpl2+)))) (define-public libcxi - (let ((commit "5b6f8b5d57017c7963debb379d5693c59aca63ed") - (revision "0")) - (package - (name "libcxi") - (version (git-version "1.0.1" revision commit)) - (home-page "https://github.com/HewlettPackard/shs-libcxi") - (source - (origin - (method git-fetch) - (uri (git-reference (url home-page) (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1h3dhird8p11q4ziaxzg1hr5gxcgwx1limzdcyildyaw50dy549g")))) - (build-system gnu-build-system) - (arguments - (list #:configure-flags - #~(list "--disable-static" - (string-append "--with-udevrulesdir=" - #$output "/lib/udev/rules.d")) + (package + (name "libcxi") + (version "12.0.1") + (home-page "https://github.com/HewlettPackard/shs-libcxi") + (source + (origin + (method git-fetch) + (uri (git-reference (url home-page) + (commit (string-append "release/shs-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1pk2mdkkgiic7nnmhx3iwvgrnxva3qqk2wyni0yhxjciln0hq7s7")))) + (build-system gnu-build-system) + (arguments + (list #:configure-flags + #~(list "--disable-static" + (string-append "--with-udevrulesdir=" + #$output "/lib/udev/rules.d")) - #:phases - #~(modify-phases %standard-phases - (add-before 'configure 'set-cassini-file-names - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "utils/cxi_dump_csrs.py" - (("/usr/share/cassini-headers/csr_defs.json") - (search-input-file - inputs - "/share/cassini-headers/csr_defs.json")))))))) - (native-inputs (list autoconf - automake - libtool - pkg-config - python-wrapper)) - (inputs (list libconfig - libuv - fuse-2 - libyaml - libnl - numactl - eudev - (list lm-sensors "lib"))) - (propagated-inputs (list cassini-headers cxi-driver)) - (synopsis "Interface to the Cassini/Slingshot high-speed interconnect") - (description - "Libcxi provides applications with a low-level interface to the + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'set-cassini-file-names + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "utils/cxi_dump_csrs.py" + (("/usr/share/cassini-headers/csr_defs.json") + (search-input-file + inputs + "/share/cassini-headers/csr_defs.json")))))))) + (native-inputs (list autoconf + automake + libtool + pkg-config + python-wrapper)) + (inputs (list libconfig + libuv + fuse-2 + libyaml + libnl + numactl + eudev + (list lm-sensors "lib"))) + (propagated-inputs (list cassini-headers cxi-driver)) + (synopsis "Interface to the Cassini/Slingshot high-speed interconnect") + (description + "Libcxi provides applications with a low-level interface to the Cray/HPE Cassini high-speed @acronym{NIC, network interface controller}, also known as Slingshot.") - ;; License is spelled out in 'cray-libcxi.spec' and in source file - ;; headers. - (license (list license:lgpl2.1+ license:bsd-3))))) ;dual-licensed + ;; License is spelled out in 'cray-libcxi.spec' and in source file + ;; headers. + (license (list license:lgpl2.1+ license:bsd-3)))) ;dual-licensed (define-public libfabric (package (name "libfabric") - (version "1.22.0") + (version "2.3.0") (source (origin (method url-fetch) @@ -10119,7 +10118,7 @@ known as Slingshot.") (string-append "https://github.com/ofiwg/libfabric/releases/download/v" version "/libfabric-" version ".tar.bz2")) (sha256 - (base32 "1znmw83rmippv0fwz0x7lgylfk17dr9ckll8lrm4z7kclspnqpj8")))) + (base32 "02gb12ijj19aad4c3dwckrrnjlsmy9fizkgw8a5zdzpqd3lgq60x")))) (build-system gnu-build-system) (inputs (let ((if-supported ;XXX: modified from openmpi @@ -10169,6 +10168,19 @@ applications deal with directly. It works in conjunction with provider libraries, which are often integrated directly into libfabric.") (license (list license:bsd-2 license:gpl2)))) ;dual +(define-public libfabric-1 ;needed by Open MPI 4.x + (package + (inherit libfabric) + (version "1.22.0") + (source + (origin + (method url-fetch) + (uri + (string-append "https://github.com/ofiwg/libfabric/releases/download/v" + version "/libfabric-" version ".tar.bz2")) + (sha256 + (base32 "1znmw83rmippv0fwz0x7lgylfk17dr9ckll8lrm4z7kclspnqpj8")))))) + (define-public psm (package (name "psm") @@ -12177,8 +12189,8 @@ suggestions from various sources, including: This tool supports checking Kconfig options and kernel cmdline parameters.") (license license:gpl3))) -(define-public kconfig-hardened-check - (deprecated-package "kconfig-hardened-check" kernel-hardening-checker)) +(define-deprecated-package kconfig-hardened-check + kernel-hardening-checker) (define-public firejail (package diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 8a8b36e455..54f7ba9f02 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -330,8 +330,8 @@ compatible, and adds new functionality.") (sbcl-package->ecl-package sbcl-3d-math)) (define-public sbcl-3d-matrices - (let ((commit "b4f5a58299f8437fad2d77f0879c374e3430f4b5") - (revision "2")) + (let ((commit "bc1ffa08dcf4732523e09adcf9deba4ddeb559ff") + (revision "3")) (package (name "sbcl-3d-matrices") (version (git-version "1.0.0" revision commit)) @@ -339,17 +339,17 @@ compatible, and adds new functionality.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Shinmera/3d-matrices") + (url "https://codeberg.org/shinmera/3d-matrices") (commit commit))) (file-name (git-file-name "cl-3d-matrices" version)) (sha256 - (base32 "1s8b4zlmqwyplghs73riz1khf0c5sk64w6b12jd599091d5nr6sr")))) + (base32 "0jzckgb5lsmh1gn1f4mczjfc5ckkw01a73wrl1shyb9sil93a751")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-parachute)) (inputs (list sbcl-3d-vectors sbcl-documentation-utils)) - (home-page "https://shinmera.github.io/3d-matrices/") + (home-page "https://codeberg.org/shinmera/3d-matrices") (synopsis "Utility library implementing 2x2, 3x3, 4x4 and NxM matrices") (description "@code{3D-MATRICES} is a library implementing common matrix operations, @@ -492,8 +492,8 @@ alternative 4x4 matrix representation.") (sbcl-package->clasp-package sbcl-3d-transforms)) (define-public sbcl-3d-vectors - (let ((commit "257969402864ac3859d77b981abf0aa5373c4e78") - (revision "2")) + (let ((commit "fc751c65b2285e971c348539bfbc3cbb58b253b0") + (revision "3")) (package (name "sbcl-3d-vectors") (version (git-version "3.1.0" revision commit)) @@ -501,11 +501,11 @@ alternative 4x4 matrix representation.") (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Shinmera/3d-vectors") + (url "https://codeberg.org/shinmera/3d-vectors") (commit commit))) (file-name (git-file-name "cl-3d-vectors" version)) (sha256 - (base32 "0vmf7nycc49ydcy0dfs25cgs655kwjc6jcjvpwxw61jq4gl2fh7x")))) + (base32 "0im0c4yv3bmlipbpfqfcbkdpqknr4468xjvdmrr01pchc8r4m11j")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-parachute)) @@ -4296,20 +4296,20 @@ operating on them.") (sbcl-package->ecl-package sbcl-cl-algebraic-data-type)) (define-public sbcl-cl-all - (let ((commit "4ce1ea9d9f33c0dd6212044e7952a0c854757ace") - (revision "0")) + (let ((commit "8db710a4a92a25ca7c8f09fe1ad91a48ad6bd0c9") + (revision "1")) (package (name "sbcl-cl-all") - (version (git-version "1.0.0" revision commit)) + (version (git-version "2.0.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/Shinmera/cl-all") + (url "https://codeberg.org/shinmera/cl-all") (commit commit))) (file-name (git-file-name "cl-all" version)) (sha256 - (base32 "0n4sjarj373zpxn78m32rmhxnsnr8qahdslrd9vrkkwjpzar2bwp")))) + (base32 "08jsbnkapijn0v4n5h9g6s87i279xmg4fnbw6jajylrg512n38cx")))) (build-system asdf-build-system/sbcl) (outputs '("out" "bin")) (arguments @@ -4323,7 +4323,7 @@ operating on them.") outputs #:entry-program '((cl-all:toplevel arguments)) #:compress? #t)))))) - (home-page "https://github.com/Shinmera/cl-all") + (home-page "https://shinmera.com/docs/cl-all") (synopsis "Evaluate Common Lisp expressions in multiple implementations") (description "@samp{cl-all} is a library and script for evaluating Common Lisp expressions in multiple implementations.") @@ -14253,11 +14253,11 @@ database files (dbf and db3 files).") (sbcl-package->ecl-package sbcl-db3)) (define-public sbcl-dbi - (let ((commit "738a74dd69adb2a7c21fa67e140d89c7df25b227") - (revision "2")) + (let ((commit "be4df4f236391f4e4150a1fe77f8acc92b9f3996") + (revision "3")) (package (name "sbcl-dbi") - (version (git-version "0.9.5" revision commit)) + (version (git-version "0.11.1" revision commit)) (source (origin (method git-fetch) @@ -14266,7 +14266,7 @@ database files (dbf and db3 files).") (commit commit))) (file-name (git-file-name "cl-dbi" version)) (sha256 - (base32 "0f8z7an8ssg8mdf9k781r4ygdppv798v6f08ibgpd8mv8a6491fg")))) + (base32 "0n3lh0rng5gbbb9aqcrszvc99f80j5zk1hdrcvz20qg6c31hhjl6")))) (build-system asdf-build-system/sbcl) (native-inputs `(("alexandria" ,sbcl-alexandria) @@ -22962,11 +22962,11 @@ extensions to Common Lisp. It contains: (sbcl-package->clasp-package sbcl-misc-extensions)) (define-public sbcl-mito - (let ((commit "47ba4865ca4bb2894b53703a49a299e973f8eb86") - (revision "3")) + (let ((commit "10c22b64047053b079beb5168d21222abe4d4b1d") + (revision "4")) (package (name "sbcl-mito") - (version (git-version "0.1" revision commit)) + (version (git-version "0.2.0" revision commit)) (home-page "https://github.com/fukamachi/mito") (source (origin @@ -22976,23 +22976,24 @@ extensions to Common Lisp. It contains: (commit commit))) (file-name (git-file-name "mito" version)) (sha256 - (base32 "0313nxlj1zqw6zyc23xpf85v0jk32sg0543ql8363jki0pmg7yhs")))) + (base32 "0yx1hf22k3wgl0b274i25i6cnshijzy7wppi6clgmhi2y5svgddr")))) (build-system asdf-build-system/sbcl) (native-inputs (list sbcl-prove)) (inputs - `(("alexandria" ,sbcl-alexandria) - ("cl-package-locks" ,sbcl-cl-package-locks) - ("cl-ppcre" ,sbcl-cl-ppcre) - ("cl-reexport" ,sbcl-cl-reexport) - ("closer-mop" ,sbcl-closer-mop) - ("dbi" ,sbcl-dbi) - ("dissect" ,sbcl-dissect) - ("esrap" ,sbcl-esrap) - ("local-time" ,sbcl-local-time) - ("sxql" ,sbcl-sxql) - ("trivia" ,sbcl-trivia) - ("uuid" ,sbcl-uuid))) + (list sbcl-alexandria + sbcl-chipz + sbcl-cl-package-locks + sbcl-cl-ppcre + sbcl-cl-reexport + sbcl-closer-mop + sbcl-dbi + sbcl-dissect + sbcl-esrap + sbcl-local-time + sbcl-sxql + sbcl-trivia + sbcl-uuid)) (arguments '(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/luanti.scm b/gnu/packages/luanti.scm index f9fb9224c9..054101eec9 100644 --- a/gnu/packages/luanti.scm +++ b/gnu/packages/luanti.scm @@ -213,8 +213,8 @@ new features.") (license license:lgpl2.1+)))) ;; This package is deprecated. "Minetest Game" is no longer the official game. -(define-public minetest-data - (deprecated-package "minetest-data" minetest-game)) +(define-deprecated-package minetest-data + minetest-game) (define-public (luanti-topic topic-id) "Return an URL (as a string) pointing to the forum topic with @@ -482,8 +482,8 @@ Minecraft, pushing beyond.") (home-page "https://content.luanti.org/packages/Wuzzy/mineclone2/") (license license:gpl3+))) -(define-public luanti-mineclone - (deprecated-package "luanti-mineclone" luanti-voxelibre)) +(define-deprecated-package luanti-mineclone + luanti-voxelibre) (define-public luanti-mobs (package diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index 4f3f740745..13890adfb3 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -1703,11 +1703,11 @@ an extensible computation graph model, as well as definitions of built-in operators and standard data types.") (license license:expat))) -(define-public python-onnx - ;; This used to be called "python-onnx" because it provided nothing but - ;; Python bindings. The package now provides shared libraries and C++ - ;; headers, hence the name change. - (deprecated-package "python-onnx" onnx)) +;; This used to be called "python-onnx" because it provided nothing but +;; Python bindings. The package now provides shared libraries and C++ +;; headers, hence the name change. +(define-deprecated-package python-onnx + onnx) (define-public onnx-optimizer (package @@ -2117,7 +2117,7 @@ computing environments.") (native-inputs (list gfortran meson-python - python-cython-3 + python-cython python-pandas python-pytest python-pytest-xdist)) @@ -2176,71 +2176,6 @@ data analysis.") ;; (<...>/_cython_blas.cpython-311-x86_64-linux-gnu.so) (delete-file-recursively "sklearn/utils/tests/test_cython_blas.py"))))))))) -(define-public python-scikit-learn-extra - ;; This commit fixes an incompatibility with newer versions of scikit-learn - (let ((commit "0f95d8dda4c69f9de4fb002366041adcb1302f3b") - (revision "1")) - (package - (name "python-scikit-learn-extra") - (version (git-version "0.3.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/scikit-learn-contrib/scikit-learn-extra") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0a248sff1psfwzmngj465gzyisq20d83nzpwpq2cspxhih51m6j9")))) - (build-system pyproject-build-system) - (arguments - (list - #:test-flags - ;; ignore tests that require network - '(list "--pyargs" "sklearn_extra" - "-k" (string-append "not test_build" - ;; The error message format has changed, - ;; but the behavior itself is still the - ;; same. - " and not test_parameter_validation" - ;; exceptions must be derived from Warning, - ;; not <class 'NoneType'> - " and not test_seuclidean")) - #:phases - #~(modify-phases %standard-phases - (add-after 'build 'build-ext - (lambda _ - (invoke "python" "setup.py" "build_ext" - "--inplace"))) - (replace 'check - (lambda* (#:key tests? test-flags #:allow-other-keys) - (when tests? - ;; Restrict OpenBLAS threads to prevent segfaults while testing! - (setenv "OPENBLAS_NUM_THREADS" "1") - - ;; Some tests require write access to $HOME. - (setenv "HOME" "/tmp") - - ;; Step out of the source directory to avoid interference; - ;; we want to run the installed code with extensions etc. - (with-directory-excursion "/tmp" - (apply invoke "pytest" "-vv" test-flags)))))))) - (propagated-inputs - (list python-numpy - python-scikit-learn - python-scipy - python-packaging)) - (native-inputs (list python-pytest python-pytest-cov python-cython - python-setuptools python-wheel)) - (home-page "https://github.com/scikit-learn-contrib/scikit-learn-extra") - (synopsis "Set of tools for scikit-learn") - (description - "This package provides a Python module for machine learning that extends -scikit-learn. It includes algorithms that are useful but do not satisfy the -scikit-learn inclusion criteria, for instance due to their novelty or lower -citation number.") - (license license:bsd-3)))) - (define-public python-mord (package (name "python-mord") @@ -2425,7 +2360,7 @@ for k-neighbor-graph construction and approximate nearest neighbor search.") (setenv "NUMBA_CACHE_DIR" "/tmp") ;; Rebuild extensions to run tests. (invoke "python" "setup.py" "build_ext" "--inplace")))))) - (native-inputs (list python-cython-3 python-pytest python-setuptools + (native-inputs (list python-cython python-pytest python-setuptools python-wheel)) (inputs (list fftw)) (propagated-inputs (list python-numpy python-pynndescent diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 418ece747e..28c6a959c7 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -579,8 +579,8 @@ compatible with the configuration of Python}.") (license license:gpl3+))) -(define-public go-gitlab.com-shackra-goimapnotify - (deprecated-package "go-gitlab.com-shackra-goimapnotify" goimapnotify)) +(define-deprecated-package go-gitlab.com-shackra-goimapnotify + goimapnotify) (define-public guile2.2-mailutils (package @@ -1277,8 +1277,8 @@ can read the same mailbox from multiple computers. It supports IMAP as REMOTE repository and Maildir/IMAP as LOCAL repository.") (license license:gpl2+)))) -(define-public offlineimap - (deprecated-package "offlineimap" offlineimap3)) +(define-deprecated-package offlineimap + offlineimap3) (define-public emacs-mew (let ((commit "35772ee0b44dd7e56b0f3899b27fa545b2bc6f03") @@ -1845,8 +1845,8 @@ features. This is a fork derived from getmail 5.14, aimed at Python 3 compatibility.") (license license:gpl2+))) ;see docs/COPYING -(define-public getmail - (deprecated-package "getmail" getmail6)) +(define-deprecated-package getmail + getmail6) (define-public libetpan (package diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index f60f229ce6..e9acf2839d 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -64,6 +64,7 @@ #:use-module (gnu packages messaging) #:use-module (gnu packages multiprecision) #:use-module (gnu packages nss) + #:use-module (gnu packages perl) #:use-module (gnu packages pdf) #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) @@ -1581,47 +1582,71 @@ can be used as backgrounds in the MATE Desktop environment.") (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 "1m51cmcl6z68bx37zhi72wfl58kq9bg7xcih1sjr6l1li6axz2ma")))) (build-system glib-or-gtk-build-system) (arguments - `(; Tests can not succeed. - ;; https://github.com/mate-desktop/mate-text-editor/issues/33 - #:tests? #f)) - (native-inputs - `(("gettext" ,gettext-minimal) - ("gtk-doc" ,gtk-doc/stable) - ("gobject-introspection" ,gobject-introspection) - ("intltool" ,intltool) - ("libtool" ,libtool) - ("pkg-config" ,pkg-config) - ("yelp-tools" ,yelp-tools))) - (inputs - (list at-spi2-core - cairo - enchant-1.6 - glib - gtk+ - gtksourceview-4 - gdk-pixbuf - iso-codes/pinned - libcanberra - libx11 - libsm - libpeas - libxml2 - libice - mate-desktop - packagekit - pango - python - startup-notification)) + (list + #:configure-flags + #~(list "--enable-python") + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'wrap-pluma + (lambda* (#:key outputs #:allow-other-keys) + (wrap-program (search-input-file outputs "bin/pluma") + ;; For plugins (same as gedit). + `("GI_TYPELIB_PATH" ":" prefix + (,(getenv "GI_TYPELIB_PATH"))) + `("GUIX_PYTHONPATH" ":" prefix + (,(getenv "GUIX_PYTHONPATH"))) + ;; For language-specs. + `("XDG_DATA_DIRS" ":" prefix + (,(string-append #$(this-package-input "gtksourceview") + "/share"))))))) + ;; Tests can not succeed. + ;; https://github.com/mate-desktop/mate-text-editor/issues/33 + #:tests? #f)) + (native-inputs (list gettext-minimal + gtk-doc/stable + gobject-introspection + intltool + libtool + perl + pkg-config + yelp-tools)) + (inputs (list at-spi2-core + cairo + enchant + glib + gtk+ + gtksourceview-4 + gdk-pixbuf + iso-codes/pinned + libcanberra + libx11 + libsm + libpeas + libxml2 + libice + mate-desktop + packagekit + pango + python + python-pygobject + python-wrapper + python-pycairo + python-six + startup-notification)) (home-page "https://mate-desktop.org/") (synopsis "Text Editor for MATE") - (description - "Pluma is the text editor for the MATE Desktop.") + (description "Pluma is the text editor for the MATE Desktop.") (license license:gpl2))) (define-public mate-system-monitor diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index e90029f4da..b190b74b47 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2185,8 +2185,8 @@ extremely large and complex data collections.") Interface to wrap the HDF5 library, which is implemented in C.") (license (package-license hdf5)))) -(define-public hdf-java - (deprecated-package "hdf-java" hdf5-java)) +(define-deprecated-package hdf-java + hdf5-java) (define-public hdf-eos2 (package @@ -3017,7 +3017,7 @@ and quadratic objectives using the Simplex algorithm.") (propagated-inputs (list python-numpy python-pytest python-scipy)) (inputs (list cbc)) (native-inputs (list pkg-config - python-cython-3 + python-cython python-hypothesis python-numpy python-pytest @@ -4651,7 +4651,7 @@ can return results in exact arithmetic.") (lambda* (#:key tests? #:allow-other-keys) (when tests? (invoke "python" "test/runtests.py"))))))) - (native-inputs (list python-cython-3)) + (native-inputs (list python-cython)) (inputs (list petsc-openmpi python-numpy)) (home-page "https://bitbucket.org/petsc/petsc4py/") (synopsis "Python bindings for PETSc") @@ -4681,7 +4681,7 @@ bindings to almost all functions of PETSc.") (list #:tests? #f)) ; there are no tests (native-inputs (list python-cysignals - python-cython-3 + python-cython python-setuptools python-wheel)) (inputs @@ -4948,7 +4948,7 @@ arising after the discretization of partial differential equations.") (lambda* (#:key tests? #:allow-other-keys) (when tests? (invoke "python" "test/runtests.py"))))))) - (native-inputs (list python-cython-3)) + (native-inputs (list python-cython)) (inputs (list python-numpy python-petsc4py petsc-openmpi slepc-openmpi)) (home-page "https://bitbucket.org/slepc/slepc4py/") (synopsis "Python bindings for SLEPc") diff --git a/gnu/packages/medical.scm b/gnu/packages/medical.scm index b6dc87af66..da9123ae93 100644 --- a/gnu/packages/medical.scm +++ b/gnu/packages/medical.scm @@ -460,8 +460,8 @@ Medicine} server instead of SQLite.") #:configure-flags #~(list "--disable-static" (string-append "--with-nifti-prefix=" - #$(this-package-input "niftilib"))))) - (inputs (list glib gtk+ libpng niftilib)) + #$(this-package-input "nifticlib"))))) + (inputs (list glib gtk+ libpng nifticlib)) (native-inputs (list pkg-config)) (home-page "https://xmedcon.sourceforge.io") (synopsis "Medical image conversion utility") diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index fead73f57f..e741fe3b8d 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -16,7 +16,6 @@ ;;; Copyright © 2018 Leo Famulari <leo@famulari.name> ;;; Copyright © 2018 Pierre-Antoine Rouby <contact@parouby.fr> ;;; Copyright © 2019 Tanguy Le Carrour <tanguy@bioneland.org> -;;; Copyright © 2019, 2020 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2019, 2020 Timotej Lazar <timotej.lazar@araneo.si> ;;; Copyright © 2020, 2021 Nicolò Balzarotti <nicolo@nixo.xyz> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> @@ -103,7 +102,6 @@ #:use-module (gnu packages golang-crypto) #:use-module (gnu packages golang-web) #:use-module (gnu packages golang-xyz) - #:use-module (gnu packages gperf) #:use-module (gnu packages graphviz) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) @@ -132,7 +130,6 @@ #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages photo) - #:use-module (gnu packages php) #:use-module (gnu packages pkg-config) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) @@ -1324,8 +1321,8 @@ and OpenPGP) and available in 29 languages.") (home-page "https://gajim.org/") (license license:gpl3))) -(define-public gajim-omemo - (deprecated-package "gajim-omemo" gajim)) +(define-deprecated-package gajim-omemo + gajim) (define-public gajim-openpgp (package @@ -2641,45 +2638,6 @@ replacement.") ;; itself is GPLv2+. (license license:gpl2+))) -(define-public tdlib - (let ((commit "5c77c4692c28eb48a68ef1c1eeb1b1d732d507d3") - (revision "0")) - (package - (name "tdlib") - (version (git-version "1.8.52" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tdlib/td") - (commit commit))) - (sha256 - (base32 "1a2hh3f2m7vg7jky1144rfw5jxly3i278ck9zsh9v4kkvxrhy41q")) - (file-name (git-file-name name version)))) - (build-system cmake-build-system) - (arguments - (list - #:build-type "Release" - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'remove-failing-tests - (lambda _ - (substitute* "test/CMakeLists.txt" - ;; The test cases are compiled into a distinct binary - ;; which uses mtproto.cpp to attempt to connect to - ;; a remote server. Removing this file from the sources - ;; list disables those specific test cases. - (("\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}/mtproto.cpp") ""))))))) - (native-inputs - (list gperf openssl zlib php doxygen)) - (synopsis "Cross-platform library for building Telegram clients") - (description "Tdlib is a cross-platform library for creating custom -Telegram clients following the official Telegram API. It can be easily used -from almost any programming language with a C-FFI and features first-class -support for high performance Telegram Bot creation.") - (home-page "https://core.telegram.org/tdlib") - (license license:boost1.0)))) - (define-public purple-mm-sms (package (name "purple-mm-sms") @@ -3120,8 +3078,8 @@ social and chat platform.") designed for experienced users.") (license license:gpl2+))) -(define-public psi - (deprecated-package "psi" psi-plus)) +(define-deprecated-package psi + psi-plus) (define-public python-zulip (package diff --git a/gnu/packages/minetest.scm b/gnu/packages/minetest.scm index ce94a3adf8..b1d9a32a0c 100644 --- a/gnu/packages/minetest.scm +++ b/gnu/packages/minetest.scm @@ -29,74 +29,74 @@ #:use-module (guix packages) #:use-module (gnu packages luanti)) -(define-public minetest - (deprecated-package "minetest" luanti)) +(define-deprecated-package minetest + luanti) -(define-public minetest-server - (deprecated-package "minetest-server" luanti-server)) +(define-deprecated-package minetest-server + luanti-server) -(define-public minetest-moreores - (deprecated-package "minetest-moreores" luanti-moreores)) +(define-deprecated-package minetest-moreores + luanti-moreores) -(define-public minetest-sound-api-core - (deprecated-package "minetest-sound-api-core" luanti-sound-api-core)) +(define-deprecated-package minetest-sound-api-core + luanti-sound-api-core) -(define-public minetest-basic-materials - (deprecated-package "minetest-basic-materials" luanti-basic-materials)) +(define-deprecated-package minetest-basic-materials + luanti-basic-materials) -(define-public minetest-coloredwood - (deprecated-package "minetest-coloredwood" luanti-coloredwood)) +(define-deprecated-package minetest-coloredwood + luanti-coloredwood) -(define-public minetest-ethereal - (deprecated-package "minetest-ethereal" luanti-ethereal)) +(define-deprecated-package minetest-ethereal + luanti-ethereal) -(define-public minetest-homedecor-modpack - (deprecated-package "minetest-homedecor-modpack" luanti-homedecor-modpack)) +(define-deprecated-package minetest-homedecor-modpack + luanti-homedecor-modpack) -(define-public minetest-mesecons - (deprecated-package "minetest-mesecons" luanti-mesecons)) +(define-deprecated-package minetest-mesecons + luanti-mesecons) -(define-public minetest-mineclone - (deprecated-package "minetest-mineclone" luanti-voxelibre)) +(define-deprecated-package minetest-mineclone + luanti-voxelibre) -(define-public minetest-mobs - (deprecated-package "minetest-mobs" luanti-mobs)) +(define-deprecated-package minetest-mobs + luanti-mobs) -(define-public minetest-mobs-animal - (deprecated-package "minetest-mobs-animal" luanti-mobs-animal)) +(define-deprecated-package minetest-mobs-animal + luanti-mobs-animal) -(define-public minetest-mobs-monster - (deprecated-package "minetest-mobs-monster" luanti-mobs-monster)) +(define-deprecated-package minetest-mobs-monster + luanti-mobs-monster) -(define-public minetest-pipeworks - (deprecated-package "minetest-pipeworks" luanti-pipeworks)) +(define-deprecated-package minetest-pipeworks + luanti-pipeworks) -(define-public minetest-technic - (deprecated-package "minetest-technic" luanti-technic)) +(define-deprecated-package minetest-technic + luanti-technic) -(define-public minetest-throwing - (deprecated-package "minetest-throwing" luanti-throwing)) +(define-deprecated-package minetest-throwing + luanti-throwing) -(define-public minetest-throwing-arrows - (deprecated-package "minetest-throwing-arrows" luanti-throwing-arrows)) +(define-deprecated-package minetest-throwing-arrows + luanti-throwing-arrows) -(define-public minetest-worldedit - (deprecated-package "minetest-worldedit" luanti-worldedit)) +(define-deprecated-package minetest-worldedit + luanti-worldedit) -(define-public minetest-unifieddyes - (deprecated-package "minetest-unifieddyes" luanti-unifieddyes)) +(define-deprecated-package minetest-unifieddyes + luanti-unifieddyes) -(define-public minetest-unified-inventory - (deprecated-package "minetest-unified-inventory" luanti-unified-inventory)) +(define-deprecated-package minetest-unified-inventory + luanti-unified-inventory) -(define-public minetest-advtrains - (deprecated-package "minetest-advtrains" luanti-advtrains)) +(define-deprecated-package minetest-advtrains + luanti-advtrains) -(define-public minetest-basic-trains - (deprecated-package "minetest-basic-trains" luanti-basic-trains)) +(define-deprecated-package minetest-basic-trains + luanti-basic-trains) -(define-public minetest-oneblock - (deprecated-package "minetest-oneblock" luanti-oneblock)) +(define-deprecated-package minetest-oneblock + luanti-oneblock) -(define-public minetest-wielded-light - (deprecated-package "minetest-wielded-light" luanti-wielded-light)) +(define-deprecated-package minetest-wielded-light + luanti-wielded-light) diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index e86892ea6e..8ddbdc255f 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -603,9 +603,8 @@ WSGI and the node exporter textfile collector.") written in Go with pluggable metric collectors.") (license license:asl2.0))) -(define-public go-github-com-prometheus-node-exporter - (deprecated-package "go-github-com-prometheus-node-exporter" - prometheus-node-exporter)) +(define-deprecated-package go-github-com-prometheus-node-exporter + prometheus-node-exporter) (define-public prometheus-postgres-exporter (package diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index ea5cc62b39..77e650e4ed 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015, 2018, 2019 Eric Bavier <bavier@member.fsf.org> -;;; Copyright © 2014-2024 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014-2025 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Ian Denhardt <ian@zenhack.net> ;;; Copyright © 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2017 Dave Love <fx@gnu.org> @@ -231,7 +231,7 @@ bind processes, and much more.") '())))) (append (list `(,hwloc-2 "lib") gfortran - libfabric + libfabric-1 ;fails to build with 2.3 libevent opensm openssh-sans-x) @@ -376,6 +376,8 @@ software vendors, application developers and computer science researchers.") ;; As of Open MPI 5.0.X, PMIx is used to communicate ;; with SLURM, so SLURM'S PMI is no longer needed. (delete "slurm") + ;; Replace libfabric 1.x with a newer version. + (replace "libfabric" libfabric) (append openpmix) ;for PMI support (launching via "srun") (append prrte))) ;for PMI support (launching via "srun") (native-inputs (modify-inputs (package-native-inputs openmpi) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index ec45033a35..2e34776731 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1034,7 +1034,7 @@ settings (aliasing, linear interpolation and cubic interpolation).") (define-public hydrogen (package (name "hydrogen") - (version "1.2.4") + (version "1.2.6") (source (origin (method git-fetch) @@ -1043,22 +1043,23 @@ settings (aliasing, linear interpolation and cubic interpolation).") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1i5gz5zck8s0kskjgnx9c75gh7zx0kbjsqzl2765f99p9svprirq")))) + (base32 "0fwyabkvrh1q30sqyhylly0c28cryq39lnqzgsv69jqvcc001bi4")))) (build-system qt-build-system) (arguments - `(#:tests? #f ; require audio subsystem - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-data-directory - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - (("/usr/share/pixmaps") - (string-append (assoc-ref outputs "out") - "/share/pixmaps")))))))) + (list + #:tests? #f ; require audio subsystem + #:configure-flags #~(list "-DWANT_QT6=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-data-directory + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + (("/usr/share/pixmaps") + (string-append #$output "/share/pixmaps")))))))) (native-inputs (list cppunit pkg-config - qttools-5)) + qttools)) (inputs (list alsa-lib jack-1 @@ -1068,10 +1069,9 @@ settings (aliasing, linear interpolation and cubic interpolation).") libsndfile lrdf pulseaudio - qtbase-5 - qtsvg-5 - qtxmlpatterns-5 - qtwayland-5 + qtbase + qtsvg + qtwayland zlib)) (home-page "http://hydrogen-music.org/") (synopsis "Drum machine") @@ -4358,8 +4358,8 @@ using the beets FetchArt plugin.") ;;; XXX: The original project is abandoned for 4y, see ;;; <https://github.com/unrblt/beets-bandcamp/issues/15>, this package may be ;;; sourced from maintained fork <https://github.com/snejus/beetcamp>. -(define-public beets-bandcamp - (deprecated-package "beets-bandcamp" beets-beetcamp)) +(define-deprecated-package beets-bandcamp + beets-beetcamp) (define-public milkytracker (package @@ -7967,7 +7967,7 @@ choice.") (define-public musikcube (package (name "musikcube") - (version "3.0.1") + (version "3.0.5") (source (origin (method git-fetch) (uri (git-reference @@ -7976,7 +7976,7 @@ choice.") (file-name (git-file-name name version)) (sha256 (base32 - "09q15xlssgg67zg5m0q574k3al2pdjdnm1580mlf0wzr6a021fnd")))) + "0kfdfai2w4qh31kypl94yknir9f41y1wh93k38cpj04w3chdzdx2")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; No test suite @@ -7994,7 +7994,7 @@ choice.") (list alsa-lib boost curl - ffmpeg-4 + ffmpeg lame libev libgme @@ -8080,7 +8080,7 @@ streaming audio server.") gtk+ gtksourceview-4 ; undo, redo, multiline text fields hicolor-icon-theme - keybinder-3.0 ; keybindings outside of GNOME + keybinder ; keybindings outside of GNOME (librsvg-for-system) libsoup-minimal python diff --git a/gnu/packages/ncdu.scm b/gnu/packages/ncdu.scm index a2261f219e..c8441dd11a 100644 --- a/gnu/packages/ncdu.scm +++ b/gnu/packages/ncdu.scm @@ -89,5 +89,5 @@ ncurses installed.") (native-inputs (list pkg-config)) (properties `((tunable? . #t))))) -(define-public ncdu-2 - (deprecated-package "ncdu2" ncdu)) +(define-deprecated-package ncdu-2 + ncdu) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 23c4f77814..8516bb0ff3 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -331,7 +331,7 @@ network can support simultaneously.") (define-public lcrq (package (name "lcrq") - (version "0.2.4") + (version "0.3.1") (source (origin (method git-fetch) (uri (git-reference @@ -340,7 +340,7 @@ network can support simultaneously.") (file-name (git-file-name name version)) (sha256 (base32 - "1d2mk3ii189462dmkksjsaqybj7cizn9vm9c8plml881brlz8a2n")))) + "0xspyqjrpjyx79z027ax4d3nrh09qj9vwfvb4pad716avd4zklc4")))) (build-system gnu-build-system) (arguments (list @@ -373,8 +373,8 @@ the RFC.") (define-public netperf (let ((version "2.7.0") - (revision "1") - (commit "3bc455b23f901dae377ca0a558e1e32aa56b31c4")) + (revision "2") + (commit "afc51ff9764741da4ed6702651fba9d9c23f8557")) (package (name "netperf") (version (git-version version revision commit)) @@ -387,13 +387,13 @@ the RFC.") (file-name (git-file-name name version)) (sha256 (base32 - "1msbhbvf39r1a0c9b9myla5i6235fvnp7r6021fl8b5svxjbb0dk")))) + "1s7f1w0q9y15z8lhprh7irc1p9qgam140lvwncqk4gk74yvmcrcf")))) (build-system gnu-build-system) (arguments `(#:configure-flags ;; Without -fcommon the build fails on newer gcc. ;; See: https://gcc.gnu.org/gcc-10/porting_to.html - (list "CFLAGS=-fcommon" + (list "CFLAGS=-fcommon -D_GNU_SOURCE" ;; --enable-demo is needed for flent (not yet packaged). "--enable-demo"))) (native-inputs @@ -2077,8 +2077,8 @@ manage, and delete Internet resources from Gandi.net such as domain names, virtual machines, and certificates.") (license license:gpl3+))) -(define-public gandi.cli - (deprecated-package "gandi.cli" gandi-cli)) +(define-deprecated-package gandi.cli + gandi-cli) (define-public go-sctp ;; docker-libnetwork-cmd-proxy requires this exact commit. diff --git a/gnu/packages/orange.scm b/gnu/packages/orange.scm index 28a066bbfb..3b741e7dbb 100644 --- a/gnu/packages/orange.scm +++ b/gnu/packages/orange.scm @@ -22,6 +22,7 @@ #:use-module (guix build-system pyproject) #:use-module (guix build-system python) #:use-module (guix download) + #:use-module (guix git-download) #:use-module (guix gexp) #:use-module (guix packages) #:use-module (gnu packages) @@ -42,38 +43,32 @@ (define-public python-orange-canvas-core (package (name "python-orange-canvas-core") - (version "0.2.5") + (version "0.2.6") (source (origin (method url-fetch) (uri (pypi-uri "orange_canvas_core" version)) (sha256 - (base32 "0bp6c5y4a4fzr1hg7aijlbfwp6bqacxxcqhwb2swc21aj846ns0n")))) + (base32 "1h0p6p36h9vwmgs7xa7x0qa06zjxjyj8pr1p8d4iykbvl60s3dq0")))) (build-system pyproject-build-system) (arguments (list + ;; tests: 227 passed, 4 skipped, 13 deselected, 15 warnings #:test-flags #~(list "-k" (string-join - (list - ;; AttributeError: 'NoneType' object has no attribute - ;; 'trigger' - "not test_context_menu_delete" - "test_copy_cut_paste" - ;; AttributeError: 'NoneType' object has no attribute - ;; 'isEnabled' - "test_item_context_menu" - ;; Tests fail with error: Failed: CALL ERROR: Exceptions - ;; caught in Qt event loop. - "test_create_new_window" - "test_new_window" - "test_dont_load_swp_on_new_window" - "test_toolbox" - "test_widgettoolgrid" - "test_editlinksnode" - "test_links_edit" - "test_links_edit_widget" - "test_flattened" - "test_tooltree_registry") + ;; Tests fail with error: Failed: CALL ERROR: Exceptions + ;; caught in Qt event loop. + (list "not test_create_new_window" + "test_dont_load_swp_on_new_window" + "test_editlinksnode" + "test_links_edit" + "test_links_edit_widget" + "test_new_window" + "test_toolbox" + "test_widgettoolgrid" + ;; AssertionError: Lists differ + "test_create_normal" + "test_create_on_demand") " and not ")) #:phases #~(modify-phases %standard-phases @@ -85,28 +80,23 @@ (add-before 'check 'pre-check (lambda _ (setenv "HOME" "/tmp") - (setenv "QT_PLUGIN_PATH" - (string-append #$(this-package-input "qtbase") "/lib/qt6/plugins:" - (getenv "QT_PLUGIN_PATH"))) (setenv "QT_QPA_PLATFORM" "offscreen")))))) (native-inputs (list python-pytest python-pytest-qt python-setuptools - python-trubar - python-wheel)) - (inputs - (list qtbase)) + python-trubar)) (propagated-inputs (list python-anyqt - python-cachecontrol python-commonmark python-dictdiffer python-docutils python-numpy + python-packaging python-qasync python-requests python-requests-cache + python-truststore python-typing-extensions)) (home-page "https://github.com/biolab/orange-canvas-core") (synopsis "Core component of Orange Canvas") @@ -166,47 +156,56 @@ GUI based workflow. It is primarily used in the Orange framework.") (define-public orange (package (name "orange") - (version "3.32.0") + ;; XXX: The latest commit provides comparability with GCC 14, revert to + ;; git tag in the next refresh cycle. + (properties '((commit . "44e66283aff4132614ef64a877f9ceef963588a7") + (revision . "0"))) + (version (git-version "3.39.0" + (assoc-ref properties 'revision) + (assoc-ref properties 'commit))) (source (origin - (method url-fetch) - (uri (pypi-uri "Orange3" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/biolab/orange3") + (commit (assoc-ref properties 'commit)))) + (file-name (git-file-name name version)) (sha256 - (base32 "0pxjwisc209cdgpqlqazc2vlmr0iqz8ry862w7jx95zic54d9p5l")))) - (build-system python-build-system) + (base32 "0d2ws64y8chj77yw689pr98wndpiapbh0msxyjah5ki8lygflizs")))) + (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'preparations - (lambda _ - ;; Delete test that opens an outgoing connection. - (delete-file "Orange/tests/test_url_reader.py") - ;; This is a binary data file and it breaks runpath validation. - (delete-file "Orange/tests/datasets/binary-blob.tab") - ;; Skip the test which uses that binary file. - (substitute* "Orange/tests/test_txt_reader.py" - (("test_read_nonutf8_encoding") "_test_read_nonutf8_encoding")) - ;; We use a correct version of PyQtWebEngine, but the build scripts - ;; consider it incorrect anyways. Remove the constraint entirely to - ;; work around this bug. - (substitute* "requirements-pyqt.txt" (("PyQtWebEngine>=5.12") "")))) - (add-before 'check 'pre-check - ;; Tests need a writable home. - (lambda _ - (setenv "HOME" "/tmp") - (setenv "QT_QPA_PLATFORM" "offscreen"))) - (add-after 'install 'wrap-executable - ;; Ensure that icons are found at runtime. - (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/orange-canvas") - `("QT_PLUGIN_PATH" prefix - ,(list (string-append (assoc-ref inputs "qtsvg") - "/lib/qt5/plugins/")))))))))) + (list + ;; TODO: Figure out how to enable/fix tests: ImportError: cannot import + ;; name '_variable' from partially initialized module 'Orange.data' + #:tests? #f + #:test-backend #~'unittest + #:test-flags #~(list "-v" "Orange.tests" "Orange.widgets.tests") + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'pre-check + ;; Tests need a writable home. + (lambda _ + (setenv "HOME" "/tmp") + (setenv "QT_QPA_PLATFORM" "offscreen"))) + (add-after 'wrap 'wrap-executable + ;; Ensure that icons are found at runtime. + (lambda _ + (wrap-program (string-append #$output "/bin/orange-canvas") + `("QT_PLUGIN_PATH" prefix + ,(list (string-append + (string-join + (list #$(this-package-input "qtbase") + #$(this-package-input "qtsvg") + #$(this-package-input "qtwayland")) + "/lib/qt6/plugins:") + "/lib/qt6/plugins"))))))))) (native-inputs - (list python-cython)) + (list python-cython + python-recommonmark + python-setuptools + python-trubar)) (inputs - (list bash-minimal + (list bash-minimal ;for wrap python-anyqt python-baycomp python-bottleneck @@ -223,21 +222,24 @@ GUI based workflow. It is primarily used in the Orange framework.") python-opentsne python-orange-canvas-core python-orange-widget-base + python-packaging python-pandas python-pygments - python-pyqt + python-pyqt-6 python-pyqtgraph - python-pyqtwebengine + python-pyqtwebengine-6 python-pyyaml python-qtconsole python-requests python-scikit-learn python-scipy python-serverfiles + python-xgboost python-xlrd python-xlsxwriter - qtbase-5 - qtsvg-5 + qtbase + qtsvg + qtwayland xdg-utils)) (home-page "https://orangedatamining.com/") (synopsis "Component-based data mining framework") diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 577ff3adf5..1ac5a9b99c 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1133,8 +1133,8 @@ transactions from C or Python.") (license license:gpl2+))) (define-public bffe - (let ((commit "2f9b1cb355e9a276903a721b48c77790841a91d6") - (revision "15")) + (let ((commit "e3226ffbdb9b615957b4815956a70bc6ef9ab175") + (revision "16")) (package (name "bffe") (version (git-version "0" revision commit)) @@ -1145,7 +1145,7 @@ transactions from C or Python.") (commit commit))) (sha256 (base32 - "0h1nzlj6k9yhhsc1an72876p19yf8kszs2h7xww5ldcjs8vwxn9c")) + "0d66xj0671rrrflln25yjvk4scmiw9946h344zj9mm35rm3mw207")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (native-inputs @@ -2232,8 +2232,8 @@ in an isolated environment, in separate namespaces.") (license license:gpl3+))) (define-public nar-herder - (let ((commit "8bfd36fe774aff71f9a33fd99e42d578a823750d") - (revision "41")) + (let ((commit "f9862fd42d4c7a307cfd092086c327f5c2c6b594") + (revision "42")) (package (name "nar-herder") (version (git-version "0" revision commit)) @@ -2244,7 +2244,7 @@ in an isolated environment, in separate namespaces.") (commit commit))) (sha256 (base32 - "0wd8nj2ji28jvs4wgshhbipxballpfmmwbxx82nk4bypbdpdwd5a")) + "1n8apwpfly9605pp2liy80imv3w6q5h750p697sdn2prnw5ifph3")) (file-name (string-append name "-" version "-checkout")))) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/patches/fgallery-also-look-for-7z.patch b/gnu/packages/patches/fgallery-also-look-for-7z.patch new file mode 100644 index 0000000000..207f77ab76 --- /dev/null +++ b/gnu/packages/patches/fgallery-also-look-for-7z.patch @@ -0,0 +1,37 @@ +Note: The 7zip package only provides the bin/7z, not bin/7zz or bin/7za. + +From 71148e6f8d98936064733eeeac7d42b4cddddd23 Mon Sep 17 00:00:00 2001 +From: "kestrelwx" <kestrel.w@proton.me> +Date: Sat, 18 Oct 2025 14:56:04 +0300 +Subject: [PATCH] Also check for 7z in $PATH. +To: wave++ "Yuri D'Elia" <wavexx@thregr.org> + +From: kestrel <kestrel.w@proton.me> + +--- + fgallery | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/fgallery b/fgallery +index 1bf90e5..1da2c82 100755 +--- a/fgallery ++++ b/fgallery +@@ -444,12 +444,14 @@ if($facedet && system("facedetect -h >/dev/null 2>&1")) { + my $p7zipcmd; + if(!system("7zz -h >/dev/null 2>&1")) { + $p7zipcmd = "7zz"; ++} elsif(!system("7z -h >/dev/null 2>&1")) { ++ $p7zipcmd = "7z"; + } elsif(!system("7za -h >/dev/null 2>&1")) { + $p7zipcmd = "7za"; + } else { + $p7zip = 0; + if(system("zip -h >/dev/null 2>&1")) { +- fatal("cannot run \"zip\" (check if 7zz, 7za or zip is installed)"); ++ fatal("cannot run \"zip\" (check if 7zz, 7za, 7z or zip is installed)"); + } + } + +-- +2.51.0 + diff --git a/gnu/packages/patches/glibc-2.29-supported-locales.patch b/gnu/packages/patches/glibc-2.29-supported-locales.patch deleted file mode 100644 index 05865dc7be..0000000000 --- a/gnu/packages/patches/glibc-2.29-supported-locales.patch +++ /dev/null @@ -1,33 +0,0 @@ -This patch is taken from debian's glibc package (generate-supported.mk). -It install the localedata/SUPPORTED file of the glibc. This file lists -all the supported locales of the glibc. - -diff --git a/localedata/Makefile b/localedata/Makefile -index 65079f9eb8..14818f84e0 100644 ---- a/localedata/Makefile -+++ b/localedata/Makefile -@@ -169,7 +169,8 @@ endif - # Files to install. - install-others := $(addprefix $(inst_i18ndir)/, \ - $(addsuffix .gz, $(charmaps)) \ -- $(locales)) -+ $(locales)) \ -+ $(inst_i18ndir)/SUPPORTED - - tests: $(objdir)/iconvdata/gconv-modules - -@@ -380,6 +381,14 @@ endif - - include SUPPORTED - -+$(inst_i18ndir)/SUPPORTED: SUPPORTED $(+force) -+ for locale in $(SUPPORTED-LOCALES); do \ -+ [ $$locale = true ] && continue; \ -+ echo $$locale | sed 's,/, ,' >> LOCALES; \ -+ done -+ $(make-target-directory) -+ $(INSTALL_DATA) LOCALES $@ -+ - INSTALL-SUPPORTED-LOCALE-ARCHIVE=$(addprefix install-archive-, $(SUPPORTED-LOCALES)) - INSTALL-SUPPORTED-LOCALE-FILES=$(addprefix install-files-, $(SUPPORTED-LOCALES)) -
\ No newline at end of file diff --git a/gnu/packages/patches/glibc-2.31-hurd-clock_gettime_monotonic.patch b/gnu/packages/patches/glibc-2.31-hurd-clock_gettime_monotonic.patch deleted file mode 100644 index 1c3fe427f9..0000000000 --- a/gnu/packages/patches/glibc-2.31-hurd-clock_gettime_monotonic.patch +++ /dev/null @@ -1,84 +0,0 @@ -This is needed to run Python on the Hurd, especially during the build of -python-boot0. - -Adapted from https://salsa.debian.org/glibc-team/glibc/-/blob/glibc-2.31/debian/patches/hurd-i386/unsubmitted-clock_t_centiseconds.diff - -Use the realtime clock for the monotonic clock. This is of course not a proper -implementation (which is being done in Mach), but will permit to fix at least -the iceweasel stack. - -vlc however doesn't build when _POSIX_CLOCK_SELECTION is enabled but -_POSIX_TIMERS is not, and they refuse to fix that (see #765578), so disable the -former. - -From 0aa1dfd580cf9ad7b812c307b128decb782b825f Mon Sep 17 00:00:00 2001 -From: Jan Nieuwenhuizen <janneke@gnu.org> -Date: Mon, 2 Mar 2020 18:59:04 +0100 -Subject: [PATCH 2/2] Use realtime clock for the monotonic clock. - ---- - sysdeps/mach/clock_gettime.c | 2 +- - sysdeps/mach/hurd/bits/posix_opt.h | 6 +++--- - sysdeps/posix/clock_getres.c | 1 + - sysdeps/pthread/timer_create.c | 2 +- - 4 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/sysdeps/mach/clock_gettime.c b/sysdeps/mach/clock_gettime.c -index ac3547df3c..af8681ba4e 100644 ---- a/sysdeps/mach/clock_gettime.c -+++ b/sysdeps/mach/clock_gettime.c -@@ -25,7 +25,7 @@ - int - __clock_gettime (clockid_t clock_id, struct timespec *ts) - { -- if (clock_id != CLOCK_REALTIME) -+ if (clock_id != CLOCK_MONOTONIC && clock_id != CLOCK_REALTIME) - { - errno = EINVAL; - return -1; -diff --git a/sysdeps/mach/hurd/bits/posix_opt.h b/sysdeps/mach/hurd/bits/posix_opt.h -index 0050151332..27b3a28ab7 100644 ---- a/sysdeps/mach/hurd/bits/posix_opt.h -+++ b/sysdeps/mach/hurd/bits/posix_opt.h -@@ -163,10 +163,10 @@ - #define _POSIX_THREAD_PROCESS_SHARED -1 - - /* The monotonic clock might be available. */ --#define _POSIX_MONOTONIC_CLOCK 0 -+#define _POSIX_MONOTONIC_CLOCK 200809L - --/* The clock selection interfaces are available. */ --#define _POSIX_CLOCK_SELECTION 200809L -+/* The clock selection interfaces are not really available yet. */ -+#define _POSIX_CLOCK_SELECTION -1 - - /* Advisory information interfaces could be available in future. */ - #define _POSIX_ADVISORY_INFO 0 -diff --git a/sysdeps/posix/clock_getres.c b/sysdeps/posix/clock_getres.c -index fcd79fd554..1dd02aa449 100644 ---- a/sysdeps/posix/clock_getres.c -+++ b/sysdeps/posix/clock_getres.c -@@ -52,6 +52,7 @@ __clock_getres (clockid_t clock_id, struct timespec *res) - switch (clock_id) - { - case CLOCK_REALTIME: -+ case CLOCK_MONOTONIC: - retval = realtime_getres (res); - break; - -diff --git a/sysdeps/pthread/timer_create.c b/sysdeps/pthread/timer_create.c -index 9d8a9ea8ae..3430582c09 100644 ---- a/sysdeps/pthread/timer_create.c -+++ b/sysdeps/pthread/timer_create.c -@@ -48,7 +48,7 @@ timer_create (clockid_t clock_id, struct sigevent *evp, timer_t *timerid) - return -1; - } - -- if (clock_id != CLOCK_REALTIME) -+ if (clock_id != CLOCK_REALTIME && clock_id != CLOCK_MONOTONIC) - { - __set_errno (EINVAL); - return -1; --- -2.24.0 - diff --git a/gnu/packages/patches/glibc-CVE-2019-19126.patch b/gnu/packages/patches/glibc-CVE-2019-19126.patch deleted file mode 100644 index 5b9ac58ab7..0000000000 --- a/gnu/packages/patches/glibc-CVE-2019-19126.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix CVE-2019-19126: - -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-19126 -https://sourceware.org/bugzilla/show_bug.cgi?id=25204 - -Taken from upstream: -https://sourceware.org/git/?p=glibc.git;a=commit;h=37c90e117310728a4ad1eb998c0bbe7d79c4a398 - -diff --git a/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h b/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h -index 975cbe2..df2cdfd 100644 ---- a/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h -+++ b/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h -@@ -31,7 +31,8 @@ - environment variable, LD_PREFER_MAP_32BIT_EXEC. */ - #define EXTRA_LD_ENVVARS \ - case 21: \ -- if (memcmp (envline, "PREFER_MAP_32BIT_EXEC", 21) == 0) \ -+ if (!__libc_enable_secure \ -+ && memcmp (envline, "PREFER_MAP_32BIT_EXEC", 21) == 0) \ - GLRO(dl_x86_cpu_features).feature[index_arch_Prefer_MAP_32BIT_EXEC] \ - |= bit_arch_Prefer_MAP_32BIT_EXEC; \ - break; diff --git a/gnu/packages/patches/glibc-CVE-2019-7309.patch b/gnu/packages/patches/glibc-CVE-2019-7309.patch deleted file mode 100644 index f9f623830a..0000000000 --- a/gnu/packages/patches/glibc-CVE-2019-7309.patch +++ /dev/null @@ -1,76 +0,0 @@ -Fix <https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-7309>. - -Taken from this upstream commit, sans ChangeLog updates and tests: -<https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=3f635fb43389b54f682fc9ed2acc0b2aaf4a923d>. - -diff --git a/sysdeps/x86_64/memcmp.S b/sysdeps/x86_64/memcmp.S -index 1fc487caa5..1322bb3b92 100644 ---- a/sysdeps/x86_64/memcmp.S -+++ b/sysdeps/x86_64/memcmp.S -@@ -21,14 +21,18 @@ - - .text - ENTRY (memcmp) -- test %rdx, %rdx -+#ifdef __ILP32__ -+ /* Clear the upper 32 bits. */ -+ movl %edx, %edx -+#endif -+ test %RDX_LP, %RDX_LP - jz L(finz) - cmpq $1, %rdx -- jle L(finr1b) -+ jbe L(finr1b) - subq %rdi, %rsi - movq %rdx, %r10 - cmpq $32, %r10 -- jge L(gt32) -+ jae L(gt32) - /* Handle small chunks and last block of less than 32 bytes. */ - L(small): - testq $1, %r10 -@@ -156,7 +160,7 @@ L(A32): - movq %r11, %r10 - andq $-32, %r10 - cmpq %r10, %rdi -- jge L(mt16) -+ jae L(mt16) - /* Pre-unroll to be ready for unrolled 64B loop. */ - testq $32, %rdi - jz L(A64) -@@ -178,7 +182,7 @@ L(A64): - movq %r11, %r10 - andq $-64, %r10 - cmpq %r10, %rdi -- jge L(mt32) -+ jae L(mt32) - - L(A64main): - movdqu (%rdi,%rsi), %xmm0 -@@ -216,7 +220,7 @@ L(mt32): - movq %r11, %r10 - andq $-32, %r10 - cmpq %r10, %rdi -- jge L(mt16) -+ jae L(mt16) - - L(A32main): - movdqu (%rdi,%rsi), %xmm0 -@@ -254,7 +258,7 @@ L(ATR): - movq %r11, %r10 - andq $-32, %r10 - cmpq %r10, %rdi -- jge L(mt16) -+ jae L(mt16) - testq $16, %rdi - jz L(ATR32) - -@@ -325,7 +329,7 @@ L(ATR64main): - movq %r11, %r10 - andq $-32, %r10 - cmpq %r10, %rdi -- jge L(mt16) -+ jae L(mt16) - - L(ATR32res): - movdqa (%rdi,%rsi), %xmm0 diff --git a/gnu/packages/patches/glibc-CVE-2019-9169.patch b/gnu/packages/patches/glibc-CVE-2019-9169.patch deleted file mode 100644 index 029b4ddbd7..0000000000 --- a/gnu/packages/patches/glibc-CVE-2019-9169.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix <https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-9169>. - -Taken from this upstream commit, sans ChangeLog updates: -https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=583dd860d5b833037175247230a328f0050dbfe9 - -diff --git a/posix/regexec.c b/posix/regexec.c -index 91d5a797b8..084b1222d9 100644 ---- a/posix/regexec.c -+++ b/posix/regexec.c -@@ -1293,8 +1293,10 @@ proceed_next_node (const re_match_context_t *mctx, Idx nregs, regmatch_t *regs, - else if (naccepted) - { - char *buf = (char *) re_string_get_buffer (&mctx->input); -- if (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx, -- naccepted) != 0) -+ if (mctx->input.valid_len - *pidx < naccepted -+ || (memcmp (buf + regs[subexp_idx].rm_so, buf + *pidx, -+ naccepted) -+ != 0)) - return -1; - } - } diff --git a/gnu/packages/patches/glibc-locales-2.28.patch b/gnu/packages/patches/glibc-locales-2.28.patch deleted file mode 100644 index 31ee6c1ff3..0000000000 --- a/gnu/packages/patches/glibc-locales-2.28.patch +++ /dev/null @@ -1,31 +0,0 @@ -This patch allows us to use glibc's build system to build locales -in a package separate from glibc. - - 1. Use 'localedef' from $PATH since we are not rebuilding it. - 2. Use '--no-archive' to avoid building the big locale archive, and - because the already-built 'localedef' would want to write it - to '/run/current-system/locale', which is not possible. - 3. Pass $(inst_complocaledir)/$$locale to install files in the right - place, and because otherwise, 'localedef' fails with: - "cannot write output files to `(null)'". - ---- glibc-2.27/localedata/Makefile -+++ glibc-2.27/localedata/Makefile -@@ -199,7 +199,7 @@ INSTALL-SUPPORTED-LOCALES=$(addprefix install-, $(SUPPORTED-LOCALES)) - - # Sometimes the whole collection of locale files should be installed. - LOCALEDEF=I18NPATH=. GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \ --$(rtld-prefix) $(common-objpfx)locale/localedef -+ localedef --no-archive - install-locales: $(INSTALL-SUPPORTED-LOCALES) - - install-locales-dir: -@@ -224,7 +224,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-locales-dir - input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \ - $(LOCALEDEF) $$flags --alias-file=../intl/locale.alias \ - -i locales/$$input -f charmaps/$$charset \ -- $(addprefix --prefix=,$(install_root)) $$locale \ -+ $(addprefix --prefix=,$(install_root)) $(inst_complocaledir)/$$locale \ - && echo ' done'; \ - - tst-setlocale-ENV = LC_ALL=ja_JP.EUC-JP diff --git a/gnu/packages/patches/glibc-skip-c++.patch b/gnu/packages/patches/glibc-skip-c++.patch deleted file mode 100644 index b2cbe76d3b..0000000000 --- a/gnu/packages/patches/glibc-skip-c++.patch +++ /dev/null @@ -1,31 +0,0 @@ -When building, say, glibc 2.31 using a compiler that's itself linked -against 2.33, linking fails with: - - gcc -Wl,-rpath-link=/tmp/guix-build-glibc-2.31.drv-0/build:/tmp/guix-build-glibc-2.31.drv-0/build/math:/tmp/guix-build-glibc-2.31.drv-0/build/elf:/tmp/guix-build-glibc-2.31.drv-0/build/dlfcn:/tmp/guix-build-glibc-2.31.drv-0/build/nss:/tmp/guix-build-glibc-2.31.drv-0/build/nis:/tmp/guix-build-glibc-2.31.drv-0/build/rt:/tmp/guix-build-glibc-2.31.drv-0/build/resolv:/tmp/guix-build-glibc-2.31.drv-0/build/mathvec:/tmp/guix-build-glibc-2.31.drv-0/build/support:/tmp/guix-build-glibc-2.31.drv-0/build/crypt:/tmp/guix-build-glibc-2.31.drv-0/build/nptl -nostdlib -nostartfiles -o /tmp/guix-build-glibc-2.31.drv-0/build/support/links-dso-program -Wl,-z,combreloc -Wl,-z,relro -Wl,--hash-style=both /tmp/guix-build-glibc-2.31.drv-0/build/csu/crt1.o /tmp/guix-build-glibc-2.31.drv-0/build/csu/crti.o `gcc --print-file-name=crtbegin.o` /tmp/guix-build-glibc-2.31.drv-0/build/support/links-dso-program.o -lstdc++ -lgcc -lgcc_s -Wl,-dynamic-linker=/gnu/store/...-glibc-2.31/lib/ld-linux-x86-64.so.2 /tmp/guix-build-glibc-2.31.drv-0/build/libc.so.6 /tmp/guix-build-glibc-2.31.drv-0/build/libc_nonshared.a -Wl,--as-needed /tmp/guix-build-glibc-2.31.drv-0/build/elf/ld.so -Wl,--no-as-needed -lgcc `gcc --print-file-name=crtend.o` /tmp/guix-build-glibc-2.31.drv-0/build/csu/crtn.o - ld: /gnu/store/...-gcc-10.3.0-lib/lib/gcc/x86_64-unknown-linux-gnu/10.3.0/../../../libstdc++.so: undefined reference to `fstat64@GLIBC_2.33' - ld: /gnu/store/...-gcc-10.3.0-lib/lib/gcc/x86_64-unknown-linux-gnu/10.3.0/../../../libstdc++.so: undefined reference to `lstat@GLIBC_2.33' - ld: /gnu/store/...-gcc-10.3.0-lib/lib/gcc/x86_64-unknown-linux-gnu/10.3.0/../../../libstdc++.so: undefined reference to `stat@GLIBC_2.33' - collect2: error: ld returned 1 exit status - -This is unsurprising given that libstdc++.so here is linked against 2.33, -whereas libc.so.6 here is 2.31. - -This patch works around it by not building the offending program. - -diff --git a/support/Makefile b/support/Makefile -index bb9889ef..6614943b 100644 ---- a/support/Makefile -+++ b/support/Makefile -@@ -210,12 +210,7 @@ CFLAGS-support_paths.c = \ - # -fexcess-precision=standard. - CFLAGS-timespec.c += -fexcess-precision=standard - --ifeq (,$(CXX)) - LINKS_DSO_PROGRAM = links-dso-program-c --else --LINKS_DSO_PROGRAM = links-dso-program --LDLIBS-links-dso-program = -lstdc++ -lgcc -lgcc_s $(libunwind) --endif - - ifeq (yes,$(have-selinux)) - LDLIBS-$(LINKS_DSO_PROGRAM) += -lselinux diff --git a/gnu/packages/patches/htslib-for-stringtie.patch b/gnu/packages/patches/htslib-for-stringtie.patch deleted file mode 100644 index 3e6cd5bb63..0000000000 --- a/gnu/packages/patches/htslib-for-stringtie.patch +++ /dev/null @@ -1,26 +0,0 @@ -These changes are commits d7e357946ead219b81cc1becbe0de8a99d96ca84 and -8ed0daa39bc662defa99507f926815431056543a in -https://github.com/samtools/htscodecs. The stringtie package expects these -changes to have been applied. - -diff -ru htslib-1.12/htscodecs/htscodecs/tokenise_name3.c stringtie-2.2.0/htslib/htscodecs/htscodecs/tokenise_name3.c ---- a/htscodecs/htscodecs/tokenise_name3.c 2021-02-22 13:07:06.000000000 +0100 -+++ b/htscodecs/htscodecs/tokenise_name3.c 2021-12-04 19:27:39.000000000 +0100 -@@ -211,7 +211,7 @@ - if (!ctx) return NULL; - ctx->max_names = max_names; - pthread_setspecific(tok_key, ctx); -- } else if (ctx->max_names < max_names) { -+ } else if (ctx->max_names < max_names+1) { - ctx = realloc(ctx, sizeof(*ctx) + ++max_names*sizeof(*ctx->lc)); - if (!ctx) return NULL; - ctx->max_names = max_names; -@@ -1058,6 +1058,8 @@ - tok = decode_token_type(ctx, ntok); - //fprintf(stderr, "Tok %d = %d\n", ntok, tok); - -+ ctx->lc[cnum].last_ntok = 0; -+ - switch (tok) { - case N_CHAR: - if (len+1 >= name_len) return -1;
\ No newline at end of file diff --git a/gnu/packages/patches/p7zip-CVE-2016-9296.patch b/gnu/packages/patches/p7zip-CVE-2016-9296.patch deleted file mode 100644 index 3fa80377ad..0000000000 --- a/gnu/packages/patches/p7zip-CVE-2016-9296.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Robert Luberda <robert@debian.org> -Date: Sat, 19 Nov 2016 08:48:08 +0100 -Subject: Fix nullptr dereference (CVE-2016-9296) - -Patch taken from https://sourceforge.net/p/p7zip/bugs/185/ -This patch file taken from Debian's patch set for p7zip ---- - CPP/7zip/Archive/7z/7zIn.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/CPP/7zip/Archive/7z/7zIn.cpp b/CPP/7zip/Archive/7z/7zIn.cpp -index b0c6b98..7c6dde2 100644 ---- a/CPP/7zip/Archive/7z/7zIn.cpp -+++ b/CPP/7zip/Archive/7z/7zIn.cpp -@@ -1097,7 +1097,8 @@ HRESULT CInArchive::ReadAndDecodePackedStreams( - if (CrcCalc(data, unpackSize) != folders.FolderCRCs.Vals[i]) - ThrowIncorrect(); - } -- HeadersSize += folders.PackPositions[folders.NumPackStreams]; -+ if (folders.PackPositions) -+ HeadersSize += folders.PackPositions[folders.NumPackStreams]; - return S_OK; - } - diff --git a/gnu/packages/patches/p7zip-CVE-2017-17969.patch b/gnu/packages/patches/p7zip-CVE-2017-17969.patch deleted file mode 100644 index 51c24000e5..0000000000 --- a/gnu/packages/patches/p7zip-CVE-2017-17969.patch +++ /dev/null @@ -1,35 +0,0 @@ -Fix CVE-2017-17969: - -https://sourceforge.net/p/p7zip/bugs/204/ -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-17969 - -Patch copied from Debian. - -Subject: Heap-based buffer overflow in 7zip/Compress/ShrinkDecoder.cpp -Origin: vendor, https://sourceforge.net/p/p7zip/bugs/_discuss/thread/0920f369/27d7/attachment/CVE-2017-17969.patch -Forwarded: https://sourceforge.net/p/p7zip/bugs/_discuss/thread/0920f369/#27d7 -Bug: https://sourceforge.net/p/p7zip/bugs/204/ -Bug-Debian: https://bugs.debian.org/888297 -Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2017-17969 -Author: Antoine Beaupré <anarcat@debian.org> -Reviewed-by: Salvatore Bonaccorso <carnil@debian.org> -Last-Update: 2018-02-01 -Applied-Upstream: 18.00-beta - ---- a/CPP/7zip/Compress/ShrinkDecoder.cpp -+++ b/CPP/7zip/Compress/ShrinkDecoder.cpp -@@ -121,8 +121,13 @@ HRESULT CDecoder::CodeReal(ISequentialIn - { - _stack[i++] = _suffixes[cur]; - cur = _parents[cur]; -+ if (cur >= kNumItems || i >= kNumItems) -+ break; - } -- -+ -+ if (cur >= kNumItems || i >= kNumItems) -+ break; -+ - _stack[i++] = (Byte)cur; - lastChar2 = (Byte)cur; - diff --git a/gnu/packages/patches/p7zip-fix-build-with-gcc-11.patch b/gnu/packages/patches/p7zip-fix-build-with-gcc-11.patch deleted file mode 100644 index 20a40488d8..0000000000 --- a/gnu/packages/patches/p7zip-fix-build-with-gcc-11.patch +++ /dev/null @@ -1,49 +0,0 @@ -Building p7zip with GCC 11 or newer normally fails with error messages like - - ../../../../CPP/7zip/Archive/Wim/WimHandler.cpp:308:11: error: use of an - operand of type ‘bool’ in ‘operator++’ is forbidden in C++17 - 308 | numMethods++; - | ^~~~~~~~~~ - -This patch causes GCC to interpret the code using the GNU dialect of the C++14 -standard, as GCC 10 did by default, and reduces these errors to warnings. - -diff --git a/makefile.linux_amd64_asm b/makefile.linux_amd64_asm -index 075c6a8..b7d73ee 100644 ---- a/makefile.linux_amd64_asm -+++ b/makefile.linux_amd64_asm -@@ -11,6 +11,8 @@ ALLFLAGS=-m64 ${OPTFLAGS} -pipe \ - -D_7ZIP_ASM \ - $(LOCAL_FLAGS) - -+ALLFLAGS_CPP=-std=gnu++14 -+ - CXX=g++ - CC=gcc - CC_SHARED=-fPIC -diff --git a/makefile.linux_any_cpu_gcc_4.X b/makefile.linux_any_cpu_gcc_4.X -index be093b5..c0f3120 100644 ---- a/makefile.linux_any_cpu_gcc_4.X -+++ b/makefile.linux_any_cpu_gcc_4.X -@@ -10,7 +10,7 @@ ALLFLAGS=${OPTFLAGS} -pipe \ - -D_7ZIP_LARGE_PAGES \ - $(LOCAL_FLAGS) - --ALLFLAGS_CPP=-DENV_HAVE_GCCVISIBILITYPATCH -fvisibility=hidden -fvisibility-inlines-hidden -+ALLFLAGS_CPP=-DENV_HAVE_GCCVISIBILITYPATCH -std=gnu++14 -fvisibility=hidden -fvisibility-inlines-hidden - - CXX=g++ - CC=gcc -diff --git a/makefile.linux_x86_asm_gcc_4.X b/makefile.linux_x86_asm_gcc_4.X -index 1ac339b..6e736d9 100644 ---- a/makefile.linux_x86_asm_gcc_4.X -+++ b/makefile.linux_x86_asm_gcc_4.X -@@ -12,7 +12,7 @@ ALLFLAGS=${OPTFLAGS} -pipe -m32 \ - -D_7ZIP_ASM \ - $(LOCAL_FLAGS) - --ALLFLAGS_CPP=-DENV_HAVE_GCCVISIBILITYPATCH -fvisibility=hidden -fvisibility-inlines-hidden -+ALLFLAGS_CPP=-DENV_HAVE_GCCVISIBILITYPATCH -std=gnu++14 -fvisibility=hidden -fvisibility-inlines-hidden - - CXX=g++ - CC=gcc diff --git a/gnu/packages/patches/p7zip-remove-unused-code.patch b/gnu/packages/patches/p7zip-remove-unused-code.patch deleted file mode 100644 index f9c782b93e..0000000000 --- a/gnu/packages/patches/p7zip-remove-unused-code.patch +++ /dev/null @@ -1,959 +0,0 @@ -diff --git a/C/Sha1.c b/C/Sha1.c -index 55c1c63..48b4c5d 100644 ---- a/C/Sha1.c -+++ b/C/Sha1.c -@@ -104,39 +104,6 @@ void Sha1_GetBlockDigest(CSha1 *p, const UInt32 *data, UInt32 *destDigest) - destDigest[4] = p->state[4] + e; - } - --void Sha1_UpdateBlock_Rar(CSha1 *p, UInt32 *data, int returnRes) --{ -- UInt32 a, b, c, d, e; -- UInt32 W[kNumW]; -- -- a = p->state[0]; -- b = p->state[1]; -- c = p->state[2]; -- d = p->state[3]; -- e = p->state[4]; -- -- RX_15 -- -- RX_1_4(R0, R1, 15); -- -- RX_20(R2, 20); -- RX_20(R3, 40); -- RX_20(R4, 60); -- -- p->state[0] += a; -- p->state[1] += b; -- p->state[2] += c; -- p->state[3] += d; -- p->state[4] += e; -- -- if (returnRes) -- { -- unsigned i; -- for (i = 0 ; i < SHA1_NUM_BLOCK_WORDS; i++) -- data[i] = W[kNumW - SHA1_NUM_BLOCK_WORDS + i]; -- } --} -- - #define Sha1_UpdateBlock(p) Sha1_GetBlockDigest(p, p->buffer, p->state) - - void Sha1_Update(CSha1 *p, const Byte *data, size_t size) -@@ -212,46 +179,6 @@ void Sha1_Update(CSha1 *p, const Byte *data, size_t size) - } - } - --void Sha1_Update_Rar(CSha1 *p, Byte *data, size_t size /* , int rar350Mode */) --{ -- int returnRes = False; -- -- unsigned pos = (unsigned)p->count & 0x3F; -- p->count += size; -- -- while (size--) -- { -- unsigned pos2 = (pos & 3); -- UInt32 v = ((UInt32)*data++) << (8 * (3 - pos2)); -- UInt32 *ref = &(p->buffer[pos >> 2]); -- pos++; -- if (pos2 == 0) -- { -- *ref = v; -- continue; -- } -- *ref |= v; -- -- if (pos == SHA1_BLOCK_SIZE) -- { -- pos = 0; -- Sha1_UpdateBlock_Rar(p, p->buffer, returnRes); -- if (returnRes) -- { -- unsigned i; -- for (i = 0; i < SHA1_NUM_BLOCK_WORDS; i++) -- { -- UInt32 d = p->buffer[i]; -- Byte *prev = data + i * 4 - SHA1_BLOCK_SIZE; -- SetUi32(prev, d); -- } -- } -- // returnRes = rar350Mode; -- returnRes = True; -- } -- } --} -- - void Sha1_Final(CSha1 *p, Byte *digest) - { - unsigned pos = (unsigned)p->count & 0x3F; -diff --git a/C/Sha1.h b/C/Sha1.h -index aa22ec3..9c45653 100644 ---- a/C/Sha1.h -+++ b/C/Sha1.h -@@ -27,8 +27,6 @@ void Sha1_GetBlockDigest(CSha1 *p, const UInt32 *data, UInt32 *destDigest); - void Sha1_Update(CSha1 *p, const Byte *data, size_t size); - void Sha1_Final(CSha1 *p, Byte *digest); - --void Sha1_Update_Rar(CSha1 *p, Byte *data, size_t size /* , int rar350Mode */); -- - void Sha1_32_PrepareBlock(const CSha1 *p, UInt32 *block, unsigned size); - void Sha1_32_Update(CSha1 *p, const UInt32 *data, size_t size); - void Sha1_32_Final(CSha1 *p, UInt32 *digest); -diff --git a/CPP/7zip/Archive/7z/7zUpdate.cpp b/CPP/7zip/Archive/7z/7zUpdate.cpp -index a0571e7..43ad3e9 100644 ---- a/CPP/7zip/Archive/7z/7zUpdate.cpp -+++ b/CPP/7zip/Archive/7z/7zUpdate.cpp -@@ -562,7 +562,7 @@ static int CompareEmptyItems(const unsigned *p1, const unsigned *p2, void *param - } - - static const char *g_Exts = -- " 7z xz lzma ace arc arj bz tbz bz2 tbz2 cab deb gz tgz ha lha lzh lzo lzx pak rar rpm sit zoo" -+ " 7z xz lzma ace arc arj bz tbz bz2 tbz2 cab deb gz tgz ha lha lzh lzo lzx pak rpm sit zoo" - " zip jar ear war msi" - " 3gp avi mov mpeg mpg mpe wmv" - " aac ape fla flac la mp3 m4a mp4 ofr ogg pac ra rm rka shn swa tta wv wma wav" -diff --git a/CPP/7zip/Bundles/Format7zFree/makefile.list b/CPP/7zip/Bundles/Format7zFree/makefile.list -index da2056b..1dcf1a5 100644 ---- a/CPP/7zip/Bundles/Format7zFree/makefile.list -+++ b/CPP/7zip/Bundles/Format7zFree/makefile.list -@@ -87,8 +87,6 @@ SRCS=\ - ../../../../CPP/7zip/Archive/PeHandler.cpp \ - ../../../../CPP/7zip/Archive/PpmdHandler.cpp \ - ../../../../CPP/7zip/Archive/QcowHandler.cpp \ -- ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp \ -- ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp \ - ../../../../CPP/7zip/Archive/RpmHandler.cpp \ - ../../../../CPP/7zip/Archive/SplitHandler.cpp \ - ../../../../CPP/7zip/Archive/SquashfsHandler.cpp \ -@@ -191,9 +189,6 @@ SRCS=\ - ../../../../CPP/7zip/Crypto/MyAesReg.cpp \ - ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp \ - ../../../../CPP/7zip/Crypto/RandGen.cpp \ -- ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp \ -- ../../../../CPP/7zip/Crypto/Rar5Aes.cpp \ -- ../../../../CPP/7zip/Crypto/RarAes.cpp \ - ../../../../CPP/7zip/Crypto/WzAes.cpp \ - ../../../../CPP/7zip/Crypto/ZipCrypto.cpp \ - ../../../../CPP/7zip/Crypto/ZipStrong.cpp \ -@@ -485,10 +480,6 @@ PpmdHandler.o : ../../../../CPP/7zip/Archive/PpmdHandler.cpp - $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/PpmdHandler.cpp - QcowHandler.o : ../../../../CPP/7zip/Archive/QcowHandler.cpp - $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/QcowHandler.cpp --RarHandler.o : ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp -- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp --Rar5Handler.o : ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp -- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp - RpmHandler.o : ../../../../CPP/7zip/Archive/RpmHandler.cpp - $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Archive/RpmHandler.cpp - SplitHandler.o : ../../../../CPP/7zip/Archive/SplitHandler.cpp -@@ -693,12 +684,6 @@ Pbkdf2HmacSha1.o : ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp - $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp - RandGen.o : ../../../../CPP/7zip/Crypto/RandGen.cpp - $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/RandGen.cpp --Rar20Crypto.o : ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp -- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp --Rar5Aes.o : ../../../../CPP/7zip/Crypto/Rar5Aes.cpp -- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/Rar5Aes.cpp --RarAes.o : ../../../../CPP/7zip/Crypto/RarAes.cpp -- $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/RarAes.cpp - WzAes.o : ../../../../CPP/7zip/Crypto/WzAes.cpp - $(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Crypto/WzAes.cpp - ZipCrypto.o : ../../../../CPP/7zip/Crypto/ZipCrypto.cpp -@@ -869,8 +854,6 @@ OBJS=\ - PeHandler.o \ - PpmdHandler.o \ - QcowHandler.o \ -- RarHandler.o \ -- Rar5Handler.o \ - RpmHandler.o \ - SplitHandler.o \ - SquashfsHandler.o \ -@@ -973,9 +956,6 @@ OBJS=\ - MyAesReg.o \ - Pbkdf2HmacSha1.o \ - RandGen.o \ -- Rar20Crypto.o \ -- Rar5Aes.o \ -- RarAes.o \ - WzAes.o \ - ZipCrypto.o \ - ZipStrong.o \ -diff --git a/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt b/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt -index 61f41f9..adc7117 100644 ---- a/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt -+++ b/CPP/7zip/CMAKE/Format7zFree/CMakeLists.txt -@@ -126,8 +126,6 @@ add_library(7z MODULE - "../../../../CPP/7zip/Archive/PeHandler.cpp" - "../../../../CPP/7zip/Archive/PpmdHandler.cpp" - "../../../../CPP/7zip/Archive/QcowHandler.cpp" -- "../../../../CPP/7zip/Archive/Rar/RarHandler.cpp" -- "../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp" - "../../../../CPP/7zip/Archive/RpmHandler.cpp" - "../../../../CPP/7zip/Archive/SplitHandler.cpp" - "../../../../CPP/7zip/Archive/SquashfsHandler.cpp" -@@ -230,9 +228,6 @@ add_library(7z MODULE - "../../../../CPP/7zip/Crypto/MyAesReg.cpp" - "../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp" - "../../../../CPP/7zip/Crypto/RandGen.cpp" -- "../../../../CPP/7zip/Crypto/Rar20Crypto.cpp" -- "../../../../CPP/7zip/Crypto/Rar5Aes.cpp" -- "../../../../CPP/7zip/Crypto/RarAes.cpp" - "../../../../CPP/7zip/Crypto/WzAes.cpp" - "../../../../CPP/7zip/Crypto/ZipCrypto.cpp" - "../../../../CPP/7zip/Crypto/ZipStrong.cpp" -diff --git a/CPP/7zip/Crypto/Sha1Cls.h b/CPP/7zip/Crypto/Sha1Cls.h -index 71acbde..cde4a57 100644 ---- a/CPP/7zip/Crypto/Sha1Cls.h -+++ b/CPP/7zip/Crypto/Sha1Cls.h -@@ -28,7 +28,6 @@ class CContext: public CContextBase - { - public: - void Update(const Byte *data, size_t size) throw() { Sha1_Update(&_s, data, size); } -- void UpdateRar(Byte *data, size_t size /* , bool rar350Mode */) throw() { Sha1_Update_Rar(&_s, data, size /* , rar350Mode ? 1 : 0 */); } - void Final(Byte *digest) throw() { Sha1_Final(&_s, digest); } - }; - -diff --git a/CPP/7zip/Guid.txt b/CPP/7zip/Guid.txt -index 7edab6e..cc22992 100644 ---- a/CPP/7zip/Guid.txt -+++ b/CPP/7zip/Guid.txt -@@ -151,7 +151,6 @@ Handler GUIDs: - - 01 Zip - 02 BZip2 -- 03 Rar - 04 Arj - 05 Z - 06 Lzh -@@ -168,7 +167,6 @@ Handler GUIDs: - C9 VDI - CA Qcow - CB GPT -- CC Rar5 - CD IHex - CE Hxs - CF TE -diff --git a/CPP/7zip/QMAKE/Format7zFree/Format7zFree.pro b/CPP/7zip/QMAKE/Format7zFree/Format7zFree.pro -index afa36d4..93c45c7 100644 ---- a/CPP/7zip/QMAKE/Format7zFree/Format7zFree.pro -+++ b/CPP/7zip/QMAKE/Format7zFree/Format7zFree.pro -@@ -137,8 +137,6 @@ SOURCES += \ - ../../../../CPP/7zip/Archive/PeHandler.cpp \ - ../../../../CPP/7zip/Archive/PpmdHandler.cpp \ - ../../../../CPP/7zip/Archive/QcowHandler.cpp \ -- ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp \ -- ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp \ - ../../../../CPP/7zip/Archive/RpmHandler.cpp \ - ../../../../CPP/7zip/Archive/SplitHandler.cpp \ - ../../../../CPP/7zip/Archive/SquashfsHandler.cpp \ -@@ -241,9 +239,6 @@ SOURCES += \ - ../../../../CPP/7zip/Crypto/MyAesReg.cpp \ - ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp \ - ../../../../CPP/7zip/Crypto/RandGen.cpp \ -- ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp \ -- ../../../../CPP/7zip/Crypto/Rar5Aes.cpp \ -- ../../../../CPP/7zip/Crypto/RarAes.cpp \ - ../../../../CPP/7zip/Crypto/WzAes.cpp \ - ../../../../CPP/7zip/Crypto/ZipCrypto.cpp \ - ../../../../CPP/7zip/Crypto/ZipStrong.cpp \ -diff --git a/CPP/7zip/QMAKE/all.pro b/CPP/7zip/QMAKE/all.pro -index a565ba8..6668619 100644 ---- a/CPP/7zip/QMAKE/all.pro -+++ b/CPP/7zip/QMAKE/all.pro -@@ -4,7 +4,6 @@ SUBDIRS = 7za \ - 7zr \ - 7z_ \ - Format7zFree \ -- Rar \ - Lzham \ - test_lib - -diff --git a/CPP/7zip/UI/Client7z/Client7z.cpp b/CPP/7zip/UI/Client7z/Client7z.cpp -index d0eca6d..7f4e6e2 100644 ---- a/CPP/7zip/UI/Client7z/Client7z.cpp -+++ b/CPP/7zip/UI/Client7z/Client7z.cpp -@@ -32,7 +32,7 @@ HINSTANCE g_hInstance = 0; - #endif - - // Tou can find the list of all GUIDs in Guid.txt file. --// use another CLSIDs, if you want to support other formats (zip, rar, ...). -+// use another CLSIDs, if you want to support other formats (zip, ...). - // {23170F69-40C1-278A-1000-000110070000} - - DEFINE_GUID(CLSID_CFormat7z, -diff --git a/CPP/7zip/UI/Common/LoadCodecs.h b/CPP/7zip/UI/Common/LoadCodecs.h -index ac9eeac..076bd1c 100644 ---- a/CPP/7zip/UI/Common/LoadCodecs.h -+++ b/CPP/7zip/UI/Common/LoadCodecs.h -@@ -158,7 +158,6 @@ struct CArcInfoEx - void AddExts(const UString &ext, const UString &addExt); - - bool IsSplit() const { return StringsAreEqualNoCase_Ascii(Name, "Split"); } -- // bool IsRar() const { return StringsAreEqualNoCase_Ascii(Name, "Rar"); } - - CArcInfoEx(): - Flags(0), -diff --git a/CPP/7zip/UI/Common/OpenArchive.cpp b/CPP/7zip/UI/Common/OpenArchive.cpp -index 7d5b0c4..88ea5ab 100644 ---- a/CPP/7zip/UI/Common/OpenArchive.cpp -+++ b/CPP/7zip/UI/Common/OpenArchive.cpp -@@ -1063,7 +1063,6 @@ static const char * const k_Formats_with_simple_signuature[] = - { - "7z" - , "xz" -- , "rar" - , "bzip2" - , "gzip" - , "cab" -@@ -1720,29 +1719,6 @@ HRESULT CArc::OpenStream2(const COpenOptions &op) - { - // signature search was here - } -- else if (extension.IsEqualTo("000") || extension.IsEqualTo("001")) -- { -- int i = FindFormatForArchiveType(op.codecs, orderIndices, "rar"); -- if (i >= 0) -- { -- const size_t kBufSize = (1 << 10); -- byteBuffer.Alloc(kBufSize); -- size_t processedSize = kBufSize; -- RINOK(ReadStream(op.stream, byteBuffer, &processedSize)); -- if (processedSize >= 16) -- { -- const Byte *buf = byteBuffer; -- const Byte kRarHeader[] = { 0x52 , 0x61, 0x72, 0x21, 0x1a, 0x07, 0x00 }; -- if (TestSignature(buf, kRarHeader, 7) && buf[9] == 0x73 && (buf[10] & 1) != 0) -- { -- orderIndices2.Add(orderIndices[i]); -- orderIndices[i] = -1; -- if (i >= (int)numFinded) -- numFinded++; -- } -- } -- } -- } - else - { - const size_t kBufSize = (1 << 10); -diff --git a/CPP/7zip/UI/FileManager/FM_rc.cpp b/CPP/7zip/UI/FileManager/FM_rc.cpp -index 83578ed..034feed 100644 ---- a/CPP/7zip/UI/FileManager/FM_rc.cpp -+++ b/CPP/7zip/UI/FileManager/FM_rc.cpp -@@ -821,8 +821,6 @@ REGISTER_STRINGTABLE(g_stringTable) - - ///////////////////////////////////////////////////// - --#include "res/ParentFolder.h" -- - SevenZipPanel::SevenZipPanel(MyFrame *frame, wxWindow *parent,int id,int panelIndex) : - wxPanel(parent,id) , m_frame(frame), _wList(0) - { -@@ -840,7 +838,7 @@ REGISTER_STRINGTABLE(g_stringTable) - int sizes[] = {150, 250, 350, -1}; - wxArrayString pathArray; - wxBoxSizer *pPathSizer = new wxBoxSizer(wxHORIZONTAL); -- m_pBmpButtonParentFolder = new wxBitmapButton(this, kParentFolderID, wxGetBitmapFromMemory(PARENT_FOLDER), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW); -+ m_pBmpButtonParentFolder = new wxBitmapButton(this, kParentFolderID, wxArtProvider::GetBitmap(wxART_GO_DIR_UP, wxART_TOOLBAR, wxDefaultSize), wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW); - m_pComboBoxPath = new wxComboBox(this, _comboBoxID, wxEmptyString, wxDefaultPosition, wxSize(300,-1), pathArray, wxCB_DROPDOWN | wxCB_SORT ); - pPathSizer->Add(m_pBmpButtonParentFolder, 0, wxALL|wxEXPAND, 0); - pPathSizer->Add(m_pComboBoxPath, 1, wxALL|wxEXPAND, 5); -diff --git a/CPP/ANDROID/Format7zFree/jni/Android.mk b/CPP/ANDROID/Format7zFree/jni/Android.mk -index 7c74e73..48cb4fa 100644 ---- a/CPP/ANDROID/Format7zFree/jni/Android.mk -+++ b/CPP/ANDROID/Format7zFree/jni/Android.mk -@@ -91,8 +91,6 @@ LOCAL_SRC_FILES := \ - ../../../../CPP/7zip/Archive/PeHandler.cpp \ - ../../../../CPP/7zip/Archive/PpmdHandler.cpp \ - ../../../../CPP/7zip/Archive/QcowHandler.cpp \ -- ../../../../CPP/7zip/Archive/Rar/RarHandler.cpp \ -- ../../../../CPP/7zip/Archive/Rar/Rar5Handler.cpp \ - ../../../../CPP/7zip/Archive/RpmHandler.cpp \ - ../../../../CPP/7zip/Archive/SplitHandler.cpp \ - ../../../../CPP/7zip/Archive/SquashfsHandler.cpp \ -@@ -195,9 +193,6 @@ LOCAL_SRC_FILES := \ - ../../../../CPP/7zip/Crypto/MyAesReg.cpp \ - ../../../../CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp \ - ../../../../CPP/7zip/Crypto/RandGen.cpp \ -- ../../../../CPP/7zip/Crypto/Rar20Crypto.cpp \ -- ../../../../CPP/7zip/Crypto/Rar5Aes.cpp \ -- ../../../../CPP/7zip/Crypto/RarAes.cpp \ - ../../../../CPP/7zip/Crypto/WzAes.cpp \ - ../../../../CPP/7zip/Crypto/ZipCrypto.cpp \ - ../../../../CPP/7zip/Crypto/ZipStrong.cpp \ -diff --git a/ChangeLog b/ChangeLog -index daabd8e..f2a01d6 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -28,7 +28,6 @@ Version 16.00 (never published) - - 7z update bcj bugs were fixed. - - split (aaa.001) fixed - - iso loop fix -- - rar4 multivol -stdin kpidSize - - drag and drop 1<2.txt - - memory access violation fix - -@@ -80,11 +79,6 @@ Version 15.12 (never published) - - "There are no errors" string after "Test" operation inside archive. - - The bugs in LZMA SDK were fixed (but these bugs are not related directly to 7-Zip's code). - -- -- - From Windows version of 7-Zip 15.11 : -- - Some bugs were fixed. -- - 7-Zip 15.10 showed incorrect error message about missing volume for multivolume RAR archives. -- - - ..../LZHAM added - - -@@ -104,9 +98,6 @@ Version 15.10 beta - version (-m switch). - - Some bugs were fixed. - - extracting from solid wim archives worked incorrectly in some cases, -- - Also there are some minor changes. -- - 7-Zip can show the name of missing volume for multivolume RAR and VMDK archives. -- - Some internal changes with 7-Zip Benchmark. - - Version 15.09 beta - ================== -@@ -128,8 +119,6 @@ Version 15.08 beta - Version 15.07 beta - ================== - -- - "bin/Codecs/Rar29.so" renamed to "bin/Codecs/Rar.so" -- - - support for cygwin 64 bits - - - support for cygwin 64 bits with asm -@@ -153,15 +142,12 @@ Version 15.07 beta - - - From Windows version of 7-zip 15.06 beta: - -- - 7-Zip now can extract RAR5 archives. - - 7-Zip now doesn't sort files by type while adding to solid 7z archive. - new -mqs switch to sort files by type while adding to solid 7z archive. - - The BUG in 7-Zip File Manager was fixed: - The "Move" operation to open 7z archive didn't delete empty files. - - The BUG in 15.05 was fixed: - console version added some text to the end of stdout stream, is -so switch was used. -- - The BUG in 9.30 - 15.05 was fixed: -- 7-Zip could not open multivolume sfx RAR archive. - - Some bugs were fixed. - - - From Windows version of 7-zip 15.05 beta: -@@ -214,9 +200,6 @@ Version 9.38 - - bug #139 "password from commanline is visible in processes list" - Now the characters of the password are replaced with *. - -- - From Windows version of 7-zip -- - bug#138 If you extract the password with # program crashes -- 7z now supports long password in RAR 3 and 4. - - - -@@ -247,12 +230,6 @@ Version 9.22 - - #3283518 : Asm/x{32,64}/7zCrcT8U.asm introduces executable stack - - --Version 9.20.1 --============== -- -- - #3211479 "p7zip 9.20 - "unsupported method" with RAR files - " fixed -- "install.sh" installs again "bin/Codecs/Rar29.so" -- - Version 9.20 - ============ - -@@ -325,8 +302,6 @@ Version 9.13 - - Some bugs were fixed. - - -- - #2863580 "Crash in Rar decoder on a corrupted file" fixed -- - - #2860898 "Dereferencing a zero pointer in cab handler" fixed - - - #2860679 "Division by zero in cab decoder" fixed -@@ -455,7 +430,7 @@ Version 4.59 (never published) - - It's allowed to use -t switch for "list" and "extract" commands. - - Some bugs were fixed. - -- - Bug : wrong timestamp for files extracted from .zip or .rar archives -+ - Bug : wrong timestamp for files extracted from .zip archives - - - Version 4.58 -@@ -468,8 +443,6 @@ Version 4.58 - 2) -mcu switch: 7-Zip uses UTF-8, if there are non-ASCII symbols. - 3) -mcl switch: 7-Zip uses local code page. - - Now it's possible to store file creation time in 7z and ZIP archives (-mtc switch). -- - 7-Zip now can unpack multivolume RAR archives created with -- "old style volume names" scheme and names *.001, *.002, ... - - Now it's possible to use -mSW- and -mSW+ switches instead of -mSW=off and -mSW=on - - Some bugs were fixed. - -@@ -685,7 +658,7 @@ Version 4.44 - - - From Windows version of 7-zip 4.44 : - - 7za : Cab support -- - Speed optimizations for LZMA, Deflate, BZip2 and unRAR. -+ - Speed optimizations for LZMA, Deflate and BZip2. - - fix : now, updating a crypted header archive keeps the crypted header - - - fixes in the help displayed by 7za/7z/7zr. -@@ -805,8 +778,6 @@ Version 4.38 - - - patch #1465026 - Patch for install.sh for packagers - -- - DosDateTimeToFileTime fixed (rar format) -- - - contrib/VirtualFileSystemForMidnightCommander/u7z updated - (thank sgh_punk) - -@@ -923,8 +894,6 @@ Version 4.25 - - Some bugs were fixed - - DOCS/MANUAL/exit_codes.htm added - -- - new plugin for 7z : RAR format support (extracting only) -- - - better dependencies in makefile - - Version 4.23 -@@ -1112,9 +1081,6 @@ Version 4.10 - - new port of 7za from the source of 7za 4.10Beta for Windows - => p7zip now work on big endian CPU. - -- - 7z for Unix is not maintain anymore (because as the source of unrar plugin for 7z -- is not available, 7z is unless on Unix). -- - Version 0.91 - ============ - - add support for FreeBSD 5.2.1 -diff --git a/DOC/License.txt b/DOC/License.txt -index 0bcbe26..5b0dfaa 100644 ---- a/DOC/License.txt -+++ b/DOC/License.txt -@@ -5,15 +5,6 @@ - - 7-Zip Copyright (C) 1999-2016 Igor Pavlov. - -- Licenses for files are: -- -- 1) CPP/7zip/Compress/Rar* files: GNU LGPL + unRAR restriction -- 2) All other files: GNU LGPL -- -- The GNU LGPL + unRAR restriction means that you must follow both -- GNU LGPL rules and unRAR restriction rules. -- -- - GNU LGPL information - -------------------- - -@@ -33,21 +24,5 @@ - USA - - -- unRAR restriction -- ----------------- -- -- The decompression engine for RAR archives was developed using source -- code of unRAR program. -- All copyrights to original unRAR code are owned by Alexander Roshal. -- -- The license for original unRAR code has the following restriction: -- -- The unRAR sources cannot be used to re-create the RAR compression algorithm, -- which is proprietary. Distribution of modified unRAR sources in separate form -- or as a part of other software is permitted, provided that it is clearly -- stated in the documentation and source comments that the code may -- not be used to develop a RAR (WinRAR) compatible archiver. -- -- - -- - Igor Pavlov -diff --git a/DOC/MANUAL/cmdline/switches/update.htm b/DOC/MANUAL/cmdline/switches/update.htm -index 27385b1..0190fc1 100644 ---- a/DOC/MANUAL/cmdline/switches/update.htm -+++ b/DOC/MANUAL/cmdline/switches/update.htm -@@ -139,7 +139,7 @@ someone in another time zone.</P> - <LI>UTC file systems: NTFS
- <LI>UTC archive formats: .zip with -mtc switch, 7z, tar, gzip2, iso, wim
- <LI>Local time file systems : FAT, FAT32
--<LI>Local time archive formats : rar, zip, cab
-+<LI>Local time archive formats : zip, cab
- </UL>
-
- <H4>Examples</H4>
-diff --git a/DOC/MANUAL/general/formats.htm b/DOC/MANUAL/general/formats.htm -index 7996c5c..cd01bd6 100644 ---- a/DOC/MANUAL/general/formats.htm -+++ b/DOC/MANUAL/general/formats.htm -@@ -47,7 +47,6 @@ - <TR> <TD align="center">NSIS</TD> <TD></TD> <TD>nsis</TD> </TR>
- <TR> <TD align="center">NTFS</TD> <TD></TD> <TD>ntfs img</TD> </TR>
- <TR> <TD align="center">MBR</TD> <TD></TD> <TD>mbr</TD> </TR>
-- <TR> <TD align="center">RAR</TD> <TD></TD> <TD>rar r00</TD> </TR>
- <TR> <TD align="center">RPM</TD> <TD></TD> <TD>rpm</TD></TR>
- <TR> <TD align="center">PPMD</TD> <TD></TD> <TD>ppmd</TD> </TR>
- <TR> <TD align="center">QCOW2</TD> <TD></TD> <TD>qcow qcow2 qcow2c</TD> </TR>
-diff --git a/DOC/Methods.txt b/DOC/Methods.txt -index 1a1c54c..daa94e2 100644 ---- a/DOC/Methods.txt -+++ b/DOC/Methods.txt -@@ -97,12 +97,6 @@ List of defined IDs - 02 - - 02 - BZip2 - -- 03 - [Rar] -- 01 - Rar1 -- 02 - Rar2 -- 03 - Rar3 -- 05 - Rar5 -- - 04 - [Arj] - 01 - Arj(1,2,3) - 02 - Arj4 -@@ -146,10 +140,6 @@ List of defined IDs - 01 - [Zip] - 01 - ZipCrypto (Main Zip crypto algo) - -- 03 - [RAR] -- 02 - -- 03 - Rar29AES (AES-128 + modified SHA-1) -- - 07 - [7z] - 01 - 7zAES (AES-256 + SHA-256) - -diff --git a/DOC/readme.txt b/DOC/readme.txt -index 4a6998c..00591d4 100644 ---- a/DOC/readme.txt -+++ b/DOC/readme.txt -@@ -9,30 +9,9 @@ - License Info - ------------ - --7-Zip is free software distributed under the GNU LGPL --(except for unRar code). -+7-Zip is free software distributed under the GNU LGPL. - read License.txt for more infomation about license. - --Notes about unRAR license: -- --Please check main restriction from unRar license: -- -- 2. The unRAR sources may be used in any software to handle RAR -- archives without limitations free of charge, but cannot be used -- to re-create the RAR compression algorithm, which is proprietary. -- Distribution of modified unRAR sources in separate form or as a -- part of other software is permitted, provided that it is clearly -- stated in the documentation and source comments that the code may -- not be used to develop a RAR (WinRAR) compatible archiver. -- --In brief it means: --1) You can compile and use compiled files under GNU LGPL rules, since -- unRAR license almost has no restrictions for compiled files. -- You can link these compiled files to LGPL programs. --2) You can fix bugs in source code and use compiled fixed version. --3) You can not use unRAR sources to re-create the RAR compression algorithm. -- -- - LZMA SDK - -------- - -@@ -96,7 +75,6 @@ DOC Documentation - --- - 7zFormat.txt - 7z format description - copying.txt - GNU LGPL license -- unRarLicense.txt - License for unRAR part of source code - src-history.txt - Sources history - Methods.txt - Compression method IDs - readme.txt - Readme file -diff --git a/DOC/src-history.txt b/DOC/src-history.txt -index 6b48c80..dda8057 100644 ---- a/DOC/src-history.txt -+++ b/DOC/src-history.txt -@@ -188,8 +188,6 @@ HISTORY of the 7-Zip source code - - 7-Zip now has 128 MB dictionary limit for 32-bit version: - It's for speed optimization: kNumLogBits = 9 + sizeof(size_t) / 2; - - TAR: 'D' link flag support. --- 7-Zip now can unpack multivolume RAR archives created with -- "old style volume names" scheme (-vn switch) and names *.001, *.002, ... - - Fixed bugs: - - 7-Zip FM could not copy / move files to root network folders like \\COMPNAME\FOLDERNAME\ - In case of move it removed original files. -@@ -200,8 +198,6 @@ HISTORY of the 7-Zip source code - 7-zip tries to delete all extra fileds (except for WzAES). - And that code could hang. - - 7-Zip GUI didn't suggest BZip2 dictionary size used in previous run. -- - If creation time stamp was included in .RAR archive, 7-zip used creation time stamp -- as modification time stamp. - - 4.58 alpha 2 2007-12-31 - ------------------------- -@@ -251,7 +247,6 @@ HISTORY of the 7-Zip source code - stratup code, or you must add CPP/Common/CRC.cpp to your project. - - Method ID in .7z now is 63-bit integer (UInt64). - - Open error messages --- unRar 1.5 fixed - - unShrink fixed - - BUG of 4.43 beta and 4.44 beta was fixed. - 7-Zip compressing to .zip in multi-threading mode didn't work in some cases. -@@ -433,11 +428,6 @@ HISTORY of the 7-Zip source code - contains common resurces - - --2.30 Beta 19 2002-04-11 --------------------------- --- SDK/Archive/Rar/Handler.cpp -- supporting RAR29 -- - 2.30 Beta 18 2002-03-25 - ------------------------- - - SDK/Archive/Cab/MSZipDecoder.cpp -diff --git a/GUI/Contents/Info.plist b/GUI/Contents/Info.plist -index 71650e1..d60b262 100644 ---- a/GUI/Contents/Info.plist -+++ b/GUI/Contents/Info.plist -@@ -311,24 +311,6 @@ - <dict> - <key>CFBundleTypeExtensions</key> - <array> -- <string>rar</string> -- <string>RAR</string> -- <string>.r00</string> -- </array> -- <key>CFBundleTypeIconFile</key> -- <string>p7zip</string> -- <key>CFBundleTypeName</key> -- <string>Rar</string> -- <key>CFBundleTypeRole</key> -- <string>Viewer</string> -- <key>LSTypeIsPackage</key> -- <false/> -- <key>NSPersistentStoreTypeKey</key> -- <string>XML</string> -- </dict> -- <dict> -- <key>CFBundleTypeExtensions</key> -- <array> - <string>ace</string> - <string>ACE</string> - <string>.c00</string> -diff --git a/README b/README -index b76407f..c03917b 100644 ---- a/README -+++ b/README -@@ -8,7 +8,7 @@ p7zip is a port of the Windows programs 7z.exe and 7za.exe provided by 7-zip. - 7-zip is a file archiver with the highest compression ratio. - Homepage : www.7-zip.org - -- 7z uses plugins (7z.so and Codecs/Rar.so) to handle archives. -+ 7z uses plugins (7z.so) to handle archives. - 7za is a stand-alone executable (7za handles less archive formats than 7z). - 7zr is a light stand-alone executable that supports only 7z/LZMA/BCJ/BCJ2. - -@@ -63,7 +63,6 @@ BUILD : - make sfx : to build bin/7zCon.sfx (7za can now create SFX archive) - make 7z : to build bin/7z and its plugins : - - "bin/7z.so" (GNU LGPL + AES code license) -- - "bin/Codecs/Rar.so" (GNU LGPL + unRAR restriction) - make 7zr : to build bin/7zr - make all : to build bin/7za and bin/7zCon.sfx - make all2 : to build bin/7za, bin/7z (with its plugins) and bin/7zCon.sfx -@@ -74,7 +73,6 @@ BUILD : - - make 7zG : to build bin/7zG and its plugins : - - "bin/7z.so" (GNU LGPL + AES code license) -- - "bin/Codecs/Rar.so" (GNU LGPL + unRAR restriction) - make test_7zG : to test bin/7zG (extracting, archiving, ...) - - -diff --git a/Utils/bin_to_sources.py b/Utils/bin_to_sources.py -index 1be72ec..7da359a 100644 ---- a/Utils/bin_to_sources.py -+++ b/Utils/bin_to_sources.py -@@ -13,9 +13,6 @@ file0='Utils/file_7zCon_sfx.py' - dir0='CPP/7zip/UI/Console' - file0='Utils/file_7z.py' - --dir0='CPP/7zip/Compress/Rar' --file0='Utils/file_Codecs_Rar_so.py' -- - dir0='CPP/7zip/Bundles/Format7zFree' - file0='Utils/file_7z_so.py' - -diff --git a/Utils/file_7z_so.py b/Utils/file_7z_so.py -index 7ca9fff..43edb87 100644 ---- a/Utils/file_7z_so.py -+++ b/Utils/file_7z_so.py -@@ -111,8 +111,6 @@ files_cpp=[ - 'CPP/7zip/Archive/PeHandler.cpp', - 'CPP/7zip/Archive/PpmdHandler.cpp', - 'CPP/7zip/Archive/QcowHandler.cpp', -- 'CPP/7zip/Archive/Rar/RarHandler.cpp', -- 'CPP/7zip/Archive/Rar/Rar5Handler.cpp', - 'CPP/7zip/Archive/RpmHandler.cpp', - 'CPP/7zip/Archive/SplitHandler.cpp', - 'CPP/7zip/Archive/SquashfsHandler.cpp', -@@ -215,9 +213,6 @@ files_cpp=[ - 'CPP/7zip/Crypto/MyAesReg.cpp', - 'CPP/7zip/Crypto/Pbkdf2HmacSha1.cpp', - 'CPP/7zip/Crypto/RandGen.cpp', -- 'CPP/7zip/Crypto/Rar20Crypto.cpp', -- 'CPP/7zip/Crypto/Rar5Aes.cpp', -- 'CPP/7zip/Crypto/RarAes.cpp', - 'CPP/7zip/Crypto/WzAes.cpp', - 'CPP/7zip/Crypto/ZipCrypto.cpp', - 'CPP/7zip/Crypto/ZipStrong.cpp', -diff --git a/Utils/generate.py b/Utils/generate.py -index 132024a..62c0456 100755 ---- a/Utils/generate.py -+++ b/Utils/generate.py -@@ -281,7 +281,6 @@ import file_7zr - import file_7zG - import file_7zFM - import file_7z_so --import file_Codecs_Rar_so - import file_Codecs_Lzham_so - import file_LzmaCon - import file_Client7z -@@ -440,43 +439,6 @@ LOCAL_CFLAGS := -DANDROID_NDK -fexceptions \ - -I../../../include_windows - ''') - --project_Codecs_Rar=Structure(name="Rar",name2="Rar", -- type=TYPE_DLL, -- need_AES=False, -- includedirs=includedirs_7za, -- defines=[ "EXTERNAL_CODECS", "_FILE_OFFSET_BITS=64", "_LARGEFILE_SOURCE", "_REENTRANT", "ENV_UNIX", "BREAK_HANDLER", "UNICODE", "_UNICODE", "UNIX_USE_WIN_FILE" ], -- files_c=file_Codecs_Rar_so.files_c, -- files_cpp=file_Codecs_Rar_so.files_cpp, -- cmake_end=''' -- --find_library(DL_LIB dl) -- --link_directories(${DL_LIB_PATH}) -- --IF(APPLE) -- TARGET_LINK_LIBRARIES(Rar ${COREFOUNDATION_LIBRARY} ${CMAKE_THREAD_LIBS_INIT}) --ELSE(APPLE) -- IF(HAVE_PTHREADS) -- TARGET_LINK_LIBRARIES(Rar ${CMAKE_THREAD_LIBS_INIT} dl) -- ENDIF(HAVE_PTHREADS) --ENDIF(APPLE) -- --''', --android_header=r''' --LOCAL_CFLAGS := -DANDROID_NDK -fexceptions \ -- -DNDEBUG -D_REENTRANT -DENV_UNIX \ -- -DEXTERNAL_CODECS \ -- -DBREAK_HANDLER \ -- -DUNICODE -D_UNICODE -DUNIX_USE_WIN_FILE \ -- -I../../../Windows \ -- -I../../../Common \ -- -I../../../../C \ ---I../../../myWindows \ ---I../../../ \ ---I../../../include_windows --''') -- -- - - project_Codecs_Lzham=Structure(name="Lzham",name2="Lzham", - type=TYPE_DLL, -@@ -762,7 +724,6 @@ generate_makefile_list('../CPP/7zip/Bundles/Alone/makefile.list',project_7za) - generate_makefile_list('../CPP/7zip/Bundles/Alone7z/makefile.list',project_7zr) - generate_makefile_list('../CPP/7zip/UI/Console/makefile.list',project_7z) - generate_makefile_list('../CPP/7zip/Bundles/Format7zFree/makefile.list',project_Format7zFree) --generate_makefile_list('../CPP/7zip/Compress/Rar/makefile.list',project_Codecs_Rar,'../../../../bin/Codecs') - generate_makefile_list('../CPP/7zip/Compress/Lzham/makefile.list',project_Codecs_Lzham,'../../../../bin/Codecs') - generate_makefile_list('../CPP/7zip/Bundles/SFXCon/makefile.list',project_7zCon_sfx) - generate_makefile_list('../CPP/7zip/UI/GUI/makefile.list',project_7zG) -@@ -776,7 +737,6 @@ generate_pro('../CPP/7zip/QMAKE/7za/7za.pro',project_7za) - generate_pro('../CPP/7zip/QMAKE/7zr/7zr.pro',project_7zr) - generate_pro('../CPP/7zip/QMAKE/7z_/7z_.pro',project_7z) - generate_pro('../CPP/7zip/QMAKE/Format7zFree/Format7zFree.pro',project_Format7zFree) --generate_pro('../CPP/7zip/QMAKE/Rar/Rar.pro',project_Codecs_Rar) - generate_pro('../CPP/7zip/QMAKE/Lzham/Lzham.pro',project_Codecs_Lzham) - - generate_premake4('../CPP/7zip/PREMAKE/premake4.lua',project_7za) -diff --git a/contrib/qnx630sp3/qnx630sp3-shared b/contrib/qnx630sp3/qnx630sp3-shared -index 6f5481f..ea07114 100644 ---- a/contrib/qnx630sp3/qnx630sp3-shared -+++ b/contrib/qnx630sp3/qnx630sp3-shared -@@ -8,7 +8,7 @@ mv ./bin/7z ../${BIN} && mv ./bin/7za ../${BIN} && mv ./bin/7zr ../${BIN} && mv - make clean && \ - cp makefile.qnx_shared.so makefile.machine && \ - make 7z && \ --mv ./bin/7z.so ../${BIN} && mv ./bin/Codecs/Rar.so ../${BIN}/Codecs && \ -+mv ./bin/7z.so ../${BIN} && \ - make clean && \ - mv makefile.machine.bak makefile.machine - echo "All done - look for binaries in ../${BIN}" -diff --git a/makefile b/makefile -index 745c8ed..f8e8e33 100644 ---- a/makefile -+++ b/makefile -@@ -31,7 +31,6 @@ depend: - $(MAKE) -C CPP/7zip/UI/Client7z depend - $(MAKE) -C CPP/7zip/UI/Console depend - $(MAKE) -C CPP/7zip/Bundles/Format7zFree depend -- $(MAKE) -C CPP/7zip/Compress/Rar depend - $(MAKE) -C CPP/7zip/UI/GUI depend - $(MAKE) -C CPP/7zip/UI/FileManager depend - -@@ -42,7 +41,6 @@ sfx: common - common7z:common - $(MKDIR) bin/Codecs - $(MAKE) -C CPP/7zip/Bundles/Format7zFree all -- $(MAKE) -C CPP/7zip/Compress/Rar all - - lzham:common - $(MKDIR) bin/Codecs -@@ -67,7 +65,6 @@ clean_C: - $(MAKE) -C CPP/7zip/UI/FileManager clean - $(MAKE) -C CPP/7zip/UI/GUI clean - $(MAKE) -C CPP/7zip/Bundles/Format7zFree clean -- $(MAKE) -C CPP/7zip/Compress/Rar clean - $(MAKE) -C CPP/7zip/Compress/Lzham clean - $(MAKE) -C CPP/7zip/Bundles/LzmaCon clean2 - $(MAKE) -C CPP/7zip/Bundles/AloneGCOV clean -diff --git a/makefile.oldmake b/makefile.oldmake -index afc681c..690af08 100644 ---- a/makefile.oldmake -+++ b/makefile.oldmake -@@ -31,7 +31,6 @@ depend: - cd CPP/7zip/UI/Client7z ; $(MAKE) depend - cd CPP/7zip/UI/Console ; $(MAKE) depend - cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) depend -- cd CPP/7zip/Compress/Rar ; $(MAKE) depend - cd CPP/7zip/UI/GUI ; $(MAKE) depend - cd CPP/7zip/UI/FileManager ; $(MAKE) depend - -@@ -42,7 +41,6 @@ sfx: common - common7z:common - $(MKDIR) bin/Codecs - cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) all -- cd CPP/7zip/Compress/Rar ; $(MAKE) all - - lzham:common - $(MKDIR) bin/Codecs -@@ -67,7 +65,6 @@ clean_C: - cd CPP/7zip/UI/FileManager ; $(MAKE) clean - cd CPP/7zip/UI/GUI ; $(MAKE) clean - cd CPP/7zip/Bundles/Format7zFree ; $(MAKE) clean -- cd CPP/7zip/Compress/Rar ; $(MAKE) clean - cd CPP/7zip/Compress/Lzham ; $(MAKE) clean - cd CPP/7zip/Bundles/LzmaCon ; $(MAKE) clean2 - cd CPP/7zip/Bundles/AloneGCOV ; $(MAKE) clean -diff --git a/makefile.qnx_shared.so b/makefile.qnx_shared.so -index abd1caf..cff5485 100644 ---- a/makefile.qnx_shared.so -+++ b/makefile.qnx_shared.so -@@ -1,5 +1,5 @@ - ################################################### --# makefile.machine for "7z.so , Codecs/Rar.so" : -+# makefile.machine for "7z.so" : - # tested with p7zip-4.47_beta on qnx-6.3.0 sp3 x86 target - - OPTFLAGS=-O -s diff --git a/gnu/packages/patches/xlispstat-fix-compilation-with-modern-gcc.patch b/gnu/packages/patches/xlispstat-fix-compilation-with-modern-gcc.patch new file mode 100644 index 0000000000..46825d1132 --- /dev/null +++ b/gnu/packages/patches/xlispstat-fix-compilation-with-modern-gcc.patch @@ -0,0 +1,213 @@ +From 29d14d78a17f2d85bc9e37f380e71221c2055dd8 Mon Sep 17 00:00:00 2001 +From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com> +Date: Thu, 23 Oct 2025 22:13:53 +0300 +Subject: [PATCH] src: Fix compilation with GCC version 14 or newer + +GCC version 14 now treats some deprecation warnings as errors, namely +it is not allowed to use implicit "int" types, implicit function +declarations (see <https://gcc.gnu.org/gcc-14/porting_to.html>.) In +this patch, deprecated code updated to match the new requirements of +GCC. + +* src/c/ddists.c, src/c/objects.c, src/include/sysvr4-foreign.h, +src/c/iviewdat.c, src/c/postscript.c: Explicitly specify variable +types and procedure return value types to satisfy requirements of +GCC version 14 or newer. +* src/c/X11graph.c: Likewise. +(StBlockForInput): Modernize "select" call. +* src/c/X11BSDstuff.c (line_available): Modernize "select" call. +--- + src/c/X11BSDstuff.c | 4 +++- + src/c/X11graph.c | 10 +++++++--- + src/c/ddists.c | 4 +++- + src/c/iviewdat.c | 2 +- + src/c/objects.c | 6 ++++-- + src/c/postscript.c | 7 ++++--- + src/include/sysvr4-foreign.h | 2 +- + 7 files changed, 23 insertions(+), 12 deletions(-) + +diff --git a/src/c/X11BSDstuff.c b/src/c/X11BSDstuff.c +index 5bb7144..4a9b91b 100644 +--- a/src/c/X11BSDstuff.c ++++ b/src/c/X11BSDstuff.c +@@ -3,6 +3,8 @@ + /* Additions to Xlisp 2.1, Copyright (c) 1989 by David Michael Betz */ + /* You may give out copies of this software; for conditions see the */ + /* file COPYING included with this distribution. */ ++/* Additions to XLISP-STAT 2.1, Copyright (c) 2025, */ ++/* by Artyom V. Poptsov <poptsov.artyom@gmail.com> */ + /* */ + /* Some modifications included from WINTERP */ + /* WINTERP 1.0 Copyright 1989 Hewlett-Packard Company (by Niels Mayer).*/ +@@ -549,7 +551,7 @@ LOCAL int line_available() + FD_ZERO(&readmask); + FD_SET(fileno(stdin), &readmask); + +- result = select(ndfs, (int *) &readmask, NULL, NULL, &tv); ++ result = select(ndfs, &readmask, NULL, NULL, &tv); + if (result > 0) return(TRUE); + /* *** should merge the select here with the one for blocking ***/ + else return(StBlockForInput()); +diff --git a/src/c/X11graph.c b/src/c/X11graph.c +index 70dff08..920957c 100644 +--- a/src/c/X11graph.c ++++ b/src/c/X11graph.c +@@ -1,6 +1,8 @@ + /* X11graph - X11 support for XLISP-STAT */ + /* XLISP-STAT 2.1 Copyright (c) 1990, by Luke Tierney */ + /* Additions to Xlisp 2.1, Copyright (c) 1989 by David Michael Betz */ ++/* Additions to XLISP-STAT 2.1, Copyright (c) 2025, */ ++/* by Artyom V. Poptsov <poptsov.artyom@gmail.com> */ + /* You may give out copies of this software; for conditions see the */ + /* file COPYING included with this distribution. */ + +@@ -23,8 +25,8 @@ extern VOID InstallMenuButton P2H(Window, LVAL); + extern VOID DeleteMenuButton P1H(Window); + extern VOID StX11FinishMenus(V); + extern VOID StX11FinishDialogs(V); +-extern StX11InitMenus(V); +-extern StX11InitDialogs(V); ++extern void StX11InitMenus(V); ++extern void StX11InitDialogs(V); + + extern char *getenv(); + +@@ -316,7 +318,7 @@ int StBlockForInput() + if (tmp > maxfd) maxfd = tmp; + FD_SET(maxfd, &readmask); + } +- result = select(maxfd+1, (int *) &readmask, NULL, NULL, NULL); ++ result = select(maxfd+1, &readmask, NULL, NULL, NULL); + return((FD_ISSET(fileno(stdin), &readmask)) ? TRUE : FALSE); + } + else return(FALSE); +@@ -1221,6 +1223,7 @@ VOID StWGetLocation(w, left, top, frame) + VOID StWSetSize(w, width, height, frame) + Window w; + int width, height; ++ int frame; + { + Display *dpy = StX11Display(); + StGWWinInfo *gwinfo; +@@ -1286,6 +1289,7 @@ VOID StWGetSize(w, pwidth, pheight, frame) + VOID StGWSetSize(gwinfo, width, height, frame) + StGWWinInfo *gwinfo; + int width, height; ++ int frame; + { + Window w; + if (gwinfo == NULL || (w = gwinfo->window) == NullWindow) return; +diff --git a/src/c/ddists.c b/src/c/ddists.c +index e6abeaa..dcefa23 100644 +--- a/src/c/ddists.c ++++ b/src/c/ddists.c +@@ -3,6 +3,8 @@ + /* Additions to Xlisp 2.1, Copyright (c) 1989 by David Michael Betz */ + /* You may give out copies of this software; for conditions see the */ + /* file COPYING included with this distribution. */ ++/* Additions to XLISP-STAT 2.1, Copyright (c) 2025, */ ++/* by Artyom V. Poptsov <poptsov.artyom@gmail.com> */ + + #include "xlisp.h" + #include "xlstat.h" +@@ -29,7 +31,7 @@ LOCAL VOID getpoisarg P1H(double *); + LOCAL double poisson_cdf P2H(int, double); + LOCAL int binomial_quant P3H(double, int, double); + LOCAL int poisson_quant P2H(double, double); +-LOCAL poisson_rand P1H(double); ++LOCAL int poisson_rand P1H(double); + LOCAL int binomial_rand P2H(int, double); + + /* numerical distribution function */ +diff --git a/src/c/iviewdat.c b/src/c/iviewdat.c +index 0b35e05..28fd2df 100644 +--- a/src/c/iviewdat.c ++++ b/src/c/iviewdat.c +@@ -237,7 +237,7 @@ static VOID IViewBasicPointsSetTransformation P2C(IViewBasicPoints, p, double ** + static VOID IViewBasicPointsApplyTransformation P3C(IViewBasicPoints, p, + double **, a, int *, inbasis) + { +- static maxvars = 0; ++ static int maxvars = 0; + static Fixed **b, *x, **screen_data, *screen_location; + int vars, n, i, j; + double *scale = p->scale, *location = p->location; +diff --git a/src/c/objects.c b/src/c/objects.c +index d9c61f2..1084b47 100644 +--- a/src/c/objects.c ++++ b/src/c/objects.c +@@ -3,7 +3,9 @@ + /* Additions to Xlisp 2.1, Copyright (c) 1989 by David Michael Betz */ + /* You may give out copies of this software; for conditions see the */ + /* file COPYING included with this distribution. */ +- ++/* Additions to XLISP-STAT 2.1, Copyright (c) 2025, */ ++/* by Artyom V. Poptsov <poptsov.artyom@gmail.com> */ ++ + #include "xlisp.h" + #include "xlstat.h" + +@@ -1260,7 +1262,7 @@ LVAL xsobject_isnew(V) + VOID xsaddmsg P2C(LVAL, object, char *, str) + { + LVAL fcn; +- static offset = FIRST_METHOD_OFFSET; ++ static int offset = FIRST_METHOD_OFFSET; + + xlsave1(fcn); + fcn = cvsubr(funtab[offset].fd_subr,funtab[offset].fd_type,offset); +diff --git a/src/c/postscript.c b/src/c/postscript.c +index 6ddbfb9..ea57351 100644 +--- a/src/c/postscript.c ++++ b/src/c/postscript.c +@@ -9,6 +9,7 @@ + /* pbmtops.c - read a portable bitmap and produce a PostScript bitmap file + ** + ** Copyright (C) 1988 by Jef Poskanzer. ++** Copyright (C) 2025 by Artyom V. Poptsov <poptsov.artyom@gmail.com> + ** + ** Permission to use, copy, modify, and distribute this software and its + ** documentation for any purpose and without fee is hereby granted, provided +@@ -60,7 +61,7 @@ static FILE *fp; + /**************************************************************************/ + + /* set up global variables and print the postscript preamble */ +-psputinit(file, cols, rows, scale ) ++void psputinit(file, cols, rows, scale ) + FILEP file; + int cols, rows; + double scale; +@@ -120,7 +121,7 @@ psputinit(file, cols, rows, scale ) + } + + /* enter a bit into the image */ +-psputbit(b) ++void psputbit(b) + int b; + { + if ( bitsperitem == 8 ) { +@@ -133,7 +134,7 @@ psputbit(b) + } + + /* clean up and print the showpage command */ +-psputrest( ) ++void psputrest( ) + { + if ( bitsperitem > 0 ) + putitem( ); +diff --git a/src/include/sysvr4-foreign.h b/src/include/sysvr4-foreign.h +index f40acc8..709fc6c 100644 +--- a/src/include/sysvr4-foreign.h ++++ b/src/include/sysvr4-foreign.h +@@ -16,7 +16,7 @@ LOCAL VOID link_and_load(fname, libs, fort) + char *fname, *libs; + int fort; + { +- static initialized = FALSE; ++ static int initialized = FALSE; + void *handle; + + if (! initialized) { +-- +2.51.0 + diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index dba033cf82..07e869db3e 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -130,7 +130,7 @@ (define-public capypdf (package (name "capypdf") - (version "0.14.0") + (version "0.18.0") (source (origin (method git-fetch) (uri (git-reference @@ -138,7 +138,7 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "05rpicxw76z4q48ax0dx5rm1k4lhp4lbdr2aw58kly402w8kjdwb")))) + (base32 "1929hswywf70lb97wp3xmri45h55n1dyq97n50frj8js582z0aqn")))) (build-system meson-build-system) (arguments (list #:configure-flags #~(list "-Dcpp_std=c++23") @@ -1151,7 +1151,7 @@ using a stylus.") (define-public xournalpp (package (name "xournalpp") - (version "1.2.6") + (version "1.2.8") (source (origin (method git-fetch) @@ -1160,7 +1160,7 @@ using a stylus.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1wsks4wwv4d6y2drd64c0p8986l5sv09pnlvpd7hl4asszxmybjm")))) + (base32 "134qmx6nvxfpfbx3sb6ss0vc5jcxlhysk699aaklpid03p8ps0y9")))) (build-system cmake-build-system) (arguments (list @@ -1201,6 +1201,7 @@ using a stylus.") (list adwaita-icon-theme alsa-lib gtk+ + gtksourceview-4 (librsvg-for-system) libsndfile libxml2 diff --git a/gnu/packages/perl.scm b/gnu/packages/perl.scm index cda9858777..c959541597 100644 --- a/gnu/packages/perl.scm +++ b/gnu/packages/perl.scm @@ -3203,7 +3203,7 @@ The maths behind this is unfortunately fiddly, hence this module.") (define-public perl-data-printer (package (name "perl-data-printer") - (version "0.40") + (version "1.002001") (source (origin (method url-fetch) @@ -3211,11 +3211,9 @@ The maths behind this is unfortunately fiddly, hence this module.") version ".tar.gz")) (sha256 (base32 - "0njjh8zp5afc4602jrnmg89icj7gfsil6i955ypcqxc2gl830sb0")))) + "0x1vdydmj0yp681w0f2nkdxv2h4wa2py002af88clppqxlljsacn")))) (build-system perl-build-system) - (propagated-inputs - (list perl-clone-pp perl-file-homedir perl-package-stash - perl-sort-naturally)) + (native-inputs (list perl-capture-tiny)) (home-page "https://metacpan.org/release/Data-Printer") (synopsis "Colored pretty-print of Perl data structures and objects") (description "Display Perl variables and objects on screen, properly diff --git a/gnu/packages/postmarketos.scm b/gnu/packages/postmarketos.scm index 7bb7e788e3..adb62f0959 100644 --- a/gnu/packages/postmarketos.scm +++ b/gnu/packages/postmarketos.scm @@ -37,7 +37,7 @@ (define-public pmbootstrap (package (name "pmbootstrap") - (version "3.4.0") + (version "3.6.0") (source (origin (method git-fetch) @@ -47,7 +47,7 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "16naj8ykipbrs2a93zaxci1wl045cc9jn7rq8sy76d1rqlqb9mmw")))) + (base32 "161q8nr9vwa7bbi5d7bqan0h7dn573xqmr48iadr3km897d3ivdh")))) (build-system pyproject-build-system) (arguments (list diff --git a/gnu/packages/profiling.scm b/gnu/packages/profiling.scm index 64bcafb373..a9708f0424 100644 --- a/gnu/packages/profiling.scm +++ b/gnu/packages/profiling.scm @@ -309,8 +309,8 @@ of performance metrics for parallel programs including MPI and OpenMP applications. CubeGUI is the graphical explorer of the CUBE project."))) ;; deprecated on 2025-09-22 -(define-public cube - (deprecated-package "cube" cubegui)) +(define-deprecated-package cube + cubegui) (define-public tracy-wayland (package diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm index e7c729b393..2d604c201f 100644 --- a/gnu/packages/prolog.scm +++ b/gnu/packages/prolog.scm @@ -189,7 +189,7 @@ it.") (define-public trealla (package (name "trealla") - (version "2.83.20") + (version "2.84.1") (source (origin (method git-fetch) @@ -198,7 +198,7 @@ it.") (url "https://github.com/trealla-prolog/trealla") (commit (string-append "v" version)))) (sha256 - (base32 "0jz66ic4pm979cslnwfxrl26c1qwdlpi81d7sv5asiq2lflc8pxw")) + (base32 "183xwjk3ivh1j1wdjz5180yxc48zsnwffz1iagqafndas1yk9dfd")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs diff --git a/gnu/packages/prometheus.scm b/gnu/packages/prometheus.scm index fa2481b8be..6b03db12b3 100644 --- a/gnu/packages/prometheus.scm +++ b/gnu/packages/prometheus.scm @@ -593,6 +593,32 @@ Protocol,ICMP} echo (ping) functionality.") "This package provides tooling to build Prometheus exporters") (license license:asl2.0))) +(define-public go-github-com-prometheus-otlptranslator + (package + (name "go-github-com-prometheus-otlptranslator") + (version "1.0.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/prometheus/otlptranslator") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1naca6ima2bzf6yhb2w9favqx644c0q1y16jlb2na7s4bgr3107p")))) + (build-system go-build-system) + (arguments + (list + #:import-path "github.com/prometheus/otlptranslator")) + (home-page "https://github.com/prometheus/otlptranslator") + (synopsis "OTLP Prometheus Translator") + (description + "This package provides a functionality to convert +@url{https://opentelemetry.io/docs/specs/otlp/, OTLP} metric and attribute +names to @url{https://prometheus.io/, Prometheus-compliant} formats. This is +an internal library for both Prometheus and Open Telemetry,") + (license license:asl2.0))) + (define-public go-github-com-prometheus-procfs (package (name "go-github-com-prometheus-procfs") diff --git a/gnu/packages/pypy.scm b/gnu/packages/pypy.scm index 5309cf38f1..ad48abf599 100644 --- a/gnu/packages/pypy.scm +++ b/gnu/packages/pypy.scm @@ -328,5 +328,5 @@ Python code natively, including C extensions.") (modify-inputs (package-inputs pypy2) (append xz))))) -(define-public pypy3 - (deprecated-package "pypy3" pypy)) +(define-deprecated-package pypy3 + pypy) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index 126b8f1c71..1dd28d5de4 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -604,6 +604,38 @@ Satisfiability modulo theories} solver explore viable execution paths and find counterexamples for you.") (license (list license:asl2.0 license:expat license:psfl)))) +(define-public python-cucumber-expressions + (package + (name "python-cucumber-expressions") + (version "18.0.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cucumber/cucumber-expressions") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1syxa142v9sajy7n2az7d0jc6lsjg93kw659pxfs3g6ddrngpdri")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + ;; Project's repository contains go, java, javascript, perl, python + ;; and ruby implementations. + (add-after 'unpack 'chdir-python + (lambda _ + (chdir "python")))))) + (native-inputs + (list python-poetry-core python-pytest python-pyyaml)) + (home-page "https://github.com/cucumber/cucumber-expressions") + (synopsis "A simpler alternative to Regular Expressions") + (description + "This package provides an alternative to Regular Expressions with a more +intuitive syntax.") + (license license:expat))) + (define-public python-cucumber-tag-expressions (package (name "python-cucumber-tag-expressions") @@ -629,13 +661,12 @@ counterexamples for you.") (lambda _ (chdir "python")))))) (native-inputs - (list python-pathpy + (list python-path python-pytest python-pytest-html python-pyyaml python-setuptools - python-setuptools-scm - python-wheel)) + python-setuptools-scm)) (home-page "https://github.com/cucumber/tag-expressions") (synopsis "Tag-expression parser for cucumber/behave") (description @@ -1339,7 +1370,7 @@ result documents that can be read by tools such as Jenkins or Bamboo.") ;; sync. kernprof.line_profiler = . kernprof.__version__ = 4.2.0. #~(list "--deselect=tests/test_cli.py::test_version_agreement"))) (native-inputs - (list python-cython-3 + (list python-cython python-pytest python-setuptools python-ubelt @@ -3104,28 +3135,28 @@ types (i.e. Convention, Warn, and Error) fail the build.") (define-public python-pytest-qt (package (name "python-pytest-qt") - (version "4.4.0") + (version "4.5.0") (source (origin (method url-fetch) - (uri (pypi-uri "pytest-qt" version)) + (uri (pypi-uri "pytest_qt" version)) (sha256 - (base32 "0i38qp2rqb44grbk9rn7zr5ffjvdlcl6k380759ji920m51632bn")))) + (base32 "17ridbk4gsr1aclgs1ai55r6k2ngrg0wn9b40g96bw48qh0hwqji")))) (build-system pyproject-build-system) (arguments (list - ;;#:test-target "pytest" #:phases - '(modify-phases %standard-phases + #~(modify-phases %standard-phases (add-before 'check 'set-qpa (lambda _ (setenv "QT_QPA_PLATFORM" "offscreen")))))) - (propagated-inputs - (list python-pluggy python-pyqt python-pytest)) (native-inputs - (list python-pre-commit + (list python-pyqt-6 + python-pytest-bootstrap python-setuptools - python-setuptools-scm - python-wheel)) + python-setuptools-scm)) + (propagated-inputs + (list python-pluggy + python-typing-extensions)) (home-page "https://github.com/pytest-dev/pytest-qt") (synopsis "Pytest support for PyQt and PySide applications") (description @@ -4182,31 +4213,24 @@ provided for the main Python test runners.") (define-public python-syrupy (package (name "python-syrupy") - (version "4.9.1") + (version "5.0.0") (source (origin - (method git-fetch) ;no tests in PyPI archive + (method git-fetch) (uri (git-reference (url "https://github.com/syrupy-project/syrupy") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "10q1xdwbcy9jfq8gd4r9q4r2p2zpcfrh4yj58nl9sbr2nc3irbh0")))) + (base32 "1ysm42an2pf4ppd1i5yzh11bq1rfydhg6rmmh5v91gcixpvi872d")))) (build-system pyproject-build-system) (arguments - (list - #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "invoke" "test"))))))) + (list #:test-backend #~'custom + #:test-flags #~(list "-m" "invoke" "test"))) (native-inputs (list python-invoke - python-debugpy - python-twine python-poetry-core - python-pytest + python-pytest-bootstrap python-pytest-xdist python-setuptools-scm)) (home-page "https://github.com/syrupy-project/syrupy") diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm index 3c1713f6f6..c02993eded 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -138,7 +138,7 @@ This Python package wraps the Blosc library.") (native-inputs (list cmake-minimal pkg-config - python-cython-3 + python-cython python-pytest python-scikit-build python-setuptools)) @@ -188,8 +188,8 @@ to access its data, so it can be used as a drop-in replacement.") package, an implementation of the Brotli lossless compression algorithm.") (license license:expat))) -(define-public python-google-brotli - (deprecated-package "python-google-brotli" python-brotli)) +(define-deprecated-package python-google-brotli + python-brotli) (define-public python-multivolumefile (package @@ -792,8 +792,8 @@ for improving compression, as well as a python/C package that implements this algorithm within the Numpy framework.") (license license:expat))) -(define-public bitshuffle - (deprecated-package "bitshuffle" python-bitshuffle)) +(define-deprecated-package bitshuffle + python-bitshuffle) (define-public bitshuffle-for-snappy (package/inherit python-bitshuffle diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 7edbd71784..63b25bd913 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -1233,6 +1233,34 @@ passwords. It can be used to implement two-factor (2FA) or multi-factor require users to log in.") (license license:expat))) +;; XXX: This project was archived by the owner on Apr 20, 2025. It is now +;; read-only. Consider to remove when starts failing to build and nothing +;; depends on it. +(define-public python-rsa + (package + (name "python-rsa") + (version "4.9.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "rsa" version)) + (sha256 + (base32 "0xdfs3mhdb9wjpckj7i4zyv9sr82m7hk0mfkvw3lrnlpakdvzgg7")))) + (build-system pyproject-build-system) + (arguments + (list #:tests? #f)) ;tests are not included in PyPI archive + (native-inputs + (list python-poetry-core)) + (propagated-inputs + (list python-pyasn1)) + (home-page "https://stuvel.eu/rsa") + (synopsis "Pure-Python RSA implementation") + (description "Python-RSA is a pure-Python RSA implementation. It supports +encryption and decryption, signing and verifying signatures, and key +generation according to PKCS#1 version 1.5. It can be used as a Python +library as well as on the command line.") + (license license:asl2.0))) + (define-public python-scrypt (package (name "python-scrypt") diff --git a/gnu/packages/python-graphics.scm b/gnu/packages/python-graphics.scm index ae87001340..d75f0edd2e 100644 --- a/gnu/packages/python-graphics.scm +++ b/gnu/packages/python-graphics.scm @@ -819,7 +819,7 @@ wrappers for common SDL2 functionality.") (setenv "HOME" "/tmp") (invoke "python" "setup.py" "build_ext" "--inplace")))))) (native-inputs - (list python-cython-3 + (list python-cython python-pytest python-setuptools python-setuptools-scm diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index c514e0ab46..cb701a0c7d 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -2406,7 +2406,7 @@ Evapotranspiration using various standard methods.") (with-directory-excursion (site-packages inputs outputs) (for-each delete-file (find-files "." "test*")))))))) (native-inputs - (list python-cython-3 python-pytest python-setuptools python-wheel)) + (list python-cython python-pytest python-setuptools python-wheel)) (propagated-inputs (list python-numpy)) (home-page "https://github.com/storpipfugl/pykdtree") @@ -2591,7 +2591,7 @@ factorization routine for quasi-definite linear system.") (with-directory-excursion #$output (apply invoke "pytest" "-vv" test-flags)))))))) (propagated-inputs (list python-numpy python-packaging python-scipy)) - (native-inputs (list python-cython-3 + (native-inputs (list python-cython python-numpy python-packaging python-pytest @@ -2975,7 +2975,7 @@ logic, also known as grey logic.") python-spin)) (native-inputs (list gfortran pkg-config - python-cython-3 + python-cython python-meson-python python-numpy python-pytest @@ -3106,7 +3106,7 @@ be accessible and easy to use in many contexts.") ;; permission. (setenv "HOME" "/tmp")))))) (native-inputs - (list python-cython-3 + (list python-cython python-pandas python-pytest python-setuptools @@ -3839,7 +3839,7 @@ tissue-specificity metrics for gene expression.") (native-inputs (list meson-python python-beautifulsoup4 - python-cython-3 + python-cython python-html5lib python-lxml python-matplotlib @@ -4590,7 +4590,7 @@ readable.") python-six python-tabulate)) (native-inputs - (list python-pytest python-cython-3 python-setuptools python-wheel)) + (list python-pytest python-cython python-setuptools python-wheel)) (home-page "https://www.github.com/maartenbreddels/vaex") (synopsis "Core of Vaex library for exploring tabular datasets") (description "Vaex is a high performance Python library for lazy @@ -5465,6 +5465,7 @@ visual integration of spatially referenced datasets.") (native-inputs (list python-ipython python-matplotlib python-numpy + python-pyqt-6 python-pytest python-pytest-cov python-pytest-qt @@ -5876,11 +5877,15 @@ abstractions to use in dvc and dvc-data.") (base32 "1qyr461hcvhgy02slfkgrbip2xwa8zz6dvmi1476v6f66lclzy34")))) (build-system pyproject-build-system) (arguments + ;; tests: 949 passed, 1356 skipped, 2 deselected, 8 xfailed, 130 warnings (list #:test-flags - ;; The test_reload test fails. It suggests to disable assert - ;; rewriting in Pytest, but it still doesn't pass. - #~(list "-k" "not test_reload" - "-n" (number->string (parallel-job-count))) + ;; Failed: CALL ERROR: Exceptions caught in Qt event loop. + #~(list "--deselect=tests/exporters/test_svg.py::test_plotscene" + ;; The test_reload test fails. It suggests to disable + ;; assert rewriting in Pytest, but it still doesn't pass. + "-k" "not test_reload" + ;; Run unit tets only. + "tests") #:phases #~(modify-phases %standard-phases (add-before 'check 'set-qpa @@ -5888,18 +5893,18 @@ abstractions to use in dvc and dvc-data.") (setenv "QT_QPA_PLATFORM" "offscreen")))))) (native-inputs (list python-pytest - python-pytest-cov - python-pytest-xdist - python-setuptools - python-wheel)) - (inputs - (list qtbase-5)) + ;; Do not propagate Qt5/Qt6 let the user of the package to select + ;; any supported one, see + ;; <https://pyqtgraph.readthedocs.io/en/pyqtgraph-0.13.7> + ;; </getting_started/how_to_use.html#pyqt-and-pyside>. + python-pyqt-6 + python-pytest-qt + python-setuptools)) (propagated-inputs (list python-h5py python-numpy python-pyopengl - python-scipy - python-pyqt)) + python-scipy)) (home-page "https://www.pyqtgraph.org") (synopsis "Scientific graphics and GUI library for Python") (description diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 0beff7d6e0..a92c6440fe 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -23,6 +23,7 @@ ;;; Copyright © 2017 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2015, 2016 David Thompson <davet@gnu.org> ;;; Copyright © 2017 Mark Meyer <mark@ofosos.org> +;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2018 Tomáš Čech <sleep_walker@gnu.org> ;;; Copyright © 2018, 2019, 2021, 2024 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> @@ -1828,7 +1829,7 @@ for adding, removing and dropping callbacks.") python-yarl)) (native-inputs (list gunicorn-bootstrap - python-cython-3 + python-cython python-freezegun python-pytest python-pytest-cov @@ -2717,9 +2718,7 @@ files.") (list python-greenlet python-pytest python-pytest-httpbin - python-readme-renderer python-setuptools - python-twine python-werkzeug)) (propagated-inputs (list python-requests)) (home-page "https://github.com/ross/requests-futures") @@ -2792,7 +2791,7 @@ AWS S3 Service using boto3 S3 resource as a driver.") (native-inputs (list python-aiofiles python-cbor2 - python-cython-3 ;for faster binaries + python-cython ;for faster binaries python-fakeredis python-httpx python-mujson @@ -2977,6 +2976,63 @@ other HTTP libraries.") "Cheroot is a high-performance, pure-Python HTTP server.") (license license:bsd-3))) +(define-public python-cherrypy + (package + (name "python-cherrypy") + (version "18.10.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cherrypy/cherrypy") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1mhs64z75mj3rk4rgxc3xm1yksaj253rj9czhk4632blz5yi0kbn")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + #~(map + (lambda (test) + (string-append "--deselect=cherrypy/test/" test)) + (list + ;; XXX: Unraisable exceptions. + "test_config_server.py::ServerConfigTests::testMaxRequestSize" + "test_core.py::CoreRequestHandlingTest::testRanges" + "test_core.py::CoreRequestHandlingTest::testRedirect" + "test_encoding.py::EncodingTests::\ +test_multipart_decoding_bigger_maxrambytes" + "test_encoding.py::EncodingTests::\ +test_test_http.py::HTTPTests::test_post_filename_with_special_characters" + "test_http.py::HTTPTests::test_post_multipart" + "test_http.py::HTTPTests::test_post_filename_with_special_characters" + "test_mime.py::SafeMultipartHandlingTest::test_Flash_Upload" + "test_tutorials.py::TutorialTest::test09Files")))) + (propagated-inputs + (list python-cheroot + python-jaraco-collections + python-more-itertools + python-portend + python-zc-lockfile)) + (native-inputs + (list python-objgraph + python-path + python-pytest + python-pytest-cov + python-pytest-forked + python-pytest-services + python-pytest-sugar + python-requests-toolbelt + python-setuptools)) + (home-page "https://www.cherrypy.dev") + (synopsis "Object-Oriented HTTP framework") + (description + "CherryPy is a pythonic, object-oriented web framework. It helps in +building web applications in the same way any other object-oriented Python +program would be built.") + (license license:bsd-3))) + (define-public httpie (package (name "httpie") @@ -3875,6 +3931,100 @@ high-speed transfers via libcurl and frequently outperforms alternatives.") ;; under the terms of LGPLv2.1+ or Expat. (license (list license:lgpl2.1+ license:expat)))) +(define-public python-tldextract + (package + (name "python-tldextract") + (version "5.3.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "tldextract" version)) + (sha256 + (base32 "02c6cyh8f3dagcw786m9nl5y0n3xa98p5mb7d7xfr84l2l5bglmk")))) + (build-system pyproject-build-system) + (native-inputs + (list nss-certs-for-test + python-pytest + python-pytest-mock + python-responses + python-setuptools + python-setuptools-scm + python-syrupy)) + (propagated-inputs + (list python-filelock + python-idna + python-requests + python-requests-file)) + (home-page "https://github.com/john-kurkowski/tldextract") + (synopsis + "Separate the TLD from the registered domain and subdomains of a URL") + (description + "TLDExtract accurately separates the TLD from the registered domain and +subdomains of a URL, using the Public Suffix List. By default, this includes +the public ICANN TLDs and their exceptions. It can optionally support the +Public Suffix List's private domains as well.") + (license license:bsd-3))) + +(define-public python-tracerite + (package + (name "python-tracerite") + (version "1.1.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "tracerite" version)) + (sha256 + (base32 "07mkg0sl0h335kj6yjvxki2c19gxhb7rkks1zgzh7aj0y83c17qi")))) + (build-system pyproject-build-system) + (arguments + (list #:tests? #f)) ;no tests in PyPI or Git + (native-inputs + (list python-setuptools + python-setuptools-scm)) + (propagated-inputs + (list python-html5tagger)) + (home-page "https://github.com/sanic-org/tracerite") + (synopsis "Human-readable HTML tracebacks") + (description + "@code{tracerite} converts Python tracebacks into useful error messages +in human-readable HTML format.") + (license license:unlicense))) + +(define-public python-trio-websocket + (package + (name "python-trio-websocket") + (version "0.12.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/HyperionGray/trio-websocket") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1lm712gakpskcn3adna22kj8m1hspz9l68pmlziklr0ycphmyqac")))) + (build-system pyproject-build-system) + (native-inputs + (list python-pytest + python-pytest-trio + python-setuptools + python-trustme)) + (propagated-inputs + (list python-outcome + python-trio + python-wsproto)) + (home-page "https://github.com/HyperionGray/trio-websocket") + (synopsis "WebSocket library for Trio") + (description "This library implements both server and client aspects of +the @url{https://tools.ietf.org/html/rfc6455, the WebSocket protocol}, +striving for safety, correctness, and ergonomics. It is based on the +@url{https://wsproto.readthedocs.io/en/latest/, wsproto project}, which is a +@url{https://sans-io.readthedocs.io/, Sans-IO} state machine that implements +the majority of the WebSocket protocol, including framing, codecs, and events. +This library handles I/O using @url{https://trio.readthedocs.io/en/latest/, +the Trio framework}.") + (license license:expat))) + (define-public python-txacme ;; 0.9.3 tag was placed in 2020 and there a lot of changes providing ;; compatibility wit twisted, use the latest commit from trunk branch. @@ -4756,8 +4906,8 @@ WebSockets (over HTTP/1 and HTTP/2), ASGI/2, and ASGI/3 specifications. It can utilise asyncio, uvloop, or trio worker types.") (license license:expat))) -(define-public python-hypercorn - (deprecated-package "python-hypercorn" hypercorn)) +(define-deprecated-package python-hypercorn + hypercorn) (define-public python-querystring-parser (package @@ -6075,26 +6225,45 @@ python-requests.") HTTP via a UNIX domain socket.") (license license:asl2.0))) -(define-public python-requests-unixsocket - (deprecated-package "python-requests-unixsocket" python-requests-unixsocket2)) +(define-deprecated-package python-requests-unixsocket + python-requests-unixsocket2) -(define-public python-requests_ntlm +(define-public python-requests-ntlm (package - (name "python-requests_ntlm") - (version "1.2.0") + (name "python-requests-ntlm") + (version "1.3.0") (source (origin - (method url-fetch) - (uri (pypi-uri "requests_ntlm" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/requests/requests-ntlm") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "1a0np7lk8ma1plv1s4aw5q9h2z3aljprkl9qsfypqcaf0zsqbhik")))) - (build-system python-build-system) + (base32 "0snsk66zdihdlyfjz2zgpyfgdyjg814m3cc4g3my09hdnb5xvagv")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + ;; XXX: Connection refused. + #~(list "-k" (string-join + (list "not test_ntlm_http_with_cbt" + "test_ntlm_http_without_cbt" + "test_ntlm_https_with_cbt" + "test_ntlm_https_without_cbt") + " and not ")) + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'spawn-test-server + (lambda _ + ;; Taken from .github/workflows/ci.yml. + (spawn "python" + (list "python" "-m" "tests.test_server"))))))) (propagated-inputs (list python-cryptography python-pyspnego python-requests)) + (native-inputs (list python-flask python-pytest python-setuptools)) (home-page "https://github.com/requests/requests-ntlm") - (synopsis - "NTLM authentication support for Requests") + (synopsis "NTLM authentication support for Requests") (description "This package allows for HTTP NTLM authentication using the requests library.") @@ -8188,7 +8357,7 @@ name resolutions asynchronously.") (("build_inplace=False") "build_inplace=True"))))))) (native-inputs (list python-covdefaults - python-cython-3 + python-cython python-expandvars python-pytest python-pytest-cov @@ -8827,7 +8996,7 @@ hard or impossible to fix in cssselect.") (delete-file-recursively "uvloop"))))))) (native-inputs (list python-aiohttp - python-cython-3 + python-cython python-psutil python-pyopenssl python-pytest @@ -9927,8 +10096,8 @@ decorators and tools to describe your API and expose its documentation properly Swagger.") (license license:bsd-3))) -(define-public python-flask-restplus - (deprecated-package "python-flask-restplus" python-flask-restx)) +(define-deprecated-package python-flask-restplus + python-flask-restx) (define-public python-flask-socketio (package @@ -10107,6 +10276,30 @@ conflicts detected by that mechanism.") for Python. It is mainly used by the ZODB.") (license license:zpl2.1))) +(define-public python-truststore + (package + (name "python-truststore") + (version "0.10.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "truststore" version)) + (sha256 + (base32 "00f3xc7720rkddsn291yrw871kfnimi6d9xbwi75xbb3ci1vv4cx")))) + (build-system pyproject-build-system) + (arguments + (list #:tests? #f)) ;all tests require Internet access + (native-inputs + (list python-flit-core)) + (home-page "https://github.com/sethmlarson/truststore") + (synopsis "Verify certificates using native system trust stores") + (description + "Truststore is a library which exposes native system certificate stores (ie +\"trust stores\") through an @code{ssl.SSLContext-like} API. This means that +Python applications no longer need to rely on certifi as a root certificate +store.") + (license license:expat))) + (define-public python-robot-detection (package (name "python-robot-detection") @@ -11558,8 +11751,8 @@ as Flask.") python-pytest-sugar python-pytest-trio)) (propagated-inputs - (list python-exceptiongroup - python-hypercorn + (list hypercorn + python-exceptiongroup python-quart python-trio)) (home-page "https://github.com/pgjones/quart-trio") @@ -11654,30 +11847,28 @@ regular expressions.") (define-public python-scrapy (package (name "python-scrapy") - (version "2.13.1") + (version "2.13.3") (source (origin (method url-fetch) (uri (pypi-uri "scrapy" version)) (sha256 - (base32 "18anr8jjjqyv6pfzdm4fr5hx4vddb8qclyja0y874f5slcnsfsrx")))) + (base32 "0k90pni6vkj7axx3cji0b2x7yg4yfh5kh1csqiq9ssp42265h5xz")))) (build-system pyproject-build-system) (arguments (list #:test-flags #~(list "--numprocesses" (number->string (parallel-job-count)) - ;; Tests requiring a display. - "-k" (string-append - "not " (string-join - (list "test_pformat" - "test_pformat_old_windows" - "test_pformat_windows" - ;; AssertionError. - "test_start_deprecated_super" - ;; Connection refused. - "test_persist") - " and not ")) - ;; Connection refused to some local FTP server. - "--ignore=tests/test_feedexport.py" + "-k" (string-join + ;; ConnectionRefusedError: [Errno 111] Connection + ;; refused + (list "not test_append" + "test_append_active_mode" + "test_overwrite" + "test_overwrite_active_mode" + "test_persist" + ;; AssertionError + "test_start_deprecated_super") + " and not ") ;; Skip documentation testing. "--ignore=docs") #:phases @@ -11697,24 +11888,22 @@ regular expressions.") python-protego python-pydispatcher python-pyopenssl + python-pypydispatcher python-queuelib python-service-identity python-tldextract - python-typing-extensions python-twisted python-w3lib python-zope-interface)) (native-inputs (list nss-certs-for-test python-hatchling - python-mypy python-pexpect python-pytest python-pytest-xdist python-setuptools python-sybil - python-testfixtures - python-wheel)) + python-testfixtures)) (home-page "https://scrapy.org") (synopsis "High-level Web crawling and Web scraping framework") (description "Scrapy is a fast high-level web crawling and web diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b5aa148e14..fdfa56ed22 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Nikita Karetnikov <nikita@karetnikov.org> -;;; Copyright © 2013-2024 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2013-2025 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2016, 2019, 2023 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2017, 2021, 2022, 2024 Eric Bavier <bavier@posteo.net> @@ -1472,6 +1472,29 @@ cache directory, to avoid modifying the host's environment, and further activated using a set of environment variables.") (license (list license:expat license:asl2.0)))) +(define-public python-pypydispatcher + (package + (name "python-pypydispatcher") + (version "2.1.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "PyPyDispatcher" version)) + (sha256 + (base32 "1wihj7xgq5fk91li0id6a311lyrnmq7ch8rbr9dm7lprrzgwbgmn")))) + (build-system pyproject-build-system) + (native-inputs + (list python-pytest + python-setuptools + python-setuptools-scm)) + (home-page "https://github.com/scrapy/pypydispatcher") + (synopsis "Multi-producer-multi-consumer signal dispatching mechanism") + (description + "This package implements a functionality of pulti-producer-multi-consumer +signal dispatching mechanism. It's a fork of +http://pydispatcher.sourceforge.net/ with PyPy support.") + (license license:bsd-3))) + (define-public python-pyte (package (name "python-pyte") @@ -1815,150 +1838,6 @@ regularly spaced grids. The actual streamline tracing is done at a low level in Rust, with a nice Python API provided on top.") (license license:gpl3+))) -(define-public python-takethetime - (package - (name "python-takethetime") - (version "0.3.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "TakeTheTime" version)) - (sha256 - (base32 "1y9gzqb9l1f2smx8783ccjzjvby5mphshgrfks7s75mml59h9qyv")))) - (build-system pyproject-build-system) - (arguments - (list #:tests? #f)) ; tests are time dependent and not provided in PyPI - (native-inputs - (list python-setuptools - python-wheel)) - (home-page "https://github.com/ErikBjare/TakeTheTime") - (synopsis "Timing chunks of code") - (description - "This package implements a functionality for time taking using context -managers.") - (license license:expat))) - -(define-public python-tatsu - (package - (name "python-tatsu") - (version "5.13.1") - (source - (origin - (method git-fetch) ; no tests in PyPI releasefor tests - (uri (git-reference - (url "https://github.com/neogeny/TatSu") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0pdq9d45vbp7j600ig4k21mv2wipvmz05dji91x7kifhzfl5i6w9")))) - (build-system pyproject-build-system) - (native-inputs - (list python-pytest - python-setuptools - python-wheel)) - (home-page "https://tatsu.readthedocs.io/en/stable/") - (synopsis "PEG/Packrat Parser generator for Python") - (description - "TatSu (竜) takes a grammar in a variation of Extended Backus-Naur -Form (EBNF) as input, and outputs a memoizing Parsing Expression Grammar (PEG) -or Packrat parser in Python.") - (license license:bsd-2))) - -(define-public python-term-image - (package - (name "python-term-image") - (version "0.7.2") - (source - (origin - ;; We need the full repo to run the tests. - (method git-fetch) - (uri (git-reference - (url "https://github.com/AnonymouX47/term-image") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1lsd5m0k5m99arkca2rzrrlln10c8ax6xfawqwjnspcbf8l3h3dq")))) - (build-system pyproject-build-system) - (arguments - (list #:test-flags - #~(list "tests" - ;; These tests require network access. - "-k" (string-append "not test_from_url" - " and not test_source" - " and not test_close")) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'adjust-dependencies - (lambda _ - (substitute* "setup.py" - (("pillow>=9.1,<11") "pillow>=9.1,<12"))))))) - (propagated-inputs (list python-pillow python-requests)) - (native-inputs - (list python-pytest - python-setuptools - python-urwid)) - (home-page "https://github.com/AnonymouX47/term-image") - (synopsis "Display images in the terminal") - (description "term-image is a library and program to display images on -compatible terminals. - -Features: -@enumerate -@item Multiple image formats (basically all formats supported by -@code{PIL.Image.open()}) -@item Multiple image source types: PIL image instance, local file, URL -@item Multiple image render styles (with automatic support detection) -@item Support for multiple terminal graphics protocols, including Kitty -@item Transparency support (with multiple options) -@item Animated image support (including transparent ones) -@item Integration into various TUI / terminal-based output libraries -@item Terminal size awareness -@item Automatic and manual image sizing -@item Horizontal and vertical alignment -@item Automatic and manual font ratio adjustment (to preserve image aspect -ratio) -@end enumerate") - (license license:expat))) - -(define-public python-trubar - (package - (name "python-trubar") - (version "0.3.4") - (source - (origin - (method url-fetch) - (uri (pypi-uri "trubar" version)) - (sha256 - (base32 "149l5wid1b41gmfzsrhapcigcbcsflviz8p1pfa937443fxw1dkd")))) - (build-system pyproject-build-system) - (arguments - (list - #:test-flags - #~(list "-k" (string-join - ;; AttributeError: module 'libcst' has no attribute - ;; 'FlattenSentinel'. Did you mean: 'MaybeSentinel'? - (list "not test_import_from_future" - "test_inport_after_docstring" - ;; AssertionError: Items in the second set but not - ;; the first - "test_walk_files") - " and not ")))) - (native-inputs - (list python-pytest - python-setuptools - python-wheel)) - (propagated-inputs - (list python-libcst - python-pyyaml)) - (home-page "https://github.com/janezd/trubar") - (synopsis "Utility for translation of Python sources") - (description - "This package provides a tool for translation and localization of Python -programs via modification of source files. Trubar supports f-strings and does -not require any changes to the original source code, such as marking strings -for translation.") - (license license:expat))) - (define-public python-jaconv (package (name "python-jaconv") @@ -2184,7 +2063,7 @@ easy logging and rotating to a console or a file.") (build-system pyproject-build-system) (native-inputs (list python-brotli - python-cython-3 + python-cython python-pytest python-setuptools python-wheel)) @@ -2618,6 +2497,39 @@ decorators, including variants of the Python standard library's (sha256 (base32 "1m20wqipm50zvcgs3z2xksb96qwx1xc1jbhvaxcnglkmj6m1qrhs")))))) +(define-public python-colorclass + (package + (name "python-colorclass") + (version "2.2.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/matthewdeanmartin/colorclass") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ylj167lfh8yzms30qrkiznv6737hdxra5lk8mhijcjm3hi1cl9l")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + #~(list "-k" "not test_piped") ; Unclear why this test fails. + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'use-poetry-core + (lambda _ + ;; Patch to use the core poetry API. + (substitute* "pyproject.toml" + (("poetry.masonry.api") "poetry.core.masonry.api"))))))) + (native-inputs (list python-poetry-core python-pytest)) + (home-page "https://github.com/matthewdeanmartin/colorclass") + (synopsis "Colorful console applications with Python") + (description + "This package provides an ANSI color text library for Python. It +provides automatic coloring for dark or light terminals.") + (license license:expat))) + (define-public python-colorcet (package (name "python-colorcet") @@ -3375,73 +3287,6 @@ commits.") generator MkDocs.") (license license:expat))) -(define-public python-skranger - (package - (name "python-skranger") - (version "0.8.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/crflynn/skranger") - (commit version) - (recursive? #true))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0njy4xbc98l295k92nyk93njv1348vd1il5pdyrnk8nnzc2anzf0")))) - (build-system pyproject-build-system) - (arguments - (list - #:modules '((guix build pyproject-build-system) - (guix build utils) - (ice-9 match)) - #:test-flags - ;; "from sklearn.datasets import load_boston" fails because it has been - ;; removed from scikit-learn since version 1.2. - '(list "--ignore=tests/conftest.py" - "--ignore=tests/test_tools.py" - "--ignore=tests/tree/test_regressor.py" - "--ignore=tests/ensemble/test_regressor.py" - ;; All tests fail with error: AttributeError: 'super' object has - ;; no attribute '__sklearn_tags__' - "--ignore=tests/tree/test_classifier.py" - "--ignore=tests/ensemble/test_classifier.py") - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'fix-tests - (lambda _ - (substitute* "tests/conftest.py" - (("from sklearn.datasets import load_boston") "") - (("^_boston_X.*") "_boston_X, _boston_Y = (True, True)\n")))) - (add-before 'check 'build-extensions - (lambda _ - ;; Cython extensions have to be built before running the tests. - (invoke "python" "buildpre.py") - (invoke "python" "build.py" "build_ext" "--inplace") - (let ((site (string-append #$output "/lib/python" - #$(version-major+minor - (package-version python)) - "/site-packages/skranger")) - (lib (match (find-files "build" "\\.so") - ((the-lib) the-lib) - (_ (error "could not find .so"))))) - (mkdir-p site) - (install-file lib site))))))) - (propagated-inputs (list python-scikit-learn)) - (native-inputs - (list python-cython - python-matplotlib - python-pandas - python-poetry-core - python-setuptools - python-wheel - python-pytest)) - (home-page "https://github.com/crflynn/skranger") - (synopsis "Python bindings for C++ ranger random forests") - (description "This package provides scikit-learn compatible Python -bindings to the C++ random forest implementation, ranger, using Cython.") - (license license:gpl3+))) - (define-public python-nanobind (package (name "python-nanobind") @@ -3576,31 +3421,6 @@ library.") of it like a generator that is \"reusable\" and has a length.") (license license:bsd-3))) -(define-public python-tenacity - (package - (name "python-tenacity") - (version "9.0.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "tenacity" version)) - (sha256 - (base32 "0fyp421r038naskvyhj90hkq0az96477njad4rhs6annjz53fzw0")))) - (build-system pyproject-build-system) - (native-inputs - (list python-pytest - python-setuptools - python-setuptools-scm - python-tornado-6 - python-typeguard - python-wheel)) - (home-page "https://github.com/jd/tenacity") - (synopsis "Retrying library for python") - (description - "Tenacity is a general-purpose python library to simplify the task of -adding retry behavior to just about anything.") - (license license:asl2.0))) - (define-public python-pytelegrambotapi (package (name "python-pytelegrambotapi") @@ -4690,8 +4510,8 @@ which is a fork of @url{http://hdfeos.org/software/pyhdf.php,pyhdf}.") ;; Version 0.9.x was called python-hdf4 in PyPI because at that time upstream ;; didn't have access to the pyhdf package in PyPI. For version 0.10.0 and ;; onward, please install pyhdf instead of python-hdf4. -(define-public python-hdf4 - (deprecated-package "python-hdf4" python-pyhdf)) +(define-deprecated-package python-hdf4 + python-pyhdf) (define-public python-h5netcdf (package @@ -5069,7 +4889,7 @@ of the netcdf4 package before.") (setenv "NO_CDL" "1") (invoke "python" "run_all.py")))))))) (native-inputs - (list python-cython-3 + (list python-cython python-setuptools python-wheel)) (propagated-inputs @@ -5424,24 +5244,6 @@ to allow the user to choose from a list of options, and terminal interaction helpers.") (license license:expat))) -(define-public python-textparser - (package - (name "python-textparser") - (version "0.23.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "textparser" version)) - (sha256 - (base32 - "0w5lyhrsvzs5a9q1l3sjgxgljrvd3ybf796w93kc39wayzvd02gh")))) - (build-system python-build-system) - (home-page "https://github.com/eerimoq/textparser") - (synopsis "Fast text parser for Python") - (description "This library provides a text parser written in the Python -language. It aims to be fast.") - (license license:expat))) - ;; XXX: The project might be abandoned and this package has no users in Guix, ;; consider to remove if it keeps failing. ;; See: <https://github.com/ethanfurman/aenum/issues/45>, @@ -7746,6 +7548,35 @@ you traverse a schema like paths and access a schema on demand with separate dereferencing accessor layer.") (license license:asl2.0))) +(define-public python-jsonschema-objects + (package + (name "python-jsonschema-objects") + (version "0.5.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/cwacek/python-jsonschema-objects/") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0p3m0fbj25brhfma4bl47xjq6x4ay14yx284qwrki96dwd6v46xd")))) + (build-system pyproject-build-system) + (native-inputs + (list python-pytest + python-pytest-mock + python-setuptools)) + (propagated-inputs + (list python-inflection + python-jsonschema + python-markdown)) + (home-page "http://python-jsonschema-objects.readthedocs.org/") + (synopsis "Automatic Python binding generation from JSON schemas") + (description + "This package provides an automatic class-based binding to JSON +Schemas for use in python.") + (license license:expat))) + (define-public python-jsonschema-specifications (package (name "python-jsonschema-specifications") @@ -7911,34 +7742,6 @@ Capabilities include: @end itemize") (license license:expat))) -(define-public python-text-unidecode - (package - (name "python-text-unidecode") - (version "1.3") - (source (origin - (method url-fetch) - (uri (pypi-uri "text-unidecode" version)) - (sha256 - (base32 - "14xb99fdv52j21dsljgsbmbaqv10ps4b453p229r29sdn4xn1mms")))) - (build-system python-build-system) - (arguments - '(#:phases (modify-phases %standard-phases - (replace 'check - (lambda _ - (invoke "pytest" "-vv")))))) - (native-inputs - (list python-pytest)) - (home-page "https://github.com/kmike/text-unidecode/") - (synopsis "Decode Unicode data") - (description - "@code{text-unidecode} is a basic Python port of the @code{Text::Unidecode} -Perl library. It can create ASCII representations of Unicode data. In general -users should prefer the @code{python-unidecode} package which offers better -memory usage and transliteration quality.") - ;; The user can choose either license. - (license (list license:clarified-artistic license:gpl2+)))) - (define-public python-pyjwt (package (name "python-pyjwt") @@ -8077,7 +7880,7 @@ environments and back.") (base32 "0gmwggzm0j0iprx074g5hah91y2f68sfhhldq0f8crddj7ndk16m")))) (build-system pyproject-build-system) (native-inputs - (list python-cython-3 + (list python-cython python-pytest python-setuptools python-wheel)) @@ -9794,8 +9597,8 @@ which can produce feeds in RSS 2.0, RSS 0.91, and Atom formats.") "This package provides a JSON RPC 2.0 server library for Python.") (license license:expat))) -(define-public python-jsonrpc-server - (deprecated-package "python-jsonrpc-server" python-lsp-jsonrpc)) +(define-deprecated-package python-jsonrpc-server + python-lsp-jsonrpc) (define-public python-pydantic (package @@ -10134,8 +9937,8 @@ This tool is used in text editing environments to provide a complete and integrated feature-set for programming Python effectively.") (license license:expat))) -(define-public python-language-server - (deprecated-package "python-language-server" python-lsp-server)) +(define-deprecated-package python-language-server + python-lsp-server) (define-public python-black (package @@ -10423,7 +10226,8 @@ writing C extensions for Python as easy as Python itself.") ;; time of the test suite. (setenv "CFLAGS" "-O0")))))))) -(define-public python-cython-3 python-cython) +;; It may be removed after 2026-01-24. +(define-deprecated/public-alias python-cython-3 python-cython) ;; NOTE: when upgrading numpy please make sure that python-numba, ;; python-pandas and python-scipy still build, as these three packages are @@ -11443,7 +11247,7 @@ convert between colorspaces like sRGB, XYZ, CIEL*a*b*, CIECAM02, CAM02-UCS, etc. (("build_inplace=False") "build_inplace=True"))))))) (native-inputs (list python-covdefaults - python-cython-3 + python-cython python-expandvars python-pytest python-pytest-cov @@ -12485,27 +12289,23 @@ a general image processing tool.") (define-public python-pillow-heif (package (name "python-pillow-heif") - (version "0.22.0") + (version "1.1.1") (source (origin (method url-fetch) (uri (pypi-uri "pillow_heif" version)) (sha256 - (base32 "16mkap63d14f69105b3bm8pi64fvpdznncgn48vhgls0jf977m31")))) + (base32 "1pkbkg88jg6f24xvbg95aq8dm8fa8ffz7zy4rq262m98i658q3pn")))) (build-system pyproject-build-system) (inputs (list libheif)) (propagated-inputs (list python-pillow)) (native-inputs (list opencv ; for opencv-python - python-coverage python-defusedxml python-numpy python-packaging - python-pre-commit - python-pylint python-pympler python-pytest - python-setuptools - python-wheel)) + python-setuptools)) (home-page "https://github.com/bigcat88/pillow_heif") (synopsis "Python interface for libheif library") (description "This package provides Python bindings for the libheif library @@ -12740,96 +12540,6 @@ ImageJ ROIs, an undocumented and ImageJ application specific format to store regions of interest, geometric shapes, paths, text, etc for image overlays.") (license license:bsd-3))) -(define-public python-tifffile - (package - (name "python-tifffile") - (version "2025.10.4") - (source - (origin - (method url-fetch) - (uri (pypi-uri "tifffile" version)) - (sha256 - (base32 "0f1ybmr2jz19gjg92p9vz3qib49m0x4ipxvrvjyfa6r1mcb7qhrf")))) - (build-system pyproject-build-system) - ;; Tests require lfdfiles, which depends on tifffile - (arguments (list #:tests? #f)) - (propagated-inputs - (list python-numpy)) - (native-inputs - (list python-setuptools)) - (home-page "https://www.lfd.uci.edu/~gohlke/") - (synopsis "Read and write TIFF(r) files") - (description - "This package lets you read image and metadata from many bio-scientific -formats such as plain TIFF, BigTIFF, OME-TIFF, STK, LSM, SGI,NIH, ImageJ, -MicroManager, MD GEL, and FluoView files. It also lets you write numpy arrays -to TIFF, BigTIFF, and ImageJ hyperstack compatible files.") - (license license:bsd-3))) - -(define-public python-tifffile-for-dask-image - ;; It's for python-dask-image@2024.5.3, remove when no longer required. - (hidden-package - (package - (inherit python-tifffile) - (name "python-tifffile") - (version "2023.12.9") - (source - (origin - (method url-fetch) - (uri (pypi-uri "tifffile" version)) - (sha256 - (base32 "1f6d8qdlq0zlksfdhp1mhj9icpwhw4cz47r4i80m6r0a328xmlcx"))))))) - -(define-public python-tiktoken - (package - (name "python-tiktoken") - (version "0.9.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "tiktoken" version)) - (sha256 - (base32 "0p9cg6n8mzdi4lbbwxrrp26chy5hr14bqmzr3w74kq1qm6k5qanh")))) - (build-system cargo-build-system) - (arguments - (list - #:install-source? #false - #:imported-modules - (append %pyproject-build-system-modules - %cargo-build-system-modules) - #:modules - '((guix build cargo-build-system) - ((guix build pyproject-build-system) #:prefix py:) - (guix build utils)) - #:phases - #~(modify-phases %standard-phases - (replace 'build - (assoc-ref py:%standard-phases 'build)) - (add-after 'install 'wrap - (lambda _ - ;; Collection of python- and pyproject-build-system phases - ;; between 'install and 'check. - (assoc-ref py:%standard-phases 'add-install-to-pythonpath) - (assoc-ref py:%standard-phases 'add-install-to-path) - (assoc-ref py:%standard-phases 'wrap) - (assoc-ref py:%standard-phases 'create-entrypoints) - (assoc-ref py:%standard-phases 'compile-bytecode))) - (replace 'install - (assoc-ref py:%standard-phases 'install))))) - (propagated-inputs (list python-regex python-requests)) - (inputs (cargo-inputs 'python-tiktoken)) - (native-inputs - (list python-setuptools - python-setuptools-rust - python-wheel - python-wrapper)) - (home-page "https://github.com/openai/tiktoken/") - (synopsis "Fast BPE tokeniser for use with OpenAI's models") - (description - "Tiktoken is a fast @dfn{byte pair encoding} (BPE) tokeniser for use with -@code{OpenAI's} models.") - (license license:expat))) - (define-public python-lfdfiles (package (name "python-lfdfiles") @@ -12965,50 +12675,52 @@ that requires its specific capabilities.") (define-public python-ffmpeg-python ;; The latest release (0.2.0) is old and its test suite crashs on Python 3.10. - (let ((commit "df129c7ba30aaa9ffffb81a48f53aa7253b0b4e6") (revision "0")) - (package - (name "python-ffmpeg-python") - (version (git-version "0.2.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/kkroening/ffmpeg-python.git") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1zj4ac37n4igfj21zy405mdlvbpv6jyb12wfpszf8zkhhj2qby4c")))) - (build-system python-build-system) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'hardcode-ffmpeg - (lambda* (#:key inputs #:allow-other-keys) - (define ffmpeg (search-input-file inputs "bin/ffmpeg")) + (package + (name "python-ffmpeg-python") + (properties '((commit . "df129c7ba30aaa9ffffb81a48f53aa7253b0b4e6") + (revision . "0"))) + (version (git-version "0.2.0" + (assoc-ref properties 'revision) + (assoc-ref properties 'commit))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/kkroening/ffmpeg-python.git") + (commit (assoc-ref properties 'commit)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1zj4ac37n4igfj21zy405mdlvbpv6jyb12wfpszf8zkhhj2qby4c")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + #~(list "-k" "not test_pipe and not test__probe") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'hardcode-ffmpeg + (lambda* (#:key inputs #:allow-other-keys) + (let ((ffmpeg (search-input-file inputs "bin/ffmpeg"))) (substitute* "ffmpeg/_run.py" (("cmd='ffmpeg'") (string-append "cmd='" ffmpeg "'"))) (substitute* "ffmpeg/tests/test_ffmpeg.py" (("out_file.compile\\(\\) == \\['ffmpeg'") - (string-append "out_file.compile() == ['" ffmpeg "'"))))) - ;; Some tests fail with ffmpeg 5+ - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest" "-vv" - "-k" "not test_pipe and not test__probe"))))))) - (inputs (list ffmpeg)) - (propagated-inputs (list python-future)) - (native-inputs (list python-future python-numpy python-pytest - python-pytest-mock python-pytest-runner)) - (home-page "https://github.com/kkroening/ffmpeg-python") - (synopsis "Python bindings for FFmpeg with complex filtering support") - (description - "ffmpeg-python allows you to write FFmpeg filtergraphs in familiar + (format #f "out_file.compile() == [~s" ffmpeg))))))))) + (inputs (list ffmpeg)) + (propagated-inputs (list python-future)) + (native-inputs (list python-future + python-numpy + python-pytest + python-pytest-mock + python-setuptools)) + (home-page "https://github.com/kkroening/ffmpeg-python") + (synopsis "Python bindings for FFmpeg with complex filtering support") + (description + "ffmpeg-python allows you to write FFmpeg filtergraphs in familiar Python terms, taking care of running ffmpeg with the correct command-line arguments. It handles arbitrarily large (directed-acyclic) signal graphs.") - (license license:asl2.0)))) + (license license:asl2.0))) (define-public python-imageio-ffmpeg (package @@ -13253,7 +12965,7 @@ a front-end for C compilers or analysis tools.") (list meson ninja pkg-config - python-cython-3 + python-cython python-meson-python python-numpy python-pytest)) @@ -13358,23 +13070,23 @@ all of your favorite programs.") (define-public python-pywinrm (package (name "python-pywinrm") - (version "0.4.1") + (version "0.5.0") (source (origin - (method url-fetch) - (uri (pypi-uri "pywinrm" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/diyan/pywinrm/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "10gabhhg3rgacd5ahmi2r128z99fzbrbx6mz1nnq0dxmhmn5rpjf")))) - (build-system python-build-system) + (base32 "0jp7rps6zg5b6n98lfkwbhv72982sxxnqc4v4i6hjlq1ycjmmb8r")))) + (build-system pyproject-build-system) (propagated-inputs - (list python-six python-requests_ntlm python-xmltodict - python-kerberos)) + (list python-requests python-requests-ntlm python-xmltodict)) (native-inputs - (list python-mock python-pytest)) + (list python-mock python-pytest python-setuptools)) (home-page "https://github.com/diyan/pywinrm/") - (synopsis - "Python library for Windows Remote Management (WinRM)") + (synopsis "Python library for Windows Remote Management (WinRM)") (description "pywinrm is a Python client for the Windows Remote Management (WinRM) service. It allows you to invoke commands on target Windows machines from @@ -13533,16 +13245,19 @@ etc. The core of this module is a decorator factory.") (uri (pypi-uri "drmaa" version)) (sha256 (base32 "0xzqriqyvk5b8hszbavsyxd29wm3sxirm8zvvdm73rs2iq7w4hkx")))) - (build-system python-build-system) + (build-system pyproject-build-system) ;; The test suite requires libdrmaa which is provided by the cluster ;; environment. At runtime the environment variable DRMAA_LIBRARY_PATH ;; should be set to the path of the libdrmaa library. (arguments - '(#:tests? #f - #:phases (modify-phases %standard-phases - ;; Loading the library fails because DRMAA_LIBRARY_PATH - ;; is not configured. - (delete 'sanity-check)))) + (list + #:tests? #f + #:phases + #~(modify-phases %standard-phases + ;; Loading the library fails because DRMAA_LIBRARY_PATH + ;; is not configured. + (delete 'sanity-check)))) + (native-inputs (list python-setuptools)) (home-page "https://pypi.org/project/drmaa/") (synopsis "Python bindings for the DRMAA library") (description @@ -13570,11 +13285,11 @@ Python language binding specification.") (substitute* '("grako/util.py" "grako/walkers.py") (("collections\\.Mapping") "collections.abc.Mapping")))))) - (build-system python-build-system) - (arguments '(#:tests? #f)) ; Test file 'grako.ebnf' is missing from archive. - (native-inputs - (list unzip python-pytest python-pytest-runner)) - (home-page "https://bitbucket.org/neogeny/grako") + (build-system pyproject-build-system) + ;; XXX: Test file 'grako.ebnf' is missing from archive. + (arguments (list #:tests? #f)) + (native-inputs (list unzip python-pytest python-setuptools)) + (home-page "https://pypi.org/project/grako") (synopsis "EBNF parser generator") (description "Grako takes a grammar in a variation of EBNF as input, and outputs a @@ -13639,7 +13354,7 @@ you to actually draw things with your favorite toolkit.") (define-public python-gridmap (package (name "python-gridmap") - (version "0.14.0") + (version "0.15.0") (source (origin (method git-fetch) @@ -13648,15 +13363,20 @@ you to actually draw things with your favorite toolkit.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0v0sgpg6pz8h61f9aqjf5xk0ipr512bbz8dxzjjylksj135qr19l")))) - (build-system python-build-system) + (base32 "0w1sxvhv5ldbzkx70q7036yvny0zsylc4zj7nzmp3nhjdl8whlrm")))) + (build-system pyproject-build-system) (arguments - '(#:tests? #f ;FIXME: Requires python-cherrypy. - #:phases (modify-phases %standard-phases - ;; Importing the web server module requires cherrypy, too. - (delete 'sanity-check)))) + (list #:tests? #f ;XXX: freezes or timeout + #:test-backend #~'nose)) + (native-inputs + (list ;; python-pynose + python-setuptools)) (propagated-inputs - (list python-psutil python-drmaa python-pyzmq)) + (list python-cherrypy + python-cloudpickle + python-psutil + python-drmaa + python-pyzmq)) (home-page "https://github.com/pygridtools/gridmap") (synopsis "Create jobs on a cluster directly from Python") (description @@ -14580,63 +14300,6 @@ cluster down and deletes the throwaway profile.") connect strings, then issue SQL commands within IPython or IPython Notebook.") (license license:expat))) -(define-public python-traitlets - (package - (name "python-traitlets") - (version "5.14.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "traitlets" version)) - (sha256 - (base32 - "0zjj8ha4z5lbhhmvcl3q8wp5qmwqq0lwxma3d8qvh10s6xdi11c5")))) - (build-system pyproject-build-system) - (arguments - (list - #:test-flags - '(list "-k" "not mypy_list_typing and not mypy_dict_typing"))) - (native-inputs - (list python-argcomplete - python-hatchling - python-mypy - python-pytest - python-pytest-mock - python-pytest-mypy-testing)) - (home-page "https://ipython.org") - (synopsis "Configuration system for Python applications") - (description - "Traitlets is a framework that lets Python classes have attributes with -type checking, dynamically calculated default values, and ‘on change’ -callbacks. The package also includes a mechanism to use traitlets for -configuration, loading values from files or from command line arguments. This -is a distinct layer on top of traitlets, so you can use traitlets in your code -without using the configuration machinery.") - (license license:bsd-3))) - -(define-public python-treelib - (package - (name "python-treelib") - (version "1.8.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/caesar0301/treelib") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0jd3rdaq8v7ykb626cm1gxa03higqnn2pmnv46fc0lc55xbrkxlf")) - (patches - (search-patches "python-treelib-remove-python2-compat.patch")))) - (build-system pyproject-build-system) - (native-inputs (list python-poetry-core python-pytest)) - (home-page "https://github.com/caesar0301/treelib") - (synopsis "Implementation of a tree structure in Python") - (description - "This package provides a Python implementation of a tree structure.") - (license license:asl2.0))) - (define-public python-optree (package (name "python-optree") @@ -15221,44 +14884,6 @@ computing.") code.") (license license:bsd-3))) -(define-public python-textdistance - (package - (name "python-textdistance") - (version "4.6.3") - (source - (origin - ;; There are no tests in the PyPI tarball. - (method git-fetch) - (uri (git-reference - (url "https://github.com/life4/textdistance") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1qaplikab46p38jqr93bxd26vvxcnvib15fjxmmp4cbsiy5196sg")))) - (build-system pyproject-build-system) - (arguments - (list - #:test-flags - #~(list "--numprocesses" (number->string (min 4 (parallel-job-count)))))) - (native-inputs - (list python-numpy - python-pytest - python-pytest-xdist - python-setuptools - python-wheel)) - (propagated-inputs - (list python-jellyfish - python-distance - python-levenshtein - python-pylev - python-pyxdameraulevenshtein - python-rapidfuzz)) - (home-page "https://github.com/life4/textdistance") - (synopsis "Compute distance between the two texts") - (description "@code{textdistance} is a pure Python library for comparing -distance between two or more sequences by many algorithms.") - (license license:expat))) - (define-public python-pydbus (package (name "python-pydbus") @@ -15609,33 +15234,6 @@ language, in Python.") GA4GH Task Execution API.") (license license:expat))) -(define-public python-toposort - (package - (name "python-toposort") - (version "1.10") - (source - (origin - (method url-fetch) - (uri (pypi-uri "toposort" version)) - (sha256 - (base32 - "1gd66z5dy6j7qs5qkj1pg0vb15rwd571yq02fkm9d9nhaff4gfxz")))) - (build-system pyproject-build-system) - (arguments - (list - #:phases - '(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (invoke "python3" "-m" "test.test_toposort")))))) - (native-inputs (list python-setuptools python-wheel)) - (home-page "https://gitlab.com/ericvsmith/toposort") - (synopsis "Topological sort algorithm") - (description - "This package provides an implementation of a topological sort -algorithm.") - (license license:asl2.0))) - (define-public python-altgraph (package (name "python-altgraph") @@ -15656,61 +15254,6 @@ traversals, topological sort, shortest paths, and more with graphviz output.") (license license:expat))) -(define-public python-three-merge - (package - (name "python-three-merge") - (version "0.1.1") - (source - (origin - ;; There are no tests in the PyPI tarball. - (method git-fetch) - (uri (git-reference - (url "https://github.com/spyder-ide/three-merge") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1fw28swh6jq4myr09j7gv68l241b8vwg470ak5xv0x4xwh2a1m86")))) - (build-system pyproject-build-system) - (propagated-inputs - (list python-diff-match-patch)) - (native-inputs - (list python-pytest python-setuptools python-wheel)) - (home-page "https://github.com/spyder-ide/three-merge") - (synopsis "Library for merging two strings with respect to a base one") - (description - "This package provides a Python library to perform a 3-way merge between -strings, based on @code{diff-match-patch}. This library performs merges at a -character level, as opposed to most VCS systems, which opt for a line-based -approach.") - (license license:expat))) - -(define-public python-throttler - (package - (name "python-throttler") - (version "1.2.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/uburuntu/throttler") - (commit (string-append "v" version)))) - (sha256 - (base32 "1gn21x0zkm7rr7qijlz7nvw7z0mm1j2r0r2lslg7wln1z36gjkbw")))) - (build-system pyproject-build-system) - (native-inputs (list python-aiohttp - python-codecov - python-flake8 - python-pytest - python-pytest-asyncio - python-pytest-cov - python-setuptools - python-wheel)) - (home-page "https://github.com/uburuntu/throttler") - (synopsis "Throttling with asyncio support") - (description - "This is a Python package for easy throttling with asyncio support.") - (license license:expat))) - (define-public python-pyqrcode (package (name "python-pyqrcode") @@ -16351,8 +15894,8 @@ file (e.g. @file{PKG-INFO}).") (license license:expat))) ;; pep621 was renamed to pyproject-metadata. -(define-public python-pep621 - (deprecated-package "python-pep621" python-pyproject-metadata)) +(define-deprecated-package python-pep621 + python-pyproject-metadata) (define-public python-meson-python (package @@ -17067,8 +16610,9 @@ stdin/stdout/stderr.") (uri (pypi-uri "stopit" version)) (sha256 (base32 "0vcrcvky249q4rbgmwf18mwmnypfk8jpn4h6knyjf86r7xc9rwzp")))) - (build-system python-build-system) - (arguments '(#:tests? #f)) ;there are none + (build-system pyproject-build-system) + (arguments (list #:tests? #f)) ;there are none + (native-inputs (list python-setuptools)) (home-page "https://pypi.python.org/pypi/stopit") (synopsis "Timeout control decorator and context managers") (description @@ -17076,27 +16620,6 @@ stdin/stdout/stderr.") blocks or callables with two context managers and two decorators.") (license license:expat))) -(define-public python-timeout-decorator - ;; TODO: Remove when python-requests-caches releses a fresh version dropping - ;; it, see, <https://github.com/requests-cache/requests-cache/pull/1111>. - (package - (name "python-timeout-decorator") - (version "0.5.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "timeout-decorator" version)) - (sha256 - (base32 "1mxk2qyydhzncm93z08kvj5ssxq3fr2n7pkrrji28nqwvdc2ybva")))) - (build-system pyproject-build-system) - (arguments (list #:tests? #f)) - (native-inputs (list python-setuptools python-wheel)) - (home-page "https://github.com/pnpnpn/timeout-decorator") - (synopsis "Timeout decorator") - (description "This package provides a decorator that raises an error -when an operation takes longer than expected.") - (license license:expat))) - (define-public python-straight-plugin (package (name "python-straight-plugin") @@ -17358,22 +16881,44 @@ from an XML-based format.") (define-public python-ly (package (name "python-ly") - (version "0.9.5") + (version "0.9.9") (source (origin - (method url-fetch) - (uri (pypi-uri name version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/frescobaldi/python-ly") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0x98dv7p8mg26p4816yy8hz4f34zf6hpnnfmr56msgh9jnsm2qfl")))) - (build-system python-build-system) + (base32 "1q9jdvc4mrv3xkp7jm4g4kisq1k1d05b5d3wfvhpd85a9yqjrhq8")))) + (build-system pyproject-build-system) (arguments - ;; FIXME: Some tests need network access. - '(#:tests? #f)) + (list + #:phases + (let ((namespace-url "http://www.w3.org/2001/03/xml.xsd") + (xlink-url "http://www.w3.org/XML/2008/06/xlink.xsd")) + #~(modify-phases %standard-phases + (add-after 'unpack 'inject-data + (lambda _ + (substitute* "tests/musicxml.xsd" + (((string-join (string-split #$namespace-url #\.) "\\.")) + #$(origin + (method url-fetch) + (uri namespace-url) + (sha256 (base32 "\ +1j6h0sp0pcqi5dv9m6sxwr8brrb59fyx091ld1x6wlh28js4vn8f")))) + (((string-join (string-split #$xlink-url #\.) "\\.")) + #$(origin + (method url-fetch) + (uri xlink-url) + (sha256 (base32 "\ +0jpjha5iiq4rf4hx3qfnmyya9cf17ysxz0rbhsffn5nwgxnghgf8"))))))))))) + (native-inputs (list python-hatchling python-lxml python-pytest)) (synopsis "Tool and library for manipulating LilyPond files") - (description "This package provides a Python library to parse, manipulate -or create documents in LilyPond format. A command line program ly is also -provided that can be used to do various manipulations with LilyPond files.") + (description + "This package provides a Python library to parse, manipulate or create +documents in LilyPond format. A command line program ly is also provided that +can be used to do various manipulations with LilyPond files.") (home-page "https://pypi.org/project/python-ly/") (license license:gpl2+))) @@ -17420,13 +16965,18 @@ refactoring library.") (package (name "python-gorilla") (version "0.3.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "gorilla" version)) - (sha256 - (base32 - "0b40blcp6fih4nvqbilra4qw1dfccv1ahjmr41ac4d9rjadqkcpy")))) - (build-system python-build-system) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/christophercrouzet/gorilla") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0hm5ynswhz6i763s6cjlh8lv5ai0f3x17mjvlihqs8idlk4vbrn0")))) + (build-system pyproject-build-system) + (arguments (list #:test-backend #~'unittest)) + (native-inputs (list python-setuptools)) (home-page "https://github.com/christophercrouzet/gorilla") (synopsis "Convenient monkey patching with Python") (description @@ -17439,22 +16989,33 @@ third-party code.") (define-public python-llfuse (package (name "python-llfuse") - (version "1.4.4") - (source (origin - (method url-fetch) - (uri (pypi-uri "llfuse" version)) - (sha256 - (base32 - "1jb4c9avvb0v3830xlbj1r9kj05i98vv6nq05105ppg57y7lq14j")))) - (build-system python-build-system) - (inputs - (list fuse-2 attr)) + (version "1.5.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/python-llfuse/python-llfuse") + (commit (string-append "release-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "16wsrg1py4gvcxfgsfkll73lfq62psc0hcqvs73az7s4b1pvyy62")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + #~(list "-k" "not test_listdir") ; requires /usr/bin access. + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'build-cython + (lambda _ + (invoke "python" "setup.py" "build_cython")))))) + (inputs (list fuse-2 attr)) (native-inputs - (list pkg-config python-pytest)) + (list pkg-config python-cython python-pytest python-setuptools)) (synopsis "Python bindings for FUSE") (description "Python-LLFUSE is a set of Python bindings for the low level FUSE API.") - (home-page "https://bitbucket.org/nikratio/python-llfuse/") + (home-page "https://github.com/python-llfuse/python-llfuse") (license license:lgpl2.0+))) (define-public python-msgpack @@ -17678,110 +17239,6 @@ programming. It provides standard programming abstractions such as as tasks, sockets, files, locks, and queues.") (license license:bsd-3))) -(define-public python-tables - (package - (name "python-tables") - (version "3.10.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "tables" version)) - (sha256 - (base32 - "0469jrkmp0qv8cmlqkizm3b8imyc97mk9pfn66ldpyl6f4m82i15")) - (snippet '(begin - (use-modules (guix build utils)) - ;; TODO: Unbundle. - ;; (delete-file-recursively "hdf5-blosc") - (delete-file-recursively "c-blosc"))))) - (build-system pyproject-build-system) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'disable-tuning - (lambda _ - (substitute* "setup.py" - (("cpu_flags = .*") - "cpu_flags = ['sse2']\n")))) - (add-after 'unpack 'fix-reference-to-blosc2 - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "tables/__init__.py" - (("( +)os.path.join\\(current_dir, blosc2_lib_hardcoded\\)," - m indent) - (string-append indent - "\"" - (search-input-file inputs "/lib/libblosc2.so") - "\",\n" m))))) - (add-before 'build 'pre-build - (lambda _ - (invoke "make" "distclean") ;Regenerate C code with Cython - (setenv "BLOSC2_DIR" #$(this-package-input "cblosc2")) - (setenv "BLOSC_DIR" #$(this-package-input "c-blosc")) - (setenv "BZIP2_DIR" #$(this-package-input "bzip2")) - (setenv "HDF5_DIR" #$(this-package-input "hdf5")) - (setenv "LZO_DIR" #$(this-package-input "lzo")))) - (add-before 'check 'pre-check - (lambda _ - (setenv "HOME" "/tmp"))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (with-directory-excursion "/tmp" - ;; Performing only a light (yet comprehensive) subset of the - ;; test suite. If you want a more complete test, try - ;; passing the --heavy flag to this script (or set the - ;; 'heavy' parameter in case you are using tables.test() - ;; call). The whole suite will take more than 4 hours to - ;; complete on a relatively modern CPU and around 512 MB of - ;; main memory. - (invoke "python" "-m" "tables.tests.test_all")))))))) - (native-inputs - (list pkg-config - python-cython - python-pytest - python-setuptools - python-sphinx)) - (inputs - (list bzip2 - c-blosc - c-blosc2 - hdf5 - lzo)) - (propagated-inputs - (list python-blosc2 - python-numexpr - python-numpy - python-packaging - python-py-cpuinfo - python-typing-extensions)) - (home-page "https://www.pytables.org/") - (synopsis "Hierarchical datasets for Python") - (description "PyTables is a package for managing hierarchical datasets and -designed to efficiently cope with extremely large amounts of data.") - (license license:bsd-3))) - -(define-public python-tasklogger - (package - (name "python-tasklogger") - (version "1.2.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "tasklogger" version)) - (sha256 - (base32 "1901mibcp6aiyjy8afnybrxnb0dkbdxlbvjqbr3gginlw7dr18xh")))) - (build-system pyproject-build-system) - (propagated-inputs (list python-deprecated)) - (native-inputs (list python-coverage python-coveralls python-nose2 - python-numpy python-setuptools python-wheel)) - (home-page "https://github.com/scottgigante/tasklogger") - (synopsis "Extension to the core Python logging library") - (description "This package provides an extension to the core Python -logging library for logging the beginning and completion of tasks and -subtasks.") - (license license:gpl2))) - (define-public python-sniffio (package (name "python-sniffio") @@ -18009,19 +17466,19 @@ provides a collection of cache libraries in the same API interface.") (version "1.2.0") (source (origin - (method url-fetch) - (uri (pypi-uri "pylru" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/jlhutch/pylru") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "15yj46307sw703vjfkgnr04dqvaicmfcj0hc6yrciildp55r6bs9")))) - (build-system python-build-system) + (base32 "0sqai530d7fpjzny476f3zqq9mv05xqbyw500jmbhrpj9yy1l9xp")))) + (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs outputs tests? #:allow-other-keys) - (when tests? - (add-installed-pythonpath inputs outputs) - (invoke "python" "test.py"))))))) + (list + #:test-backend #~'custom + #:test-flags #~(list "test.py"))) + (native-inputs (list python-pytest python-setuptools)) (home-page "https://github.com/jlhutch/pylru") (synopsis "Least recently used (LRU) cache implementation") (description @@ -18262,74 +17719,64 @@ is binding LibSass.") (version "1.0.1") (source (origin - (method url-fetch) - (uri (pypi-uri "idna-ssl" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/aio-libs/idna-ssl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0ydrc8hpg9mdr5hqq1lqfsfbn6sjq69slwpfrnlrm3k0phqg14qj")))) - (build-system python-build-system) - (arguments - `(#:tests? #f)) ;circular dependency with python-aiohttp + (base32 "1fj4zkcnx3mk7kbnf4d6pjgv331n17wzpphpwdnmr498ghbsph9k")))) + (build-system pyproject-build-system) + (arguments (list #:tests? #f)) ;circular dependency with python-aiohttp + (native-inputs (list python-setuptools)) (propagated-inputs (list python-idna)) (home-page "https://github.com/aio-libs/idna-ssl") - (synopsis "Patch @code{ssl.match_hostname} for Unicode(idna) domains support") - (description "Patch @code{ssl.match_hostname} for Unicode(idna) -domains support.") + (synopsis "Support Unicode(idna) domains for Python's @code{ssl} module") + (description + "This package provides Unicode(idna) domains support for Python's +@code{ssl} module. It patches @code{ssl.match_hostname} for that purpose.") (license license:expat))) -;;; Variant used to break a cycle with python-pip-run-bootstrap. -(define-public python-path-bootstrap - (hidden-package - (package - (name "python-path-bootstrap") - (version "17.1.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "path" version)) - (sha256 - (base32 "1scqbwgcbisx8mb28hw789a7np953851wg6z0bbzdm519znha7nl")))) - (build-system pyproject-build-system) - (arguments - (list #:tests? #f)) - (native-inputs (list python-setuptools python-setuptools-scm python-wheel)) - (home-page "https://github.com/jaraco/path") - (synopsis "Object-oriented file system path manipulation library") - (description "@code{path} (formerly @code{path.py}) implements path -objects as first-class entities, allowing common operations on files to be -invoked on those path objects directly.") - (license license:expat)))) - (define-public python-path - (package/inherit python-path-bootstrap + (package (name "python-path") + (version "17.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "path" version)) + (sha256 + (base32 "1scqbwgcbisx8mb28hw789a7np953851wg6z0bbzdm519znha7nl")))) + (build-system pyproject-build-system) (arguments - (substitute-keyword-arguments - (package-arguments python-path-bootstrap) - ((#:tests? _ #f) - (not (%current-target-system))) - ((#:test-flags flags #~'()) - #~(append (list "-k" - (string-append - ;; Do not test the myproject.toml build as it tries - ;; to pull dependencies from the Internet. - "not project " - ;; This tests assumes a root user exists. - "and not test_get_owner")) - #$flags)))) + (list + #:tests? (not (%current-target-system)) + #:test-flags + #~(list "-k" + (string-append + ;; Do not test the myproject.toml build as it tries + ;; to pull dependencies from the Internet. + "not project " + ;; This tests assumes a root user exists. + "and not test_get_owner")))) (native-inputs - (modify-inputs (package-native-inputs python-path-bootstrap) - (append python-appdirs - python-more-itertools - python-packaging - python-pygments - python-pytest))) - (properties (alist-delete 'hidden? - (package-properties - python-path-bootstrap))))) + (list python-appdirs + python-more-itertools + python-packaging + python-pygments + python-pytest + python-setuptools + python-setuptools-scm)) + (home-page "https://github.com/jaraco/path") + (synopsis "Object-oriented file system path manipulation library") + (description "@code{path} (formerly @code{path.py}) implements path +objects as first-class entities, allowing common operations on files to be +invoked on those path objects directly.") + (license license:expat))) -(define-public python-pathpy - (deprecated-package "python-pathpy" python-path)) +;; It may be removed after 2026-01-24. +(define-deprecated/public-alias python-path-bootstrap python-path) +(define-deprecated/public-alias python-pathpy python-path) (define-public python-pretend (package @@ -18357,207 +17804,64 @@ or doubles. Basically, a stub is an object that returns pre-canned responses, rather than doing any computation.") (license license:bsd-3))) -;;; Variant used to break a dependency cycle with -;;; python-pytest-perf-bootstrap. -(define-public python-pip-run-bootstrap - (hidden-package - (package - (name "python-pip-run-bootstrap") - (version "8.8.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jaraco/pip-run") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0ycrjj3jgqcr9c2k7y8vprq65iblg0q0hvwz8zwi13gmb0ffds0c")))) - (build-system python-build-system) - (arguments - (list - #:tests? #f - #:phases - #~(modify-phases %standard-phases - (add-before 'build 'pretend-version - ;; The version string is usually derived via setuptools-scm, but - ;; without the git metadata available this fails. - (lambda _ - (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version)))))) - (native-inputs (list python-setuptools-scm)) - (propagated-inputs (list python-autocommand python-path-bootstrap - python-packaging)) - (home-page "https://github.com/jaraco/pip-run") - (synopsis "Dynamic dependency loader for Python") - (description "The @command{pip-run} command provides on-demand temporary -package installation for a single interpreter run. It replaces this series of -commands: -@example -$ virtualenv --python pythonX.X --system-site-packages /tmp/env -$ /tmp/env/bin/pip install pkg1 pkg2 -r reqs.txt -$ /tmp/env/bin/python ... -$ rm -rf /tmp/env -@end example") - (license license:expat)))) - (define-public python-pip-run - (package/inherit python-pip-run-bootstrap - (name "python-pip-run") - (arguments - (substitute-keyword-arguments (package-arguments python-pip-run-bootstrap) - ((#:tests? _ #f) - (not (%current-target-system))) - ((#:phases phases #~%standard-phases) - #~(modify-phases #$phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "pytest" "-k" - (string-append - ;; Do not test the myproject.toml build as it tries - ;; to pull dependencies from the internet. - "not project " - ;; These tests attempt to install dependencies from - ;; the network and fail. - "and not test_pkg_imported " - "and not test_pkg_loaded_from_alternate_index "))))))))) - (propagated-inputs - (modify-inputs (package-propagated-inputs python-pip-run-bootstrap) - (replace "python-path-bootstrap" python-path))) - (native-inputs - (modify-inputs (package-native-inputs python-pip-run-bootstrap) - (append python-nbformat - python-pygments - python-pytest))) - (properties (alist-delete 'hidden? (package-properties - python-pip-run-bootstrap))))) - -(define-public python-tlsh (package - (name "python-tlsh") - (version "4.11.2") - (home-page "https://github.com/trendmicro/tlsh") + (name "python-pip-run") + (version "8.8.0") (source (origin (method git-fetch) - (uri (git-reference (url home-page) (commit version))) + (uri (git-reference + (url "https://github.com/jaraco/pip-run") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1gb5j73nw3nmx030rf8pm75rns5syxhv44zxr6i74kjicyly1i9w")))) - (build-system python-build-system) - (arguments - (list #:phases - #~(modify-phases %standard-phases - (add-before 'build 'configure - (lambda _ - (invoke "cmake" "."))) ;to generate tlsh_version.h - (add-after 'configure 'chdir - (lambda _ - (chdir "py_ext"))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (with-directory-excursion "../Testing" - (invoke "./python_test.sh")))))))) - (native-inputs (list cmake-minimal)) - (synopsis "Fuzzy matching library for Python") - (description - "Trend Micro Locality Sensitive Hash (TLSH) is a fuzzy matching library. -Given a byte stream with a minimum length of 256 bytes, TLSH generates a hash -value which can be used for similarity comparisons. Similar objects have -similar hash values, which allows for the detection of similar objects by -comparing their hash values. The byte stream should have a sufficient amount -of complexity; for example, a byte stream of identical bytes will not generate -a hash value.") - (license license:asl2.0))) - -(define-public python-termcolor - (package - (name "python-termcolor") - (version "2.5.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "termcolor" version)) - (sha256 - (base32 "0vwaxyr2vk8gi7s1slq74nb0ssbb0wcn208ziqp48j3dv8kqv3cr")))) + (base32 "0ycrjj3jgqcr9c2k7y8vprq65iblg0q0hvwz8zwi13gmb0ffds0c")))) (build-system pyproject-build-system) - (native-inputs - (list python-hatch-vcs - python-hatchling - python-pytest - python-pytest-cov)) - (home-page "https://pypi.org/project/termcolor/") - (synopsis "ANSII Color formatting for terminal output") - (description - "This package provides ANSII Color formatting for output in terminals.") - (license license:expat))) - -(define-public python-termcolor-1 - (package - (inherit python-termcolor) - (version "1.1.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "termcolor" version)) - (sha256 - (base32 - "0fv1vq14rpqwgazxg4981904lfyp84mnammw7y046491cv76jv8x")))) - ;; There are no tests - (arguments (list #:tests? #false)) - (native-inputs - (list python-setuptools - python-wheel)))) - -(define-public python-terminaltables - (package - (name "python-terminaltables") - (version "3.1.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "terminaltables" version)) - (sha256 - (base32 - "109vhldk6nv1z3hzp4dyqf6rjvlhl0y2k5k7qcm9fcrq5swhxszk")))) - (build-system python-build-system) - (home-page "https://github.com/Robpol86/terminaltables") - (synopsis - "Generate simple tables in terminals from a nested list of strings") - (description - "This package makes it easy to draw tables in terminal/console -applications from a list of lists of strings. It supports multi-line rows.") - (license license:expat))) - -(define-public python-term-background - (package - (name "python-term-background") - (version "1.0.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "term_background" version)) - (sha256 - (base32 "0p674silrwc3jncncmdnj1lr6pl2q5qbx0xi3mzjq9sgcs5vmp4n")))) (arguments (list + #:tests? (not (%current-target-system)) + #:test-flags + #~(list "-k" (string-append + ;; Do not test the myproject.toml build as it tries + ;; to pull dependencies from the internet. + "not project " + ;; These tests attempt to install dependencies from + ;; the network and fail. + "and not test_pkg_imported " + "and not test_pkg_loaded_from_alternate_index " + "and not test_pkg_loaded_from_url ")) #:phases - '(modify-phases %standard-phases - (add-after 'unpack 'fix-build - (lambda _ (delete-file "setup.py")))))) - (build-system pyproject-build-system) + #~(modify-phases %standard-phases + (add-before 'build 'pretend-version + (lambda _ + (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version)))))) (native-inputs - (list python-pytest + (list python-nbformat + python-pygments + python-pytest python-setuptools - python-setuptools-scm - python-wrapper - python-wheel)) - (home-page "http://github.com/rocky/shell-term-background") - (synopsis "Determine if shell has a light or dark background") - (description "This package determines if shell has a light or dark -background.") - (license license:gpl2+))) + python-setuptools-scm)) + (propagated-inputs + (list python-autocommand + python-packaging + python-path + python-pip)) + (home-page "https://github.com/jaraco/pip-run") + (synopsis "Dynamic dependency loader for Python") + (description "The @command{pip-run} command provides on-demand temporary +package installation for a single interpreter run. It replaces this series of +commands: +@example +$ virtualenv --python pythonX.X --system-site-packages /tmp/env +$ /tmp/env/bin/pip install pkg1 pkg2 -r reqs.txt +$ /tmp/env/bin/python ... +$ rm -rf /tmp/env +@end example") + (license license:expat))) + +;; It may be removed after 2026-01-24. +(define-deprecated/public-alias python-pip-run-bootstrap python-pip-run) (define-public python-libarchive-c (package @@ -18598,26 +17902,26 @@ Python's @code{ctypes} foreign function interface (FFI).") (define-public python-file (package/inherit file (name "python-file") - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - '(#:tests? #f ;no tests - #:configure-flags '("--single-version-externally-managed" "--root=/") - #:phases (modify-phases %standard-phases - (add-before 'build 'change-directory - (lambda _ - (chdir "python") - #t)) - (add-before 'build 'set-library-file-name - (lambda* (#:key inputs #:allow-other-keys) - (let ((file (assoc-ref inputs "file"))) - (substitute* "magic.py" - (("find_library\\('magic'\\)") - (string-append "'" file "/lib/libmagic.so'"))) - #t)))))) - (inputs `(("file" ,file))) - (native-inputs (if (%current-target-system) - `(("self" ,this-package)) - '())) + (list + #:tests? #f ;no tests + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'change-directory + (lambda _ + (chdir "python"))) + (add-before 'build 'set-library-file-name + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "magic.py" + (("find_library\\('magic'\\)") + (format #f "~s" (search-input-file inputs + "lib/libmagic.so"))))))))) + (inputs (list file)) + (native-inputs (cons* python-setuptools + (if (%current-target-system) + (list this-package) + '()))) (synopsis "Python bindings to the libmagic file type guesser") (description "This package provides Python bindings to the libmagic file type guesser. @@ -18823,9 +18127,9 @@ Python.") (copy-file "lib/debian/_version.py.in" "lib/debian/_version.py") (substitute* "lib/debian/_version.py" (("__CHANGELOG_VERSION__") #$version)))))) - (build-system python-build-system) + (build-system pyproject-build-system) (native-inputs - (list python-pytest)) + (list python-pytest python-setuptools)) (propagated-inputs (list python-six python-chardet)) (synopsis "Debian package related modules") @@ -19057,19 +18361,24 @@ functions to find and load entry points.") (define-public python-epc (package (name "python-epc") - (version "0.0.5") + (properties '((commit . "f3673ae5c35f20a0f71546ab34c28e3dde3595c1") + (revision . "0"))) + (version (git-version "0.0.5" + (assoc-ref properties 'revision) + (assoc-ref properties 'commit))) (source (origin - (method url-fetch) - (uri (pypi-uri "epc" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/tkf/python-epc") + (commit (assoc-ref properties 'commit)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "09bx1ln1bwa00917dndlgs4k589h8qx2x080xch5m58p92kjwkd1")))) - (build-system python-build-system) - (propagated-inputs - (list python-sexpdata)) - (native-inputs - (list python-nose)) + (base32 "0q27bj49yan2qg6i8m5czs5b5jv26ff42yz7j4r5652s7j3f42mm")))) + (build-system pyproject-build-system) + (arguments (list #:test-backend #~'nose)) + (propagated-inputs (list python-sexpdata)) + (native-inputs (list python-pynose python-setuptools)) (home-page "https://github.com/tkf/python-epc") (synopsis "Remote procedure call (RPC) stack for Emacs Lisp and Python") (description @@ -19083,17 +18392,17 @@ from elisp.") (version "1.5") (source (origin - (method url-fetch) - (uri (pypi-uri "forex-python" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/MicroPyramid/forex-python") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "1ma8cl1i2dh8aa99pifnlilyy4d1gd1s07fj0yd17wcbpsh532cj")))) - (build-system python-build-system) - (arguments - ;; Tests are not included in the PyPI tarball. Also, the tests in the - ;; repository require online data. - `(#:tests? #f)) - (propagated-inputs - (list python-requests python-simplejson)) + (base32 "0pl5sfd0wkv1a2y324l518h6sing7wkadrbr5xcf6hjykn2mbi5h")))) + (build-system pyproject-build-system) + (arguments (list #:tests? #f)) ; Tests require online data. + (native-inputs (list python-setuptools)) + (propagated-inputs (list python-requests python-simplejson)) (home-page "https://github.com/MicroPyramid/forex-python") (synopsis "Foreign exchange rates and currency conversion") (description @@ -19119,11 +18428,15 @@ Features: (version "0.9.12") (source (origin - (method url-fetch) - (uri (pypi-uri "simpleeval" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/danthedeckie/simpleeval") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0diysdzvx865yy2rjfah75ha2qfxaxz7r108kp7j2kkd903ya2ry")))) - (build-system python-build-system) + (base32 "0khgl729q5133fgc00d550f4r77707rkkn7r56az4v8bvx0q8xp4")))) + (build-system pyproject-build-system) + (native-inputs (list python-pytest python-setuptools)) (home-page "https://github.com/danthedeckie/simpleeval") (synopsis "Simple, safe single expression evaluator library") (description @@ -19382,39 +18695,32 @@ Jupyter kernels such as IJulia and IRKernel.") (define-public python-jsbeautifier (package (name "python-jsbeautifier") - (version "1.10.2") + (version "1.15.3") (home-page "https://github.com/beautify-web/js-beautify") - (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0wawb070ki1axb3jc9xvsrgpji52vcfif3zmjzc3z4g98m5xw4kg")))) - (build-system python-build-system) + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1zl1g6w5zn2hxk5qq83j52cxa1ig75ryjwsjxv9wiwkar4qq88zg")))) + (build-system pyproject-build-system) (arguments - `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'chdir - (lambda _ - ;; The upstream Git repository contains all the code, - ;; but this package only builds the python code. - (chdir "python") - #t)) - (add-after 'unpack 'patch-python-six-requirements - (lambda _ - (substitute* "python/setup.py" - (("six>=1.12.0") - "six>=1.11.0")) - #t))))) - (propagated-inputs - (list python-editorconfig python-six)) - (native-inputs - (list python-pytest)) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'chdir + (lambda _ + (chdir "python") + (rename-file "setup-js.py" "setup.py")))))) + (propagated-inputs (list python-editorconfig python-six)) + (native-inputs (list python-pytest python-setuptools)) (synopsis "JavaScript unobfuscator and beautifier") - (description "Beautify, unpack or deobfuscate JavaScript, leveraging -popular online obfuscators.") + (description + "This packages provides tooling to beautify, unpack or deobfuscate +JavaScript, leveraging popular online obfuscators.") (license license:expat))) (define-public python-chardet @@ -19623,38 +18929,45 @@ tutorial.") @code{PythonAnywhere} services.") (license license:expat))) -(define-public python-pythondialog +(define-public python-dialog (package - (name "python-pythondialog") - (version "3.4.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "pythondialog" version)) - (sha256 - (base32 - "1728ghsran47jczn9bhlnkvk5bvqmmbihabgif5h705b84r1272c")))) - (build-system python-build-system) + (name "python-dialog") + (version "3.5.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pythondialog" version)) + (sha256 + (base32 "08v3flvbhpc0p20drniiaalc3ijghlxk9ka5vz5mqqm6y254m8xj")) + (modules '((guix build utils))) + (snippet #~(delete-file-recursively "doc")))) + (build-system pyproject-build-system) (arguments - `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-path - (lambda* (#:key inputs #:allow-other-keys) - (let* ((dialog (assoc-ref inputs "dialog"))) - (substitute* "dialog.py" - (("os.getenv\\(\"PATH\", \":/bin:/usr/bin\"\\)") (string-append - "os.getenv(\"PATH\") + \":" - dialog - "/bin\""))) - #t)))) - #:tests? #f)) - (propagated-inputs (list dialog)) + (list + ;; XXX: There are no tests, but some examples. However, they need to + ;; be run on a terminal. + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "dialog.py" + (("_path_to_executable\\(dialog\\)") + (format #f "os.path.realpath(~s)" + (search-input-file inputs "bin/dialog"))))))))) + (native-inputs (list python-setuptools)) + (inputs (list dialog)) (home-page "https://pythondialog.sourceforge.net/") (synopsis "Python interface to the UNIX dialog utility") (description - "A Python wrapper for the dialog utility. Its purpose is to -provide an easy to use, pythonic and comprehensive Python interface to dialog. -This allows one to make simple text-mode user interfaces on Unix-like systems") + "A Python wrapper for the dialog utility. Its purpose is to provide an +easy to use, pythonic and comprehensive Python interface to dialog. This +allows one to make simple text-mode user interfaces on Unix-like systems") (license license:lgpl2.1))) +(define-public python-pythondialog + (deprecated-package "python-pythondialog" python-dialog)) + (define-public python-confection (package (name "python-confection") @@ -19851,29 +19164,6 @@ and dataclasses.") @code{ArgumentParser} object.") (license license:asl2.0))) -(define-public python-texttable - (package - (name "python-texttable") - (version "1.6.4") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/foutaise/texttable/") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1lcn76wx6fsj8d79gs985irkqz5qbwq1v9ji9jxsra6dbb643v5j")))) - (build-system pyproject-build-system) - (arguments (list #:test-flags #~(list "tests.py"))) - (native-inputs (list python-pytest python-setuptools)) - (home-page "https://github.com/foutaise/texttable/") - (synopsis "Create simple ASCII tables in Python") - (description - "This package provides a Python module for creating simple ASCII -tables.") - (license license:expat))) - (define-public python-atomicwrites (package (name "python-atomicwrites") @@ -20596,28 +19886,6 @@ text.") @code{boto} library.") (license license:asl2.0))) -(define-public python-rsa - (package - (name "python-rsa") - (version "3.4.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "rsa" version)) - (sha256 - (base32 - "1dcxvszbikgzh99ybdc7jq0zb9wspy2ds8z9mjsqiyv3q884xpr5")))) - (build-system python-build-system) - (propagated-inputs - (list python-pyasn1)) - (synopsis "Pure-Python RSA implementation") - (description "Python-RSA is a pure-Python RSA implementation. It supports -encryption and decryption, signing and verifying signatures, and key -generation according to PKCS#1 version 1.5. It can be used as a Python -library as well as on the command line.") - (home-page "https://stuvel.eu/rsa") - (license license:asl2.0))) - (define-public python-plumbum (package (name "python-plumbum") @@ -20745,7 +20013,7 @@ document.") (invoke "nose2" "-v" "symengine.tests")) (format #t "test suite not run~%"))))))) (native-inputs (list cmake-minimal - python-cython-3 + python-cython python-nose2 python-setuptools python-wheel)) @@ -20760,40 +20028,53 @@ manipulation library.") (define-public python-asteval (package (name "python-asteval") - (version "0.9.23") + (version "1.0.6") (source (origin (method url-fetch) (uri (pypi-uri "asteval" version)) (sha256 - (base32 - "0f54sd4w1a72ij1bcxs2x7dk9xf8bzclawijf1z18bqx9f96l2gm")))) - (build-system python-build-system) + (base32 "17x1qk07cixj1nn59pp5dzjc9jna92v6kljdss81l5rf9cqfga0s")))) + (build-system pyproject-build-system) (native-inputs - (list python-pytest)) + (list python-pytest + python-pytest-cov + python-setuptools + python-setuptools-scm)) (home-page "https://github.com/newville/asteval") (synopsis "Minimalistic evaluator of Python expressions") (description "This package provides a minimalistic evaluator of Python expression -using the @code{ast} module") +using the @code{ast} module.") (license license:expat))) (define-public python-lmfit (package (name "python-lmfit") - (version "1.0.2") + (version "1.3.4") (source (origin (method url-fetch) (uri (pypi-uri "lmfit" version)) (sha256 (base32 - "0iab33jjb60f8kn0k0cqb0vjp1mdskks2n3kpn97zkw5cvjhq2b7")))) - (build-system python-build-system) + "15z4zcyc4crfdw22qnbaq8wrf552jgl83gd3nk2zc5zp8f6c48iw")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + ;; Costly tests that may fail with multiprocessing.context.TimeoutError. + #~(list "--ignore=tests/test_jacobian_pickling.py") + #:phases + #~(modify-phases %standard-phases + ;; XXX: Unclear why, but the phase seems broken. + ;; asteval>=1.0 is not understood correctly. + (delete 'sanity-check)))) (propagated-inputs - (list python-asteval python-numpy python-scipy python-uncertainties)) + (list python-asteval python-dill python-numpy python-scipy + python-uncertainties)) (native-inputs - (list python-pytest)) + (list python-pytest python-pytest-cov python-setuptools)) (home-page "https://lmfit.github.io/lmfit-py/") (synopsis "Least-Squares minimization with bounds and constraints") (description @@ -20999,19 +20280,32 @@ Amazon Web Services (AWS) API.") (define-public python-pyfiglet (package (name "python-pyfiglet") - (version "0.8.post1") + (version "1.0.4") (source (origin - (method url-fetch) - (uri (pypi-uri "pyfiglet" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/pwaller/pyfiglet") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "0f9n2076ga2ccsg174k2d7n0z4d44ml96yzc72s6g4nhalbk5hn6")))) - (build-system python-build-system) + (base32 "1r1fyphz99jar2xfk761cl740zxk4b0gygajgjfx6i1kf0dxdv40")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fallback-on-default-build + (lambda _ + ;; This pyproject has little value and fails because of the + ;; :__legacy__ suffix. Removing it to rely on defaults. + (delete-file "pyproject.toml")))))) + (native-inputs (list python-pytest python-setuptools)) (home-page "https://github.com/pwaller/pyfiglet") (synopsis "Draw ASCII art big letters in Python") - (description "This module lets you draw large letter from ordinary characters -in pure Python.") + (description + "This module lets you draw large letter from ordinary characters in pure + Python.") (license license:expat))) (define-public python-mako @@ -21331,83 +20625,72 @@ Eventlet, or gevent. Tasks can execute asynchronously (in the background) or synchronously (wait until ready).") (license license:bsd-3))) -(define-public python-translitcodec - (package - (name "python-translitcodec") - (version "0.4.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "translitcodec" version)) - (sha256 - (base32 - "10x6pvblkzky1zhjs8nmx64nb9jdzxad4bxhq4iwv0j4z2aqjnki")))) - (build-system python-build-system) - (arguments - `(#:tests? #f)) ; no tests provided - (home-page - "https://github.com/claudep/translitcodec") - (synopsis - "Unicode to 8-bit charset transliteration codec") - (description - "This package contains codecs for transliterating ISO 10646 texts into -best-effort representations using smaller coded character sets (ASCII, -ISO 8859, etc.).") - (license license:expat))) - (define-public python-anyqt (package (name "python-anyqt") - (version "0.2.0") + (version "0.2.1") (source (origin - (method url-fetch) - (uri (pypi-uri "AnyQt" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/ales-erjavec/anyqt") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0fvnhdk0nzhlm1xydisvdq1w7lwaakdkbwb1rkyz4vd232wji4jb")))) - (build-system python-build-system) + (base32 "0dci4sx53icd3jxv5gm22yr5g4dcyqbyvkkwliqpmbkxxjxj0dc8")))) + (build-system pyproject-build-system) (arguments - `(#:tests? #f ;there are no tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'delete-files - ;; Delete files related to other operating systems. - (lambda _ - (delete-file "AnyQt/QtMacExtras.py") - (delete-file "AnyQt/QtWinExtras.py")))))) + (list + ;; XXX: Qt tests require Qt modules, see test/test_import.py. + ;; TODO Add/configure the right Qt inputs. + #:test-flags + #~(list "--ignore-glob=tests/test_q*.py") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'delete-files + ;; Delete files related to other operating systems. + (lambda _ + (delete-file "AnyQt/QtMacExtras.py") + (delete-file "AnyQt/QtWinExtras.py")))))) + (native-inputs + (list python-pyqt-6 + python-pytest + python-pytest-qt + python-setuptools)) (home-page "https://github.com/ales-erjavec/anyqt") - (synopsis "PyQt4/PyQt5 compatibility layer") - (description "AnyQt is a PyQt4/PyQt5 compatibility layer.") + (synopsis "PyQt compatibility layer") + (description + "This package provides a PyQt/PySide compatibility layer. More precisely, +it provides compatibility for the following modules: PyQt4, PyQt5, PyQt6, +PySide, PySide2.") (license license:gpl3))) (define-public python-qasync (package (name "python-qasync") - (version "0.27.1") + (version "0.28.0") (source (origin - ;; There are no tests in the PyPI tarball. (method git-fetch) (uri (git-reference - (url "https://github.com/CabbageDevelopment/qasync/") - (commit (string-append "v" version)))) + (url "https://github.com/CabbageDevelopment/qasync/") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0j6ksfnq9qfjdfppbkdz7jh6w0gnslwnckhafmlgim29b25g0z51")))) + (base32 "13i5riq7ig4csxlx61fzb8xl12ny0dkwj4h8f8r95xz5rii7a0kr")))) (build-system pyproject-build-system) (arguments - (list #:test-flags - ;; XXX: Added with python@3.11, not fixed upstream. - #~(list "-k" "not test_regression_bug13") - #:phases - #~(modify-phases %standard-phases - (add-before 'check 'set-qpa - (lambda _ - (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (list + #:build-backend "poetry.core.masonry.api" ;XXX: python-uv-build is required + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'set-qpa + (lambda _ + (setenv "QT_QPA_PLATFORM" "offscreen")))))) (native-inputs (list python-poetry-core python-pytest)) (propagated-inputs - (list python-pyqt)) + (list python-pyqt-6)) (home-page "https://github.com/CabbageDevelopment/qasync") (synopsis "Implementation of the PEP 3156 Event-Loop with Qt") (description @@ -21417,40 +20700,44 @@ by providing an implementation of the PEP 3156 event-loop.") (define-public python-editor (package - (name "python-editor") - (version "1.0.4") - (source - (origin - (method url-fetch) - (uri (pypi-uri "python-editor" version)) - (sha256 - (base32 - "0yrjh8w72ivqxi4i7xsg5b1vz15x8fg51xra7c3bgfyxqnyadzai")))) - (build-system python-build-system) - (arguments - '(#:tests? #f)) ;XXX: needs a TTY and an editor - (home-page "https://github.com/fmoo/python-editor") - (synopsis "Programmatically open an editor, capture the result") - (description - "python-editor is a library that provides the editor module for -programmatically interfacing with your system's $EDITOR.") - (license license:asl2.0))) + (name "python-editor") + (version "1.0.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fmoo/python-editor") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0hm5gcz5117dsq39bqfxpwazk4khqd272ran0n12x0x84mnqvfxa")))) + (build-system pyproject-build-system) + (arguments (list #:tests? #f)) ;XXX: needs a TTY and an editor + (native-inputs (list python-setuptools)) + (home-page "https://github.com/fmoo/python-editor") + (synopsis "Programmatically open an editor, capture the result") + (description + "This package provides the editor module for programmatically interfacing +with your system's $EDITOR.") + (license license:asl2.0))) (define-public python-multiprocessing-logging (package (name "python-multiprocessing-logging") - (version "0.3.1") + (version "0.3.4") (home-page "https://github.com/jruere/multiprocessing-logging") - (source (origin - (method git-fetch) - (uri (git-reference - (url home-page) - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1625wy3djlr3b2fpd3vi822f8gw6b75mnls5a4318dbi9za5pf0y")))) - (build-system python-build-system) + (source + (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ib1plsyi4g68n0crc2cqhk54fccsmcijzh66g89fd3lgababgxd")))) + (build-system pyproject-build-system) + (arguments (list #:test-backend #~'unittest)) + (native-inputs (list python-setuptools)) (synopsis "Manage logs from multiple processes") (description "This Python module implements a multiprocessing-aware @code{Handler} @@ -21462,33 +20749,27 @@ main process so that they are handled correctly.") (package (name "python-munkres") (version "1.1.4") - (source (origin - (method url-fetch) - (uri (pypi-uri "munkres" version)) - (sha256 - (base32 - "00yvj8bxmhhhhd74v7j0x673is7vizmxwgb3dd5xmnkr74ybyi7w")))) + (source + (origin + (method url-fetch) + (uri (pypi-uri "munkres" version)) + (sha256 + (base32 "00yvj8bxmhhhhd74v7j0x673is7vizmxwgb3dd5xmnkr74ybyi7w")))) + (build-system pyproject-build-system) (arguments (list - #:phases - '(modify-phases %standard-phases - (add-after 'unpack 'disable-test - (lambda _ - ;; See https://github.com/bmc/munkres/issues/40 - (substitute* "test/test_munkres.py" - (("^def test_profit_float" m) - (string-append "\ -import platform -@pytest.mark.skipif(platform.architecture()[0] == \"32bit\", - reason=\"Fails on 32 bit architectures\") -" m)))))))) - (build-system python-build-system) - (native-inputs (list python-pytest)) + ;; See https://github.com/bmc/munkres/issues/40 + #:test-flags + (if (member (%current-system) %32bit-supported-systems) + #~(list "-k" "not test_profit_float") + #~(list)))) + (native-inputs (list python-pytest python-setuptools)) (home-page "https://software.clapper.org/munkres/") (synopsis "Implementation of the Munkres algorithm") - (description "The Munkres module provides an implementation of the Munkres -algorithm (also called the Hungarian algorithm or the Kuhn-Munkres algorithm), -useful for solving the Assignment Problem.") + (description + "The Munkres module provides an implementation of the Munkres algorithm +(also called the Hungarian algorithm or the Kuhn-Munkres algorithm), useful +for solving the Assignment Problem.") (license license:bsd-3))) (define-public python-codespell @@ -21604,37 +20885,39 @@ can also be used to get the exact location, font or color of the text.") (define-public python-rarfile (package (name "python-rarfile") - (version "4.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "rarfile" version)) - (sha256 - (base32 - "1882wv9szcm29mnyhjmspyflyr2l7z73srn14w4dlnww49lqfm37")))) - (build-system python-build-system) + (version "4.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/markokr/rarfile") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1lm4vz4w0hrnzln7w10ijhdiwxy7gz45m44zw4fz7rdnn7c06b36")))) + (build-system pyproject-build-system) (arguments - `(#:tests? #f ;; The bsdtar utility is very limited and most tests fail. - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "rarfile.py" - ;; Disable unrar and unar, which are unavailable on Guix. - (("(unrar|unar)=True" all tool) (string-append tool "=False")) - ;; Hardcode path to bsdtar - (("\"bsdtar\"") - (string-append "\"" (assoc-ref inputs "libarchive") "/bin/bsdtar\""))) - #t)) - (replace 'check - (lambda* (#:key inputs tests? #:allow-other-keys) - (when tests? - (invoke "pytest" "-vv"))))))) - (native-inputs (list python-pytest)) + (list + #:tests? #f ;The bsdtar utility is very limited and most tests fail. + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "rarfile.py" + ;; Disable unrar and unar, which are unavailable on Guix. + (("(unrar|unar)=True" all tool) + (string-append tool "=False")) + ;; Hardcode path to bsdtar + (("\"bsdtar\"") + (format #f "~s" + (search-input-file inputs "bin/bsdtar"))))))))) + (native-inputs (list python-pytest python-setuptools)) (inputs (list libarchive)) (home-page "https://github.com/markokr/rarfile") (synopsis "RAR archive reader for Python") - (description "This is Python module for RAR archive reading. The interface -is made as zipfile like as possible.") + (description + "This is Python module for RAR archive reading. The interface is made as +zipfile like as possible.") (license license:isc))) (define-public python-slugid @@ -21650,21 +20933,14 @@ is made as zipfile like as possible.") (file-name (git-file-name name version)) (sha256 (base32 "1h64p2jlqv6lsmw8h2j203kx3bhv72cwzpk5gdhsaamw30cp3h1i")))) - (build-system python-build-system) - (native-inputs (list python-nose)) - (arguments - (list #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key inputs tests? #:allow-other-keys) - (when tests? - ;; The project uses tox to run the tests via nose. - (invoke "nosetests" "-v" "test.py"))))))) + (build-system pyproject-build-system) + (arguments (list #:test-backend #~'nose)) + (native-inputs (list python-pynose python-setuptools)) (home-page "http://taskcluster.github.io/slugid.py") (synopsis "Module for Base64 encoded UUID v4 slugs") - (description "This package provides a module for generating v4 -UUIDs and encoding them into 22 character URL-safe base64 slug -representation.") + (description + "This package provides a module for generating v4 UUIDs and encoding them +into 22 character URL-safe base64 slug representation.") (license license:mpl2.0))) (define-public python-rich @@ -21740,58 +21016,6 @@ attractive help output from click, formatted with rich, with minimal customization required.") (license license:expat))) -(define-public python-textual - (package - (name "python-textual") - (version "3.5.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Textualize/textual") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1sldkhy8phk9c7pln70dyb6aya7qpxb5niym9s91z144dv6ykgws")))) - (build-system pyproject-build-system) - (arguments - (list #:test-flags - ;; Snapshot tests require python-pytest-textual-snapshot which - ;; in turn depends on python-textual. - '(list "--ignore=tests/snapshot_tests/test_snapshots.py" - "-k" (string-append - ;; Broken for unknown reason. - "not test_textual_env_var" - ;; Tests that require python-treesitter-languages. - " and not test_widget_construct" - " and not test_setting_builtin_language_via_constructor" - " and not test_setting_builtin_language_via_attribute" - " and not test_setting_language_to_none" - " and not test_setting_unknown_language" - " and not test_register_language" - " and not test_update_highlight_query" - " and not test_default_theme" - " and not test_setting_builtin_themes" - " and not test_setting_unknown_theme_raises_exception" - " and not test_registering_and_setting_theme")))) - (propagated-inputs - (list python-markdown-it-py - python-platformdirs - python-rich - python-tree-sitter - ;; python-tree-sitter-languages ; optional, not packed yet - python-typing-extensions)) - (native-inputs - (list python-poetry-core - python-pytest - python-pytest-asyncio - python-pytest-xdist)) - (home-page "https://github.com/Textualize/textual") - (synopsis "Build text user interfaces in Python") - (description "Textual is a @acronym{TUI, Text User Interface} framework -for Python inspired by modern web development.") - (license license:expat))) - (define-public python-magic (package (name "python-magic") @@ -21803,49 +21027,40 @@ for Python inspired by modern web development.") (uri (git-reference (url home-page) (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 - "1x11kfn4g244fia9a7y4ly8dqv5zsxfg3l5azc54dl6gkp2bk7vx")) - (modules '((guix build utils))) - ;; Adjust expected output for file@5.45. - (snippet #~(substitute* "test/libmagic_test.py" - (("PDF document, version 1\\.2, 2 pages") - "PDF document, version 1.2, 2 page(s)"))))) - (build-system python-build-system) + (base32 "1x11kfn4g244fia9a7y4ly8dqv5zsxfg3l5azc54dl6gkp2bk7vx")))) + (build-system pyproject-build-system) (arguments - '(#:phases (modify-phases %standard-phases - ;; Replace a specific method call with a hard-coded - ;; path to the necessary libmagic.so file in the - ;; store. If we don't do this, then the method call - ;; will fail to find the libmagic.so file, which in - ;; turn will cause any application using - ;; python-magic to fail. - (add-before 'build 'hard-code-path-to-libmagic - (lambda* (#:key inputs #:allow-other-keys) - (let ((magic (search-input-file inputs "/lib/libmagic.so"))) - (substitute* "magic/loader.py" - (("find_library\\('magic'\\)") - (string-append "'" magic "'")))))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - ;; The test suite mandates this variable. - (setenv "LC_ALL" "C.UTF-8") - (if tests? - (with-directory-excursion "test" - (invoke "python" "./libmagic_test.py")) - (format #t "test suite not run~%"))))))) - (native-inputs - (list which)) + (list + #:test-backend #~'custom + #:test-flags #~(list "test/libmagic_test.py") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-tests + (lambda _ + ;; Adjust expected output for file@5.45. + (substitute* "test/libmagic_test.py" + (("PDF document, version 1\\.2, 2 pages") + "PDF document, version 1.2, 2 page(s)")))) + ;; Replace a specific method call with a hard-coded path to the + ;; necessary libmagic.so file in the store. + (add-before 'build 'hard-code-path-to-libmagic + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "magic/loader.py" + (("find_library\\('magic'\\)") + (format #f "~s" + (search-input-file inputs "lib/libmagic.so"))))))))) + (native-inputs (list which python-setuptools)) (inputs ;; python-magic needs to be able to find libmagic.so. (list file)) (synopsis "File type identification using libmagic") (description - "This module uses ctypes to access the libmagic file type -identification library. It makes use of the local magic database and -supports both textual and MIME-type output. Note that this module and -the python-file module both provide a \"magic.py\" file; these two -modules, which are different and were developed separately, both serve -the same purpose: to provide Python bindings for libmagic.") + "This module uses ctypes to access the libmagic file type identification +library. It makes use of the local magic database and supports both textual +and MIME-type output. Note that this module and the python-file module both +provide a \"magic.py\" file; these two modules, which are different and were +developed separately, both serve the same purpose: to provide Python bindings +for libmagic.") (license license:expat))) (define-public s3cmd @@ -21947,6 +21162,7 @@ check if a package meets certain version requirements, query CFLAGS and LDFLAGS and parse the output to build extensions with setup.py.") (license license:expat))) +;; This package is unmaintained since 2014, but still used in `khmer'. (define-public python-bz2file (package (name "python-bz2file") @@ -21956,11 +21172,10 @@ LDFLAGS and parse the output to build extensions with setup.py.") (method url-fetch) (uri (pypi-uri "bz2file" version)) (sha256 - (base32 - "126s53fkpx04f33a829yqqk8fj4png3qwg4m66cvlmhmwc8zihb4")))) - (build-system python-build-system) - (arguments - `(#:tests? #f)) ; Tests use deprecated python modules. + (base32 "126s53fkpx04f33a829yqqk8fj4png3qwg4m66cvlmhmwc8zihb4")))) + (build-system pyproject-build-system) + (arguments (list #:tests? #f)) ; Tests use deprecated python modules. + (native-inputs (list python-setuptools)) (home-page "https://github.com/nvawda/bz2file") (synopsis "Read and write bzip2-compressed files") (description @@ -22024,7 +21239,7 @@ codebase to support both Python 2 and Python 3 with minimal overhead.") (build-system pyproject-build-system) (native-inputs (list meson-python pkg-config - python-cython-3 + python-cython python-pytest python-sphinx)) (home-page "https://github.com/sagemath/cysignals") @@ -22067,105 +21282,37 @@ in strings and comments.") (define-public python-py3status (package (name "python-py3status") - (version "3.50") - (source - (origin - (method url-fetch) - (uri (pypi-uri "py3status" version)) - (sha256 - (base32 "0j2dx9lzpic15r8p0r0s3jmcskxpacahxl640b4864ldn5rlnh9d")))) - (build-system python-build-system) - (inputs - (list file)) - (arguments - '(#:phases - (modify-phases %standard-phases - ;; 'file' is used for detection of configuration file encoding - ;; let's make link the dependency to particular input - (add-before 'build 'patch-file-path - (lambda* (#:key inputs #:allow-other-keys) - (let ((file-path (assoc-ref inputs "file"))) - (substitute* "py3status/parse_config.py" - (("\\[\"file\", \"-b\"") - (string-append "['" file-path "/bin/file', '-b'"))) - #t)))) - #:tests? #f)) ; TODO: Requires many libraries not in Guix. - (home-page "https://github.com/ultrabug/py3status") - (synopsis "Extensible i3status wrapper written in Python") - (description "py3status is an i3status wrapper which extends i3status -functionality in a modular way, allowing you to extend your panel with your -own code, responding to click events and updating clock every second.") - (license license:bsd-3))) - -(define-public python-tblib - (package - (name "python-tblib") - (version "3.1.0") + (version "3.62") (source (origin - (method url-fetch) - (uri (pypi-uri "tblib" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/ultrabug/py3status") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 "0lnnbicpxx774s29nkbic4rrqvy4rhxd8skx5pp6zxh7kwn4qh06")))) + (base32 "13ggwr35w5isylrg1n7akhycm18r03bxin95hdpcmqg7fvqyfppz")))) (build-system pyproject-build-system) (arguments (list - ;; Don't run benchmark tests. - #:test-flags #~(list "--ignore=tests/test_perf.py") #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'fix-pytest-config - (lambda _ - (substitute* "pytest.ini" - (("--benchmark-disable") ""))))))) - (native-inputs - (list python-pytest - python-setuptools)) - (home-page "https://github.com/ionelmc/python-tblib") - (synopsis "Traceback serialization library") + (add-before 'build 'hardcode-file-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "py3status/parse_config.py" + (("\\[\"file\", \"-b\"") + (format #f "[~s, \"-b\"" + (search-input-file inputs "bin/file"))))))))) + (native-inputs (list python-hatchling python-pytest)) + (inputs (list file)) + (home-page "https://github.com/ultrabug/py3status") + (synopsis "Extensible i3status wrapper written in Python") (description - "Traceback serialization allows you to: - -@enumerate -@item Pickle tracebacks and raise exceptions with pickled tracebacks in -different processes. This allows better error handling when running code over -multiple processes (imagine multiprocessing, billiard, futures, celery etc). - -@item Parse traceback strings and raise with the parsed tracebacks. -@end enumerate\n") + "py3status is an i3status wrapper which extends i3status functionality in +a modular way, allowing you to extend your panel with your own code, +responding to click events and updating clock every second.") (license license:bsd-3))) -(define-public python-tftpy - (package - (name "python-tftpy") - (version "0.8.2") - (source - (origin - (method git-fetch) ;no tests in PyPI archive - (uri (git-reference - (url "https://github.com/msoulier/tftpy") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1gl04ps8h8r7av3h0zbm8gwmkqs9rkk5vf7n8mv2bzrkwvy9hacc")))) - (build-system python-build-system) - (arguments - `(#:phases (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? inputs outputs #:allow-other-keys) - (when tests? - ;; The default DEBUG logging level is way too verbose. - (substitute* "t/test.py" - (("logging\\.DEBUG") - "logging.INFO")) - (invoke "python" "-m" "unittest" "t/test.py"))))))) - (home-page "https://tftpy.sourceforge.net/") - (synopsis "Python trivial file transfer protocol (TFTP) library") - (description "TFTPy is a trivial file transfer protocol (TFTP) Python -library. It can be used to act both as a TFTP client or TFTP server.") - (license license:expat))) - (define-public python-greenlet (package (name "python-greenlet") @@ -22380,147 +21527,57 @@ graphviz.") (define-public python-fastimport (package (name "python-fastimport") - (version "0.9.9") + (version "0.9.16") (source - (origin - (method url-fetch) - (uri (pypi-uri "fastimport" version)) - (sha256 - (base32 "06gk14qgm9dxx3pzjn0ckdbywc8ial2bjfzddqwlr4bn1nnqkbll")))) - (build-system python-build-system) + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jelmer/python-fastimport") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1pbnp9ffjs09ngva9qcizpscxl9s47rmd4dhxl62f5iwl6c46798")))) + (build-system pyproject-build-system) + (arguments (list #:test-backend #~'unittest)) + (native-inputs (list python-setuptools)) (home-page "https://github.com/jelmer/python-fastimport") (synopsis "VCS fastimport parser and generator in Python") - (description "This package provides a parser for and generator of the Git + (description + "This package provides a parser for and generator of the Git @url{https://www.kernel.org/pub/software/scm/git/docs/git-fast-import.html,fastimport} format.") (license license:gpl2+))) -(define-public python-twisted +(define-public python-pika (package - (name "python-twisted") - (version "24.11.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/twisted/twisted") - (commit (string-append "twisted-" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0k4rd5bpx40j1k0mgbhzqa35dyni0kk7pxjr8x3pm1iaka1718rh")))) + (name "python-pika") + (version "1.3.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/pika/pika") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0bmp79lds26y2976xrpf53r3acqzpf3wpkprhlh3asqpfv5pwipb")))) (build-system pyproject-build-system) (arguments (list - ;; tests: skips=638, successes=9759 - #:test-backend #~'custom #:test-flags - #~(list "-m" "twisted.trial" - "--temp-directory=/tmp/_trial_temp" - (string-append "-j" (number->string (min 8 (parallel-job-count)))) - "twisted") + ;; XXX: These test most likely require a running RabbitMQ server. + #~(list "--ignore=tests/acceptance/blocking_adapter_test.py") #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'disable-broken-tests - (lambda _ - (for-each delete-file - (list - ;; No idea why they fail - "src/twisted/test/test_log.py" - ;; Network tests - "src/twisted/conch/test/test_cftp.py" - "src/twisted/internet/test/test_endpoints.py" - "src/twisted/protocols/test/test_tls.py" - "src/twisted/test/test_sslverify.py" - "src/twisted/web/test/test_agent.py" - "src/twisted/web/test/test_tap.py" - ;; These need a git executable - "src/twisted/python/test/test_release.py" - ;; These leave behind a socket file, which breaks the - ;; build with "...has an unsupported type" - "src/twisted/internet/test/test_unix.py" - "src/twisted/test/test_unix.py" - ;; These complain about missing test modules. - "src/twisted/test/test_failure.py" - "src/twisted/web/test/test_http2.py" - "src/twisted/conch/test/test_forwarding.py"))))))) - (propagated-inputs - (list python-attrs - python-automat - python-bcrypt - python-constantly - python-hyperlink - python-incremental - python-typing-extensions - python-zope-interface - ;; [conch] - python-appdirs - python-bcrypt - python-cryptography - ;; [http2] - python-h2 - python-priority - ;; [tls] - python-idna - python-pyopenssl - python-service-identity - ;; [serial] - python-pyserial)) - (native-inputs - (list glibc-utf8-locales ;for OpenTestLogTests.test_utf8 - python-hatch-fancy-pypi-readme - python-hatchling - python-httpx - python-hypothesis - python-incremental - python-pyhamcrest - python-pytest)) - (home-page "https://twistedmatrix.com/") - (synopsis "Asynchronous networking framework written in Python") - (description - "Twisted is an extensible framework for Python programming, with special -focus on event-based network programming and multiprotocol integration.") - (license license:expat))) - -(define-public python-pika - (package - (name "python-pika") - (version "1.2.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/pika/pika") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0sqj3bg6jwign8vwvn337fbwy69sm684ns1vh5kbfnskq4him9i2")))) - (build-system python-build-system) - (arguments - '(#:phases (modify-phases %standard-phases - (add-after 'unpack 'disable-live-tests - (lambda _ - ;; Disable tests that require RabbitMQ, which is not - ;; yet available in Guix. - (substitute* "nose2.cfg" - (("tests=tests/unit,tests/acceptance") - "start-dir=tests/unit")) - (with-directory-excursion "tests" - (for-each delete-file - '("unit/base_connection_tests.py" - "unit/threaded_test_wrapper_test.py"))))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (setenv "PYTHONPATH" (getcwd)) - (invoke "nose2" "-v"))))))) - (native-inputs - (list python-mock - python-nose2 - ;; These are optional at runtime, and provided here for tests. - python-gevent - python-tornado - python-twisted)) + (add-before 'check 'configure-tests + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "PYTHONPATH" (getcwd)))))))) + (native-inputs (list python-pytest + python-gevent + python-tornado + python-twisted + python-setuptools)) (home-page "https://pika.readthedocs.org") (synopsis "Pure Python AMQP Client Library") (description @@ -22551,29 +21608,6 @@ network support library.") It uses LR parsing and does extensive error checking.") (license license:bsd-3))) -(define-public python-tabulate - (package - (name "python-tabulate") - (version "0.9.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "tabulate" version)) - (sha256 - (base32 - "0g4b0qnbw55igbpxfxzciqvb6w8ncw4gmcgyq0lyavcnylmv3580")))) - (build-system pyproject-build-system) - (native-inputs - (list python-pytest - python-setuptools-scm - python-setuptools - python-wheel)) - (home-page "https://bitbucket.org/astanin/python-tabulate") - (synopsis "Pretty-print tabular data") - (description - "Tabulate is a library and command-line utility to pretty-print tabular -data in Python.") - (license license:expat))) - (define-public python-kazoo (package (name "python-kazoo") @@ -22765,31 +21799,6 @@ Wikipedia code samples at docstring and colored output.") (license license:expat))) -(define-public python-tomlkit - (package - (name "python-tomlkit") - (version "0.13.3") - (source - (origin - (method url-fetch) - (uri (pypi-uri "tomlkit" version)) - (sha256 - (base32 "18fjmmhiv5jkkg1dwidmxd0sjqnkf675igizxsa2ppspxr3z4323")))) - (build-system pyproject-build-system) - (native-inputs - (list python-poetry-core - python-pytest - python-pyyaml)) - (home-page "https://github.com/sdispater/tomlkit") - (synopsis "Style-preserving TOML library") - (description - "TOML Kit is a 1.0.0rc1-compliant TOML library. It includes a parser that -preserves all comments, indentations, whitespace and internal element ordering, -and makes them accessible and editable via an intuitive API. It can also -create new TOML documents from scratch using the provided helpers. Part of the -implementation has been adapted, improved, and fixed from Molten.") - (license license:expat))) - (define-public python-shellingham (package (name "python-shellingham") @@ -23585,24 +22594,26 @@ characters, mouse support, and auto suggestions.") (define-public python-proselint (package (name "python-proselint") - (version "0.13.0") + (version "0.14.0") (source (origin (method url-fetch) (uri (pypi-uri "proselint" version)) (sha256 - (base32 - "0n1ahnq2mkgvh94g05xhc3l1fs3hh0ycskqlqivhhfdaq8ybdlkx")))) - (build-system python-build-system) + (base32 "11hfd207bhsvb0iznlnbr0w7jxihvn3ismpjbmz7c57a5ckn8jb2")))) + (build-system pyproject-build-system) (arguments - `(#:tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'set-home-directory - (lambda _ - (setenv "HOME" "/tmp")))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'set-home-directory + (lambda _ + (setenv "HOME" "/tmp")))))) + (native-inputs + (list python-poetry-core + python-pytest)) (propagated-inputs - (list python-click python-future python-six)) + (list python-click)) (home-page "http://proselint.com/") (synopsis "Linter for prose") (description "@code{python-proselint} is a linter for English prose, that @@ -24149,8 +23160,8 @@ pytest-fixtures-style dependency injection.") extracting firmware images") (license license:expat))) -(define-public python-binwalk - (deprecated-package "python-binwalk" binwalk)) +(define-deprecated-package python-binwalk + binwalk) (define-public python-bson (package @@ -24726,7 +23737,7 @@ from the header, as well as section details and data available.") (build-system pyproject-build-system) (propagated-inputs (list python-numpy)) (native-inputs - (list python-cython-3 + (list python-cython python-pytest python-setuptools python-setuptools-scm @@ -24761,29 +23772,6 @@ Werman's implementation of the Earth Mover's Distance.") JPEG2000 and GIF files in pure Python.") (license license:expat))) -(define-public python-termstyle - (package - (name "python-termstyle") - (version "0.1.11") - (source - (origin - (method url-fetch) - (uri (pypi-uri "termstyle" version)) - (sha256 - (base32 - "17wzkkcqy5zc0g68xlad3kcv66iw14d2pwqc0h9420gak0vbhx7g")))) - (build-system python-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (invoke "python" "test3.py")))))) - (home-page "https://github.com/gfxmonk/termstyle") - (synopsis "Console text coloring for Python") - (description "This package provides console text coloring for Python.") - (license license:bsd-3))) - (define-public python-argcomplete (package (name "python-argcomplete") @@ -26968,37 +25956,6 @@ version of @code{SocksiPy} with bug fixes and extra features.") @code{ffmpeg} to open various audio formats.") (license license:expat))) ; MIT license -(define-public python-tqdm - (package - (name "python-tqdm") - (version "4.67.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "tqdm" version)) - (sha256 - (base32 "1wi7cql2fc76b5z9v1sr96ix2gxcb974z8qfydjkmh885k2zkbpq")))) - (build-system pyproject-build-system) - (arguments - (list #:test-flags - '(list "-o" "asyncio_mode=auto" - "-k" "not perf and not test_rlock_creation"))) - (native-inputs - (list python-pytest - python-pytest-asyncio - python-pytest-timeout - python-setuptools - python-setuptools-scm - python-toml - python-wheel)) - (home-page "https://github.com/tqdm/tqdm") - (synopsis "Fast, extensible progress meter") - (description - "Make loops show a progress bar on the console by just wrapping any -iterable with @code{|tqdm(iterable)|}. Offers many options to define -design and layout.") - (license (list license:mpl2.0 license:expat)))) - (define-public python-pkginfo (package (name "python-pkginfo") @@ -27028,63 +25985,6 @@ distribution, and the *.egg-info stored in a \"development checkout\" (e.g, created by running @code{python setup.py develop}).") (license license:expat))) -(define-public python-twine - (package - (name "python-twine") - (version "6.1.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "twine" version)) - (sha256 - (base32 "1gcd990456sk0g05ln6x6mwn9z1jybnm3wlkxq3ivyggf9i4ycmy")))) - (build-system pyproject-build-system) - (native-inputs - (list python-pretend - python-pytest - python-pytest-socket - python-setuptools - python-setuptools-scm)) - (propagated-inputs - (list python-id - python-keyring - python-packaging - python-readme-renderer - python-requests - python-requests-toolbelt - python-rfc3986 - python-rich - python-urllib3)) - (home-page "https://github.com/pypa/twine") - (synopsis "Collection of utilities for interacting with PyPI") - (description - "@code{twine} currently supports registering projects and uploading -distributions. It authenticates the user over HTTPS, allows them to pre-sign -their files and supports any packaging format (including wheels).") - (license license:asl2.0))) - -(define-public python-tracerite - (package - (name "python-tracerite") - (version "1.1.3") - (source (origin - (method url-fetch) - (uri (pypi-uri "tracerite" version)) - (sha256 - (base32 - "07mkg0sl0h335kj6yjvxki2c19gxhb7rkks1zgzh7aj0y83c17qi")))) - (build-system pyproject-build-system) - (arguments - (list #:tests? #f)) ;no tests in PyPI or Git - (native-inputs (list python-setuptools python-setuptools-scm)) - (propagated-inputs (list python-html5tagger)) - (home-page "https://github.com/sanic-org/tracerite") - (synopsis "Human-readable HTML tracebacks") - (description - "@code{tracerite} converts Python tracebacks into useful error messages -in human-readable HTML format.") - (license license:unlicense))) - ;; XXX: This project was archived by the owner on Oct 4, 2023. It is now ;; read-only. Consider to remvoe when nothing depends on it. (define-public python-ratelimiter @@ -27144,7 +26044,7 @@ executed more than a given number of times during a given period.") (substitute* "pyproject.toml" ((".*addopts.*") ""))))))) (native-inputs - (list python-cython-3 + (list python-cython python-pytest python-pytest-asyncio python-pytest-timeout @@ -27357,59 +26257,6 @@ definitions to simplify the use of C bindings.") Angus Johnson's polygon clipping Clipper library (ver. 6.4.2).") (license license:expat))) -(define-public python-tempdir - (package - (name "python-tempdir") - (version "0.7.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "tempdir" version)) - (sha256 - (base32 "13msyyxqbicr111a294x7fsqbkl6a31fyrqflx3q7k547gnq15k8")))) - (build-system pyproject-build-system) - (arguments (list #:tests? #f)) ; No tests. - (native-inputs (list python-setuptools)) - (home-page "https://pypi.org/project/tempdir/") - (synopsis "Python library for managing temporary directories") - (description - "This library manages temporary directories that are automatically -deleted with all their contents when they are no longer needed. It is -particularly convenient for use in tests.") - (license license:expat))) - -(define-public python-tempora - (package - (name "python-tempora") - (version "5.8.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "tempora" version)) - (sha256 - (base32 "1k9d6qmlp0i4v3d0dcqcsndvmng3lfdh4y0p8gwy9i8cg7ndkddb")))) - (build-system pyproject-build-system) - (arguments - (list - ;; Do not test the myproject.toml build as it tries to pull dependencies - ;; from the Internet. - #:test-flags #~(list "-k" "not project" - "tests"))) - (native-inputs - (list python-freezegun - python-pytest - python-setuptools - python-setuptools-scm - python-tzdata)) - (propagated-inputs (list python-dateutil python-jaraco-functools)) - (home-page "https://github.com/jaraco/tempora") - (synopsis "Python date and time objects and routines") - (description "The @code{tempora} Python library contains miscellaneous -date and time related utilities and constants, routines for measuring, -profiling, and getting datetime-aware @acronym{UTC, Coordinated Universal -Time} values as well as an event scheduler.") - (license license:expat))) - (define-public python-semver (package (name "python-semver") @@ -27771,64 +26618,6 @@ a notation for identifying weeks; yyyyWww (where the W is a literal). Week instances stringify to this form.") (license license:bsd-3))) -(define-public python-tokenize-rt - (package - (name "python-tokenize-rt") - (version "6.2.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/asottile/tokenize-rt") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1maa9sifma0a6v7kl7mmyqzj0jdclzlp4wjr0vkdx95raihxx4fv")))) - (build-system pyproject-build-system) - (native-inputs (list python-pytest python-setuptools)) - (home-page "https://github.com/asottile/tokenize-rt") - (synopsis "Wrapper around the stdlib tokenize which roundtrips") - (description - "This Python library is a wrapper around @code{tokenize} from the Python -standard library. It provides two additional tokens @code{ESCAPED_NL} and -@code{UNIMPORTANT_WS}, and a @code{Token} data type. Use @code{src_to_tokens} -and @code{tokens_to_src} to roundtrip.") - (license license:expat))) - -(define-public python-towncrier - (package - (name "python-towncrier") - (version "23.6.0") - (source (origin - (method url-fetch) - (uri (pypi-uri "towncrier" version)) - (sha256 - (base32 - "1hbhzxcn30qlnab1rnk2bf09jfy5bpxzfdp6zfn8sz3jnidbsagw")))) - (build-system pyproject-build-system) - (arguments - (list #:test-flags - ;; TODO: Why is this failing? - #~'("-k" "not test_version"))) - (propagated-inputs - (list python-click - python-click-default-group - python-incremental - python-jinja2 - python-tomli)) - (native-inputs - (list git-minimal/pinned ;tests create git repositories - python-hatchling - python-packaging - python-pytest - python-twisted)) - (home-page "https://towncrier.readthedocs.io/en/stable/") - (synopsis "Manage release notes") - (description - "@code{towncrier} is a utility to produce useful, summarized news -files (also known as changelogs) for a project.") - (license license:expat))) - (define-public python-future-fstrings (package (name "python-future-fstrings") @@ -28835,49 +27624,19 @@ a file (or some information about a file), return a set of standardized tags identifying what the file is.") (license license:expat))) -(define-public python-tldextract +(define-public tldr (package - (name "python-tldextract") - (version "3.3.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "tldextract" version)) - (sha256 - (base32 "1wac4yvcpgqjvls770mfx165amvy7gr00nnd2w24bqqwyamj9kdd")))) - (build-system pyproject-build-system) - (native-inputs (list nss-certs-for-test - python-pytest - python-pytest-mock - python-responses - python-setuptools - python-setuptools-scm - python-wheel)) - (propagated-inputs (list python-filelock python-idna python-requests - python-requests-file)) - (home-page "https://github.com/john-kurkowski/tldextract") - (synopsis - "Separate the TLD from the registered domain and subdomains of a URL") - (description - "TLDExtract accurately separates the TLD from the registered domain and -subdomains of a URL, using the Public Suffix List. By default, this includes -the public ICANN TLDs and their exceptions. It can optionally support the -Public Suffix List's private domains as well.") - (license license:bsd-3))) - -(define-public python-tldr - (package - (name "python-tldr") - (version "3.3.0") + (name "tldr") + (version "3.4.3") (source (origin - (method git-fetch) ; there's no test in PyPI + (method git-fetch) (uri (git-reference - (url "https://github.com/tldr-pages/tldr-python-client") - (commit version))) + (url "https://github.com/tldr-pages/tldr-python-client") + (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "15mab6a7ph2rviy5f2ypid6qdbb583fvaf5zhd6q0nrggxx0kkcm")))) + (base32 "06rhpywaypqwakw8v187cdf52yl5c7fm19f1q7nbbsydbs0ndmb1")))) (build-system pyproject-build-system) (arguments (list @@ -28889,12 +27648,10 @@ Public Suffix List's private domains as well.") (lambda _ (invoke "make" "-C" "docs")))))) (native-inputs - (list python-pytest - python-pytest-runner - python-setuptools - python-sphinx-argparse - python-wheel)) - (propagated-inputs + (list python-hatchling + python-pytest + python-sphinx-argparse)) + (inputs (list python-colorama python-termcolor python-shtab)) @@ -28903,7 +27660,10 @@ Public Suffix List's private domains as well.") (description "This package provides the @code{tldr} command allowing users to view @code{tldr} pages from a shell. The @code{tldr} pages are a community effort to simplify the man pages with practical examples.") - (license license:expat))) ; MIT license + (license license:expat))) + +(define-public python-tldr + (deprecated-package "python-tldr" tldr)) (define-public python-nodeenv (package @@ -29378,63 +28138,6 @@ library's @code{threading} module.") instead of pickle.") (license license:psfl))) -(define-public python-toolrack - (package - (name "python-toolrack") - (version "4.0.3") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/albertodonato/toolrack") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1aglfj7j25fiwx9jh1rl34mlhfpdhn8yrkn30vhkz9yw7zrx42h0")))) - (build-system pyproject-build-system) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'patch-/bin/sh - (lambda _ - (substitute* "tests/aio/process_test.py" - (("/bin/sh") - (which "sh")))))))) - (native-inputs (list python-pytest - python-pytest-asyncio - python-pytest-mock - python-setuptools)) - (home-page "https://github.com/albertodonato/toolrack") - (synopsis "Collection of Python utility functions and classes") - (description "This package provides a collection of miscellaneous utility -functions and classes.") - (license license:lgpl3+))) - -(define-public python-toolz - (package - (name "python-toolz") - (version "1.0.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "toolz" version)) - (sha256 - (base32 - "00ks0jhl1jwm9576c5sh10pnla8ni21yvg4kcxasr627l3cy71ic")))) - (build-system pyproject-build-system) - (native-inputs - (list python-pytest - python-setuptools - python-wheel)) - (home-page "https://github.com/pytoolz/toolz/") - (synopsis "List processing tools and functional utilities") - (description - "This package provides a set of utility functions for iterators, -functions, and dictionaries.") - (license license:bsd-3))) - (define-public python-cytoolz (package (name "python-cytoolz") @@ -29947,186 +28650,6 @@ project.") ;; Either license applies. (license (list license:expat license:asl2.0)))) -(define-public python-trio - (package - (name "python-trio") - (version "0.28.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "trio" version)) - (sha256 - (base32 "019wqwlbj185skknbjd7paxqqx6vl5gpqk2fwmc5d2lyzsb7hm2f")))) - (build-system pyproject-build-system) - (arguments - (list - #:test-flags - `(list "-k" - (string-append - ;; This tests times out. - "not test_ki_protection_works" - " and not test_KI_interrupts" - ;; This fails with: signal only works in main thread of the main interpreter - " and not test_catch_signals_race_condition_on_exit" - ;; Assertion errors. - " and not test_named_thread_os" - " and not test_has_pthread_setname_np" - " and not test_guest_mode_ki" - " and not test_run_in_trio_thread_ki" - " and not test_simple_cancel_scope_usage_doesnt_create\ -_cyclic_garbage" - " and not test_nursery_cancel_doesnt_create_cyclic_garbage" - " and not test_cancel_scope_exit_doesnt_create_cyclic_garbage" - " and not test_locals_destroyed_promptly_on_cancel" - " and not test_ipython_exc_handler" - " and not test_for_leaking_fds" - ;; Signals don’t work in the build sandbox. - " and not test_open_signal_receiver" - ;; These try to raise KeyboardInterrupt which does not work - ;; in the build environment. - " and not test_ki_self" - " and not test_ki_wakes_us_up" - ;; Failure in name resolution. - " and not test_getnameinfo" - " and not test_SocketType_resolve" - ;; OSError: protocol not found. - " and not test_getprotobyname" - ;; EOFError: Ran out of input. - " and not test_static_tool_sees_all_symbols") - ,@(if (package? (this-package-native-input "python-trustme")) - '() - `("--ignore=src/trio/_tests/test_dtls.py" - "--ignore=src/trio/_tests/test_highlevel_ssl_helpers.py" - "--ignore=src/trio/_tests/test_ssl.py")) - ;; It rerquires black and ruff to generate a final report. - "--ignore=src/trio/_tests/tools/test_gen_exports.py" - "src/trio/_tests") - #:phases - '(modify-phases %standard-phases - (add-after 'unpack 'ignore-deprecations - (lambda _ - (substitute* "pyproject.toml" - ((" \"error\",") " \"ignore\",")))) - (add-before 'check 'set-env - (lambda _ - ;; Tests require a writable home. - (setenv "HOME" "/tmp") - ;; #$output is first in path which causes "import file mismatch" - (setenv "PYTHONPATH" (string-append (getcwd) "/src:$PYTHONPATH"))))))) - (native-inputs - (append - (if (supported-package? python-pyopenssl) - (list python-pyopenssl) - '()) - (list python-pytest - python-setuptools) - (if (supported-package? python-trustme) - (list python-trustme) - '()) - (list python-wheel))) - (propagated-inputs - (list python-attrs - python-cffi - python-exceptiongroup - python-idna - python-outcome - python-sniffio - python-sortedcontainers)) - (home-page "https://github.com/python-trio/trio") - (synopsis "Friendly Python library for async concurrency and I/O") - (description - "Trio strives to be a production-quality, async/await-native I/O library -for Python. Like all async libraries, its main purpose is to help you write -programs that do multiple things at the same time with parallelized I/O.") - ;; Either license applies. - (license (list license:expat license:asl2.0)))) - -(define-public python-trio-typing - (package - (name "python-trio-typing") - (version "0.10.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "trio-typing" version)) - (sha256 - (base32 "1hvsj3w500i33ykfgh3sfkjnxhxf05incx131smshlkd562fcph6")))) - (build-system pyproject-build-system) - (native-inputs (list python-pytest python-setuptools python-wheel)) - (propagated-inputs - (list python-async-generator - python-importlib-metadata - python-mypy-extensions - python-packaging - python-trio - python-typing-extensions)) - (home-page "https://github.com/python-trio/trio-typing") - (synopsis "Static type checking support for Trio and related projects") - (description - "This package provides: - -@itemize -@item PEP 561 typing stubs packages for the Trio project packages: - -@itemize -@item trio (@code{trio-stubs}) -@item outcome (@code{outcome-stubs}) -@item async_generator (@code{async_generator-stubs}) -@end itemize - -@item A package @code{trio_typing} containing types that Trio programs often -want to refer to (@code{AsyncGenerator[Y, S]} and @code{TaskStatus[T])} and -a mypy plugin that smooths over some limitations in the basic type hints. -@end itemize") - ;; Either license applies. - (license (list license:expat license:asl2.0)))) - -(define-public python-trio-websocket - (package - (name "python-trio-websocket") - (version "0.11.1") - (source - (origin - (method git-fetch) ;no tests in pypi archive - (uri (git-reference - (url "https://github.com/HyperionGray/trio-websocket") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1sw85r8gikd86zc8jaqv0vmgcf2k62v6zjzxiv8xr6zm8ridplkm")))) - (build-system pyproject-build-system) - (arguments - (list - #:test-flags - '(list "-k" - ;; FIXME: These raise nursery exceptions. Perhaps pytest-trio is - ;; too old? - (string-append "not test_handshake_exception_before_accept" - " and not test_reject_handshake" - " and not test_reject_handshake_invalid_info_status" - " and not test_client_open_timeout" - " and not test_client_close_timeout" - " and not test_client_connect_networking_error" - " and not test_finalization_dropped_exception")))) - (native-inputs - (list python-pytest - python-pytest-trio - python-setuptools - python-trustme - python-wheel)) - (propagated-inputs (list python-async-generator python-trio python-wsproto)) - (home-page "https://github.com/HyperionGray/trio-websocket") - (synopsis "WebSocket library for Trio") - (description "This library implements both server and client aspects of -the @url{https://tools.ietf.org/html/rfc6455, the WebSocket protocol}, -striving for safety, correctness, and ergonomics. It is based on the -@url{https://wsproto.readthedocs.io/en/latest/, wsproto project}, which is a -@url{https://sans-io.readthedocs.io/, Sans-IO} state machine that implements -the majority of the WebSocket protocol, including framing, codecs, and events. -This library handles I/O using @url{https://trio.readthedocs.io/en/latest/, -the Trio framework}.") - (license license:expat))) - (define-public python-humanize (package (name "python-humanize") @@ -30148,26 +28671,6 @@ and dates in \"human readable\" forms. For example, it would display \"12345591313\" as \"12.3 billion\".") (license license:expat))) -(define-public python-toolshed - (package - (name "python-toolshed") - (version "0.4.6") - (source - (origin - (method url-fetch) - (uri (pypi-uri "toolshed" version)) - (sha256 - (base32 - "14zvz51gzf9i1i3d1sj363ba4rksl6lcf4lz1arl8hpqgcbir8r3")))) - (build-system python-build-system) - (native-inputs - (list python-nose)) - (home-page "https://github.com/brentp/toolshed/") - (synopsis "Collection of modules and functions for working with data") - (description "This is a collection of well-tested, simple modules and -functions that aim to reduce boilerplate when working with data.") - (license license:bsd-2))) - (define-public python-annoy (package (name "python-annoy") @@ -31433,37 +29936,6 @@ dedicated platform. The tool proposes a unified interface for any format and an upload option to send your work back to the platform.") (license license:gpl3+))) -(define-public python-titlecase - (package - (name "python-titlecase") - (version "2.4.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "titlecase" version)) - (sha256 - (base32 - "1x9myq3rlbw6wh946ncch8px7wyabhzacy2fjji13nmvrivs50vx")))) - (build-system pyproject-build-system) - (arguments - (list - #:phases - #~(modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? test-flags #:allow-other-keys) - (when tests? - (apply invoke "python" "-m" "unittest" test-flags))))))) - (native-inputs - (list python-setuptools)) - (home-page "https://github.com/ppannuto/python-titlecase") - (synopsis "Capitalize strings similar to book titles") - (description - "Python-Titlecase is a Python port of John Gruber's titlecase.pl. -It capitalizes (predominantly English) strings in a way that is similar to -book titles, using the New York Times Manual of Style to leave certain words -lowercase.") - (license license:expat))) - (define-public python-pypng (package (name "python-pypng") @@ -33005,33 +31477,6 @@ a Python library to convert RELAX NG schemata in Compact syntax (rnc) to equivalent schemata in the XML-based default RELAX NG syntax.") (license license:expat))) -(define-public python-telethon - (package - (name "python-telethon") - (version "1.41.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/LonamiWebs/Telethon") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0rbzqbxsihqm2w1zrvaaafvzwyqqyjx49wfffxrnsr9m32giwzsp")))) - (build-system pyproject-build-system) - (native-inputs - (list python-pytest - python-pytest-asyncio-0.26 - python-pytest-trio - python-setuptools)) - (propagated-inputs - (list python-rsa python-pyaes)) - (home-page "https://docs.telethon.dev") - (synopsis "Full-featured Telegram client library for Python 3") - (description "This library is designed to make it easy to write Python -programs that can interact with Telegram.") - (license license:expat))) - (define-public python-citeproc-py (package (name "python-citeproc-py") @@ -34582,18 +33027,39 @@ were local.") (define-public python-nampa (package (name "python-nampa") - (version "0.1.1") + ;; PyPI version is 0.1.1 from 2017. Tag 1.0 on git is from 2020 and still + ;; has 0.1.1 as version. Latest commit is from 2024. + (properties '((commit . "cb6a63aae64324f57bdc296064bc6aa2b99ff99a") + (revision . "0"))) + (version (git-version "1.0.0" + (assoc-ref properties 'revision) + (assoc-ref properties 'commit))) (source (origin - (method url-fetch) - (uri (pypi-uri "nampa" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/thebabush/nampa") + (commit (assoc-ref properties 'commit)))) + (file-name (git-file-name name version)) (sha256 - (base32 "0k6cq2gflpkm40qhgqbbcjmq5lq589c15bmk567qyh3d08062hvd")))) + (base32 "0a3fx0wpch4il1fwv1nan6nsd7bv84b0bs2xxxjacisw3spizlg0")))) (build-system pyproject-build-system) (arguments - (list #:tests? #f)) ;no tests in PyPI archvie, no 0.1.1 tag in Git + (list + #:test-flags + #~(list "-k test_random_values") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-tests + (lambda _ + ;; Unclear why this top-level __init__.py is here. It seems to + ;; setup a plugin for binaryninja, which Guix does not package. + (delete-file "__init__.py") + ;; Yields tests, which is not allowed anymore. + (substitute* "tests/test_crc.py" + (("yield") "#yield"))))))) (propagated-inputs (list python-future)) - (native-inputs (list python-setuptools)) + (native-inputs (list python-pytest python-setuptools)) (home-page "https://github.com/thebabush/nampa") (synopsis "Python implementation of IDA Pro's FLIRT technology") (description @@ -35260,67 +33726,6 @@ HTML/XML from a Python program in an intuitive, lightweight, customizable and pythonic way.") (license license:expat))) -(define-public python-tablib - (package - (name "python-tablib") - (version "3.8.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "tablib" version)) - (sha256 - (base32 "0ayv93q7kpii6z3n57i6b78mpr1ibwd70nvd981a05d7cpfbrn4l")))) - (build-system pyproject-build-system) - (native-inputs - (list python-pandas - python-pytest - python-pytest-cov - python-setuptools - python-setuptools-scm - python-wheel)) - (propagated-inputs - (list python-markuppy - python-odfpy - python-openpyxl - python-pyyaml - python-tabulate - python-xlrd - python-xlwt)) - (home-page "https://tablib.readthedocs.io") - (synopsis "Format agnostic tabular data library") - (description - "@code{tablib} is a format-agnostic tabular dataset library, -written in Python. Supported output formats are Excel (Sets + Books), -JSON (Sets + Books), YAML (Sets + Books), HTML (Sets), Jira (Sets), -TSV (Sets), ODS (Sets), CSV (Sets), and DBF (Sets). - -@code{tablib} also supports Pandas DataFrames (Sets). Anyhow, since pandas is -quite huge, this Guix package doesn't depend on pandas. In case, just also -install @code{python-pandas}.") - (license license:expat))) - -(define-public python-taskgroup - (package - (name "python-taskgroup") - (version "0.0.0a4") - (source - (origin - (method url-fetch) - (uri (pypi-uri "taskgroup" version)) - (sha256 - (base32 "170m7b59nxrhzs0nz6brj9brz4rzvw6k587ja0cnc9qy48nr027b")))) - (build-system pyproject-build-system) - (arguments - (list #:tests? #f)) ; no tests in PyPI and Git checkout - (native-inputs - (list python-flit-core)) - (home-page "https://github.com/graingert/taskgroup") - (synopsis "Backport of asyncio.TaskGroup, asyncio.Runner and asyncio.timeout") - (description - "This package provides a backport of @code{asyncio.TaskGroup}, -@code{asyncio.Runner} and @code{asyncio.timeout}.") - (license license:expat))) - (define-public python-csb43 (package (name "python-csb43") @@ -35907,8 +34312,8 @@ all the niceties of modern GUI-based debuggers in a more lightweight and keyboard-friendly package.") (license license:expat))) -(define-public pudb - (deprecated-package "pudb" python-pudb)) +(define-deprecated-package pudb + python-pudb) (define-public python-iwlib (package @@ -38114,6 +36519,1571 @@ instance in spelling correction, predictive typing, to help disabled people write text fast, and for various text generation, statistics, and modeling tasks.") (license license:expat))) +(define-public python-tables + (package + (name "python-tables") + (version "3.10.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "tables" version)) + (sha256 + (base32 + "0469jrkmp0qv8cmlqkizm3b8imyc97mk9pfn66ldpyl6f4m82i15")) + (snippet '(begin + (use-modules (guix build utils)) + ;; TODO: Unbundle. + ;; (delete-file-recursively "hdf5-blosc") + (delete-file-recursively "c-blosc"))))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-tuning + (lambda _ + (substitute* "setup.py" + (("cpu_flags = .*") + "cpu_flags = ['sse2']\n")))) + (add-after 'unpack 'fix-reference-to-blosc2 + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "tables/__init__.py" + (("( +)os.path.join\\(current_dir, blosc2_lib_hardcoded\\)," + m indent) + (string-append indent + "\"" + (search-input-file inputs "/lib/libblosc2.so") + "\",\n" m))))) + (add-before 'build 'pre-build + (lambda _ + (invoke "make" "distclean") ;Regenerate C code with Cython + (setenv "BLOSC2_DIR" #$(this-package-input "cblosc2")) + (setenv "BLOSC_DIR" #$(this-package-input "c-blosc")) + (setenv "BZIP2_DIR" #$(this-package-input "bzip2")) + (setenv "HDF5_DIR" #$(this-package-input "hdf5")) + (setenv "LZO_DIR" #$(this-package-input "lzo")))) + (add-before 'check 'pre-check + (lambda _ + (setenv "HOME" "/tmp"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "/tmp" + ;; Performing only a light (yet comprehensive) subset of the + ;; test suite. If you want a more complete test, try + ;; passing the --heavy flag to this script (or set the + ;; 'heavy' parameter in case you are using tables.test() + ;; call). The whole suite will take more than 4 hours to + ;; complete on a relatively modern CPU and around 512 MB of + ;; main memory. + (invoke "python" "-m" "tables.tests.test_all")))))))) + (native-inputs + (list pkg-config + python-cython + python-pytest + python-setuptools + python-sphinx)) + (inputs + (list bzip2 + c-blosc + c-blosc2 + hdf5 + lzo)) + (propagated-inputs + (list python-blosc2 + python-numexpr + python-numpy + python-packaging + python-py-cpuinfo + python-typing-extensions)) + (home-page "https://www.pytables.org/") + (synopsis "Hierarchical datasets for Python") + (description "PyTables is a package for managing hierarchical datasets and +designed to efficiently cope with extremely large amounts of data.") + (license license:bsd-3))) + +(define-public python-tablib + (package + (name "python-tablib") + (version "3.9.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "tablib" version)) + (sha256 + (base32 "1qjzbpaln1grr5ngcm2apd5dxp0gcrwis5n60hg60d8gvf7bsshv")))) + (build-system pyproject-build-system) + (native-inputs + (list python-pytest + python-pytest-cov + python-setuptools + python-setuptools-scm)) + (inputs ;; [cli] + (list python-tabulate)) + (propagated-inputs + (list python-markuppy + python-odfpy + python-openpyxl + python-pyyaml + python-xlrd + python-xlwt)) + (home-page "https://tablib.readthedocs.io") + (synopsis "Format agnostic tabular data library") + (description + "@code{tablib} is a format-agnostic tabular dataset library, +written in Python. Supported output formats are Excel (Sets + Books), +JSON (Sets + Books), YAML (Sets + Books), HTML (Sets), Jira (Sets), +TSV (Sets), ODS (Sets), CSV (Sets), and DBF (Sets). + +@code{tablib} also supports Pandas DataFrames (Sets). Anyhow, since pandas is +quite huge, this Guix package doesn't depend on pandas. In case, just also +install @code{python-pandas}.") + (license license:expat))) + +(define-public python-tabulate + (package + (name "python-tabulate") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "tabulate" version)) + (sha256 + (base32 "0g4b0qnbw55igbpxfxzciqvb6w8ncw4gmcgyq0lyavcnylmv3580")))) + (build-system pyproject-build-system) + (native-inputs + (list python-pytest + python-setuptools-scm + python-setuptools + python-wheel)) + (home-page "https://github.com/astanin/python-tabulate") + (synopsis "Pretty-print tabular data") + (description + "Tabulate is a library and command-line utility to pretty-print tabular +data in Python.") + (license license:expat))) + +(define-public python-takethetime + (package + (name "python-takethetime") + (version "0.3.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "TakeTheTime" version)) + (sha256 + (base32 "1y9gzqb9l1f2smx8783ccjzjvby5mphshgrfks7s75mml59h9qyv")))) + (build-system pyproject-build-system) + (arguments + (list #:tests? #f)) ; tests are time dependent and not provided in PyPI + (native-inputs + (list python-setuptools + python-wheel)) + (home-page "https://github.com/ErikBjare/TakeTheTime") + (synopsis "Timing chunks of code") + (description + "This package implements a functionality for time taking using context +managers.") + (license license:expat))) + +(define-public python-taskgroup + (package + (name "python-taskgroup") + (version "0.0.0a4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "taskgroup" version)) + (sha256 + (base32 "170m7b59nxrhzs0nz6brj9brz4rzvw6k587ja0cnc9qy48nr027b")))) + (build-system pyproject-build-system) + (arguments + (list #:tests? #f)) ; no tests in PyPI and Git checkout + (native-inputs + (list python-flit-core)) + (home-page "https://github.com/graingert/taskgroup") + (synopsis "Backport of asyncio.TaskGroup, asyncio.Runner and asyncio.timeout") + (description + "This package provides a backport of @code{asyncio.TaskGroup}, +@code{asyncio.Runner} and @code{asyncio.timeout}.") + (license license:expat))) + +(define-public python-tasklogger + (package + (name "python-tasklogger") + (version "1.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "tasklogger" version)) + (sha256 + (base32 "1901mibcp6aiyjy8afnybrxnb0dkbdxlbvjqbr3gginlw7dr18xh")))) + (build-system pyproject-build-system) + (native-inputs + (list python-pytest + python-numpy + python-setuptools)) + (propagated-inputs + (list python-deprecated)) + (home-page "https://github.com/scottgigante/tasklogger") + (synopsis "Extension to the core Python logging library") + (description "This package provides an extension to the core Python +logging library for logging the beginning and completion of tasks and +subtasks.") + (license license:gpl2))) + +(define-public python-tatsu + (package + (name "python-tatsu") + (version "5.13.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/neogeny/TatSu") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ppgi5r55iirzhnf988b32yvh8ly8lzxbg59y0zgqfaxbma50650")))) + (build-system pyproject-build-system) + (native-inputs + (list python-pytest + python-setuptools)) + (home-page "https://tatsu.readthedocs.io/en/stable/") + (synopsis "PEG/Packrat Parser generator for Python") + (description + "TatSu (竜) takes a grammar in a variation of Extended Backus-Naur +Form (EBNF) as input, and outputs a memoizing Parsing Expression Grammar (PEG) +or Packrat parser in Python.") + (license license:bsd-2))) + +(define-public python-tblib + (package + (name "python-tblib") + (version "3.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "tblib" version)) + (sha256 + (base32 "0lnnbicpxx774s29nkbic4rrqvy4rhxd8skx5pp6zxh7kwn4qh06")))) + (build-system pyproject-build-system) + (arguments + (list + ;; Don't run benchmark tests. + #:test-flags #~(list "--ignore=tests/test_perf.py") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-pytest-config + (lambda _ + (substitute* "pytest.ini" + (("--benchmark-disable") ""))))))) + (native-inputs + (list python-pytest + python-setuptools)) + (home-page "https://github.com/ionelmc/python-tblib") + (synopsis "Traceback serialization library") + (description + "Traceback serialization allows you to: + +@enumerate +@item Pickle tracebacks and raise exceptions with pickled tracebacks in +different processes. This allows better error handling when running code over +multiple processes (imagine multiprocessing, billiard, futures, celery etc). + +@item Parse traceback strings and raise with the parsed tracebacks. +@end enumerate\n") + (license license:bsd-3))) + +(define-public python-telethon + (package + (name "python-telethon") + (version "1.41.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/LonamiWebs/Telethon") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0rbzqbxsihqm2w1zrvaaafvzwyqqyjx49wfffxrnsr9m32giwzsp")))) + (build-system pyproject-build-system) + (native-inputs + (list python-pytest + python-pytest-asyncio-0.26 + python-pytest-trio + python-setuptools)) + (propagated-inputs + (list python-rsa python-pyaes)) + (home-page "https://docs.telethon.dev") + (synopsis "Full-featured Telegram client library for Python 3") + (description "This library is designed to make it easy to write Python +programs that can interact with Telegram.") + (license license:expat))) + +(define-public python-tempdir + (package + (name "python-tempdir") + (version "0.7.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "tempdir" version)) + (sha256 + (base32 "13msyyxqbicr111a294x7fsqbkl6a31fyrqflx3q7k547gnq15k8")))) + (build-system pyproject-build-system) + (arguments (list #:tests? #f)) ; No tests. + (native-inputs (list python-setuptools)) + (home-page "https://pypi.org/project/tempdir/") + (synopsis "Python library for managing temporary directories") + (description + "This library manages temporary directories that are automatically +deleted with all their contents when they are no longer needed. It is +particularly convenient for use in tests.") + (license license:expat))) + +(define-public python-tempora + (package + (name "python-tempora") + (version "5.8.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "tempora" version)) + (sha256 + (base32 "1k9d6qmlp0i4v3d0dcqcsndvmng3lfdh4y0p8gwy9i8cg7ndkddb")))) + (build-system pyproject-build-system) + (arguments + (list + ;; Do not test the myproject.toml build as it tries to pull dependencies + ;; from the Internet. + #:test-flags #~(list "-k" "not project" + "tests"))) + (native-inputs + (list python-freezegun + python-pytest + python-setuptools + python-setuptools-scm + python-tzdata)) + (propagated-inputs (list python-dateutil python-jaraco-functools)) + (home-page "https://github.com/jaraco/tempora") + (synopsis "Python date and time objects and routines") + (description + "The @code{tempora} Python library contains miscellaneous date and time +related utilities and constants, routines for measuring, profiling, and +getting datetime-aware @acronym{UTC, Coordinated Universal Time} values as +well as an event scheduler.") + (license license:expat))) + +(define-public python-tenacity + (package + (name "python-tenacity") + (version "9.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "tenacity" version)) + (sha256 + (base32 "0fyp421r038naskvyhj90hkq0az96477njad4rhs6annjz53fzw0")))) + (build-system pyproject-build-system) + (native-inputs + (list python-pytest + python-setuptools + python-setuptools-scm + python-tornado-6 + python-typeguard + python-wheel)) + (home-page "https://github.com/jd/tenacity") + (synopsis "Retrying library for python") + (description + "Tenacity is a general-purpose python library to simplify the task of +adding retry behavior to just about anything.") + (license license:asl2.0))) + +(define-public python-term-background + (package + (name "python-term-background") + (version "1.0.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "term_background" version)) + (sha256 + (base32 "0p674silrwc3jncncmdnj1lr6pl2q5qbx0xi3mzjq9sgcs5vmp4n")))) + (arguments + (list + #:phases + '(modify-phases %standard-phases + (add-after 'unpack 'fix-build + (lambda _ (delete-file "setup.py")))))) + (build-system pyproject-build-system) + (native-inputs + (list python-pytest + python-setuptools + python-setuptools-scm + python-wrapper + python-wheel)) + (home-page "http://github.com/rocky/shell-term-background") + (synopsis "Determine if shell has a light or dark background") + (description "This package determines if shell has a light or dark +background.") + (license license:gpl2+))) + +(define-public python-term-image + (package + (name "python-term-image") + (version "0.7.2") + (source + (origin + ;; We need the full repo to run the tests. + (method git-fetch) + (uri (git-reference + (url "https://github.com/AnonymouX47/term-image") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1lsd5m0k5m99arkca2rzrrlln10c8ax6xfawqwjnspcbf8l3h3dq")))) + (build-system pyproject-build-system) + (arguments + (list #:test-flags + #~(list "tests" + ;; These tests require network access. + "-k" (string-append "not test_from_url" + " and not test_source" + " and not test_close")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'adjust-dependencies + (lambda _ + (substitute* "setup.py" + (("pillow>=9.1,<11") "pillow>=9.1,<12"))))))) + (propagated-inputs (list python-pillow python-requests)) + (native-inputs + (list python-pytest + python-setuptools + python-urwid)) + (home-page "https://github.com/AnonymouX47/term-image") + (synopsis "Display images in the terminal") + (description "term-image is a library and program to display images on +compatible terminals. + +Features: +@enumerate +@item Multiple image formats (basically all formats supported by +@code{PIL.Image.open()}) +@item Multiple image source types: PIL image instance, local file, URL +@item Multiple image render styles (with automatic support detection) +@item Support for multiple terminal graphics protocols, including Kitty +@item Transparency support (with multiple options) +@item Animated image support (including transparent ones) +@item Integration into various TUI / terminal-based output libraries +@item Terminal size awareness +@item Automatic and manual image sizing +@item Horizontal and vertical alignment +@item Automatic and manual font ratio adjustment (to preserve image aspect +ratio) +@end enumerate") + (license license:expat))) + +(define-public python-termcolor + (package + (name "python-termcolor") + (version "2.5.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "termcolor" version)) + (sha256 + (base32 "0vwaxyr2vk8gi7s1slq74nb0ssbb0wcn208ziqp48j3dv8kqv3cr")))) + (build-system pyproject-build-system) + (native-inputs + (list python-hatch-vcs + python-hatchling + python-pytest + python-pytest-cov)) + (home-page "https://pypi.org/project/termcolor/") + (synopsis "ANSII Color formatting for terminal output") + (description + "This package provides ANSII Color formatting for output in terminals.") + (license license:expat))) + +(define-public python-termcolor-1 + (package + (inherit python-termcolor) + (version "1.1.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "termcolor" version)) + (sha256 + (base32 + "0fv1vq14rpqwgazxg4981904lfyp84mnammw7y046491cv76jv8x")))) + ;; There are no tests + (arguments (list #:tests? #false)) + (native-inputs + (list python-setuptools + python-wheel)))) + +(define-public python-terminaltables + (package + (name "python-terminaltables") + (version "3.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Robpol86/terminaltables") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 (base32 "1jlm7n6kxypbr8mvwpd7hf9hbfk0a002ad03wqgxlri4aw8pk39a")))) + (build-system pyproject-build-system) + ;; XXX: A lot of test fail with flaky behavior. + (arguments (list #:tests? #f)) + (native-inputs + (list python-colorclass + python-colorama + python-pytest + python-setuptools + python-termcolor)) + (home-page "https://github.com/Robpol86/terminaltables") + (synopsis + "Generate simple tables in terminals from a nested list of strings") + (description + "This package makes it easy to draw tables in terminal/console +applications from a list of lists of strings. It supports multi-line rows.") + (license license:expat))) + +(define-public python-termstyle + (package + (name "python-termstyle") + (version "0.1.11") + (source + (origin + (method url-fetch) + (uri (pypi-uri "termstyle" version)) + (sha256 + (base32 "17wzkkcqy5zc0g68xlad3kcv66iw14d2pwqc0h9420gak0vbhx7g")))) + (build-system pyproject-build-system) + (arguments + (list #:test-backend #~'custom + #:test-flags #~(list "test3.py"))) + (native-inputs + (list python-setuptools)) + (home-page "https://github.com/gfxmonk/termstyle") + (synopsis "Console text coloring for Python") + (description "This package provides console text coloring for Python.") + (license license:bsd-3))) + +(define-public python-text-unidecode + (package + (name "python-text-unidecode") + (version "1.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "text-unidecode" version)) + (sha256 + (base32 "14xb99fdv52j21dsljgsbmbaqv10ps4b453p229r29sdn4xn1mms")))) + (build-system pyproject-build-system) + (native-inputs + (list python-pytest + python-setuptools)) + (home-page "https://github.com/kmike/text-unidecode/") + (synopsis "Decode Unicode data") + (description + "@code{text-unidecode} is a basic Python port of the @code{Text::Unidecode} +Perl library. It can create ASCII representations of Unicode data. In general +users should prefer the @code{python-unidecode} package which offers better +memory usage and transliteration quality.") + ;; The user can choose either license. + (license (list license:clarified-artistic license:gpl2+)))) + +(define-public python-textdistance + (package + (name "python-textdistance") + (version "4.6.3") + (source + (origin + ;; There are no tests in the PyPI tarball. + (method git-fetch) + (uri (git-reference + (url "https://github.com/life4/textdistance") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1qaplikab46p38jqr93bxd26vvxcnvib15fjxmmp4cbsiy5196sg")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + #~(list "--numprocesses" (number->string (min 4 (parallel-job-count)))))) + (native-inputs + (list python-numpy + python-pytest + python-pytest-xdist + python-setuptools + python-wheel)) + (propagated-inputs + (list python-jellyfish + python-distance + python-levenshtein + python-pylev + python-pyxdameraulevenshtein + python-rapidfuzz)) + (home-page "https://github.com/life4/textdistance") + (synopsis "Compute distance between the two texts") + (description "@code{textdistance} is a pure Python library for comparing +distance between two or more sequences by many algorithms.") + (license license:expat))) + +(define-public python-textparser + (package + (name "python-textparser") + (version "0.24.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "textparser" version)) + (sha256 + (base32 "0dc3aqbzh0x13i6cmr73q777wv8nxyk3p0kdnynh5l59bbkhixsn")))) + (build-system pyproject-build-system) + (arguments + (list #:test-backend #~'unittest)) + (native-inputs (list python-setuptools)) + (home-page "https://github.com/eerimoq/textparser") + (synopsis "Fast text parser for Python") + (description "This library provides a text parser written in the Python +language. It aims to be fast.") + (license license:expat))) + +(define-public python-texttable + (package + (name "python-texttable") + (version "1.6.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/foutaise/texttable/") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1lcn76wx6fsj8d79gs985irkqz5qbwq1v9ji9jxsra6dbb643v5j")))) + (build-system pyproject-build-system) + (arguments (list #:test-flags #~(list "tests.py"))) + (native-inputs (list python-pytest python-setuptools)) + (home-page "https://github.com/foutaise/texttable/") + (synopsis "Create simple ASCII tables in Python") + (description + "This package provides a Python module for creating simple ASCII +tables.") + (license license:expat))) + +(define-public python-textual + (package + (name "python-textual") + (version "3.5.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Textualize/textual") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1sldkhy8phk9c7pln70dyb6aya7qpxb5niym9s91z144dv6ykgws")))) + (build-system pyproject-build-system) + (arguments + (list #:test-flags + ;; Snapshot tests require python-pytest-textual-snapshot which + ;; in turn depends on python-textual. + '(list "--ignore=tests/snapshot_tests/test_snapshots.py" + "-k" (string-append + ;; Broken for unknown reason. + "not test_textual_env_var" + ;; Tests that require python-treesitter-languages. + " and not test_widget_construct" + " and not test_setting_builtin_language_via_constructor" + " and not test_setting_builtin_language_via_attribute" + " and not test_setting_language_to_none" + " and not test_setting_unknown_language" + " and not test_register_language" + " and not test_update_highlight_query" + " and not test_default_theme" + " and not test_setting_builtin_themes" + " and not test_setting_unknown_theme_raises_exception" + " and not test_registering_and_setting_theme")))) + (propagated-inputs + (list python-markdown-it-py + python-platformdirs + python-rich + python-tree-sitter + ;; python-tree-sitter-languages ; optional, not packed yet + python-typing-extensions)) + (native-inputs + (list python-poetry-core + python-pytest + python-pytest-asyncio + python-pytest-xdist)) + (home-page "https://github.com/Textualize/textual") + (synopsis "Build text user interfaces in Python") + (description "Textual is a @acronym{TUI, Text User Interface} framework +for Python inspired by modern web development.") + (license license:expat))) + +(define-public python-tftpy + (package + (name "python-tftpy") + (version "0.8.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/msoulier/tftpy") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "11cs52skmisg7rlmcxghmpcxfszcwmph6cvmfdn2p0ks6ckfy9q2")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-backend #~'unittest + #:test-flags #~(list "tests/test.py") + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'configure-tests + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; The default DEBUG logging level is way too verbose. + (substitute* "tests/test.py" + (("logging\\.DEBUG") + "logging.INFO")))))))) + (native-inputs (list python-setuptools)) + (home-page "https://tftpy.sourceforge.net/") + (synopsis "Python trivial file transfer protocol (TFTP) library") + (description + "TFTPy is a trivial file transfer protocol (TFTP) Python library. It can +be used to act both as a TFTP client or TFTP server.") + (license license:expat))) + +(define-public python-three-merge + (package + (name "python-three-merge") + (version "0.1.1") + (source + (origin + ;; There are no tests in the PyPI tarball. + (method git-fetch) + (uri (git-reference + (url "https://github.com/spyder-ide/three-merge") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1fw28swh6jq4myr09j7gv68l241b8vwg470ak5xv0x4xwh2a1m86")))) + (build-system pyproject-build-system) + (propagated-inputs + (list python-diff-match-patch)) + (native-inputs + (list python-pytest python-setuptools python-wheel)) + (home-page "https://github.com/spyder-ide/three-merge") + (synopsis "Library for merging two strings with respect to a base one") + (description + "This package provides a Python library to perform a 3-way merge between +strings, based on @code{diff-match-patch}. This library performs merges at a +character level, as opposed to most VCS systems, which opt for a line-based +approach.") + (license license:expat))) + +(define-public python-throttler + (package + (name "python-throttler") + (version "1.2.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/uburuntu/throttler") + (commit (string-append "v" version)))) + (sha256 + (base32 "1gn21x0zkm7rr7qijlz7nvw7z0mm1j2r0r2lslg7wln1z36gjkbw")))) + (build-system pyproject-build-system) + (native-inputs + (list python-aiohttp + python-codecov + python-flake8 + python-pytest + python-pytest-asyncio + python-pytest-cov + python-setuptools + python-wheel)) + (home-page "https://github.com/uburuntu/throttler") + (synopsis "Throttling with asyncio support") + (description + "This is a Python package for easy throttling with asyncio support.") + (license license:expat))) + +(define-public python-tifffile + (package + (name "python-tifffile") + (version "2025.10.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "tifffile" version)) + (sha256 + (base32 "0f1ybmr2jz19gjg92p9vz3qib49m0x4ipxvrvjyfa6r1mcb7qhrf")))) + (build-system pyproject-build-system) + ;; Tests require lfdfiles, which depends on tifffile + (arguments (list #:tests? #f)) + (propagated-inputs + (list python-numpy)) + (native-inputs + (list python-setuptools)) + (home-page "https://www.lfd.uci.edu/~gohlke/") + (synopsis "Read and write TIFF(r) files") + (description + "This package lets you read image and metadata from many bio-scientific +formats such as plain TIFF, BigTIFF, OME-TIFF, STK, LSM, SGI,NIH, ImageJ, +MicroManager, MD GEL, and FluoView files. It also lets you write numpy arrays +to TIFF, BigTIFF, and ImageJ hyperstack compatible files.") + (license license:bsd-3))) + +(define-public python-tifffile-for-dask-image + ;; It's for python-dask-image@2024.5.3, remove when no longer required. + (hidden-package + (package + (inherit python-tifffile) + (name "python-tifffile") + (version "2023.12.9") + (source + (origin + (method url-fetch) + (uri (pypi-uri "tifffile" version)) + (sha256 + (base32 "1f6d8qdlq0zlksfdhp1mhj9icpwhw4cz47r4i80m6r0a328xmlcx"))))))) + +(define-public python-tiktoken + (package + (name "python-tiktoken") + (version "0.9.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "tiktoken" version)) + (sha256 + (base32 "0p9cg6n8mzdi4lbbwxrrp26chy5hr14bqmzr3w74kq1qm6k5qanh")))) + (build-system cargo-build-system) + (arguments + (list + #:install-source? #false + #:imported-modules + (append %pyproject-build-system-modules + %cargo-build-system-modules) + #:modules + '((guix build cargo-build-system) + ((guix build pyproject-build-system) #:prefix py:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + (replace 'build + (assoc-ref py:%standard-phases 'build)) + (add-after 'install 'wrap + (lambda _ + ;; Collection of python- and pyproject-build-system phases + ;; between 'install and 'check. + (assoc-ref py:%standard-phases 'add-install-to-pythonpath) + (assoc-ref py:%standard-phases 'add-install-to-path) + (assoc-ref py:%standard-phases 'wrap) + (assoc-ref py:%standard-phases 'create-entrypoints) + (assoc-ref py:%standard-phases 'compile-bytecode))) + (replace 'install + (assoc-ref py:%standard-phases 'install))))) + (propagated-inputs (list python-regex python-requests)) + (inputs (cargo-inputs 'python-tiktoken)) + (native-inputs + (list python-setuptools + python-setuptools-rust + python-wheel + python-wrapper)) + (home-page "https://github.com/openai/tiktoken/") + (synopsis "Fast BPE tokeniser for use with OpenAI's models") + (description + "Tiktoken is a fast @dfn{byte pair encoding} (BPE) tokeniser for use with +@code{OpenAI's} models.") + (license license:expat))) + +(define-public python-timeout-decorator + ;; TODO: Remove when python-requests-caches releses a fresh version dropping + ;; it, see, <https://github.com/requests-cache/requests-cache/pull/1111>. + (package + (name "python-timeout-decorator") + (version "0.5.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "timeout-decorator" version)) + (sha256 + (base32 "1mxk2qyydhzncm93z08kvj5ssxq3fr2n7pkrrji28nqwvdc2ybva")))) + (build-system pyproject-build-system) + (arguments (list #:tests? #f)) + (native-inputs (list python-setuptools python-wheel)) + (home-page "https://github.com/pnpnpn/timeout-decorator") + (synopsis "Timeout decorator") + (description "This package provides a decorator that raises an error +when an operation takes longer than expected.") + (license license:expat))) + +(define-public python-titlecase + (package + (name "python-titlecase") + (version "2.4.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "titlecase" version)) + (sha256 + (base32 "1x9myq3rlbw6wh946ncch8px7wyabhzacy2fjji13nmvrivs50vx")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-backend #~'unittest)) + (native-inputs + (list python-setuptools)) + (home-page "https://github.com/ppannuto/python-titlecase") + (synopsis "Capitalize strings similar to book titles") + (description + "Python-Titlecase is a Python port of John Gruber's titlecase.pl. +It capitalizes (predominantly English) strings in a way that is similar to +book titles, using the New York Times Manual of Style to leave certain words +lowercase.") + (license license:expat))) + +(define-public python-tlsh + (package + (name "python-tlsh") + (version "4.11.2") + (home-page "https://github.com/trendmicro/tlsh") + (source + (origin + (method git-fetch) + (uri (git-reference (url home-page) (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1gb5j73nw3nmx030rf8pm75rns5syxhv44zxr6i74kjicyly1i9w")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'configure + (lambda _ + (invoke "cmake" "."))) ;to generate tlsh_version.h + (add-after 'configure 'chdir + (lambda _ + (chdir "py_ext"))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "../Testing" + (invoke "./python_test.sh")))))))) + (native-inputs (list cmake-minimal python-setuptools)) + (synopsis "Fuzzy matching library for Python") + (description + "Trend Micro Locality Sensitive Hash (TLSH) is a fuzzy matching library. +Given a byte stream with a minimum length of 256 bytes, TLSH generates a hash +value which can be used for similarity comparisons. Similar objects have +similar hash values, which allows for the detection of similar objects by +comparing their hash values. The byte stream should have a sufficient amount +of complexity; for example, a byte stream of identical bytes will not generate +a hash value.") + (license license:asl2.0))) + +(define-public python-tokenize-rt + (package + (name "python-tokenize-rt") + (version "6.2.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/asottile/tokenize-rt") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1maa9sifma0a6v7kl7mmyqzj0jdclzlp4wjr0vkdx95raihxx4fv")))) + (build-system pyproject-build-system) + (native-inputs (list python-pytest python-setuptools)) + (home-page "https://github.com/asottile/tokenize-rt") + (synopsis "Wrapper around the stdlib tokenize which roundtrips") + (description + "This Python library is a wrapper around @code{tokenize} from the Python +standard library. It provides two additional tokens @code{ESCAPED_NL} and +@code{UNIMPORTANT_WS}, and a @code{Token} data type. Use @code{src_to_tokens} +and @code{tokens_to_src} to roundtrip.") + (license license:expat))) + +(define-public python-tomlkit + (package + (name "python-tomlkit") + (version "0.13.3") + (source + (origin + (method url-fetch) + (uri (pypi-uri "tomlkit" version)) + (sha256 + (base32 "18fjmmhiv5jkkg1dwidmxd0sjqnkf675igizxsa2ppspxr3z4323")))) + (build-system pyproject-build-system) + (native-inputs + (list python-poetry-core + python-pytest + python-pyyaml)) + (home-page "https://github.com/sdispater/tomlkit") + (synopsis "Style-preserving TOML library") + (description + "TOML Kit is a 1.0.0rc1-compliant TOML library. It includes a parser that +preserves all comments, indentations, whitespace and internal element ordering, +and makes them accessible and editable via an intuitive API. It can also +create new TOML documents from scratch using the provided helpers. Part of the +implementation has been adapted, improved, and fixed from Molten.") + (license license:expat))) + +(define-public python-toolrack + (package + (name "python-toolrack") + (version "4.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/albertodonato/toolrack") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1aglfj7j25fiwx9jh1rl34mlhfpdhn8yrkn30vhkz9yw7zrx42h0")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-/bin/sh + (lambda _ + (substitute* "tests/aio/process_test.py" + (("/bin/sh") + (which "sh")))))))) + (native-inputs + (list python-pytest + python-pytest-asyncio + python-pytest-mock + python-setuptools)) + (home-page "https://github.com/albertodonato/toolrack") + (synopsis "Collection of Python utility functions and classes") + (description "This package provides a collection of miscellaneous utility +functions and classes.") + (license license:lgpl3+))) + +(define-public python-toolshed + (package + (name "python-toolshed") + (version "0.4.6") + (source + (origin + (method url-fetch) + (uri (pypi-uri "toolshed" version)) + (sha256 + (base32 "14zvz51gzf9i1i3d1sj363ba4rksl6lcf4lz1arl8hpqgcbir8r3")))) + (build-system pyproject-build-system) + (arguments + (list #:tests? #f)) ;tests are not included in PyPI archive + (native-inputs + (list python-setuptools)) + (home-page "https://github.com/brentp/toolshed/") + (synopsis "Collection of modules and functions for working with data") + (description "This is a collection of well-tested, simple modules and +functions that aim to reduce boilerplate when working with data.") + (license license:bsd-2))) + +(define-public python-toolz + (package + (name "python-toolz") + (version "1.0.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "toolz" version)) + (sha256 + (base32 "00ks0jhl1jwm9576c5sh10pnla8ni21yvg4kcxasr627l3cy71ic")))) + (build-system pyproject-build-system) + (native-inputs + (list python-pytest + python-setuptools + python-wheel)) + (home-page "https://github.com/pytoolz/toolz/") + (synopsis "List processing tools and functional utilities") + (description + "This package provides a set of utility functions for iterators, +functions, and dictionaries.") + (license license:bsd-3))) + +(define-public python-toposort + (package + (name "python-toposort") + (version "1.10") + (source + (origin + (method url-fetch) + (uri (pypi-uri "toposort" version)) + (sha256 + (base32 "1gd66z5dy6j7qs5qkj1pg0vb15rwd571yq02fkm9d9nhaff4gfxz")))) + (build-system pyproject-build-system) + (arguments + (list #:test-backend #~'custom + #:test-flags #~(list "-m" "test.test_toposort"))) + (native-inputs (list python-setuptools)) + (home-page "https://gitlab.com/ericvsmith/toposort") + (synopsis "Topological sort algorithm") + (description + "This package provides an implementation of a topological sort +algorithm.") + (license license:asl2.0))) + +(define-public python-towncrier + (package + (name "python-towncrier") + (version "25.8.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "towncrier" version)) + (sha256 + (base32 "1c8fjjwlx29jgllxvyzby4cn51iraxba0cmfnfmmgb9iz0lnvwgf")))) + (build-system pyproject-build-system) + (native-inputs + (list git-minimal/pinned ;tests create git repositories + python-hatchling + python-pytest + python-twisted)) + (propagated-inputs + (list python-click + python-jinja2)) + (home-page "https://towncrier.readthedocs.io/en/stable/") + (synopsis "Manage release notes") + (description + "@code{towncrier} is a utility to produce useful, summarized news files + (also known as changelogs) for a project.") + (license license:expat))) + +(define-public python-tqdm + (package + (name "python-tqdm") + (version "4.67.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "tqdm" version)) + (sha256 + (base32 "1wi7cql2fc76b5z9v1sr96ix2gxcb974z8qfydjkmh885k2zkbpq")))) + (build-system pyproject-build-system) + (arguments + (list #:test-flags + '(list "-o" "asyncio_mode=auto" + "-k" "not perf and not test_rlock_creation"))) + (native-inputs + (list python-pytest + python-pytest-asyncio + python-pytest-timeout + python-setuptools + python-setuptools-scm + python-toml + python-wheel)) + (home-page "https://github.com/tqdm/tqdm") + (synopsis "Fast, extensible progress meter") + (description + "Make loops show a progress bar on the console by just wrapping any +iterable with @code{|tqdm(iterable)|}. Offers many options to define +design and layout.") + (license (list license:mpl2.0 license:expat)))) + +(define-public python-traitlets + (package + (name "python-traitlets") + (version "5.14.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "traitlets" version)) + (sha256 + (base32 "0zjj8ha4z5lbhhmvcl3q8wp5qmwqq0lwxma3d8qvh10s6xdi11c5")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + '(list "-k" "not mypy_list_typing and not mypy_dict_typing"))) + (native-inputs + (list python-argcomplete + python-hatchling + python-mypy + python-pytest + python-pytest-mock + python-pytest-mypy-testing)) + (home-page "https://ipython.org") + (synopsis "Configuration system for Python applications") + (description + "Traitlets is a framework that lets Python classes have attributes with +type checking, dynamically calculated default values, and ‘on change’ +callbacks. The package also includes a mechanism to use traitlets for +configuration, loading values from files or from command line arguments. This +is a distinct layer on top of traitlets, so you can use traitlets in your code +without using the configuration machinery.") + (license license:bsd-3))) + +(define-public python-translitcodec + (package + (name "python-translitcodec") + (version "0.7.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/claudep/translitcodec") + (commit (string-append "version-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1cj11sa5hy8ga7p0dgwi4g4gv0qx6c1yi2csgnvxiir16ywslhpw")))) + (build-system pyproject-build-system) + (native-inputs (list python-pytest python-setuptools)) + (home-page "https://github.com/claudep/translitcodec") + (synopsis "Unicode to 8-bit charset transliteration codec") + (description + "This package contains codecs for transliterating ISO 10646 texts into +best-effort representations using smaller coded character sets (ASCII, +ISO 8859, etc.).") + (license license:expat))) + +(define-public python-treelib + (package + (name "python-treelib") + (version "1.8.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/caesar0301/treelib") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0jd3rdaq8v7ykb626cm1gxa03higqnn2pmnv46fc0lc55xbrkxlf")) + (patches + (search-patches "python-treelib-remove-python2-compat.patch")))) + (build-system pyproject-build-system) + (native-inputs (list python-poetry-core python-pytest)) + (home-page "https://github.com/caesar0301/treelib") + (synopsis "Implementation of a tree structure in Python") + (description + "This package provides a Python implementation of a tree structure.") + (license license:asl2.0))) + +(define-public python-trio + (package + (name "python-trio") + (version "0.28.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "trio" version)) + (sha256 + (base32 "019wqwlbj185skknbjd7paxqqx6vl5gpqk2fwmc5d2lyzsb7hm2f")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + `(list "-k" + (string-append + ;; This tests times out. + "not test_ki_protection_works" + " and not test_KI_interrupts" + ;; This fails with: signal only works in main thread of the main interpreter + " and not test_catch_signals_race_condition_on_exit" + ;; Assertion errors. + " and not test_named_thread_os" + " and not test_has_pthread_setname_np" + " and not test_guest_mode_ki" + " and not test_run_in_trio_thread_ki" + " and not test_simple_cancel_scope_usage_doesnt_create\ +_cyclic_garbage" + " and not test_nursery_cancel_doesnt_create_cyclic_garbage" + " and not test_cancel_scope_exit_doesnt_create_cyclic_garbage" + " and not test_locals_destroyed_promptly_on_cancel" + " and not test_ipython_exc_handler" + " and not test_for_leaking_fds" + ;; Signals don’t work in the build sandbox. + " and not test_open_signal_receiver" + ;; These try to raise KeyboardInterrupt which does not work + ;; in the build environment. + " and not test_ki_self" + " and not test_ki_wakes_us_up" + ;; Failure in name resolution. + " and not test_getnameinfo" + " and not test_SocketType_resolve" + ;; OSError: protocol not found. + " and not test_getprotobyname" + ;; EOFError: Ran out of input. + " and not test_static_tool_sees_all_symbols") + ,@(if (package? (this-package-native-input "python-trustme")) + '() + `("--ignore=src/trio/_tests/test_dtls.py" + "--ignore=src/trio/_tests/test_highlevel_ssl_helpers.py" + "--ignore=src/trio/_tests/test_ssl.py")) + ;; It rerquires black and ruff to generate a final report. + "--ignore=src/trio/_tests/tools/test_gen_exports.py" + "src/trio/_tests") + #:phases + '(modify-phases %standard-phases + (add-after 'unpack 'ignore-deprecations + (lambda _ + (substitute* "pyproject.toml" + ((" \"error\",") " \"ignore\",")))) + (add-before 'check 'set-env + (lambda _ + ;; Tests require a writable home. + (setenv "HOME" "/tmp") + ;; #$output is first in path which causes "import file mismatch" + (setenv "PYTHONPATH" (string-append (getcwd) "/src:$PYTHONPATH"))))))) + (native-inputs + (append + (if (supported-package? python-pyopenssl) + (list python-pyopenssl) + '()) + (list python-pytest + python-setuptools) + (if (supported-package? python-trustme) + (list python-trustme) + '()) + (list python-wheel))) + (propagated-inputs + (list python-attrs + python-cffi + python-exceptiongroup + python-idna + python-outcome + python-sniffio + python-sortedcontainers)) + (home-page "https://github.com/python-trio/trio") + (synopsis "Friendly Python library for async concurrency and I/O") + (description + "Trio strives to be a production-quality, async/await-native I/O library +for Python. Like all async libraries, its main purpose is to help you write +programs that do multiple things at the same time with parallelized I/O.") + ;; Either license applies. + (license (list license:expat license:asl2.0)))) + +(define-public python-trio-typing + (package + (name "python-trio-typing") + (version "0.10.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "trio-typing" version)) + (sha256 + (base32 "1hvsj3w500i33ykfgh3sfkjnxhxf05incx131smshlkd562fcph6")))) + (build-system pyproject-build-system) + (native-inputs (list python-pytest python-setuptools python-wheel)) + (propagated-inputs + (list python-async-generator + python-importlib-metadata + python-mypy-extensions + python-packaging + python-trio + python-typing-extensions)) + (home-page "https://github.com/python-trio/trio-typing") + (synopsis "Static type checking support for Trio and related projects") + (description + "This package provides: + +@itemize +@item PEP 561 typing stubs packages for the Trio project packages: + +@itemize +@item trio (@code{trio-stubs}) +@item outcome (@code{outcome-stubs}) +@item async_generator (@code{async_generator-stubs}) +@end itemize + +@item A package @code{trio_typing} containing types that Trio programs often +want to refer to (@code{AsyncGenerator[Y, S]} and @code{TaskStatus[T])} and +a mypy plugin that smooths over some limitations in the basic type hints. +@end itemize") + ;; Either license applies. + (license (list license:expat license:asl2.0)))) + +(define-public python-trubar + (package + (name "python-trubar") + (version "0.3.4") + (source + (origin + (method url-fetch) + (uri (pypi-uri "trubar" version)) + (sha256 + (base32 "149l5wid1b41gmfzsrhapcigcbcsflviz8p1pfa937443fxw1dkd")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + #~(list "-k" (string-join + ;; AttributeError: module 'libcst' has no attribute + ;; 'FlattenSentinel'. Did you mean: 'MaybeSentinel'? + (list "not test_import_from_future" + "test_inport_after_docstring" + ;; AssertionError: Items in the second set but not + ;; the first + "test_walk_files") + " and not ")))) + (native-inputs + (list python-pytest + python-setuptools + python-wheel)) + (propagated-inputs + (list python-libcst + python-pyyaml)) + (home-page "https://github.com/janezd/trubar") + (synopsis "Utility for translation of Python sources") + (description + "This package provides a tool for translation and localization of Python +programs via modification of source files. Trubar supports f-strings and does +not require any changes to the original source code, such as marking strings +for translation.") + (license license:expat))) + +(define-public python-twine + (package + (name "python-twine") + (version "6.2.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "twine" version)) + (sha256 + (base32 "1kvm9cdvbnh232wafww1w5scaic9kkrwhlff1mvmk68cswphvvg5")))) + (build-system pyproject-build-system) + (arguments + (list + ;; tests: 228 passed, 1 deselected + #:test-flags + ;; Assertion is not equal for one tests. + #~(list "--deselect=tests/test_check.py::test_fails_rst_syntax_error"))) + (native-inputs + (list python-pretend + python-pytest + python-pytest-socket + python-setuptools + python-setuptools-scm)) + (propagated-inputs + (list python-id + python-keyring + python-packaging + python-readme-renderer + python-requests + python-requests-toolbelt + python-rfc3986 + python-rich + python-urllib3)) + (home-page "https://github.com/pypa/twine") + (synopsis "Collection of utilities for interacting with PyPI") + (description + "@code{twine} currently supports registering projects and uploading +distributions. It authenticates the user over HTTPS, allows them to pre-sign +their files and supports any packaging format (including wheels).") + (license license:asl2.0))) + +(define-public python-twisted + (package + (name "python-twisted") + (version "24.11.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/twisted/twisted") + (commit (string-append "twisted-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0k4rd5bpx40j1k0mgbhzqa35dyni0kk7pxjr8x3pm1iaka1718rh")))) + (build-system pyproject-build-system) + (arguments + (list + ;; tests: skips=638, successes=9759 + #:test-backend #~'custom + #:test-flags + #~(list "-m" "twisted.trial" + "--temp-directory=/tmp/_trial_temp" + (string-append "-j" (number->string (min 8 (parallel-job-count)))) + "twisted") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-broken-tests + (lambda _ + (for-each delete-file + (list + ;; No idea why they fail + "src/twisted/test/test_log.py" + ;; Network tests + "src/twisted/conch/test/test_cftp.py" + "src/twisted/internet/test/test_endpoints.py" + "src/twisted/protocols/test/test_tls.py" + "src/twisted/test/test_sslverify.py" + "src/twisted/web/test/test_agent.py" + "src/twisted/web/test/test_tap.py" + ;; These need a git executable + "src/twisted/python/test/test_release.py" + ;; These leave behind a socket file, which breaks the + ;; build with "...has an unsupported type" + "src/twisted/internet/test/test_unix.py" + "src/twisted/test/test_unix.py" + ;; These complain about missing test modules. + "src/twisted/test/test_failure.py" + "src/twisted/web/test/test_http2.py" + "src/twisted/conch/test/test_forwarding.py"))))))) + (propagated-inputs + (list python-attrs + python-automat + python-bcrypt + python-constantly + python-hyperlink + python-incremental + python-typing-extensions + python-zope-interface + ;; [conch] + python-appdirs + python-bcrypt + python-cryptography + ;; [http2] + python-h2 + python-priority + ;; [tls] + python-idna + python-pyopenssl + python-service-identity + ;; [serial] + python-pyserial)) + (native-inputs + (list glibc-utf8-locales ;for OpenTestLogTests.test_utf8 + python-hatch-fancy-pypi-readme + python-hatchling + python-httpx + python-hypothesis + python-incremental + python-pyhamcrest + python-pytest)) + (home-page "https://twistedmatrix.com/") + (synopsis "Asynchronous networking framework written in Python") + (description + "Twisted is an extensible framework for Python programming, with special +focus on event-based network programming and multiprotocol integration.") + (license license:expat))) + (define-public python-typeapi (package (name "python-typeapi") diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index cbf66f4612..6142272b51 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -6166,8 +6166,8 @@ services using the XML based SOAP protocol and without the need for a dedicated web server.") (license (list license:gpl2 license:gpl3))))) -(define-public kdsoap-qt6 - (deprecated-package "kdsoap-qt6" kdsoap)) +(define-deprecated-package kdsoap-qt6 + kdsoap) (define-public libaccounts-qt (package diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm index f26f629d78..07a14a7dd7 100644 --- a/gnu/packages/radio.scm +++ b/gnu/packages/radio.scm @@ -918,7 +918,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") (define-public gnuradio (package (name "gnuradio") - (version "3.10.11.0") + (version "3.10.12.0") (source (origin (method git-fetch) @@ -927,7 +927,7 @@ used by RDS Spy, and audio files containing @dfn{multiplex} signals (MPX).") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1px44c9clafivjw37zy6h6d94xf70v7i5iyarrdgm6cr7x95grj0")))) + (base32 "0al8rci1fpz8sqkk4i2ncy8lc0hd5d04in9wj7isw7gsmirlzkz3")))) (build-system cmake-build-system) (native-inputs (list doxygen diff --git a/gnu/packages/rails.scm b/gnu/packages/rails.scm index ad8e727e86..219ba5f010 100644 --- a/gnu/packages/rails.scm +++ b/gnu/packages/rails.scm @@ -112,7 +112,7 @@ tzdata-for-tests)) (propagated-inputs (list ruby-benchmark - ruby-concurrent + ruby-concurrent-ruby ruby-connection-pool ruby-i18n ruby-minitest @@ -1421,7 +1421,7 @@ handling application bootup, plugins, generators, and Rake tasks.") '(;; No included tests #:tests? #f)) (propagated-inputs - (list ruby-concurrent ruby-rack)) + (list ruby-concurrent-ruby ruby-rack)) (synopsis "Sprockets is a Rack-based asset packaging system") (description "Sprockets is a Rack-based asset packaging system that concatenates and diff --git a/gnu/packages/ruby-xyz.scm b/gnu/packages/ruby-xyz.scm index 7a31c39b6b..7bf1200102 100644 --- a/gnu/packages/ruby-xyz.scm +++ b/gnu/packages/ruby-xyz.scm @@ -7726,8 +7726,8 @@ documents and fragments. It's built on top of Nokogiri and libxml2.") (license license:expat))) ;;; The ruby-nokogumbo package has been absorbed into ruby-nokogiri. -(define-public ruby-nokogumbo - (deprecated-package "ruby-nokogumbo" ruby-nokogiri)) +(define-deprecated-package ruby-nokogumbo + ruby-nokogiri) (define-public ruby-samovar (package @@ -12037,8 +12037,8 @@ patterns.") ;;; The 'gem' is called 'concurrent-ruby'; reversing its name was confusing ;;; and failed to be picked by the gem importer (which led to this newer ;;; package). -(define-public ruby-concurrent - (deprecated-package "ruby-concurrent" ruby-concurrent-ruby)) +(define-deprecated-package ruby-concurrent + ruby-concurrent-ruby) (define-public ruby-concurrent-ruby-ext (package diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 791c96baf8..c250d5ae83 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -89,7 +89,7 @@ (define-public ruby-3.4 (package (name "ruby") - (version "3.4.6") + (version "3.4.7") (source (origin (method url-fetch) @@ -98,7 +98,7 @@ "/ruby-" version ".tar.xz")) (sha256 (base32 - "1f2r91mfcas1wz0dyplmsfd40cxi7h8d603h29ss92lk4ay9ajc0")))) + "1irh0l7g75p0arnah58ismzixa80qxn99x3qfnalcxg0ys35lhnv")))) (build-system gnu-build-system) (arguments `(#:test-target "test" diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 6c12b7caed..641682ea9a 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -1021,8 +1021,8 @@ metadata. It also knows about symlinks, extended attributes, and Git. This package is the community maintained fork of @code{exa}.") (license license:eupl1.2))) -(define-public exa - (deprecated-package "exa" eza)) +(define-deprecated-package exa + eza) (define-public fclones (package @@ -4008,8 +4008,8 @@ and users are in full control of their data and workflow.") (substitute-keyword-arguments (package-arguments rust-xremap) ((#:features _) '(list "hyprland")))))) -(define-public xremap-sway - (deprecated-package "xremap-sway" xremap-wlroots)) +(define-deprecated-package xremap-sway + xremap-wlroots) (define-public xremap-x11 (package diff --git a/gnu/packages/sagemath.scm b/gnu/packages/sagemath.scm index 4fad4d30ca..f70c537009 100644 --- a/gnu/packages/sagemath.scm +++ b/gnu/packages/sagemath.scm @@ -199,7 +199,7 @@ represented as strings.") "080p17yn8wjl973jnw15hz3dhxzp3db1bi4giw3c28d2brrki8qk")))) (build-system pyproject-build-system) (native-inputs - (list python-cython-3 python-pytest python-setuptools python-wheel)) + (list python-cython python-pytest python-setuptools python-wheel)) (propagated-inputs (list python-cysignals)) (inputs @@ -281,7 +281,7 @@ libraries GMO, MPFR and MPC.") (base32 "1zggfj09zkfcabcsasq27vwbhdmkig4yn380gi6wykcih9n22anl")))) (build-system pyproject-build-system) (native-inputs - (list python-cython-3 + (list python-cython python-pytest python-setuptools python-wheel)) @@ -381,7 +381,7 @@ database.") (build-system pyproject-build-system) (native-inputs (list autoconf automake m4 pkg-config ; for ./bootstrap - python-cython-3 + python-cython python-cysignals python-memory-allocator python-pkgconfig diff --git a/gnu/packages/scribus.scm b/gnu/packages/scribus.scm index 2ae5c01c91..ca08a18853 100644 --- a/gnu/packages/scribus.scm +++ b/gnu/packages/scribus.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2018, 2023 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> -;;; Copyright © 2017, 2018, 2021, 2022, 2024 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2017, 2018, 2021, 2022, 2024, 2025 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020, 2021 Tobias Geerinckx-Rice <me@tobias.gr> @@ -50,14 +50,14 @@ (define-public scribus (package (name "scribus") - (version "1.6.3") + (version "1.6.4") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/scribus/scribus/" version "/scribus-" version ".tar.gz")) (sha256 - (base32 "1dfj0jg5p25rq9i9bkcmnx96sasdf5w06m009lkkv0d41c3c62hh")))) + (base32 "1ddsga862wwq2lb12rlsm6009gfx9nxx3s5323jifs53fs1y3knp")))) (build-system cmake-build-system) (arguments `(#:tests? #f ;no test target diff --git a/gnu/packages/serialization.scm b/gnu/packages/serialization.scm index b2775e795f..5b1483927e 100644 --- a/gnu/packages/serialization.scm +++ b/gnu/packages/serialization.scm @@ -211,8 +211,8 @@ serialization."))) ;;; The msgpack package was split into msgpack-c and msgpack-cxx starting from ;;; version 4.0.0. -(define-public msgpack - (deprecated-package "msgpack" msgpack-c)) +(define-deprecated-package msgpack + msgpack-c) (define-public msgpack-3 (package diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index f286650ada..8c40b60a83 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -1033,10 +1033,10 @@ scripts and YSH is a legacy-free shell, with structured data for Python and JavaScript users who avoid shell.") (license (list license:asl2.0)))) -(define-public oil - ;; Since release 0.16.0 the former Oil project has been renamed to Oils: - ;; <https://www.oilshell.org/blog/2023/03/rename.html>. - (deprecated-package "oil" oils)) +;; Since release 0.16.0 the former Oil project has been renamed to Oils: +;; <https://www.oilshell.org/blog/2023/03/rename.html>. +(define-deprecated-package oil + oils) (define-public gash (package diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index 71d9cee818..cdaab7f795 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -443,22 +443,39 @@ all of the regexes given on the command line in order.") (define-public shfmt (package (name "shfmt") - (version "3.9.0") + (version "3.12.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/mvdan/sh") - (commit (string-append "v" version)))) + (url "https://github.com/mvdan/sh") + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0qqrggliwicmrqzwv9ivg7w1chy1b97w8p7ifpvqfsbal0qcr1xi")))) + (base32 "11rlx3l37aspd9674xdisw394bdly0yb38asqxaz4riadgj0vbfx")) + (modules '((guix build utils))) + (snippet + #~(begin + ;; It fails during check phase, looks like a MVP: gosh is a proof + ;; of concept shell built on top of [interp]. + (delete-file-recursively "cmd/gosh"))))) (build-system go-build-system) (arguments (list #:install-source? #f #:import-path "mvdan.cc/sh/v3/cmd/shfmt" #:unpack-path "mvdan.cc/sh/v3" + #:test-flags + ;; Tests fail for these groups unable to set locale. + #~(list "-skip" (string-join + (list "FuzzQuote" + "TestKillTimeout" + "TestParseBashConfirm" + "TestParseErrBashConfirm" + "TestRunnerRun" + "TestRunnerRunConfirm") + "|")) + #:test-subdirs #~(list "../../...") ;test the whole libary #:phases #~(modify-phases %standard-phases (add-after 'unpack 'set-version @@ -472,21 +489,13 @@ all of the regexes given on the command line in order.") (("version = \"\\(devel\\)\"") (format #f "version = \"~a\"" fixed-version))) (substitute* "cmd/shfmt/testdata/script/flags.txtar" - (("devel\\|v3") #$version)))))) - ;; XXX: Replace when go-build-system supports nested path. - (replace 'check - (lambda* (#:key import-path tests? #:allow-other-keys) - (when tests? - (with-directory-excursion (string-append "src/" import-path) - (invoke "go" "test" "-v" "./...")))))))) + (("devel\\|v3") #$version))))))))) (native-inputs (list go-github-com-creack-pty go-github-com-go-quicktest-qt go-github-com-google-go-cmp go-github-com-google-renameio-v2 - go-github-com-muesli-cancelreader - go-github-com-rogpeppe-go-internal - go-golang-org-x-sync + go-github-com-rogpeppe-go-internal-1.14 go-golang-org-x-sys go-golang-org-x-term go-mvdan-cc-editorconfig)) @@ -494,9 +503,9 @@ all of the regexes given on the command line in order.") (synopsis "Shell formatter with bash support") (description "This package provides a shell formatter. Supports -@url{https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html,POSIX -Shell}, @url{https://www.gnu.org/software/bash/,Bash}, and -@url{http://www.mirbsd.org/mksh.htm,mksh}.") +@url{https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html, +POSIX Shell}, @url{https://www.gnu.org/software/bash/, Bash}, and +@url{http://www.mirbsd.org/mksh.htm, mksh}.") (license license:bsd-3))) (define-public starship diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index 82512f80e6..efd307aea1 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -414,9 +414,6 @@ problems for efficient solution on parallel systems.") (license license:gpl3+) (home-page "https://openfoam.org"))) -(define-public openfoam - (deprecated-package "openfoam" openfoam-org)) - (define-public openfoam-com ;; This is a fork of 'openfoam-org', maintained separately. (package diff --git a/gnu/packages/speech.scm b/gnu/packages/speech.scm index 097aa885f8..23da2455da 100644 --- a/gnu/packages/speech.scm +++ b/gnu/packages/speech.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2018, 2020–2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2019, 2021, 2022, 2023 Ricardo Wurmus <rekado@elephly.net> -;;; Copyright © 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2020, 2025 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2021 qblade <qblade@protonmail.com> ;;; Copyright © 2024 Sébastien Lerique <sl@eauchat.org> @@ -31,6 +31,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils) + #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) #:use-module (gnu packages) @@ -182,36 +183,38 @@ based on human speech recordings.") (license license:gpl3+))) (define-public espeak-ng - (package - (name "espeak-ng") - (version "1.51") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/espeak-ng/espeak-ng") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0xhgdmvpgi464x9ba586c6hvscfkbhry75cv796hl9pz1nawq31b")))) - (build-system gnu-build-system) - (arguments - `(#:configure-flags '("--disable-static") - ;; Building in parallel triggers a race condition in 1.49.2. - #:parallel-build? #f - ;; XXX: Some tests require an audio device. - #:tests? #f)) - (native-inputs - (list autoconf automake libtool which)) - (inputs - (list libcap pcaudiolib)) - (home-page "https://github.com/espeak-ng/espeak-ng") - (synopsis "Software speech synthesizer") - (description - "eSpeak NG is a software speech synthesizer for more than 100 languages. + (let ((commit "0d451f8c1c6ae837418b823bd9c4cbc574ea9ff5") + (revision "1")) + (package + (name "espeak-ng") + (version (git-version "1.52.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/espeak-ng/espeak-ng") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0s1kiq8y7vlz8p5xgkxdrbiyh3p0rd32hdzib421nbnji3wy54y2")))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags '("-DBUILD_SHARED_LIBS=ON") + ;; Building in parallel triggers a race condition in 1.49.2. + #:parallel-build? #f + ;; XXX: Some tests require an audio device. + #:tests? #f)) + (native-inputs + (list which)) + (inputs + (list libcap pcaudiolib sonic)) + (home-page "https://github.com/espeak-ng/espeak-ng") + (synopsis "Software speech synthesizer") + (description + "eSpeak NG is a software speech synthesizer for more than 100 languages. It is based on the eSpeak engine and supports spectral and Klatt formant synthesis, and the ability to use MBROLA voices.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public mitlm (package diff --git a/gnu/packages/sphinx.scm b/gnu/packages/sphinx.scm index 5d04470960..52e898ea02 100644 --- a/gnu/packages/sphinx.scm +++ b/gnu/packages/sphinx.scm @@ -152,7 +152,7 @@ (native-inputs (list imagemagick ;for "convert" nss-certs-for-test - python-cython-3 + python-cython python-defusedxml python-flit-core python-pytest diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 688db00783..ba3b792e37 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -244,12 +244,13 @@ This package also provides @command{xls2csv} to export Excel files to CSV.") pango readline gtk+ - gtksourceview-3 + gtksourceview-4 spread-sheet-widget zlib)) (native-inputs (list autoconf ;for tests `(,glib "bin") ;for glib-genmarshal + glibc-locales ;for test 1597: tex non-ascii perl pkg-config python-3 ;for tests @@ -1402,7 +1403,7 @@ conformal prediction methods intervals.") python-patsy python-scipy)) (native-inputs - (list python-cython-3 + (list python-cython python-matplotlib python-setuptools python-setuptools-scm)) @@ -3311,7 +3312,7 @@ files, including Rmarkdown files.") (build-system python-build-system) (propagated-inputs (list python-pandas)) (inputs (list libiconv zlib)) - (native-inputs (list python-cython-3)) + (native-inputs (list python-cython)) (home-page "https://github.com/Roche/pyreadstat") (synopsis "Read and write SAS, SPSS and Stata files into/from Pandas DataFrames") @@ -3632,7 +3633,10 @@ and Causal), and simulations in Bayesian Networks.") (file-name (git-file-name name version)) (sha256 (base32 - "1p0cmgy19kbkxia139cb5w9dnkp2cdqp5n3baag6cq3prn3n71mf")))) + "1p0cmgy19kbkxia139cb5w9dnkp2cdqp5n3baag6cq3prn3n71mf")) + (patches + (search-patches + "xlispstat-fix-compilation-with-modern-gcc.patch")))) (build-system gnu-build-system) (arguments `(#:parallel-build? #f ; Parallel builds are not supported diff --git a/gnu/packages/sycl.scm b/gnu/packages/sycl.scm index de33de8a71..ee4ee18cc2 100644 --- a/gnu/packages/sycl.scm +++ b/gnu/packages/sycl.scm @@ -99,5 +99,5 @@ for CPUs and GPUs from all vendors, with independent, community-driven compiler for C++-based heterogeneous programming models") (license license:bsd-2))) -(define-public opensycl - (deprecated-package "opensycl" adaptivecpp)) +(define-deprecated-package opensycl + adaptivecpp) diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index c586e689b9..0b82d8ffbb 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -99,8 +99,11 @@ (snippet '(begin ;; QProgressIndicator is not available in Guix. - ;; FIXME: Fix building with the system kirigami. - (let* ((keep '("QProgressIndicator" "kirigami"))) + ;; FIXME: Fix building with the system kirigami and qtsolutions. + (let* ((keep '("QProgressIndicator" + "kirigami" + "qtlockedfile" + "qtsingleapplication"))) (with-directory-excursion "src/3rdparty" (for-each delete-file-recursively (lset-difference string=? @@ -109,18 +112,8 @@ (with-directory-excursion "src/gui" (substitute* "CMakeLists.txt" ;; Remove references of deleted 3rdparties. - (("[ \t]*\\.\\./3rdparty/qtlockedfile/?.*\\.(cpp|h)") - "") - (("[ \t]*\\.\\./3rdparty/qtsingleapplication/?.*\\.(cpp|h)") - "") (("[ \t]*\\.\\./3rdparty/kmessagewidget/?.*\\.(cpp|h)") "") - (("[ \t]*list\\(APPEND 3rdparty_SRC \\.\\./3rdparty/?.*\\)") - "") - (("\\$\\{CMAKE_SOURCE_DIR\\}/src/3rdparty/qtlockedfile") - "") - (("\\$\\{CMAKE_SOURCE_DIR\\}/src/3rdparty/qtsingleapplication") - "") (("\\$\\{CMAKE_SOURCE_DIR\\}/src/3rdparty/kmessagewidget") ;; For this, we rely on build inputs, so let's just replace ;; them by an autoconf-style variable. @@ -129,15 +122,7 @@ ;; no longer are post-vendoring. (("KF6::Archive") (string-append "KF6::Archive " - "QtSolutions_LockedFile " - "QtSolutions_SingleApplication " - "KF6WidgetsAddons"))) - ;; Fix compatibility with QtSingleApplication from QtSolutions. - (substitute* '("application.h" "application.cpp") - (("SharedTools::QtSingleApplication") - "QtSingleApplication") - (("slotParseMessage\\(const QString &(msg)?.*\\)") - "slotParseMessage(const QString &msg)"))) + "KF6WidgetsAddons")))) #t)))) (build-system qt-build-system) (arguments @@ -245,7 +230,6 @@ qt5compat qtdeclarative qtkeychain-qt6 - qtsolutions qtsvg qtwayland qtwebchannel diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index b9fd043da4..a029523b46 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -224,8 +224,8 @@ notification area icon for Syncthing. Supported Syncthing features: @end itemize\n") (license gpl2)))) -(define-public qsyncthingtray - (deprecated-package "qsyncthingtray" syncthing-gtk)) +(define-deprecated-package qsyncthingtray + syncthing-gtk) (define-public go-github-com-syncthing-notify (package diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index 61a71d2d9f..8444116572 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2024 Luis Guilherme Coelho <lgcoelho@disroot.org> ;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com> ;;; Copyright © 2025 Ashish SHUKLA <ashish.is@lostca.se> +;;; Copyright © 2025 Andreas Enge <andreas@enge.fr> ;;; ;;; This file is part of GNU Guix. ;;; @@ -281,7 +282,7 @@ Features: (define-public liferea (package (name "liferea") - (version "1.14.6") + (version "1.16.5") (source (origin (method git-fetch) @@ -290,7 +291,7 @@ Features: (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1d701rjjpf2d8i88xdl7m9bi5lfl88920aj7wajk3vl1fwg3pzqp")))) + (base32 "1bphjmab2zj0ivydzlr00ds57krfcfaakk02yyxzxr3wsgdi8saf")))) (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags @@ -298,10 +299,6 @@ Features: "--disable-static") #:phases (modify-phases %standard-phases - (add-before 'configure 'prepare-build-environment - (lambda* (#:key inputs #:allow-other-keys) - ;; Workaround for https://github.com/lwindolf/liferea/issues/767. - (setenv "WEBKIT_DISABLE_COMPOSITING_MODE" "1"))) (add-after 'install 'wrap-gi-python (lambda* (#:key inputs outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) @@ -309,8 +306,7 @@ Features: (python-path (getenv "GUIX_PYTHONPATH"))) (wrap-program (string-append out "/bin/liferea") `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)) - `("GUIX_PYTHONPATH" ":" prefix (,python-path)))) - #t))))) + `("GUIX_PYTHONPATH" ":" prefix (,python-path))))))))) (native-inputs (list autoconf automake @@ -330,9 +326,9 @@ Features: gstreamer json-glib libnotify - libpeas + libpeas-2 libsecret - libsoup-minimal-2 + libsoup-minimal libxml2 libxslt pango @@ -340,7 +336,7 @@ Features: python-pycairo python-pygobject sqlite - webkitgtk-with-libsoup2)) + webkitgtk-for-gtk3)) (home-page "https://lzone.de/liferea/") (synopsis "News reader for GTK/GNOME") (description "Liferea is a desktop feed reader/news aggregator that diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 6bd48757ae..d1a73bc629 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -1,4 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2019, 2020 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name> ;;; Copyright © 2022, 2023 Hilton Chain <hako@ultrarare.space> ;;; Copyright © 2023 Saku Laesvuori <saku@laesvuori.fi> @@ -39,12 +40,14 @@ #:use-module (gnu packages cpp) #:use-module (gnu packages crypto) #:use-module (gnu packages digest) + #:use-module (gnu packages documentation) #:use-module (gnu packages fcitx5) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gl) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) + #:use-module (gnu packages gperf) #:use-module (gnu packages gtk) #:use-module (gnu packages hunspell) #:use-module (gnu packages image) @@ -57,6 +60,7 @@ #:use-module (gnu packages lua) #:use-module (gnu packages messaging) #:use-module (gnu packages perl) + #:use-module (gnu packages php) #:use-module (gnu packages pkg-config) #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) @@ -438,6 +442,44 @@ and not propagated to upstream.") (base32 "0fg4x4ikj7f3706bmfvkwq4smxc98qr3cgpm25w48n4ys6wfgadg")))) +(define-public tdlib + (let ((commit "7d257dcda5dd2c616c1146540ef51147c5bb2c69")) + (package + (name "tdlib") + (version "1.8.55") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tdlib/td") + (commit commit))) + (sha256 + (base32 "0w36jwblwi4rb61id0jkfasy01p69c9myvm51qgmv3hlw60kwq51")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + (list + #:build-type "Release" + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'remove-failing-tests + (lambda _ + (substitute* "test/CMakeLists.txt" + ;; The test cases are compiled into a distinct binary + ;; which uses mtproto.cpp to attempt to connect to + ;; a remote server. Removing this file from the sources + ;; list disables those specific test cases. + (("\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}/mtproto.cpp") ""))))))) + (native-inputs + (list gperf openssl zlib php doxygen)) + (synopsis "Cross-platform library for building Telegram clients") + (description "Tdlib is a cross-platform library for creating custom +Telegram clients following the official Telegram API. It can be easily used +from almost any programming language with a C-FFI and features first-class +support for high performance Telegram Bot creation.") + (home-page "https://core.telegram.org/tdlib") + (license license:boost1.0)))) + (define tde2e (let ((base tdlib)) (package diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 485a55a928..47baa946d7 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -1259,8 +1259,8 @@ while also supporting native scrolling and @command{tmux} control mode (@code{tmux -CC}).") (license license:asl2.0))) -(define-public wterm - (deprecated-package "wterm" foot)) +(define-deprecated-package wterm + foot) (define-public tilix (package diff --git a/gnu/packages/tex.scm b/gnu/packages/tex.scm index ce89ebc881..fd5b71ac39 100644 --- a/gnu/packages/tex.scm +++ b/gnu/packages/tex.scm @@ -263,11 +263,6 @@ ;;; ;;; Code: -(define-syntax-rule (define-deprecated-package old-name name) - "Define OLD-NAME as a deprecated package alias for NAME." - (define-deprecated/public old-name name - (deprecated-package (symbol->string 'old-name) name))) - (define-public texlive-source (package (name "texlive-source") diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index 715b9c4f98..fdd76876d3 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -1173,14 +1173,21 @@ file, but can even be dynamic.") (package (name "txt2tags") (version "3.9") - (source (origin - (method url-fetch) - (uri (pypi-uri "txt2tags" version)) - (sha256 - (base32 - "0ik7gpr3gymgxnj0p86k8768kyxncbncv93zq67sbak3dbdl8hky")))) - (build-system python-build-system) - (native-inputs (list python-tox)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/txt2tags/txt2tags") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1nfps6c3jchjkbwzh8v919fxql91l1lxa6q1vssprxivk0jcc0rz")))) + (build-system pyproject-build-system) + (arguments + (list #:test-backend #~'custom + #:test-flags #~(list "test/run.py"))) + (native-inputs + (list python-setuptools)) (home-page "https://txt2tags.org") (synopsis "Convert between markup languages") (description @@ -1449,8 +1456,8 @@ It uses a plain-text database, a location-independent library, and features git integration, command-line support, and a curses-based TUI.") (license license:expat))) -(define-public python-cobib - (deprecated-package "python-cobib" cobib)) +(define-deprecated-package python-cobib + cobib) (define-public bibutils (package diff --git a/gnu/packages/time.scm b/gnu/packages/time.scm index c1ad2ba86f..d1a6d90507 100644 --- a/gnu/packages/time.scm +++ b/gnu/packages/time.scm @@ -76,18 +76,17 @@ (version "1.18.0") (source (origin - (method url-fetch) - (uri (pypi-uri "termdown" version)) + (method git-fetch) + (uri (git-reference + (url "https://github.com/trehn/termdown") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "07nxsqpwnpr9jkvif2ngjlcq05z0ldnmqxd15d1l593lzmxdyrci")))) + (base32 "15i7ilwzwdj831bcd1gjnirydcdbr1b10d7jw5syjv0xwqq3yy8y")))) (build-system pyproject-build-system) - (native-inputs - (list python-setuptools python-wheel)) - (propagated-inputs - (list python-click - python-pyfiglet - python-dateutil)) + (arguments (list #:tests? #f)) ; No tests. + (native-inputs (list python-pytest python-setuptools)) + (propagated-inputs (list python-click python-pyfiglet python-dateutil)) (home-page "https://github.com/trehn/termdown") (synopsis "Countdown timer for your terminal") (description diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index 2eb73704d4..b01431bba0 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -304,7 +304,7 @@ key, and private key are written to a new directory.") (base32 "16yr25llnbgl2iwk458ca0rhrxsmpfx72q4gdg4a52i6g546p3hd")))) (build-system pyproject-build-system) (native-inputs - (list python-cython-3 + (list python-cython python-poetry-core python-pytest python-setuptools)) diff --git a/gnu/packages/tree-sitter.scm b/gnu/packages/tree-sitter.scm index a2f0cdd7d8..5733be1a73 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -275,6 +275,16 @@ which will be used as a snippet in origin." #:repository-url "https://github.com/briot/tree-sitter-ada" #:commit commit))) +(define-public tree-sitter-arduino + (tree-sitter-grammar + "arduino" "Arduino" + "1h0h61xhs511l6ahv0isj9v59ndz8q3948dw9mi9lc7cp24jshdp" + "0.24.0" + #:repository-url + "https://github.com/tree-sitter-grammars/tree-sitter-arduino" + #:inputs (delay (list tree-sitter-c tree-sitter-cpp)) + #:article "an")) + (define-public tree-sitter-awk (tree-sitter-grammar "awk" "AWK" @@ -299,6 +309,14 @@ which will be used as a snippet in origin." #:commit commit #:license license:expat))) +(define-public tree-sitter-bicep + (tree-sitter-grammar + "bicep" "Bicep" + "0ydz1vf6n8ky0vcgcmihr6ddfdlswnz8xa59zjiwdcra0qkf3azs" + "1.1.0" + #:repository-url + "https://github.com/tree-sitter-grammars/tree-sitter-bicep")) + (define-public tree-sitter-blueprint (let ((commit "329699d55f3e3955091e13756563c3f320a561fc") (revision "0")) @@ -316,6 +334,22 @@ which will be used as a snippet in origin." "1vw7jd3wrb4vnigfllfmqxa8fwcpvgp1invswizz0grxv249piza" "0.23.5")) +(define-public tree-sitter-chatito + (tree-sitter-grammar + "chatito" "Chatito" + "16pfm7s9zxdskmn1vg5ba6ni91zm5xncbri9pm0cd8pmld5w37wz" + "0.5.0" + #:repository-url + "https://github.com/tree-sitter-grammars/tree-sitter-chatito")) + +(define-public tree-sitter-clarity + (tree-sitter-grammar + "clarity" "Clarity" + "14qprf98199rnlr6hrjmzvn6d3ch9z8yxgjxva6m6gk9hcyyfy84" + "0.0.5" + #:repository-url + "https://github.com/xlittlerag/tree-sitter-clarity")) + (define-public tree-sitter-clojure (tree-sitter-grammar "clojure" "Clojure" @@ -342,6 +376,13 @@ which will be used as a snippet in origin." "0.7.0" #:repository-url "https://github.com/uyha/tree-sitter-cmake")) +(define-public tree-sitter-comment + (tree-sitter-grammar + "comment" "comment tags (like TODO, FIXME)" + "1x0l8phr4x07n739z0ax8faxq0l6irmpkdprrv1z088zqdr43l1v" + "0.3.0" + #:repository-url "https://github.com/stsewd/tree-sitter-comment")) + (define-public tree-sitter-cpp (tree-sitter-grammar "cpp" "C++" @@ -361,6 +402,17 @@ which will be used as a snippet in origin." "0c5j9zyjcykmraix1agbc0gdk85zs2v379q0aykr10fi9w2r9z9c" "0.23.2")) +(define-public tree-sitter-dart + (let ((version "1.0.0") + (commit "d4d8f3e337d8be23be27ffc35a0aef972343cd54") + (revision "0")) + (tree-sitter-grammar + "dart" "Dart" + "09k4nclfvclwcz6lza4p2rkm25dpdasj800dn47hvm1b5al5iyym" + (git-version version revision commit) + #:commit commit + #:repository-url "https://github.com/UserNobody14/tree-sitter-dart"))) + (define-public tree-sitter-devicetree (tree-sitter-grammar "devicetree" "Devicetree" @@ -393,6 +445,18 @@ which will be used as a snippet in origin." #:repository-url "https://github.com/rydesun/tree-sitter-dot" #:commit commit))) +(define-public tree-sitter-doxygen + (let ((version "1.1.0") + (commit "1e28054cb5be80d5febac082706225e42eff14e6") + (revision "0")) + (tree-sitter-grammar + "doxygen" "Doxygen" + "11xflk40xp7x7f4h9knhy997k79psrw3ik9m0xkc2vzqi57l9by2" + (git-version version revision commit) + #:commit commit + #:repository-url + "https://github.com/tree-sitter-grammars/tree-sitter-doxygen"))) + (define-public tree-sitter-elixir (tree-sitter-grammar "elixir" "Elixir" @@ -451,6 +515,92 @@ which will be used as a snippet in origin." (delete-file-recursively "test/highlight") #$(tree-sitter-delete-generated-files grammar-directories)))))) +(define-public tree-sitter-firrtl + (let ((version "0.8.0") + (commit "8503d3a0fe0f9e427863cb0055699ff2d29ae5f5") + (revision "0")) + (tree-sitter-grammar + "firrtl" "FIRRTL" + "0mmnsks3b21b1dixi85jds31ykgrmzl3hkkc1r7c8k4vdrr0qq93" + (git-version version revision commit) + #:commit commit + #:repository-url + "https://github.com/tree-sitter-grammars/tree-sitter-firrtl" + #:license license:asl2.0))) + +(define-public tree-sitter-fortran + (let ((version "0.5.1") + ;; Can't use the tag above directly; the build at that tag is + ;; non‑deterministic, so pin to a later commit. + (commit "8334abca785db3a041292e3b3b818a82a55b238f") + (revision "0")) + (tree-sitter-grammar + "fortran" "Fortran" + "0iwjz7ks0barg6na966jbkvzi8whgys8qh6arxlaygr9b6mhq39i" + (git-version version revision commit) + #:repository-url + "https://github.com/stadelmanma/tree-sitter-fortran" + #:commit commit))) + +(define-public tree-sitter-func + (let ((version "1.0.0") + (commit "c1d2cc41b39760127a8cd5d4f4923e27114c373b") + (revision "0")) + (tree-sitter-grammar + "func" "FunC" + "066g8jn2snmcxwm74wqyxxz2nz2vsjlwhdc455l389czddnncf2j" + (git-version version revision commit) + #:commit commit + #:repository-url + "https://github.com/tree-sitter-grammars/tree-sitter-func"))) + +(define-public tree-sitter-gdscript + (let ((version "6.0.0") + ;; Can't use the tag above directly; the build at that tag is + ;; non‑deterministic, so pin to a later commit. + (commit "839cd921c8aa8b79c9afe2eb71a6a7bfa809e995") + (revision "0")) + (tree-sitter-grammar + "gdscript" "GDScript" + "00icy0dpdmhz2lfa35npvj26y0m37f0l73asxn7f2prmpm2jsm8c" + (git-version version revision commit) + #:repository-url + "https://github.com/PrestonKnopp/tree-sitter-gdscript" + #:commit commit))) + +(define-public tree-sitter-gitignore + (let ((version "0.1.0") + (commit "f4685bf11ac466dd278449bcfe5fd014e94aa504") + (revision "0")) + (tree-sitter-grammar + "gitignore" "Git .gitignore" + "17rar33y4dngmx69kjiw6wgrsd6kc0c8w4xa4rx06rjmv7b1hfij" + (git-version version revision commit) + #:commit commit + #:repository-url + "https://github.com/shunsambongi/tree-sitter-gitignore"))) + +(define-public tree-sitter-gleam + (tree-sitter-grammar + "gleam" "Gleam" + "0d7z5bk6x0qi3wy4d8174a69wxsc4287c7fcdfabkn8dixpa920q" + "1.1.0" + #:repository-url + "https://github.com/gleam-lang/tree-sitter-gleam" + #:license license:asl2.0)) + +(define-public tree-sitter-gn + (let ((version "1.0.0") + (commit "bc06955bc1e3c9ff8e9b2b2a55b38b94da923c05") + (revision "0")) + (tree-sitter-grammar + "gn" "GN" + "0i6f0kar3c734ag5bli519ah3rmamsk8kihbw5ga5b0ihrxqfzja" + (git-version version revision commit) + #:commit commit + #:repository-url + "https://github.com/tree-sitter-grammars/tree-sitter-gn"))) + (define-public tree-sitter-go (tree-sitter-grammar "go" "Go" @@ -464,6 +614,18 @@ which will be used as a snippet in origin." "1.1.0" #:repository-url "https://github.com/camdencheek/tree-sitter-go-mod")) +(define-public tree-sitter-gosum + (let ((version "1.0.0") + (commit "27816eb6b7315746ae9fcf711e4e1396dc1cf237") + (revision "0")) + (tree-sitter-grammar + "gosum" "Go .sum" + "13h690k9q8kf7mldcps10h0kj0bdnlkfml9zkcawdswx8r7wblzn" + (git-version version revision commit) + #:commit commit + #:repository-url + "https://github.com/tree-sitter-grammars/tree-sitter-go-sum"))) + (define-public tree-sitter-gpr (let ((version "0.1.0") ; In package.json, but untagged (commit "cea857d3c18d1385d1f5b66cd09ea1e44173945c") @@ -488,6 +650,41 @@ which will be used as a snippet in origin." (delete-file-recursively "src/tree_sitter"))) '#$grammar-directories)))))) +(define-public tree-sitter-groovy + (let ((version "0.0.1") + (commit "86911590a8e46d71301c66468e5620d9faa5b6af") + (revision "0")) + (tree-sitter-grammar + "groovy" "Groovy" + "0vbsg5xkdja6xyp8nm7g9fs4ndaq3qz6lq8vk9c7l2znw6bb17gb" + (git-version version revision commit) + #:commit commit + #:repository-url + "https://github.com/murtaza64/tree-sitter-groovy"))) + +(define-public tree-sitter-gstlaunch + (let ((version "0.1.0") + (commit "cf696c7f5e7265a7f6bd0cd1cc8864edd917a3de") + (revision "0")) + (tree-sitter-grammar + "gstlaunch" "gst-launch-1.0" + "0kd2pmh5jq0vc9mdzf2w12hn8qrcg3jybys1q4j2dnhqcalzmppa" + (git-version version revision commit) + #:commit commit + #:repository-url + "https://github.com/tree-sitter-grammars/tree-sitter-gstlaunch"))) + +(define-public tree-sitter-hack + (let ((version "0.0.4") + (commit "bc5b3a10d6d27e8220a113a9a7fe9bec0a1574b0") + (revision "0")) + (tree-sitter-grammar + "hack" "Hack" + "08rmlbxhb79d4zb0rb5wwkm4cqgy4a2l8zh37p2kx9gr352wjl3m" + (git-version version revision commit) + #:commit commit + #:repository-url "https://github.com/slackhq/tree-sitter-hack"))) + (define-public tree-sitter-haskell (tree-sitter-grammar "haskell" "Haskell" @@ -524,6 +721,27 @@ which will be used as a snippet in origin." "0slhrmwcw2xax4ylyaykx4libkzlaz2lis8x8jmn6b3hbdxlrpix" "0.23.2")) +(define-public tree-sitter-hyprlang + (tree-sitter-grammar + "hyprlang" "Hyprlang" + "171p3hj36a1jqflg9xv138445j4m4m16na6bgpm1km3l67jhvl54" + "3.1.0" + #:repository-url + "https://github.com/tree-sitter-grammars/tree-sitter-hyprlang")) + +(define-public tree-sitter-ini + (let ((version "1.3.0") + (commit "32b31863f222bf22eb43b07d4e9be8017e36fb31") + (revision "0")) + (tree-sitter-grammar + "ini" "INI" + "0sp9075fllimy6zrw2gx5mij0igl9zvcrakh23wn7m5wh0w9lq4i" + (git-version version revision commit) + #:commit commit + #:repository-url "https://github.com/justinmk/tree-sitter-ini" + #:article "an" + #:license license:asl2.0))) + (define-public tree-sitter-janet (tree-sitter-grammar "janet" "Janet" @@ -538,24 +756,58 @@ which will be used as a snippet in origin." "11j4ifhl5hsmb2sa651cp5xds9cjgjynl86yivvk6bnr2ba0xw9s" "0.23.5")) +(define-public tree-sitter-java-properties + (tree-sitter-grammar + "java-properties" "Java properties" + "0y2w3szzmn4y6m0fh0zi4xqfwr9lm849abrpsi3i3dlz9rnhcs71" + "0.3.0" + #:repository-url + "https://github.com/tree-sitter-grammars/tree-sitter-properties")) + (define-public tree-sitter-javascript (tree-sitter-grammar "javascript" "JavaScript(JSX)" "03v1gpr5lnifrk4lns690fviid8p02wn7hfdwp3ynp7lh1cid63a" "0.23.1")) +(define-public tree-sitter-jsdoc + (tree-sitter-grammar + "jsdoc" "JSDoc" + "1qrgan1xpj717qmwdbgb3lqjgffyhsw0qxhjwhdhqfv2lgkw4cn6" + "0.25.0")) + (define-public tree-sitter-json (tree-sitter-grammar "json" "JSON" "0p0fiqi5imxm13s1fs6bhqw6v11n79ri1af3d072zm7jqkcl5mhc" "0.24.8")) +(define-public tree-sitter-jsonnet + (let ((version "0.0.1") + (commit "ddd075f1939aed8147b7aa67f042eda3fce22790") + (revision "0")) + (tree-sitter-grammar + "jsonnet" "JSONNET" + "1bfdjxp0h95d124bzlhlvc9b5q19cdj716aym41nyl6z5a992c9q" + (git-version version revision commit) + #:commit commit + #:repository-url + "https://github.com/sourcegraph/tree-sitter-jsonnet"))) + (define-public tree-sitter-julia (tree-sitter-grammar "julia" "Julia" "0xi04a48ly438gar25bkkvvr8by4dd013cnafbjdysqjfs04q2wg" "0.23.1")) +(define-public tree-sitter-kconfig + (tree-sitter-grammar + "kconfig" "Kconfig" + "1gjh5pz2hwccfcljz3qlg66b6rgv3wsv1bdml1gzrphca9xxz66a" + "1.3.0" + #:repository-url + "https://github.com/tree-sitter-grammars/tree-sitter-kconfig")) + (define-public tree-sitter-kdl (tree-sitter-grammar "kdl" "KDL" @@ -584,6 +836,18 @@ which will be used as a snippet in origin." (delete-file "binding.gyp") (delete-file-recursively "bindings"))))) +(define-public tree-sitter-linkerscript + (let ((version "1.0.0") + (commit "f99011a3554213b654985a4b0a65b3b032ec4621") + (revision "0")) + (tree-sitter-grammar + "linkerscript" "Linker script" + "004irhiaj5n4sgr0fqwqxnijsbalvn3ahc2ys4s9l33rr4hhr3qf" + (git-version version revision commit) + #:commit commit + #:repository-url + "https://github.com/tree-sitter-grammars/tree-sitter-linkerscript"))) + (define-public tree-sitter-lua (tree-sitter-grammar "lua" "Lua" @@ -597,6 +861,50 @@ which will be used as a snippet in origin." (delete-file-recursively "test/highlight") ;FIXME #$(tree-sitter-delete-generated-files grammar-directories))))) +(define-public tree-sitter-luadoc + (let ((version "1.1.0") + (commit "818acda56809f994274de64a42f97f509b3c0ad2") + (revision "0")) + (tree-sitter-grammar + "luadoc" "Luadoc/LuaCATS" + "1sb0zgd2gk0x18c45f5y9pz5fr8mil9adsspa9q7kbd2hwrf14gi" + (git-version version revision commit) + #:commit commit + #:repository-url + "https://github.com/tree-sitter-grammars/tree-sitter-luadoc"))) + +(define-public tree-sitter-lua-patterns + (let ((version "1.0.1") + (commit "31461ae9bd0866cb5117cfe5de71189854fd0f3e") + (revision "0")) + (tree-sitter-grammar + "lua-patterns" "Lua patterns" + "1wfsfh44jn7m9kx0lfsbrf0hqavad142wl2pffab3mvpmrnawva9" + (git-version version revision commit) + #:commit commit + #:repository-url + "https://github.com/tree-sitter-grammars/tree-sitter-luap"))) + +(define-public tree-sitter-magik + (let ((version "0.0.1") + (commit "1fd4c5502fd375c157bbe0916834f697c97704bb") + (revision "0")) + (tree-sitter-grammar + "magik" "Magik" + "07zdsilaa97c4hq1pj0qiyhrkbzhawnqc7sbsvr0nsz6n5jj3gwx" + (git-version version revision commit) + #:commit commit + #:repository-url + "https://github.com/krn-robin/tree-sitter-magik"))) + +(define-public tree-sitter-make + (tree-sitter-grammar + "make" "Makefile" + "0g8k9rfmc979lza2cx5xwla1ic2p9hpvm0h2sgfs4r29kw1a2ass" + "1.1.1" + #:repository-url + "https://github.com/tree-sitter-grammars/tree-sitter-make")) + (define-public tree-sitter-markdown (tree-sitter-grammar "markdown" "Markdown (CommonMark Spec v0.30)" @@ -615,8 +923,8 @@ which will be used as a snippet in origin." '("extension_wikilink.txt" "spec.txt" "tags.txt"))) #$(tree-sitter-delete-generated-files grammar-directories))))) -(define-public tree-sitter-markdown-gfm - (deprecated-package "tree-sitter-markdown-gfm" tree-sitter-markdown)) +(define-deprecated-package tree-sitter-markdown-gfm + tree-sitter-markdown) (define-public tree-sitter-matlab (tree-sitter-grammar @@ -645,6 +953,36 @@ which will be used as a snippet in origin." #:repository-url "https://github.com/Decodetalkers/tree-sitter-meson" #:license license:expat)) +(define-public tree-sitter-netlinx + (tree-sitter-grammar + "netlinx" "NetLinx" + "09q2w9g4bb8v603b4ykxn5g8ndqjfhrgskslsmzhy095r3jysb2q" + "1.0.4" + #:repository-url "https://github.com/Norgate-AV/tree-sitter-netlinx")) + +(define-public tree-sitter-nim + (let ((version "0.6.2") + (commit "4ad352773688deb84a95eeaa9872acda5b466439") + (revision "0")) + (tree-sitter-grammar + "nim" "Nim" + "17wgv8lv6v3wgsjhwcmrqpvdj0bj69ldmr62j588vsppn2cwqabn" + (git-version version revision commit) + #:commit commit + #:repository-url "https://github.com/alaviss/tree-sitter-nim" + #:license license:mpl2.0))) + +(define-public tree-sitter-ninja + (let ((version "0.1.0") + (commit "0a95cfdc0745b6ae82f60d3a339b37f19b7b9267") + (revision "0")) + (tree-sitter-grammar + "ninja" "Ninja" + "1vmfx2k6bxfwcz319vskjhyszc6hz3j32bw4lgj72l7p890ykwkv" + (git-version version revision commit) + #:commit commit + #:repository-url "https://github.com/alemuller/tree-sitter-ninja"))) + (define-public tree-sitter-nix (tree-sitter-grammar "nix" "Nix" @@ -666,6 +1004,14 @@ which will be used as a snippet in origin." "0.24.0" #:grammar-directories '("grammars/interface" "grammars/ocaml" "grammars/type"))) +(define-public tree-sitter-odin + (tree-sitter-grammar + "odin" "Odin" + "05ljga1gqhx8hr7ldpcbrz79ixni5qyz6ckyyh7chxnkl5fkjp5y" + "1.3.0" + #:repository-url "https://github.com/tree-sitter-grammars/tree-sitter-odin" + #:article "an")) + (define-public tree-sitter-org ;; There are a lot of additions, the last tag was placed a while ago (let ((commit "64cfbc213f5a83da17632c95382a5a0a2f3357c1") @@ -677,6 +1023,40 @@ which will be used as a snippet in origin." #:repository-url "https://github.com/milisims/tree-sitter-org" #:commit commit))) +(define-public tree-sitter-pascal + (tree-sitter-grammar + "pascal" "Pascal" + "0wxg6k1vvp32c5grvrw1xihb1zr0idfmc4p07rmv99f7f472djhj" + "0.10.0" + #:repository-url "https://github.com/Isopod/tree-sitter-pascal")) + +(define-public tree-sitter-pem + (let ((version "0.1.1") + (commit "e525b177a229b1154fd81bc0691f943028d9e685") + (revision "0")) + (tree-sitter-grammar + "pem" "PEM" + "02g17ki5da7iams576qxyc01r1c95y5ycd7yhap9fhyxc8a6my6r" + (git-version version revision commit) + #:commit commit + #:repository-url + "https://github.com/tree-sitter-grammars/tree-sitter-pem"))) + +(define-public tree-sitter-pgn + (tree-sitter-grammar + "pgn" "Chess Portable Game Notation (PGN)" + "0mazy9y80pd20a3a76b0nfxswh7xxdsnya0y0lzl86sh4w95f52p" + "1.2.12" + #:repository-url "https://github.com/rolandwalker/tree-sitter-pgn" + #:license license:bsd-2)) + +(define-public tree-sitter-php + (tree-sitter-grammar + "php" "PHP" + "05qhz14vvqgwpxgdfr1skwgrv041zwc3wxjyx6y679965nn0lrji" + "0.23.12" + #:grammar-directories '("php" "php_only"))) + (define-public tree-sitter-plantuml ;; No tags (let ((commit "c7361a1d481dc1ff6700b14ea1d5efc549b72713") @@ -697,12 +1077,34 @@ which will be used as a snippet in origin." (delete-file "binding.gyp") (delete-file-recursively "bindings")))))) -(define-public tree-sitter-php +(define-public tree-sitter-po + (let ((version "0.0.1") + (commit "bd860a0f57f697162bf28e576674be9c1500db5e") + (revision "0")) + (tree-sitter-grammar + "po" "GNU gettext translation file (PO/POT)" + "1d28lyg0sx9xs09y68618cxnhi5sacfschcrv4xmy06k21bp8azx" + (git-version version revision commit) + #:commit commit + #:repository-url + "https://github.com/tree-sitter-grammars/tree-sitter-po"))) + +(define-public tree-sitter-powershell (tree-sitter-grammar - "php" "PHP" - "05qhz14vvqgwpxgdfr1skwgrv041zwc3wxjyx6y679965nn0lrji" - "0.23.12" - #:grammar-directories '("php" "php_only"))) + "powershell" "Powershell" + "1wz34js891sx6j2s128sdcbxj1k2zi300fg5a4vf5acaz82jcs8q" + "0.25.8" + #:repository-url + "https://github.com/airbus-cert/tree-sitter-powershell")) + +(define-public tree-sitter-printf + (tree-sitter-grammar + "printf" "printf" + "15p5fr1dhmf54aic9mszrb7859q2adcq66mnivzpfvzvh4xnpmr5" + "0.5.1" + #:repository-url + "https://github.com/tree-sitter-grammars/tree-sitter-printf" + #:license license:isc)) (define-public tree-sitter-prisma (tree-sitter-grammar @@ -712,12 +1114,55 @@ which will be used as a snippet in origin." #:repository-url "https://github.com/victorhqc/tree-sitter-prisma" #:license license:expat)) +(define-public tree-sitter-proto + (let ((version "0.1.0") + (commit "e9f6b43f6844bd2189b50a422d4e2094313f6aa3") + (revision "0")) + (tree-sitter-grammar + "proto" "Protocol Buffers" + "1r8g28rp852f1qj4bhnkf4fzfir1r5blq2p0nz4x9y5jfplb1vji" + (git-version version revision commit) + #:commit commit + #:repository-url "https://github.com/treywood/tree-sitter-proto"))) + +(define-public tree-sitter-puppet + (tree-sitter-grammar + "puppet" "Puppet" + "19032dhb60vxij6b6xvgnigwhhbm4y89dr11vxsr1kk10zj61vkc" + "1.3.0" + #:repository-url + "https://github.com/tree-sitter-grammars/tree-sitter-puppet")) + +(define-public tree-sitter-purescript + (tree-sitter-grammar + "purescript" "PureScript" + "11c57k50kppc560a6qr3wpxppl9p4w7a7yn9g51ybzd28vc55qxl" + "0.3.0" + #:repository-url + "https://github.com/postsolar/tree-sitter-purescript")) + (define-public tree-sitter-python (tree-sitter-grammar "python" "Python" "0a108sfqcsxrp54lapk7k3kq6fmz8745z5q99wpn3i1cqpi9slzg" "0.23.6")) +(define-public tree-sitter-python-manifest + (tree-sitter-grammar + "python-manifest" "PyPA manifest" + "16k9izgwg2f8yyz1vlzyw9qw4np5fjy3nxr3ksq499a0bz8a59cd" + "0.6.0" + #:repository-url + "https://github.com/tree-sitter-grammars/tree-sitter-pymanifest")) + +(define-public tree-sitter-python-requirements + (tree-sitter-grammar + "python-requirements" "Python requirements.txt" + "1gwp1cwsyr67qclfm9f8ilakaq747qzqmj3bgy0jacjjjs0xgk32" + "0.5.0" + #:repository-url + "https://github.com/tree-sitter-grammars/tree-sitter-requirements")) + (define-public tree-sitter-qml (let ((version "0.2.0") ; Tagged, but we use a more recent commit (commit "0889da4632bba3ec6f39ef4102625654890c15c1") @@ -731,6 +1176,18 @@ which will be used as a snippet in origin." #:inputs (delay (list tree-sitter-javascript tree-sitter-typescript)) #:license license:expat))) +(define-public tree-sitter-qmldir + (let ((version "0.2.2") + (commit "fbf29ddf1ebb01e0c389dde2a51e874f688a2327") + (revision "0")) + (tree-sitter-grammar + "qmldir" "Qmldir" + "07wmr7vsqqv77m69inrhdk3qmlwivwkdpppcjwc326b2r8a88y7j" + (git-version version revision commit) + #:commit commit + #:repository-url + "https://github.com/tree-sitter-grammars/tree-sitter-qmldir"))) + (define-public tree-sitter-query (package (inherit (tree-sitter-grammar "query" @@ -763,6 +1220,30 @@ which will be used as a snippet in origin." "0.23.0-1" #:repository-url "https://github.com/6cdh/tree-sitter-racket")) +(define-public tree-sitter-readline + (let ((version "1.1.1") + (commit "74addc90fc539d31d413c0c7cf7581997a7fa46e") + (revision "0")) + (tree-sitter-grammar + "readline" "GNU Readline init" + "0qmnmzab9qn6chsdh2sfa9v2yrpik3ng9j14shw70ck0zc02gd3i" + (git-version version revision commit) + #:commit commit + #:repository-url + "https://github.com/tree-sitter-grammars/tree-sitter-readline"))) + +(define-public tree-sitter-rego + (let ((version "1.0.0") + (commit "20b5a5958c837bc9f74b231022a68a594a313f6d") + (revision "0")) + (tree-sitter-grammar + "rego" "Rego" + "0cmja3gd5nbmi251qc14hh1cbfd7i0mydx74qxs30qvix6q5a2az" + (git-version version revision commit) + #:commit commit + #:repository-url + "https://github.com/FallenAngel97/tree-sitter-rego"))) + (define-public tree-sitter-ron (let ((commit "78938553b93075e638035f624973083451b29055") (revision "0")) @@ -774,6 +1255,13 @@ which will be used as a snippet in origin." #:commit commit #:license (list license:asl2.0 license:expat)))) +(define-public tree-sitter-rst + (tree-sitter-grammar + "rst" "ReStructuredText" + "1lrdyhgda2f66biq7dk4s0llk4fcxn23rf5zrhi17nnl8zmjg18i" + "0.2.0" + #:repository-url "https://github.com/stsewd/tree-sitter-rst")) + (define-public tree-sitter-ruby (tree-sitter-grammar "ruby" "Ruby" @@ -799,6 +1287,14 @@ which will be used as a snippet in origin." "0.23.0-1" #:repository-url "https://github.com/6cdh/tree-sitter-scheme")) +(define-public tree-sitter-solidity + (tree-sitter-grammar + "solidity" "Solidity" + "0vbxghnihnmfdgg4a5j2g5s7fcff8axqmqa2y8yci434n35wgq3g" + "1.2.13" + #:repository-url + "https://github.com/JoranHonig/tree-sitter-solidity")) + (define-public tree-sitter-starlark (tree-sitter-grammar "starlark" "Starlark" @@ -817,6 +1313,43 @@ which will be used as a snippet in origin." #:repository-url "https://github.com/FuelLabs/tree-sitter-sway" #:commit commit))) +(define-public tree-sitter-tablegen + (let ((version "1.0.0") + (commit "3e9c4822ab5cdcccf4f8aa9dcd42117f736d51d9") + (revision "0")) + (tree-sitter-grammar + "tablegen" "LLVM TableGen" + "02anzjxk30323jmbvn2l7fwarq59zix84g7rdcgx8s7z7c5zyagk" + (git-version version revision commit) + #:commit commit + #:repository-url + "https://github.com/Flakebi/tree-sitter-tablegen"))) + +(define-public tree-sitter-tcl + (let ((version "1.1.0") + (commit "8f11ac7206a54ed11210491cee1e0657e2962c47") + (revision "0")) + (tree-sitter-grammar + "tcl" "TCL" + "0dkxh6bn0kqn1gbyd5qwkg21fm634mxvas3w4ahv6zr5d8f95c96" + (git-version version revision commit) + #:commit commit + #:repository-url + "https://github.com/tree-sitter-grammars/tree-sitter-tcl"))) + +(define-public tree-sitter-test + (package + ;; Similar to the tree-sitter-query. + (inherit (tree-sitter-grammar + "test" "corpus test" + "0n61mhi2244x3xv1zvwypcih9x65qqgrlz0sz4766h5v68mc58zg" + "0.3.0" + #:repository-url + "https://github.com/tree-sitter-grammars/tree-sitter-test")) + (synopsis "Tree-sitter grammar for Tree-sitter's corpus test files") + (description "This package provides Tree-sitter's grammar for corpus test +files."))) + (define-public tree-sitter-tlaplus (tree-sitter-grammar "tlaplus" "TLA+" @@ -832,6 +1365,18 @@ which will be used as a snippet in origin." "0.7.0" #:repository-url "https://github.com/tree-sitter-grammars/tree-sitter-toml")) +(define-public tree-sitter-twig + (let ((version "0.7.0") + (commit "40d17f0eb990215e12531abe29ee7691d7ca99a5") + (revision "0")) + (tree-sitter-grammar + "twig" "Twig" + "06a6rfgh9mmzqvs7bp8y92axa4fni4c72s82bdin7j3a0x5mxwi6" + (git-version version revision commit) + #:commit commit + #:repository-url "https://github.com/kaermorchen/tree-sitter-twig" + #:license license:mpl2.0))) + (define-public tree-sitter-typescript (tree-sitter-grammar "typescript" "TypeScript and TSX" @@ -854,6 +1399,18 @@ which will be used as a snippet in origin." (delete-file "test/corpus/negative.scm") #$(tree-sitter-delete-generated-files grammar-directories))))) +(define-public tree-sitter-udev + (let ((version "0.2.1") + (commit "2fcb563a4d56a6b8e8c129252325fc6335e4acbf") + (revision "0")) + (tree-sitter-grammar + "udev" "udev rules" + "0azs4q43bdg0an4f5s8ac7jqxikwi1rnqhl4g0l58ghf2g51i70i" + (git-version version revision commit) + #:commit commit + #:repository-url + "https://github.com/tree-sitter-grammars/tree-sitter-udev"))) + (define-public tree-sitter-ungrammar ;; No releases yet. (let ((commit "debd26fed283d80456ebafa33a06957b0c52e451") @@ -866,6 +1423,18 @@ which will be used as a snippet in origin." #:repository-url "https://github.com/tree-sitter-grammars/tree-sitter-ungrammar" #:article "an"))) +(define-public tree-sitter-uxntal + (let ((version "1.0.0") + (commit "bd6cc0cf5c97bb25ee65b39132768d1a1f70ffa9") + (revision "0")) + (tree-sitter-grammar + "uxntal" "Uxntal" + "0sbwwr6d6yiq0ddhjkcafi0k61rcp6l1fa6vpmkykr3kh7znq9pn" + (git-version version revision commit) + #:commit commit + #:repository-url + "https://github.com/tree-sitter-grammars/tree-sitter-uxntal"))) + (define-public tree-sitter-verilog (tree-sitter-grammar "verilog" "Verilog" @@ -922,6 +1491,25 @@ which will be used as a snippet in origin." "https://github.com/neovim/tree-sitter-vimdoc" #:license license:expat)) +(define-public tree-sitter-xcompose + (tree-sitter-grammar + "xcompose" "XCompose" + "03c0ycwrxafxvbhzi6pzcq8md40frh7ybwkhcsd4s1hmg6arwpyx" + "0.4.0" + #:repository-url + "https://github.com/tree-sitter-grammars/tree-sitter-xcompose" + #:article "an")) + +(define-public tree-sitter-xml + (tree-sitter-grammar + "xml" "XML and DTD" + "0ghfjjhw1rvd98xd1c3mq3bffrl3wg5dmp22ksb0659g76qi0hpz" + "0.7.0" + #:repository-url + "https://github.com/tree-sitter-grammars/tree-sitter-xml" + #:grammar-directories '("xml" "dtd") + #:article "an")) + (define-public tree-sitter-yaml (tree-sitter-grammar "yaml" "YAML" diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 5cb9754f7f..918ef96786 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -304,8 +304,8 @@ and protocols. One of the key differences with Bazaar is that Breezy runs on Python 3.3 and later, rather than on Python 2.") (license license:gpl2+))) -(define-public bazaar - (deprecated-package "bazaar" breezy)) +(define-deprecated-package bazaar + breezy) (define git-cross-configure-flags #~(list "ac_cv_fread_reads_directories=yes" @@ -2449,7 +2449,7 @@ also walk each side of a merge and test those changes individually.") wrappers, to be used for optional gitolite extensions." (package (name "gitolite") - (version "3.6.13") + (version "3.6.14") (source (origin (method git-fetch) @@ -2458,7 +2458,7 @@ wrappers, to be used for optional gitolite extensions." (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0lp4hi8pfg7k0fk0l8wzs8hxp1aspzv78nkafdbbq8m9lzwnwl7x")))) + (base32 "0qfl9qjs9nvgvl244rvidap8s202bq2gsmnxaylqrkj77az6l2h7")))) (build-system gnu-build-system) (arguments (list #:tests? #f ; no tests @@ -2713,8 +2713,8 @@ specify a list of hooks you want and pre-commit manages the installation and execution of any hook written in any language before every commit.") (license license:expat))) -(define-public python-pre-commit - (deprecated-package "python-pre-commit" pre-commit)) +(define-deprecated-package python-pre-commit + pre-commit) ;; XXX: This is a temporary helper to avoid recompiling mercurial/pinned. ;; If you update mercurial, don't touch it but work around it. diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 5c58227d0b..396a9f11f7 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1314,8 +1314,8 @@ playing videos from YouTube. It parses the YouTube website directly and relies on the Invidious instances only as a fallback method.") (license license:artistic2.0))) -(define-public straw-viewer - (deprecated-package "straw-viewer" pipe-viewer)) +(define-deprecated-package straw-viewer + pipe-viewer) (define-public x265 (package @@ -3080,8 +3080,8 @@ wallpaper using mpv.") to download videos from Austria's national television broadcaster.") (license license:bsd-3))) -(define-public orf-dl - (deprecated-package "orf-dl" orfondl)) +(define-deprecated-package orf-dl + orfondl) (define-public yle-dl (package @@ -3134,7 +3134,7 @@ video streaming services of the Finnish national broadcasting company Yle.") (define-public yt-dlp (package (name "yt-dlp") - (version "2025.09.26") + (version "2025.10.22") (source (origin (method git-fetch) @@ -3146,7 +3146,7 @@ video streaming services of the Finnish national broadcasting company Yle.") (snippet #~(substitute* "pyproject.toml" (("^.*Programming Language :: Python :: 3\\.13.*$") ""))) (sha256 - (base32 "0j6l2zskmsvqk8h3ialbymk75i0bfzn2qmc2gk6s1ybhnpryrv7y")))) + (base32 "19viqfk3gnl6yk9p17kp0a21w18yr32qii4grm3mys758ws881ld")))) (build-system pyproject-build-system) (arguments (list @@ -3192,7 +3192,7 @@ video streaming services of the Finnish national broadcasting company Yle.") python-certifi python-mutagen python-pycryptodomex - python-requests ; TODO Remove this special package + python-requests python-urllib3 python-websockets)) (native-inputs @@ -4650,9 +4650,9 @@ scenes, sources and filters.") via a filter.") (license license:gpl2))) -(define-public obs-websocket - ;; Functionality was merged into OBS. - (deprecated-package "obs-websocket" obs)) +;; Functionality was merged into OBS. +(define-deprecated-package obs-websocket + obs) (define-public obs-wlrobs (package @@ -6605,17 +6605,31 @@ downloader. It does not require a Youtube API key.") (define-public python-youtube-search (package (name "python-youtube-search") - (version "1.6.6") + ;; Original repository is archived, see + ;; https://github.com/alexmercerind/youtube-search-python/issues/189 + ;; The most promising fork (in the sense that it works) is + ;; https://github.com/ahmedayyad-dev/youtube-search-python-fork, + ;; which is therefor packaged in Guix. + (properties '((commit . "6d7e16ebcdc90032392749c2f30f8e29ea0956ae") + (revision . "0"))) + (version (git-version "1.6.6" + (assoc-ref properties 'revision) + (assoc-ref properties 'commit))) (source (origin - (method url-fetch) - (uri (pypi-uri "youtube-search-python" version)) + (method git-fetch) + (uri + (git-reference + (url "https://github.com/ahmedayyad-dev/youtube-search-python-fork") + (commit (assoc-ref properties 'commit)))) + (file-name (git-file-name name version)) (sha256 - (base32 "1xgw6nqypnj3ymjkfyzc1vvwar73qvp08prnp15ypmzcd7bx2s25")))) + (base32 "1b2sc0v0xw8kqrqy1844xkdsss70npkyk26fprpw3yhz09az5k3q")))) + (arguments (list #:tests? #f)) ;no tests in repository (build-system pyproject-build-system) (propagated-inputs (list python-httpx)) - (native-inputs (list python-setuptools python-wheel)) - (home-page "https://github.com/alexmercerind/youtube-search-python") + (native-inputs (list python-setuptools)) + (home-page "https://github.com/ahmedayyad-dev/youtube-search-python-fork") (synopsis "Search for YouTube videos, channels & playlists") (description "This package provides tools to search for @code{YouTube} videos, @@ -6966,8 +6980,8 @@ Users in group ``wheel'' can skip password authentication.") (home-page "https://github.com/AlynxZhou/showmethekey") (license license:asl2.0))) -(define-public show-me-the-key - (deprecated-package "show-me-the-key" showmethekey)) +(define-deprecated-package show-me-the-key + showmethekey) ;;; ;;; Avoid adding new packages to the end of this file. To reduce the chances diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index 02182dad48..0a2fd893be 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -872,7 +872,7 @@ is based on Vim's builtin plugin support.") #$(local-file (search-auxiliary-file "guix-nvim.vim")) (string-append nvimdir "/sysinit.vim")))))))) (inputs (list libuv-for-luv - msgpack + msgpack-c libtermkey libvterm unibilium diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 1c98d8828c..689b91551b 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -942,8 +942,8 @@ traversing network address translators (@dfn{NAT}s) and firewalls.") ncurses openvpn procps + python-dialog python-jinja2 - python-pythondialog python-requests which)) (synopsis "Command-line client for ProtonVPN") diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index aa55af927a..bc42fe28b2 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -820,7 +820,7 @@ is fully configurable and extensible in Common Lisp.") (define-public lagrange (package (name "lagrange") - (version "1.18.4") + (version "1.19.3") (source (origin (method url-fetch) @@ -828,7 +828,7 @@ is fully configurable and extensible in Common Lisp.") (string-append "https://git.skyjake.fi/skyjake/lagrange/releases/" "download/v" version "/lagrange-" version ".tar.gz")) (sha256 - (base32 "0c3dwsp8zkx2nzmd5mskcf91n20mjk7dlzgy6gn3df6brw57awk9")) + (base32 "0srd5ahkls1kdf6waszjaayjgk7jd58i8hjlzh636d26h0vmy0k5")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b916ea3ecc..af0e973a88 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1887,8 +1887,8 @@ C.") (SAX-style) JSON parser and validating generator written in ANSI C.") (license license:isc))) -(define-public libyajl - (deprecated-package "libyajl" yajl)) +(define-deprecated-package libyajl + yajl) (define-public libwebsockets (package @@ -2418,8 +2418,8 @@ directions.") (description (package-description esbuild)) (license (package-license esbuild)))) -(define-public esbuild-node - (deprecated-package "esbuild-node" node-esbuild)) +(define-deprecated-package esbuild-node + node-esbuild) (define-public wwwoffle (package @@ -5559,8 +5559,8 @@ Cloud.") (license license:expat))) (define-public guix-data-service - (let ((commit "683b375d5679acd248aeff7e8e16424530a92346") - (revision "71")) + (let ((commit "6e25a64815957700008cf0ba4aae8b08321d449a") + (revision "72")) (package (name "guix-data-service") (version (string-append "0.0.1-" revision "." (string-take commit 7))) @@ -5572,7 +5572,7 @@ Cloud.") (file-name (git-file-name name version)) (sha256 (base32 - "19z1v907dkwpg70d273avvms2vmqnimr6smx5rp5vn6p9wyv95h8")))) + "0nh5381hlcnhmrf4wfrj2ns1mi1aw3ivc5760cjmah3fyvb06igr")))) (build-system gnu-build-system) (arguments (list @@ -7226,8 +7226,8 @@ developers can integrate into their applications to make use of the functions of Tidy.") (license license:bsd-3))) -(define-public tidy - (deprecated-package "tidy" tidy-html)) +(define-deprecated-package tidy + tidy-html) (define-public hiawatha (package diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 1d404cc213..5504bcec18 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -580,8 +580,8 @@ many programming languages.") (release-monitoring-url . "https://i3wm.org/downloads"))) (license license:bsd-3))) -(define-public i3-gaps - (deprecated-package "i3-gaps" i3-wm)) +(define-deprecated-package i3-gaps + i3-wm) (define-public i3ipc-glib (package @@ -1822,8 +1822,8 @@ Keybinder works with GTK-based applications using the X Window System.") (home-page "https://github.com/kupferlauncher/keybinder") (license license:x11))) -(define-public keybinder-3.0 - (deprecated-package "keybinder-3.0" keybinder)) +(define-deprecated-package keybinder-3.0 + keybinder) (define-public sandbar (package @@ -2484,7 +2484,7 @@ narrow the items to those matching the tokens in the input.") (package (inherit sway) (name "swayfx") - (version "0.5") + (version "0.5.3") (source (origin (method git-fetch) (uri (git-reference @@ -2493,7 +2493,7 @@ narrow the items to those matching the tokens in the input.") (file-name (git-file-name name version)) (sha256 (base32 - "0pvha915hihip59g6dkhjifm9rvwrvgxd3shc6xz99r377prpml1")))) + "1d4srsp1c4dfq7qqcccbqw0jwn9ghzqhkvgr1msgs7r1jkk4v4sd")))) (build-system meson-build-system) (inputs (list basu cairo @@ -2507,7 +2507,7 @@ narrow the items to those matching the tokens in the input.") scenefx swaybg wayland - wlroots-0.18)) + wlroots-0.19)) (home-page "https://github.com/WillPower3309/swayfx") (synopsis "Sway Fork with extra options and effects") (description @@ -4699,7 +4699,7 @@ configure input, and customize Wayfire plugins.") (define-public scenefx (package (name "scenefx") - (version "0.2.1") + (version "0.4.1") (source (origin (method git-fetch) (uri (git-reference @@ -4708,7 +4708,7 @@ configure input, and customize Wayfire plugins.") (file-name (git-file-name name version)) (sha256 (base32 - "1jvbskpmhq0vs4rx9723n709h77zg4c0cid8jwnrag1hqh601ch4")))) + "10f4rygnb8qrlcxw6f3gpl4xa20wrykx63cvn8wih74smdr48gjw")))) (build-system meson-build-system) (native-inputs (list pkg-config ;; for wayland-scanner. @@ -4717,7 +4717,7 @@ configure input, and customize Wayfire plugins.") mesa libxkbcommon libdrm - wlroots-0.18)) + wlroots-0.19)) (home-page "https://github.com/wlrfx/scenefx") (synopsis "Drop-in replacement for the wlroots scene API") (description diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index f810ee394e..4ff7d1a492 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -44,7 +44,7 @@ ;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com> ;;; Copyright © 2020-2021, 2023-2025 Zheng Junjie <z572@z572.online> ;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim@guixotic.coop> -;;; Copyright © 2021, 2022, 2024 Nicolas Goaziou <mail@nicolasgoaziou.fr> +;;; Copyright © 2021, 2022, 2024, 2025 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz> ;;; Copyright © 2021 Renzo Poddighe <renzo@poddighe.nl> ;;; Copyright © 2021 Paul A. Patience <paul@apatience.com> @@ -1524,14 +1524,14 @@ transparent text on your screen.") (define-public wob (package (name "wob") - (version "0.15.1") + (version "0.16") (source (origin (method url-fetch) (uri (string-append "https://github.com/francma/wob/releases/download/" version "/wob-" version ".tar.gz")) (sha256 - (base32 "1632y0yr1ig5nihs6kqyvfi117815zszhnfvaabm97qkf5blkj5p")))) + (base32 "18p5l045kajnwv8ms751sb29q8ay6ycv9ni7iyx7nr26n5cm3vql")))) (build-system meson-build-system) (native-inputs (list pkg-config scdoc)) @@ -2310,8 +2310,8 @@ applications you regularly use and also allows you to search for an application by name.") (license license:expat))) -(define-public rofi-wayland - (deprecated-package "rofi-wayland" rofi)) +(define-deprecated-package rofi-wayland + rofi) (define-public rofi-calc (package diff --git a/gnu/packages/xfig.scm b/gnu/packages/xfig.scm index 9d07a5cd42..fa5cc5d32a 100644 --- a/gnu/packages/xfig.scm +++ b/gnu/packages/xfig.scm @@ -94,8 +94,8 @@ variety of environments.") (license:non-copyleft "file://Makefile.am" "See <https://spdx.org/licenses/Xfig.html>.")))) -(define-public transfig - (deprecated-package "transfig" fig2dev)) +(define-deprecated-package transfig + fig2dev) (define-public xfig (package diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 26a63ea06b..923f75acfc 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -296,8 +296,8 @@ project (but it is usable outside of the Gnome platform).") provides an @code{--xpath0} option to @command{xmllint} that enables it to output XPath results with a null delimiter."))) -(define-public python-libxml2 - (deprecated-package "python-libxml2" libxml2)) +(define-deprecated-package python-libxml2 + libxml2) (define-public libxlsxwriter (package diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index caceaf8dcf..f7e5317655 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6564,7 +6564,7 @@ basic eye-candy effects.") (define-public xpra (package (name "xpra") - (version "6.3.3") + (version "6.3.4") (source (origin (method git-fetch) @@ -6573,7 +6573,7 @@ basic eye-candy effects.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0br6fmc8gm5d86zb7s4nqkvljahn1mx9d3bbqahshjyhizl84kw6")) + (base32 "0zzjx60qk6ps5h9ykwlwsj69vnxsjmk0zn01my6mr117xpajq7sv")) (patches (search-patches "xpra-6.0-systemd-run.patch" "xpra-6.1-install_libs.patch")))) (build-system python-build-system) @@ -6616,7 +6616,7 @@ basic eye-candy effects.") python-lz4 ; Faster compression than zlib. python-netifaces python-pycups)) - (native-inputs (list pkg-config pandoc python-cython-3)) + (native-inputs (list pkg-config pandoc python-cython)) (arguments (list #:configure-flags #~(list "--without-Xdummy" diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm index 9665a56a2d..b4e38a6b57 100644 --- a/gnu/packages/zig-xyz.scm +++ b/gnu/packages/zig-xyz.scm @@ -278,6 +278,30 @@ compatible Zig code based on the @acronym{LSP, Language Server Protocol} meta model.") (license license:expat)))) +(define-public zig-lsp-kit-for-zls-0.15 + (let ((commit "6274eebace9a6a82ce182e24468fef88e0b95f37") + (revision "0")) + (package + (name "zig-lsp-kit") + (version (git-version "0.1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zigtools/lsp-kit") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0g4jdvj2pj6qbg912fxifk8rq6bg62kpgpcm0nfmi2h1h34cwp53")))) + (build-system zig-build-system) + (arguments (list #:skip-build? #t)) + (home-page "https://zigtools.github.io/lsp-kit/") + (synopsis "Develop Language Server Protocol implementations in Zig") + (description + "Zig @acronym{LSP, Language Server Protocol} Kit provides the necessary +building blocks to develop LSP implementations in Zig.") + (license license:expat)))) + (define-public zig-diffz (let ((commit "420fcb22306ffd4c9c3c761863dfbb6bdbb18a73") (revision "0")) @@ -319,6 +343,23 @@ model.") (base32 "0ah1m8mjqjc2szl5lx62zqj69irkbb3y245z14pknikxgg8xdzg7"))))))) +(define-public zig-diffz-for-zls-0.15 + (let ((commit "a20dd1f11b10819a6f570f98b42e1c91e3704357") + (revision "0")) + (package + (inherit zig-diffz) + (name "zig-diffz") + (version (git-version "0.0.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ziglibs/diffz") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1qz7jqdh4f5dcrzkxipdmsgkfs37k450r9gm7ik7r72dfvjs9c6b"))))))) + (define-public zig-known-folders (let ((commit "1cceeb70e77dec941a4178160ff6c8d05a74de6f") (revision "0")) @@ -363,6 +404,27 @@ across several operating systems.") (substitute-keyword-arguments (package-arguments base) ((#:zig _ #f) zig-0.14)))))) +(define-public zig-known-folders-for-zls-0.15 + (let ((commit "92defaee76b07487769ca352fd0ba95bc8b42a2f") + (revision "0") + (base zig-known-folders)) + (package + (inherit base) + (name "zig-known-folders") + (version (git-version "0.7.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ziglibs/known-folders") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1bwv7kndr4lv7khrrjwg2vgg3cy41y28rmv7rbv7jy06shqy4nzq")))) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:zig _ #f) zig-0.15)))))) + (define-public zig-pixman (package (name "zig-pixman") @@ -619,4 +681,34 @@ Language Server Protocol} for the Zig programming language.") (replace "zig-diffz" zig-diffz-for-zig-zls-0.14) (replace "zig-known-folders" zig-known-folders-for-zig-0.14)))))) +(define-public zig-zls-0.15 + (let ((base zig-zls-0.14)) + (package + (inherit base) + (name "zig-zls") + (version "0.15.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zigtools/zls") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0ydnaxf29mj3gamig9phf991s1civfk6jkydn2xiqwv394fx4p0q")) + (snippet + (rename-zig-dependencies + '(("diffz" . "zig-diffz") + ("known_folders" . "zig-known-folders") + ("lsp_kit" . "zig-lsp-kit")))))) + (native-inputs + (modify-inputs (package-native-inputs base) + (replace "zig" zig-0.15))) + (inputs + (modify-inputs (package-inputs base) + (prepend zig-lsp-kit-for-zls-0.15) + (delete "zig-lsp-codegen") + (replace "zig-diffz" zig-diffz-for-zls-0.15) + (replace "zig-known-folders" zig-known-folders-for-zls-0.15)))))) + (define-public zig-zls zig-zls-0.13) diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm index 82484d652d..219896e730 100644 --- a/gnu/packages/zig.scm +++ b/gnu/packages/zig.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2021 Calum Irwin <calumirwin1@gmail.com> ;;; Copyright © 2022-2024 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2023, 2024 Hilton Chain <hako@ultrarare.space> +;;; Copyright © 2025 dan <i@dan.games> ;;; ;;; This file is part of GNU Guix. ;;; @@ -2009,25 +2010,21 @@ toolchain. Among other features it provides (method git-fetch) (uri (git-reference (url "https://github.com/ziglang/libc-abi-tools") - (commit "21993a6036cc165485b20229589340dff9d4fc3c"))) + (commit "6878b563bd0620c626dc92c7b641a903b648c592"))) (file-name "libc-abi-tools") (sha256 - (base32 "0miwb0zfgfmm4bh2bs7982wpk0wp5vj2mz10x9c3m8fw7zzcyvbh")) - (modules '((guix build utils))) - (snippet - #~(substitute* "netbsd/consolidate.zig" - ((".write_buffer = buffer") ".write_buffer = &buffer"))))) + (base32 "0yfg3ggjmsricg44yalg2l6l5r3hk8lmgh485p6nhhgdiqfdwzng")))) (define-public zig-0.15 (package (inherit zig-0.14) (name "zig") - (version "0.15.1") + (version "0.15.2") (source (origin (inherit (zig-source version version - "1cp18plf0x5wip4rnxiqavaqnqxnqzhipb34in6zd3y7wihwjmj4")) + "0kr8y1xzb7ffqg4yy7ncg4jh6kndxn5xfqf2viy5gvqdqqql8ymv")) (patches (search-patches "zig-0.14-use-baseline-cpu-by-default.patch" diff --git a/gnu/services/ci.scm b/gnu/services/ci.scm index 595cad347e..08416e9962 100644 --- a/gnu/services/ci.scm +++ b/gnu/services/ci.scm @@ -180,6 +180,8 @@ (default "/var/lib/forgejo-runner")) (run-directory forgejo-runner-configuration-run-directory (default "/var/run/forgejo-runner")) + (log-file forgejo-runner-configuration-log-file + (default "/var/log/forgejo-runner.log")) ;; Configuration options for the YAML config file: ;; <https://forgejo.org/docs/latest/admin/runner-installation/#configuration>. @@ -259,7 +261,7 @@ (define (forgejo-runner-shepherd-service config) (match-record config <forgejo-runner-configuration> - (package data-directory run-directory name + (package data-directory run-directory log-file name capacity timeout fetch-timeout fetch-interval report-interval labels) (define runner (file-append package "/bin/forgejo-runner")) @@ -286,6 +288,7 @@ #:user "forgejo-runner" #:group "forgejo-runner" #:directory #$run-directory + #:log-file #$log-file #:environment-variables ;; Provide access to a fresh Guix obtained via 'guix ;; pull'. diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm index 338ba012d0..42a65a2767 100644 --- a/gnu/services/dns.scm +++ b/gnu/services/dns.scm @@ -1147,7 +1147,7 @@ log.") (let ((config-file (unbound-config-file config))) (list (shepherd-service (documentation "Unbound daemon.") - (provision '(unbound dns)) + (provision '(unbound)) ;; unbound may be bound to a particular IP address, hence ;; only start it after the networking service has started. (requirement '(user-processes networking)) diff --git a/gnu/services/guix.scm b/gnu/services/guix.scm index cb8f6ef4f7..ee5913a1d8 100644 --- a/gnu/services/guix.scm +++ b/gnu/services/guix.scm @@ -844,6 +844,10 @@ ca-certificates.crt file in the system profile." (default "127.0.0.1")) (port nar-herder-configuration-port (default 8734)) + (control-host nar-herder-configuration-control-host + (default "127.0.0.1")) + (control-port nar-herder-configuration-control-port + (default 8735)) (storage nar-herder-configuration-storage (default #f)) (storage-limit nar-herder-configuration-storage-limit @@ -968,6 +972,8 @@ ca-certificates.crt file in the system profile." "--pid-file=/var/run/nar-herder/pid" #$(string-append "--port=" (number->string port)) #$(string-append "--host=" host) + #$(string-append "--control-port=" (number->string port)) + #$(string-append "--control-host=" host) #$@(if mirror (list (string-append "--mirror=" mirror)) '()) diff --git a/gnu/services/herd.scm b/gnu/services/herd.scm index 06361ba49e..d276ba1b74 100644 --- a/gnu/services/herd.scm +++ b/gnu/services/herd.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016-2019, 2022-2023 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2016-2019, 2022-2023, 2025 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2017, 2020 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2023 Maxim Cournoyer <maxim@guixotic.coop> ;;; @@ -58,7 +58,6 @@ unload-services unload-service load-services - load-services/safe start-service stop-service restart-service @@ -297,14 +296,9 @@ service is transient." "Load and register the services from FILES, where FILES contain code that returns a shepherd <service> object." (eval-there `(register-services - ,@(map (lambda (file) - `(primitive-load ,file)) - files)))) - -(define load-services/safe - ;; Deprecated. It used to behave differently before service replacements - ;; were a thing. - load-services) + (list ,@(map (lambda (file) + `(primitive-load ,file)) + files))))) (define* (start-service name #:optional (arguments '())) (invoke-action name 'start arguments diff --git a/gnu/system/install.scm b/gnu/system/install.scm index ea2e624b1a..5041dadf15 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -102,6 +102,7 @@ ("en" . "System Installation") ("es" . "Instalación del sistema") ("fr" . "Installation du système") + ("it" . "Installazione del Sistema") ("pt_BR" . "Instalação do sistema") ("ru" . "Установка системы") ("zh_CN" . "系统安装"))) diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index 240facc3bd..315becaab6 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -172,6 +172,9 @@ for i in /etc/bashrc.d/*.sh; do [[ -r $i ]] && source \"$i\" done unset i + +# Increase the history size (default is 500 entries). +HISTSIZE=10000 ")) (define %default-bash-profile |