diff options
| -rw-r--r-- | gnu/packages/gnome.scm | 42 | ||||
| -rw-r--r-- | gnu/packages/mail.scm | 19 | ||||
| -rw-r--r-- | gnu/packages/pantheon.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/prolog.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/python-xyz.scm | 253 | ||||
| -rw-r--r-- | gnu/packages/video.scm | 16 |
6 files changed, 190 insertions, 150 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e2af4d567b..506578fb11 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5991,16 +5991,6 @@ coordinates) using the Nominatim service. geocode-glib caches requests for faster results and to avoid unnecessary server load.") (license license:lgpl2.0+))) -(define-public geocode-glib-with-libsoup2 - (package - (inherit geocode-glib) - (name "geocode-glib-with-libsoup2") - (arguments (substitute-keyword-arguments (package-arguments geocode-glib) - ((#:configure-flags flags ''()) - #~(delete "-Dsoup2=false" #$flags)))) - (inputs (modify-inputs (package-inputs geocode-glib) - (replace "libsoup" libsoup-minimal-2))))) - (define-public upower (package (name "upower") @@ -8518,30 +8508,6 @@ contacts, tasks, and calendar information. It was originally developed for Evolution (hence the name), but is now used by other packages as well.") (license license:lgpl2.0))) -;;; This version can be used for projects with dependencies stuck on libsoup2. -(define-public evolution-data-server-3.44 - (package - (inherit evolution-data-server) - (name "evolution-data-server") - (version "3.44.4") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 "1sxjrjr31wqbp9g4pf6dwj8rc4mi7c5fbfd489ha92ym7246bin0")))) - (inputs - (modify-inputs (package-inputs evolution-data-server) - (replace "gnome-online-accounts" gnome-online-accounts-3.44) - (replace "libgweather4" libgweather) - (replace "webkitgtk-for-gtk3" webkitgtk-with-libsoup2))) - (propagated-inputs - (modify-inputs (package-propagated-inputs evolution-data-server) - (delete "gtk") - (replace "libsoup" libsoup-minimal-2))))) - (define-public caribou (package (name "caribou") @@ -11299,14 +11265,6 @@ compiled.") (home-page "https://wiki.gnome.org/Projects/Folks") (license license:lgpl2.1+))) -(define-public folks-with-libsoup2 - (package - (inherit folks) - (name "folks-with-libsoup2") - (inputs - (modify-inputs (package-inputs folks) - (replace "evolution-data-server" evolution-data-server-3.44))))) - (define-public gfbgraph (package (name "gfbgraph") diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index d5731926a9..b7ed4bace3 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -113,6 +113,7 @@ #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gawk) + #:use-module (gnu packages gcc) #:use-module (gnu packages gdb) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) @@ -4830,7 +4831,7 @@ on RFC 3501 and original @code{imaplib} module.") (define-public rspamd (package (name "rspamd") - (version "3.6") + (version "3.12.1") (source (origin (method git-fetch) @@ -4838,16 +4839,26 @@ on RFC 3501 and original @code{imaplib} module.") (url "https://github.com/rspamd/rspamd") (commit version))) (sha256 - (base32 "1ra18c3wczbdqrg9p69k04smjskjkdpxcfff9ff4yi7pmqjaxr8s")) + (base32 "0li75dqqy0irrvv2jddmll2adf15cywif982ijj034hldg9162bc")) (file-name (git-file-name name version)))) (build-system cmake-build-system) (arguments - '(#:configure-flags '("-DENABLE_LUAJIT=ON" - "-DLOCAL_CONFDIR=/etc/rspamd"))) + (list #:configure-flags #~(list "-DENABLE_LUAJIT=ON" + "-DLOCAL_CONFDIR=/etc/rspamd") + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "make" "run-test" + "-j" (number->string (parallel-job-count))))))))) (inputs (list file glib icu4c + libarchive + libbfd + libiberty libsodium luajit openssl diff --git a/gnu/packages/pantheon.scm b/gnu/packages/pantheon.scm index 2e4fa08d5a..b17197a858 100644 --- a/gnu/packages/pantheon.scm +++ b/gnu/packages/pantheon.scm @@ -173,10 +173,10 @@ desktop.") (symlink bin link))))))) (inputs (list clutter - evolution-data-server-3.44 - folks-with-libsoup2 + evolution-data-server + folks geoclue - geocode-glib-with-libsoup2 + geocode-glib granite-6 glib gtk diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm index cf6700543c..4744f39579 100644 --- a/gnu/packages/prolog.scm +++ b/gnu/packages/prolog.scm @@ -185,7 +185,7 @@ it.") (define-public trealla (package (name "trealla") - (version "2.79.22") + (version "2.80.4") (source (origin (method git-fetch) @@ -194,7 +194,7 @@ it.") (url "https://github.com/trealla-prolog/trealla") (commit (string-append "v" version)))) (sha256 - (base32 "1fhk9lsj71a3l5j0dvn2qjmj85r2ixianjqlf5j5s4d7h08amm2y")) + (base32 "1sbfrzsjakfkbjvw8hl344l0cnf65nia8b7xxb6y7370k47mkil1")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (native-inputs diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e24cd2288f..e7b3b98c96 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -885,6 +885,24 @@ comparison operators, as defined in the original processes, in parallel, in the console, with an interactive TUI.") (license license:expat))) +(define-public python-orderly-set + (package + (name "python-orderly-set") + (version "5.5.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "orderly_set" version)) + (sha256 + (base32 "1kp64m0nabhhb0zxr4f8idrmniraahnfwq41gx7adbyqwk48awg8")))) + (build-system pyproject-build-system) + (native-inputs (list python-flit-core python-pytest)) + (home-page "https://github.com/seperman/orderly-set") + (synopsis "Multiple implementations of Ordered Set") + (description "Orderly Set is a package containing multiple implementations +of Ordered Set.") + (license license:expat))) + (define-public python-pastel (package (name "python-pastel") @@ -931,6 +949,42 @@ your terminal.") edit distance algorithm for Python in Cython for high performance.") (license license:bsd-3))) +(define-public python-safety-schemas + (package + (name "python-safety-schemas") + (version "0.0.14") + (source + (origin + (method url-fetch) + (uri (pypi-uri "safety_schemas" version)) + (sha256 + (base32 "0smgszbd3nb7jh61cgpycqhcvfwwdyaai5amw8mmf6g9b5x3z5a9")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + #~(list "-k" (string-join + ;; These tests are failing for unknown reasons. + ;; (AssertionError). + (list "not test_model[ConfigModel-ConfigModel]" + "test_model[MetadataModel-MetadataModel]" + "test_model[PolicyFileModel-PolicyFileModel]" + "test_model[ProjectModel-ProjectModel]" + "test_model[ReportModel-ReportModel]") + " and not ")))) + (propagated-inputs (list python-dparse + python-packaging + python-pydantic-2 + python-ruamel.yaml + python-typing-extensions)) + (native-inputs (list python-deepdiff python-hatchling python-pytest)) + ;; Source code is not yet published outside of PyPI: + ;; https://github.com/pyupio/safety/issues/494 + (home-page "https://pypi.org/project/safety-schemas/") + (synopsis "Schemas for Safety tools") + (description "This package contains models and schemas used by Safety.") + (license license:expat))) + (define-public python-senf (package (name "python-senf") @@ -23131,23 +23185,16 @@ implementation has been adapted, improved, and fixed from Molten.") (define-public python-shellingham (package (name "python-shellingham") - (version "1.5.1") + (version "1.5.4") (source (origin (method url-fetch) (uri (pypi-uri "shellingham" version)) (sha256 - (base32 "0iawv24xx6vhwbhqlxyyg901f8pf6abqyfg0711v1bvlipx83g21")))) - (build-system python-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "python" "-m" "pytest" "-v"))))))) + (base32 "1ph46hv920ha9clwxgrllbrphh0ww4v4pjmkbb9mnzj8kmrs1g4d")))) + (build-system pyproject-build-system) (native-inputs - (list python-pytest python-pytest-mock)) + (list python-pytest python-pytest-mock python-setuptools python-wheel)) (home-page "https://github.com/sarugaku/shellingham") (synopsis "Tool to detect surrounding shell") (description @@ -24695,28 +24742,28 @@ JSON) codec.") (define-public python-nltk (package (name "python-nltk") - (version "3.6.2") - (source (origin - (method url-fetch) - (uri (pypi-uri "nltk" version ".zip")) - (sha256 - (base32 - "1sq32lwgij9h8rsksymnxxr7bqfw3vgx5ijw4azbj6k2xnmmdmap")))) - (build-system python-build-system) + (version "3.9.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "nltk" version)) + (sha256 + (base32 "0s78gayd45vl1wvpa0a44ydij6ybb7xfar8jz2j8kgg47nyjglc7")))) + (build-system pyproject-build-system) (arguments - '(;; The tests require some extra resources to be downloaded. - ;; TODO Try packaging these resources. - #:tests? #f)) - (propagated-inputs - (list python-click python-joblib python-regex python-tqdm)) - (native-inputs - (list unzip)) - (home-page "http://nltk.org/") + ;; Tests require some extra resources to be downloaded. + ;; TODO Try packaging these resources. + '(#:tests? #f)) + (propagated-inputs (list python-click python-joblib python-regex + python-tqdm)) + (native-inputs (list python-setuptools python-wheel)) + (home-page "https://www.nltk.org/") (synopsis "Natural Language Toolkit") - (description "It provides interfaces to over 50 corpora and lexical - resources such as WordNet, along with a suite of text processing libraries - for classification, tokenization, stemming, tagging, parsing, and semantic - reasoning, wrappers for natural language processing libraries.") + (description + "NLTK provides interfaces to over 50 corpora and lexical resources such as +WordNet, along with a suite of text processing libraries for classification, +tokenization, stemming, tagging, parsing, and semantic reasoning, wrappers for +natural language processing libraries.") (license license:asl2.0))) (define-public python-pymongo @@ -28647,35 +28694,21 @@ source bytes using the UTF-8 encoding and then rewrites Python 3.6 style (define-public python-typer (package (name "python-typer") - (version "0.6.1") + (version "0.16.0") (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/tiangolo/typer") + (url "https://github.com/fastapi/typer") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1knv353qhkl2imav3jfp6bgq47m8wkkqhq1dzmqg2sv8rsy7zgl7")))) + (base32 "1axd3840b2vipfp9l36cnh5ipbsladizmjadgsnpnk502qily7sq")))) (build-system pyproject-build-system) (arguments (list - #:test-flags - '(let ((disabled-tests (list "test_show_completion" - "test_install_completion"))) - (list "-k" (string-append "not " - (string-join disabled-tests - " and not ")))) #:phases #~(modify-phases %standard-phases - ;; Unfortunately, this doesn't seem to be enough to fix these two - ;; tests, but we'll patch this anyway. - (add-after 'unpack 'patch-shell-reference - (lambda _ - (substitute* "tests/test_completion/test_completion.py" - (("\"bash\"") (string-append "\"" (which "bash") "\"")) - (("\"/bin/bash\"") - (string-append "\"" (which "bash") "\""))))) (add-before 'check 'pre-check (lambda* (#:key tests? #:allow-other-keys) (when tests? @@ -28683,12 +28716,14 @@ source bytes using the UTF-8 encoding and then rewrites Python 3.6 style ;; This is for completion tests (with-output-to-file "/tmp/.bashrc" (lambda _ (display "# dummy"))))))))) - (propagated-inputs - (list python-click)) - (native-inputs - (list python-coverage python-flit python-pytest python-rich - python-shellingham)) - (home-page "https://github.com/tiangolo/typer") + (propagated-inputs (list python-click + python-rich + python-shellingham + python-typing-extensions)) + (native-inputs (list python-coverage ; this is required in tests + python-pdm-backend + python-pytest)) + (home-page "https://github.com/fastapi/typer") (synopsis "Typer builds CLI based on Python type hints") (description "Typer is a library for building CLI applications. It's based on Python @@ -34286,19 +34321,16 @@ dates in almost any string formats commonly found on web pages.") (define-public python-dparse (package (name "python-dparse") - (version "0.5.1") + (version "0.6.4") (source - (origin - (method url-fetch) - (uri (pypi-uri "dparse" version)) - (sha256 - (base32 - "0rzkg3nymsbwdjc0ms2bsajkda02jipwyp3xk97qj71f21lz3dd1")))) - (build-system python-build-system) - (native-inputs - (list python-pytest)) - (propagated-inputs - (list python-packaging python-pyyaml python-toml)) + (origin + (method url-fetch) + (uri (pypi-uri "dparse" version)) + (sha256 + (base32 "06i069hij4i53hikrsv332h2ibwfchr42b68hii6rhzdwcwrrclh")))) + (build-system pyproject-build-system) + (native-inputs (list python-hatchling python-pytest)) + (propagated-inputs (list python-packaging python-toml)) (home-page "https://github.com/pyupio/dparse") (synopsis "Parser for Python dependency files") (description "This package provides a parser for Python dependency files.") @@ -34333,31 +34365,55 @@ facility for filtering those results.") (define-public python-safety (package (name "python-safety") - (version "1.9.0") + (version "3.6.0") (source - (origin - (method url-fetch) - (uri (pypi-uri "safety" version)) - (sha256 - (base32 - "1j801xsxfzavjbzhhc934awvnk1b7jc0qsw3jp3ys0241mlj1gr3")))) - (build-system python-build-system) + (origin + (method url-fetch) + (uri (pypi-uri "safety" version)) + (sha256 + (base32 "1qzplv044yfr8w41h0qmjc8lj2admk029azsqbax70wzd4kzh858")))) + (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'disable-tests - (lambda _ - (substitute* "tests/test_safety.py" - ;; requires network - (("def test_check_live") "def _test_check_live")) - #t))))) - (propagated-inputs - (list python-click python-dparse python-packaging python-requests)) + (list + #:test-flags + #~(list "-k" (string-join + ;; test_announcements fails with AssertionError. + (list "not test_announcements_if_is_not_tty" + ;; Tests below need a network connection. + "test_check_live" + "test_check_live_cached" + "test_get_packages_licenses_without_api_key") + " and not ")) + #:phases #~(modify-phases %standard-phases + (add-before 'check 'set-home ; some tests run mkdir + (lambda _ + (setenv "HOME" "/tmp")))))) + (native-inputs (list nss-certs-for-test python-hatchling python-pytest)) + (propagated-inputs (list python-authlib + python-click + python-dparse + python-filelock + python-httpx + python-jinja2 + python-marshmallow + python-nltk + python-packaging + python-psutil + python-pydantic-2 + python-requests + python-ruamel.yaml + python-safety-schemas + python-tenacity + python-tomli + python-tomlkit + python-typer + python-typing-extensions)) (home-page "https://github.com/pyupio/safety") (synopsis "Check installed dependencies for known vulnerabilities") - (description "Safety checks installed dependencies for known vulnerabilities. + (description + "Safety checks installed dependencies for known vulnerabilities. By default it uses the open Python vulnerability database Safety DB.") - (license license:expat))) + (license license:expat))) (define-public python-pypandoc (package @@ -38807,26 +38863,31 @@ object, which can be useful if you want to force your objects into a table.") (define-public python-deepdiff (package (name "python-deepdiff") - (version "6.3.0") + (version "8.5.0") (source (origin (method url-fetch) (uri (pypi-uri "deepdiff" version)) (sha256 (base32 - "0i5nnb3nppi2vgbhiakpxiagyhx7l1f50hzcl8fcgica4bkz2fva")))) + "1l8wvirgif61cqwsqzd3kf8slzlrjnffmqxnrfwxak4dz8lkbpd4")))) (build-system pyproject-build-system) - (propagated-inputs (list python-ordered-set)) + (arguments + ;; Ignore Polars test (not packaged). + (list #:test-flags #~(list "-k" "not test_polars"))) + (propagated-inputs (list python-click ; for CLI + python-pyyaml ; for CLI + python-orderly-set + python-orjson)) ; for optimization (native-inputs - (list python-click - python-dateutil + (list python-flit-core python-jsonpickle - python-mock python-numpy + python-pandas + python-pydantic-2 python-pytest - python-pyyaml - python-setuptools - python-wheel - python-toml)) + python-pytest-benchmark + python-pytz + python-tomli-w)) (home-page "https://github.com/seperman/deepdiff") (synopsis "Deep difference and search of any Python object/data") (description diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index cbdb31e3fe..98cca568fc 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3231,7 +3231,7 @@ YouTube.com and many more sites.") (define-public yt-dlp (package (name "yt-dlp") - (version "2025.06.30") + (version "2025.07.21") (source (origin (method git-fetch) @@ -3243,7 +3243,7 @@ YouTube.com and many more sites.") (snippet '(substitute* "pyproject.toml" (("^.*Programming Language :: Python :: 3\\.13.*$") ""))) (sha256 - (base32 "14pk2rk5vm9469ghkvciaz74fihbl8dfi27qj6xnxv71hpm5w03p")))) + (base32 "051y9pb2imdrpi065d9l2xfmd68l22ahbz90z81yqv7kv84j9mal")))) (build-system pyproject-build-system) (arguments `(#:tests? ,(not (%current-target-system)) @@ -3277,7 +3277,17 @@ YouTube.com and many more sites.") (replace 'check (lambda* (#:key tests? test-flags #:allow-other-keys) (when tests? - (apply invoke "pytest" "-k" "not download" test-flags))))))) + (apply invoke "pytest" + "-k" + (string-append + "not download" + ;; TestHTTPRequestHandler tests are disabled due to + ;; https://github.com/yt-dlp/yt-dlp/issues/13927 + " and not " + "test_incompleteread" + " and not " + "test_partial_read_then_full_read") + test-flags))))))) (inputs (list ffmpeg python-brotli python-certifi python-mutagen |