diff options
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/audio.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/finance.scm | 117 | ||||
| -rw-r--r-- | gnu/packages/geo.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/gnome.scm | 79 | ||||
| -rw-r--r-- | gnu/packages/gnupg.scm | 14 | ||||
| -rw-r--r-- | gnu/packages/guile-xyz.scm | 56 | ||||
| -rw-r--r-- | gnu/packages/icu4c.scm | 12 | ||||
| -rw-r--r-- | gnu/packages/patches/libgcrypt-arm32-register-pressure.patch | 133 | ||||
| -rw-r--r-- | gnu/packages/python-web.scm | 25 | ||||
| -rw-r--r-- | gnu/packages/python-xyz.scm | 20 | ||||
| -rw-r--r-- | gnu/packages/web.scm | 37 | ||||
| -rw-r--r-- | gnu/packages/wm.scm | 37 | ||||
| -rw-r--r-- | gnu/packages/xdisorg.scm | 28 |
14 files changed, 320 insertions, 245 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index bd568cc095..af9c49bd90 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1749,6 +1749,7 @@ dist_patch_DATA = \ %D%/packages/patches/libcroco-CVE-2020-12825.patch \ %D%/packages/patches/libcyaml-libyaml-compat.patch \ %D%/packages/patches/libexpected-use-provided-catch2.patch \ + %D%/packages/patches/libgcrypt-arm32-register-pressure.patch \ %D%/packages/patches/libgda-CVE-2021-39359.patch \ %D%/packages/patches/libgda-disable-data-proxy-test.patch \ %D%/packages/patches/libgda-fix-build.patch \ diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 622ce50020..4027a3e1de 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -3575,14 +3575,14 @@ included are the command line utilities @code{send_osc} and @code{dump_osc}.") (define-public python-soundfile (package (name "python-soundfile") - (version "0.13.0") + (version "0.13.1") (source (origin (method url-fetch) (uri (pypi-uri "soundfile" version)) (sha256 (base32 - "0mc3g5l9fzj57m62zrwwz0w86cbihpna3mikgh8kpmz7ppc9jcz8")))) + "0nqf7z2wrb70vppjv5729565h0p3azgl6nqa10bp6a9h3smqvimj")))) (build-system pyproject-build-system) (arguments (list diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 20c5356765..f2177edfad 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -562,10 +562,80 @@ It's not clear at the moment whether one day it will be possible to do so.") (license license:agpl3+))) +(define-public python-electrum-ecc + (package + (name "python-electrum-ecc") + (version "0.0.5") + (source + (origin + (method url-fetch) + (uri (pypi-uri "electrum_ecc" version)) + (sha256 + (base32 "1lmp5zmhabaxp6jha3xlsmqviivrxxhsy20x6z42ayqgd9cvhczp")) + (modules '((guix build utils))) + (snippet + '(begin + ;; Delete the vendored dependency. + (delete-file-recursively "libsecp256k1"))))) + (build-system pyproject-build-system) + (arguments + (list + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'prepare-env + (lambda* (#:key inputs #:allow-other-keys) + ;; Do not attempt to compile vendored libsecp256k1. + (setenv "ELECTRUM_ECC_DONT_COMPILE" "1") + ;; Make the package find our libsecp256k1. + (substitute* "src/electrum_ecc/ecc_fast.py" + (("library_paths = \\[\\]") + (string-append + "library_paths = ['" + (search-input-file inputs "/lib/libsecp256k1.so") + "']")))))))) + (native-inputs (list python-pytest python-setuptools python-wheel)) + (inputs (list libsecp256k1)) + (home-page "https://github.com/spesmilo/electrum-ecc") + (synopsis "Pure python ctypes wrapper for libsecp256k1") + (description "This package provides a pure Python ctypes wrapper for +@code{libsecp256k1}.") + (license license:expat))) + +(define-public electrum-aionostr + (package + (name "electrum-aionostr") + (version "0.0.11") + (source + (origin + (method url-fetch) + (uri (pypi-uri "electrum_aionostr" version)) + (sha256 + (base32 "10fgidah8ca59j3gssg9b434j49c1dd9cs3224nanjsxwl0ivsqf")))) + (build-system pyproject-build-system) + (arguments + (list + ;; Test below fails to match an exit code, pointing to this in Click: + ;; https://github.com/pallets/click/pull/1489 + ;; This was fixed in Click 8.2.0. + #:test-flags #~(list "-k" "not test_command_line_interface"))) + (inputs (list python-aiohttp + python-aiohttp-socks + python-aiorpcx + python-cryptography + python-electrum-ecc)) + (native-inputs (list python-click + python-pytest + python-setuptools + python-wheel)) + (home-page "https://github.com/spesmilo/electrum-aionostr") + (synopsis "Asyncio nostr client") + (description "This package is a fork of @code{aionostr} that does not +require Coincurve.") + (license license:bsd-3))) + (define-public electrum (package (name "electrum") - (version "4.4.6") + (version "4.6.1") (source (origin (method url-fetch) @@ -573,42 +643,51 @@ do so.") version "/Electrum-" version ".tar.gz")) (sha256 - (base32 "1f0hb8xmqv1j9pf82xpyvxnn2dzmi93rhf0sh0iqakja2pbl4707")) + (base32 "1h7z019sp99csrj1djmhlm9y7vyyzl7wvar7z9x4jx59lmmvs1xs")) (modules '((guix build utils))) (snippet '(begin ;; Delete the bundled dependencies. (delete-file-recursively "packages"))))) - (build-system python-build-system) + (build-system pyproject-build-system) + (arguments + (list + ;; Either pycryptodomex or cryptography must be available. + ;; This package uses python-cryptography, but this test checks for + ;; cryptodomex anyway. Skip it since it's not useful. + #:test-flags #~(list "-k" "not test_pycryptodomex_is_available") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'relax-deps + (lambda _ + (substitute* "contrib/requirements/requirements.txt" + ;; These packages have tight version requirements because + ;; the developer does not want to introduce Hatchling in + ;; the build environment. They do work at runtime. + (("attrs.*") "attrs") + (("dnspython.*") "dnspython")))) + (add-before 'check 'set-home + (lambda _ ; 3 tests run mkdir + (setenv "HOME" "/tmp")))))) + (native-inputs (list python-pytest python-setuptools python-wheel)) (inputs - (list libsecp256k1 + (list electrum-aionostr python-aiohttp python-aiohttp-socks python-aiorpcx python-attrs - python-bitstring - python-btchip-python python-certifi python-cryptography python-dnspython + python-electrum-ecc python-hidapi - python-ledgerblue + python-jsonpatch python-protobuf - python-pyqt + python-pyaes + python-pyqt-6 python-qdarkstyle python-qrcode zbar)) - (arguments - `(#:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'use-libsecp256k1-input - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "electrum/ecc_fast.py" - (("library_paths = \\[\\]") - (string-append "library_paths = ['" - (assoc-ref inputs "libsecp256k1") - "/lib/libsecp256k1.so']")))))))) (home-page "https://electrum.org/") (synopsis "Bitcoin wallet") (description diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 35700b2382..367440ccc7 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -554,7 +554,7 @@ topology functions.") gtk libadwaita libgee - libgweather4 + libgweather librsvg libsecret libshumate diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 506578fb11..9e3a641f07 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1632,7 +1632,7 @@ extraction, and lookup for applications on the desktop.") json-glib mit-krb5 libadwaita - libgweather4 + libgweather libnma libpwquality libsecret @@ -6135,69 +6135,6 @@ service via the system message bus.") services for numerous locations.") (license license:gpl2+))) -;; libgweather no longer follows the GNOME version, and recommends changing -;; the package name in distributions to avoid accidental downgrades. See -;; <https://discourse.gnome.org/t/changes-in-libgweather-for-gnome-42/7770/2>. -;; TODO: how to prevent the updater from picking version 40? -(define-public libgweather4 - (package - (inherit libgweather) - (name "libgweather4") - (version "4.2.0") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/libgweather/" - (version-major+minor version) "/" - "libgweather-" version ".tar.xz")) - (sha256 - (base32 - "00v2rb9dizfvcsq3bgrz68bsi1k04ln5fqhx1q06m5yql0nq32mg")))) - (arguments - (list - #:configure-flags - #~(list (string-append "-Dzoneinfo_dir=" - (search-input-directory %build-inputs - "share/zoneinfo"))) - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'set-HOME - (lambda _ - (setenv "HOME" "/tmp"))) - (add-after 'unpack 'disable-problematic-tests - (lambda _ - (substitute* "libgweather/tests/meson.build" - ;; The timezones test fails for unknown reasons (see: - ;; https://gitlab.gnome.org/GNOME/libgweather/-/issues/188). - ((".*'name': 'timezones'.*") "") - ;; The 'metar' test is known to fail, fixed but not yet released - ;; upstream (see: - ;; https://gitlab.gnome.org/GNOME/libgweather/-/issues/168). - ((".*'name': 'metar'.*") "")))) - (delete 'check) ;move after the install phase - (add-after 'install 'check - (assoc-ref %standard-phases 'check))))) - (native-inputs - (list gettext-minimal - gi-docgen - `(,glib "bin") ;for glib-mkenums - gobject-introspection - (libc-utf8-locales-for-target) - gsettings-desktop-schemas - pkg-config - python - python-pygobject - vala)) - ;; TODO: It would be good to make the package respect TZDIR instead - ;; of using a "hard coded" version of tzdata. - (inputs (list tzdata)) - (propagated-inputs - ;; gweather4.pc refers to all of these. - (list geocode-glib - glib - json-glib - libsoup - libxml2)))) - (define-public gnome-settings-daemon (package (name "gnome-settings-daemon") @@ -6262,7 +6199,7 @@ services for numerous locations.") lcms libcanberra libgudev - libgweather4 + libgweather libnotify (librsvg-for-system) libwacom @@ -8495,7 +8432,7 @@ Microsoft Exchange, Last.fm, IMAP/SMTP, Jabber, SIP and Kerberos.") gnome-online-accounts json-glib libcanberra - libgweather4 + libgweather libphonenumber mit-krb5 openldap @@ -9717,7 +9654,7 @@ printf '~a is deprecated. Use the \"gnome-extensions\" CLI or \ ibus libcanberra libcroco - libgweather4 + libgweather libnma libsoup mesa-headers @@ -10457,7 +10394,7 @@ associations for GNOME.") gsettings-desktop-schemas gtk libadwaita - libgweather4)) + libgweather)) (synopsis "Weather monitoring for GNOME desktop") (description "GNOME Weather is a small application that allows you to monitor the current weather conditions for your city, or anywhere in the @@ -10890,7 +10827,7 @@ Microsoft SkyDrive and Hotmail, using their REST protocols.") gsound gtk libadwaita - libgweather4)) + libgweather)) (home-page "https://wiki.gnome.org/Apps/Clocks") (synopsis "GNOME's clock application") (description @@ -10940,7 +10877,7 @@ desktop. It supports world clock, stop watch, alarms, and count down timer.") gsettings-desktop-schemas libadwaita libdazzle - libgweather4)) + libgweather)) (home-page "https://wiki.gnome.org/Apps/Calendar") (synopsis "GNOME's calendar application") (description @@ -12376,7 +12313,7 @@ generic enough to work for everyone.") gspell highlight libcanberra - libgweather4 + libgweather libnotify libsoup nss diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 486af36202..eae66e64b6 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2014, 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2014, 2015, 2016, 2020 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> -;;; Copyright © 2015-2021, 2024 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2015-2021, 2024, 2025 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2017, 2019, 2025 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2016 Christine Lemmer-Webber <cwebber@dustycloud.org> ;;; Copyright © 2016, 2017 Nikita <nikita@n0.is> @@ -207,6 +207,18 @@ Daemon and possibly more in the future.") (add-before 'configure 'setenv (lambda _ (setenv "GCRYPT_NO_BENCHMARKS" "t"))))) + '()) + ,@(if (target-arm32?) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'apply-upstream-patch + (lambda _ + (let ((patch-file + #$(local-file + (search-patch + "libgcrypt-arm32-register-pressure.patch")))) + (invoke "patch" "--force" "-p1" "-i" patch-file)))))) '()))) (outputs '("out" "debug")) (home-page "https://gnupg.org/") diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index f683115cb6..325373d265 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -4884,36 +4884,6 @@ return accumulators. It is implemented by wrapping the sample implementation in a thin Guile compatibility layer.") (license license:gpl3+)))) -(define-public guile-srfi-159 - (let ((commit "1bd98abda2ae4ef8f36761a167903e55c6bda7bb") - (revision "0")) - (package - (name "guile-srfi-159") - (version (git-version "0" revision commit)) - (home-page "https://bitbucket.org/bjoli/guile-srfi-159") - (source (origin - (method hg-fetch) - (uri (hg-reference (changeset commit) - (url home-page))) - (sha256 - (base32 - "1zw6cmcy7xdbfiz3nz9arqnn7l2daidaps6ixkcrc9b6k51fdv3p")) - (file-name (git-file-name name version)))) - (build-system guile-build-system) - (arguments - ;; The *-impl.scm files are actually included from module files; they - ;; should not be compiled separately, but they must be installed. - '(#:not-compiled-file-regexp "-impl\\.scm$")) - (inputs - (list guile-2.2)) - (synopsis "Formatting combinators for Guile") - (description - "The @code{(srfi-159)} module and its sub-modules implement the -formatting combinators specified by -@uref{https://srfi.schemers.org/srfi-159/srfi-159.html, SRFI-159}. These are -more expressive and flexible than the traditional @code{format} procedure.") - (license license:bsd-3)))) - (define-public guile-srfi-180 (let ((commit "9188bf9724c6d320ef804579d222e855b007b193") (revision "0")) @@ -6339,22 +6309,20 @@ Relay Chat} (IRC).") (define-public guile-websocket (package (name "guile-websocket") - (version "0.2.0") - (source (origin - (method url-fetch) - (uri (string-append "https://files.dthompson.us/guile-websocket/" - "guile-websocket-" version ".tar.gz")) - (sha256 - (base32 - "143ng1x5xwy218wd1svj718ikqnrglwsywyzpd3ap9jnivw66g7f")))) + (version "0.2.1") + (source + (origin + (method url-fetch) + (uri (string-append "https://files.dthompson.us/releases/" + "guile-websocket/guile-websocket-" version + ".tar.gz")) + (sha256 + (base32 "0mbxbwc5flrafh77sl0cbfclpk3vys0hh3fqmdl9v3nqyl0cbsij")))) (build-system gnu-build-system) (arguments - '(#:make-flags - '("GUILE_AUTO_COMPILE=0"))) - (native-inputs - (list autoconf automake pkg-config)) - (inputs - (list guile-3.0 guile-gnutls)) + '(#:make-flags '("GUILE_AUTO_COMPILE=0"))) + (native-inputs (list autoconf automake pkg-config)) + (inputs (list guile-3.0 guile-gnutls)) (synopsis "Websocket server/client for Guile") (description "Guile-websocket provides an implementation of the WebSocket protocol as defined by RFC 6455.") diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm index f473527449..0c0351dd9d 100644 --- a/gnu/packages/icu4c.scm +++ b/gnu/packages/icu4c.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org> -;;; Copyright © 2016, 2017, 2020, 2022 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016, 2017, 2020, 2022, 2025 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019, 2020, 2022 Marius Bakke <marius@gnu.org> @@ -112,6 +112,16 @@ (substitute* "source/test/Makefile.in" ((" intltest ") " "))))) #~()) + #$@(if (target-arm32?) + #~((add-after 'unpack 'disable-failing-test + (lambda _ + ;; The caltest test started to fail to compile after + ;; the upgrade to gcc-14 but it's unclear which test is + ;; failing or how to disable just that one test. + ;; Error: co-processor offset out of range + (substitute* "source/test/Makefile.in" + ((" intltest ") " "))))) + #~()) (add-after 'install 'avoid-coreutils-reference ;; Don't keep a reference to the build tools. (lambda _ diff --git a/gnu/packages/patches/libgcrypt-arm32-register-pressure.patch b/gnu/packages/patches/libgcrypt-arm32-register-pressure.patch new file mode 100644 index 0000000000..9eff5c42e1 --- /dev/null +++ b/gnu/packages/patches/libgcrypt-arm32-register-pressure.patch @@ -0,0 +1,133 @@ +This patch is from upstream and probably can be dropped with any version +after 1.11.0. + +From 9c93b4607adcf9b3efd53aba43e2d33bf5aef9df Mon Sep 17 00:00:00 2001 +From: Jussi Kivilinna <jussi.kivilinna@iki.fi> +Date: Sun, 4 Aug 2024 18:04:49 +0300 +Subject: [PATCH] mpi/ec-inline: reduce register pressure on 32-bit ARM + +* mpi/ec-inline.h [HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS] (ADD4_LIMB32) +(ADD6_LIMB32, SUB4_LIMB32, SUB6_LIMB32): Reuse input registers +as output (use just two unique operators). +-- + +This fixes building ec-nist.c with GCC-14 on 32-bit ARM. + +GnuPG-bug-id: 7226 +Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi> +--- + mpi/ec-inline.h | 63 ++++++++++++++++++++++++------------------------- + 1 file changed, 31 insertions(+), 32 deletions(-) + +diff --git a/mpi/ec-inline.h b/mpi/ec-inline.h +index c24d5352..3a526246 100644 +--- a/mpi/ec-inline.h ++++ b/mpi/ec-inline.h +@@ -836,18 +836,18 @@ LIMB64_HILO(mpi_limb_t hi, mpi_limb_t lo) + #ifdef HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS + + #define ADD4_LIMB32(A3, A2, A1, A0, B3, B2, B1, B0, C3, C2, C1, C0) \ +- __asm__ ("adds %3, %7, %11\n" \ +- "adcs %2, %6, %10\n" \ +- "adcs %1, %5, %9\n" \ +- "adc %0, %4, %8\n" \ ++ __asm__ ("adds %3, %3, %11\n" \ ++ "adcs %2, %2, %10\n" \ ++ "adcs %1, %1, %9\n" \ ++ "adc %0, %0, %8\n" \ + : "=r" (A3), \ + "=&r" (A2), \ + "=&r" (A1), \ + "=&r" (A0) \ +- : "r" ((mpi_limb_t)(B3)), \ +- "r" ((mpi_limb_t)(B2)), \ +- "r" ((mpi_limb_t)(B1)), \ +- "r" ((mpi_limb_t)(B0)), \ ++ : "0" ((mpi_limb_t)(B3)), \ ++ "1" ((mpi_limb_t)(B2)), \ ++ "2" ((mpi_limb_t)(B1)), \ ++ "3" ((mpi_limb_t)(B0)), \ + "Ir" ((mpi_limb_t)(C3)), \ + "Ir" ((mpi_limb_t)(C2)), \ + "Ir" ((mpi_limb_t)(C1)), \ +@@ -857,18 +857,18 @@ LIMB64_HILO(mpi_limb_t hi, mpi_limb_t lo) + #define ADD6_LIMB32(A5, A4, A3, A2, A1, A0, B5, B4, B3, B2, B1, B0, \ + C5, C4, C3, C2, C1, C0) do { \ + mpi_limb_t __carry6_32; \ +- __asm__ ("adds %3, %7, %10\n" \ +- "adcs %2, %6, %9\n" \ +- "adcs %1, %5, %8\n" \ +- "adc %0, %4, %4\n" \ ++ __asm__ ("adds %3, %3, %10\n" \ ++ "adcs %2, %2, %9\n" \ ++ "adcs %1, %1, %8\n" \ ++ "adc %0, %0, %0\n" \ + : "=r" (__carry6_32), \ + "=&r" (A2), \ + "=&r" (A1), \ + "=&r" (A0) \ +- : "r" ((mpi_limb_t)(0)), \ +- "r" ((mpi_limb_t)(B2)), \ +- "r" ((mpi_limb_t)(B1)), \ +- "r" ((mpi_limb_t)(B0)), \ ++ : "0" ((mpi_limb_t)(0)), \ ++ "1" ((mpi_limb_t)(B2)), \ ++ "2" ((mpi_limb_t)(B1)), \ ++ "3" ((mpi_limb_t)(B0)), \ + "Ir" ((mpi_limb_t)(C2)), \ + "Ir" ((mpi_limb_t)(C1)), \ + "Ir" ((mpi_limb_t)(C0)) \ +@@ -878,18 +878,18 @@ LIMB64_HILO(mpi_limb_t hi, mpi_limb_t lo) + } while (0) + + #define SUB4_LIMB32(A3, A2, A1, A0, B3, B2, B1, B0, C3, C2, C1, C0) \ +- __asm__ ("subs %3, %7, %11\n" \ +- "sbcs %2, %6, %10\n" \ +- "sbcs %1, %5, %9\n" \ +- "sbc %0, %4, %8\n" \ ++ __asm__ ("subs %3, %3, %11\n" \ ++ "sbcs %2, %2, %10\n" \ ++ "sbcs %1, %1, %9\n" \ ++ "sbc %0, %0, %8\n" \ + : "=r" (A3), \ + "=&r" (A2), \ + "=&r" (A1), \ + "=&r" (A0) \ +- : "r" ((mpi_limb_t)(B3)), \ +- "r" ((mpi_limb_t)(B2)), \ +- "r" ((mpi_limb_t)(B1)), \ +- "r" ((mpi_limb_t)(B0)), \ ++ : "0" ((mpi_limb_t)(B3)), \ ++ "1" ((mpi_limb_t)(B2)), \ ++ "2" ((mpi_limb_t)(B1)), \ ++ "3" ((mpi_limb_t)(B0)), \ + "Ir" ((mpi_limb_t)(C3)), \ + "Ir" ((mpi_limb_t)(C2)), \ + "Ir" ((mpi_limb_t)(C1)), \ +@@ -899,18 +899,17 @@ LIMB64_HILO(mpi_limb_t hi, mpi_limb_t lo) + #define SUB6_LIMB32(A5, A4, A3, A2, A1, A0, B5, B4, B3, B2, B1, B0, \ + C5, C4, C3, C2, C1, C0) do { \ + mpi_limb_t __borrow6_32; \ +- __asm__ ("subs %3, %7, %10\n" \ +- "sbcs %2, %6, %9\n" \ +- "sbcs %1, %5, %8\n" \ +- "sbc %0, %4, %4\n" \ ++ __asm__ ("subs %3, %3, %9\n" \ ++ "sbcs %2, %2, %8\n" \ ++ "sbcs %1, %1, %7\n" \ ++ "sbc %0, %0, %0\n" \ + : "=r" (__borrow6_32), \ + "=&r" (A2), \ + "=&r" (A1), \ + "=&r" (A0) \ +- : "r" ((mpi_limb_t)(0)), \ +- "r" ((mpi_limb_t)(B2)), \ +- "r" ((mpi_limb_t)(B1)), \ +- "r" ((mpi_limb_t)(B0)), \ ++ : "1" ((mpi_limb_t)(B2)), \ ++ "2" ((mpi_limb_t)(B1)), \ ++ "3" ((mpi_limb_t)(B0)), \ + "Ir" ((mpi_limb_t)(C2)), \ + "Ir" ((mpi_limb_t)(C1)), \ + "Ir" ((mpi_limb_t)(C0)) \ +-- diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index da16c06692..9ab20defae 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1624,17 +1624,30 @@ It features a minimal TLS 1.3 implementation, a QUIC stack and an HTTP/3 stack." (define-public python-aiorpcx (package (name "python-aiorpcx") - (version "0.22.1") + (version "0.25.0") (source (origin - (method url-fetch) - (uri (pypi-uri "aiorpcX" version)) + (method git-fetch) + ;; PyPI misses the util.py file used for tests. + (uri (git-reference + (url "https://github.com/kyuupichan/aiorpcX") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "0lx54bcinp44fmr8q4bbffsqbkg8kdcwykf9i5jj0bj3sfzgf9k0")))) - (build-system python-build-system) + "0sn4xxlpy0kb5b25bqrjzh2m6bskdyydc6cq8bigb7g5dacksn4q")))) + (build-system pyproject-build-system) + (arguments + (list + #:test-flags + ;; This test opens a remote connection. + #~(list "-k" "not test_create_connection_resolve_good"))) + (native-inputs (list python-pytest + python-pytest-asyncio + python-setuptools + python-wheel)) (propagated-inputs - (list python-attrs)) + (list python-attrs python-websockets)) (home-page "https://github.com/kyuupichan/aiorpcX") (synopsis "Generic asyncio RPC implementation") (description diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index e7b3b98c96..6b65e112d1 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -35271,23 +35271,23 @@ handling those variations.") (define-public python-qdarkstyle (package (name "python-qdarkstyle") - (version "2.8.1") + (version "3.2.3") (source (origin (method url-fetch) (uri (pypi-uri "QDarkStyle" version)) (sha256 (base32 - "0883vzg35fzpyl1aiijzpfcdfvpq5vi325w0m7xkx7nxplh02fym")))) - (build-system python-build-system) - (arguments - `(;; Fails unable to detect valid Qt bindings even when - ;; added as native-inputs. - #:tests? #f)) + "1bpi0asa7sd5ch6x6b60n5yias04nsx6kcwji40228g9lrs7y2qc")))) + (build-system pyproject-build-system) + (native-inputs (list python-pytest + python-qtsass + python-setuptools + python-watchdog + python-wheel)) (propagated-inputs - (list python-helpdev python-qtpy)) - (home-page - "https://github.com/ColinDuquesnoy/QDarkStyleSheet") + (list python-qtpy python-pyqt-6)) + (home-page "https://github.com/ColinDuquesnoy/QDarkStyleSheet") (synopsis "Complete dark stylesheet for Python and Qt applications") (description "QDarkStyle is the most complete dark stylesheet for Python and diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 8c1f887a29..8a0d2daf5a 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -9859,43 +9859,6 @@ provided by a TLS reverse proxy (e.g. tlstunnel, hitch or stunnel).") the Fediring.") (license (list license:cc0 license:bsd-2))))) -(define-public archivebox - (package - (name "archivebox") - (version "0.6.2") - (source (origin - (method url-fetch) - (uri (pypi-uri name version)) - (sha256 - (base32 - "1mnq82ynq01l7vx957bbx4bvgwdh59qsnx6pdydaqszbakp74yyc")))) - (build-system python-build-system) - (propagated-inputs - (list curl - node-lts)) - (inputs - (list python - youtube-dl - wget - git - python-w3lib - python-ipython - python-croniter - python-crontab - python-dateparser - python-django-extensions - python-django-3.1.14 - python-mypy-extensions)) - (native-inputs - (list python-wheel)) - (synopsis "Self-hosted Web archiving") - (description "ArchiveBox is a powerful, self-hosted Web archiving -solution to collect, save, and view sites you want to preserve offline. -You can feed it URLs one at a time, or schedule regular imports. It saves -snapshots of the URLs you feed it in several formats.") - (home-page "https://archivebox.io/") - (license license:expat))) - (define-public awslogs (package (name "awslogs") diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 80adb463ec..dc2f0b0db1 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1929,43 +1929,6 @@ limited size and a few external dependencies. It is configurable via ;; LICENSE LICENSE.dwm LICENSE.tinywl (license (list license:gpl3+ license:expat license:cc0)))) -(define-public nitrogen - (package - (name "nitrogen") - (version "1.6.1") - (source (origin - (method url-fetch) - (uri (string-append "http://github.com/l3ib/nitrogen/" - "releases/download/" version "/" - name "-" version ".tar.gz")) - (sha256 - (base32 - "0zc3fl1mbhq0iyndy4ysmy8vv5c7xwf54rbgamzfhfvsgdq160pl")))) - (build-system gnu-build-system) - (inputs - (list gtk+-2 gtkmm-2 glib glibmm)) - (native-inputs - (list pkg-config)) - (home-page "http://projects.l3ib.org/nitrogen/") - (synopsis "Background browser and setter for X windows") - (description - "This package is a background browser and setter for X windows. It's -features are: - -@itemize -@item Multihead and Xinerama aware -@item Recall mode to used via startup script -@item Uses freedesktop.org standard for thumbnails -@item Can set GNOME background -@item Command lie set modes for script use -@item Inotify monitoring of browse directory -@item Lazy loading of thumbnails - conserves memory -@item \"Automatic\" set mode - determines best mode to set an image based on -its size -@item Display preview images in a tiled icon layout -@end itemize") - (license license:gpl2+))) - (define-public polybar (package (name "polybar") diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 3d7b270bca..1af8930ce1 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2015 Florian Paul Schmidt <mista.tapas@gmx.net> ;;; Copyright © 2016 Christine Lemmer-Webber <cwebber@dustycloud.org> ;;; Copyright © 2016, 2018 Ricardo Wurmus <rekado@elephly.net> -;;; Copyright © 2016-2021, 2023 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2016-2021, 2023, 2025 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017, 2019, 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2016 Petter <petter@mykolab.ch> @@ -906,26 +906,22 @@ typing tool (@code{wtype}, @code{xdotool}, etc.), or via standard output.") (source (origin (method url-fetch) - (uri - (string-append - "https://www.cairographics.org/releases/pixman-" - version ".tar.gz")) + (uri (string-append "https://www.cairographics.org/releases/pixman-" + version ".tar.gz")) (sha256 (base32 "0pk298iqxqr64vk3z6nhjwr6vjg1971zfrjkqy5r9zd2mppq057a")) - (patches - (search-patches - "pixman-CVE-2016-5296.patch")))) + (patches (search-patches "pixman-CVE-2016-5296.patch")))) (build-system gnu-build-system) (arguments `(#:configure-flags - (list - "--disable-static" - "--enable-timers" - "--enable-gnuplot"))) - (native-inputs - (list pkg-config)) - (inputs - (list libpng zlib)) + (list "--disable-static" + "--enable-timers" + "--enable-gnuplot" + ,@(if (target-arm32?) + `("--disable-arm-simd") + '())))) + (native-inputs (list pkg-config)) + (inputs (list libpng zlib)) (synopsis "Low-level pixel manipulation library") (description "Pixman is a low-level software library for pixel manipulation, providing features such as image compositing and trapezoid |