diff options
Diffstat (limited to 'gnu')
126 files changed, 1682 insertions, 2352 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/local.mk b/gnu/local.mk index 816f68cd6f..2d059f3535 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1436,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 \ @@ -1474,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 \ @@ -1581,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 \ 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..2d3d005227 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 @@ -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 diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index b03d2d4fe5..634ca92990 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") 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/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 067fb5cb86..b82ec38157 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") @@ -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 @@ -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") 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..15a072849b 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm @@ -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/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 6efa55b736..b6e9e7e7a0 100644 --- a/gnu/packages/compression.scm +++ b/gnu/packages/compression.scm @@ -2437,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 397ffd1c27..7d975d22e8 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -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..27b6df3b86 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -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 @@ -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 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/electronics.scm b/gnu/packages/electronics.scm index a2c9e3cf09..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 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 2aa90e3938..f24141b6bb 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -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 @@ -8918,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. @@ -13936,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 @@ -16791,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")) @@ -21463,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 @@ -22305,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 @@ -26149,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 @@ -28554,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 @@ -29741,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 @@ -29823,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")) @@ -32904,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. @@ -35010,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 @@ -36397,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") @@ -36543,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 @@ -36692,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 @@ -37016,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 @@ -37206,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") @@ -37597,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 @@ -37883,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 @@ -38165,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 @@ -43570,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 @@ -44737,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 @@ -44935,8 +44935,8 @@ 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 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 c639655196..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) @@ -2271,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 @@ -3878,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/firmware.scm b/gnu/packages/firmware.scm index 950d91930d..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") 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/games.scm b/gnu/packages/games.scm index 612e5bfde1..96488318ee 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -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 @@ -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 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/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 ecc8fe4dc2..4d14b1fcbe 100644 --- a/gnu/packages/golang-web.scm +++ b/gnu/packages/golang-web.scm @@ -14136,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 a28aca3173..3c95cf279b 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -8354,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 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/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 b8619ef081..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 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..1f746e71c1 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -40,6 +40,8 @@ ;;; 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. ;;; @@ -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 bad92269e6..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 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..9309279ea6 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 @@ -172,14 +174,14 @@ script engines.") (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 +212,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 +250,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 +258,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 +308,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 +320,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 +466,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 +474,7 @@ games, and tools.") version ".tar.xz")) (sha256 (base32 - "0954nyd3y4xiqjhqav2m0limbcs5lg6nyc97cf5bbvhvj25m2lny")))) + "161yg136hm17p6xiakzyywbckvmzxcama8wlnjq23vg8pl6262x3")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase #:tests? #f)) @@ -541,7 +543,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 +551,7 @@ desktop.") version ".tar.xz")) (sha256 (base32 - "0i8ak6zijxihl3wabbi5896y0ai7r7284mb5f4njvdmnbl12q71q")))) + "12xm2902g2f52m13kchgsf2d0g483szwaaafw9md7bdf8avmq1ki")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase #:tests? #f @@ -569,20 +571,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 +598,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 +640,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 +664,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 +672,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 +712,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 @@ -763,7 +765,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 +773,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 +794,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 +802,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 +839,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 +948,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 +956,7 @@ computer's hardware.") ".tar.xz")) (sha256 (base32 - "0bwlr048yzha22q5x9jxvzq3m2xj268cwcbw5a763h967b6hf3v1")))) + "0f2yc163ssm8a5ipmz9y6w2bki5lb239q4phgwvzr0b9548raqas")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase #:tests? #f)) @@ -1055,14 +1057,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 +1094,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 +1102,7 @@ PipeWire in Qt projects.") ".tar.xz")) (sha256 (base32 - "0dqh8grmzzqx06r2kwgzcix08q5sifxb3i0wabbg7rxi721dwaxr")))) + "17hxfgg95jga655g12m0dgy3mqk8s0sw5dkj76m5a5h1yzq35swi")))) (build-system cmake-build-system) (arguments ;; TODO: All tests fail @@ -1109,28 +1111,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 +1143,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 +1170,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 +1178,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 +1208,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 +1236,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,14 +1298,14 @@ 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 @@ -1326,7 +1325,12 @@ the running system.") "verifyOutputs" ;; also fail on upstream "testEdidParser" - "testEnv")))))))))) + "testEnv" + "testPreferredBackend" + "testFallback" + "testModeSwitching" + "verifyConfig" + "verifyScreen")))))))))) (native-inputs (list extra-cmake-modules pkg-config @@ -1347,14 +1351,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 +1396,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 +1404,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 +1429,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 +1437,7 @@ you login.") version ".tar.xz")) (sha256 (base32 - "00ymvq1l7lmqw7isdds18ahp7b9hhc2q4mwy1hvvsfvnacqdcazx")))) + "1fim63sbdpcmjl704v9y35lvz6hbdwzzw85z6avda56dhrsadbf2")))) (build-system qt-build-system) (arguments (list #:phases #~(modify-phases %standard-phases @@ -1444,8 +1448,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 +1474,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 +1483,51 @@ 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") + "|")) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch @@ -1516,7 +1559,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 +1573,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 @@ -1593,7 +1595,6 @@ KDE Frameworks components.") kcmutils kcompletion kconfig - kconfigwidgets kcoreaddons kcrash kdbusaddons @@ -1637,7 +1638,6 @@ KDE Frameworks components.") qtsvg wayland xcb-util ;fails at build time without this - xcb-util-cursor xcb-util-keysyms xcb-util-wm xcmsdb @@ -1660,7 +1660,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 +1668,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 +1684,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 +1692,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 +1716,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 +1724,7 @@ on top of Baloo.") version ".tar.xz")) (sha256 (base32 - "1zrpf34z0c23g3rgb7x9b8784xq8gd2hx9z4g304c66x8glpadfz")))) + "1n96yrzfbcac45f617zxfvzdgkn4wsnvh4gr4a1cl5zwn2jf47b7")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase @@ -1732,7 +1732,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 +1742,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 +1750,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 +1762,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 +1770,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 +1783,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 +1930,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 +1938,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 +1965,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 +1973,7 @@ with other frameworks.") version ".tar.xz")) (sha256 (base32 - "0c0c925s6bjq32acl40jjx3vwxngvr4lh4znfybgjl059ir4ziim")))) + "05gmcg8ffs46mpf44s0sg5hk4fsbykl7w29g2pbdwk0xmhc27mv1")))) (build-system cmake-build-system) (arguments (list #:tests? #f)) (native-inputs @@ -1992,29 +1991,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 +2010,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 +2028,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 +2069,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 +2091,6 @@ the KDE Plasma 6 desktop.") (inputs (list packagekit-qt6 signon-plugin-oauth2 signond-qt6 - icu4c attica appstream-qt6 baloo @@ -2194,6 +2182,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 +2206,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 +2226,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 +2234,7 @@ activities effectively, without being distracting.") version ".tar.xz")) (sha256 (base32 - "1wzya67q4sfx259w0750fr1av52iz11m7cym24ys2l68zd4wf5w0")))) + "1ypq7im5wsdcx1zsi2i9fn5xkmvx0xa72n42xz16qp7j45lf3978")))) (build-system qt-build-system) (arguments (list #:qtbase qtbase @@ -2275,7 +2269,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 +2277,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 +2297,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 +2305,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 +2346,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 +2375,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 +2383,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 +2423,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 +2492,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 +2500,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 +2544,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 +2598,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 +2660,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 +2702,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 +2711,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 +2751,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 +2796,7 @@ sensors, process information and other system resources.") kidletime kio lsof - xdotool + xdotool ;for X11 qqc2-desktop-style qcoro-qt6 kirigami-addons @@ -2833,7 +2816,6 @@ sensors, process information and other system resources.") kscreenlocker ktexteditor ktextwidgets - kunitconversion kuserfeedback kwallet kwayland @@ -3005,14 +2987,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 +3007,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 +3025,6 @@ hardware management, and a high degree of customizability.") kconfigwidgets kcoreaddons kdbusaddons - kiconthemes kirigami ki18n kio @@ -3065,14 +3046,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 +3079,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 +3139,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 +3191,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 +3239,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 +3247,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..2c19cac6e0 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) ;;; @@ -12177,8 +12177,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/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..8d918338ef 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 @@ -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") 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..1d36ed00d5 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 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 b8d75a920e..e741fe3b8d 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1321,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 @@ -3078,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/music.scm b/gnu/packages/music.scm index ec45033a35..b64ef53138 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -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/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/pdf.scm b/gnu/packages/pdf.scm index cefe21fcc8..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") 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 cc81f7400d..6a11852bc7 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.21") + (version "2.83.23") (source (origin (method git-fetch) @@ -198,7 +198,7 @@ it.") (url "https://github.com/trealla-prolog/trealla") (commit (string-append "v" version)))) (sha256 - (base32 "18qa91g395kqi7a7rrhrfbrx2w5yil3rg8k3fmfng47i8i7522hm")) + (base32 "18j824bvypk4z36xd59gafwb3ssl5fh6jlfrrzskpcllbpslcajl")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs 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..57b723c811 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -3104,28 +3104,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 +4182,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..c4efd30ea5 100644 --- a/gnu/packages/python-compression.scm +++ b/gnu/packages/python-compression.scm @@ -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-science.scm b/gnu/packages/python-science.scm index c514e0ab46..12a0dc7d20 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm @@ -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 4aec58282a..016ac6a1da 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2717,9 +2717,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") @@ -3932,6 +3930,41 @@ 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-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. @@ -4813,8 +4846,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 @@ -6132,8 +6165,8 @@ 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 (package @@ -10003,8 +10036,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 @@ -10183,6 +10216,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") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 37108fa59e..b9962fc569 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> @@ -2618,6 +2618,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 +3408,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") @@ -4690,8 +4656,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 @@ -9823,8 +9789,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 @@ -10163,8 +10129,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 @@ -16390,8 +16356,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 @@ -18367,8 +18333,8 @@ invoked on those path objects directly.") (package-properties python-path-bootstrap))))) -(define-public python-pathpy - (deprecated-package "python-pathpy" python-path)) +(define-deprecated-package python-pathpy + python-path) (define-public python-pretend (package @@ -18483,7 +18449,7 @@ $ rm -rf /tmp/env (file-name (git-file-name name version)) (sha256 (base32 "1gb5j73nw3nmx030rf8pm75rns5syxhv44zxr6i74kjicyly1i9w")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments (list #:phases #~(modify-phases %standard-phases @@ -18498,7 +18464,7 @@ $ rm -rf /tmp/env (when tests? (with-directory-excursion "../Testing" (invoke "./python_test.sh")))))))) - (native-inputs (list cmake-minimal)) + (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. @@ -18555,12 +18521,21 @@ a hash value.") (version "3.1.0") (source (origin - (method url-fetch) - (uri (pypi-uri "terminaltables" version)) - (sha256 - (base32 - "109vhldk6nv1z3hzp4dyqf6rjvlhl0y2k5k7qcm9fcrq5swhxszk")))) - (build-system python-build-system) + (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") @@ -18637,26 +18612,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. @@ -18862,9 +18837,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") @@ -19096,19 +19071,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 @@ -19122,17 +19102,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 @@ -19158,11 +19138,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 @@ -19421,39 +19405,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 @@ -19662,38 +19639,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") @@ -20799,40 +20783,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 @@ -21038,19 +21035,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 @@ -21373,21 +21383,20 @@ synchronously (wait until ready).") (define-public python-translitcodec (package (name "python-translitcodec") - (version "0.4.0") + (version "0.7.0") (source (origin - (method url-fetch) - (uri (pypi-uri "translitcodec" version)) + (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 - "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") + (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, @@ -21397,56 +21406,69 @@ ISO 8859, etc.).") (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 @@ -21456,40 +21478,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} @@ -21501,33 +21527,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 @@ -23624,24 +23644,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 @@ -24188,8 +24210,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 @@ -27070,14 +27092,20 @@ created by running @code{python setup.py develop}).") (define-public python-twine (package (name "python-twine") - (version "6.1.0") + (version "6.2.0") (source (origin (method url-fetch) (uri (pypi-uri "twine" version)) (sha256 - (base32 "1gcd990456sk0g05ln6x6mwn9z1jybnm3wlkxq3ivyggf9i4ycmy")))) + (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 @@ -30120,52 +30148,6 @@ a mypy plugin that smooths over some limitations in the basic type hints. ;; 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") @@ -34621,18 +34603,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 @@ -35946,8 +35949,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 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/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/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/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/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/tree-sitter.scm b/gnu/packages/tree-sitter.scm index da60e97875..5733be1a73 100644 --- a/gnu/packages/tree-sitter.scm +++ b/gnu/packages/tree-sitter.scm @@ -923,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 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 2ef3e4ea3e..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.10.14") + (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 "187rwpdh881m922h6m32pikqah1wlxjqww73ijw511i2fnwykfy7")))) + (base32 "19viqfk3gnl6yk9p17kp0a21w18yr32qii4grm3mys758ws881ld")))) (build-system pyproject-build-system) (arguments (list @@ -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.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 62fc3ec099..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 diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index a967992d67..4ff7d1a492 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -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..b3162b492e 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) 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/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 |