amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge staging branch.

Browse source 
Conflicts resolved in:
	gnu/packages/engineering.scm
	gnu/packages/gnuzilla.scm
	gnu/packages/photo.scm
This commit is contained in:
Maxim Cournoyer 2023-04-13 13:45:35 -04:00
commit c02257b6d1
No known key found for this signature in database
GPG key ID: 1260E46482E63562
72 changed files with 4192 additions and 2972 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NEWS
View file

@ -13,6 +13,9 @@ Copyright © 2022 Mathieu Othacehe <othacehe@gnu.org>
Please send Guix bug reports to bug-guix@gnu.org. Please send Guix bug reports to bug-guix@gnu.org.
* Changes in 1.5.0 (since 1.4.0)
** Package management
*** New ‘rpm’ format for the ‘guix pack’ command
* Changes in 1.4.0 (since 1.3.0) * Changes in 1.4.0 (since 1.3.0)
** Package management ** Package management
*** New ‘guix home’ command, for home environment management *** New ‘guix home’ command, for home environment management

9
gnu/local.mk
View file

@ -1249,6 +1249,7 @@ dist_patch_DATA = \
%D%/packages/patches/glibc-2.29-supported-locales.patch \ %D%/packages/patches/glibc-2.29-supported-locales.patch \
%D%/packages/patches/glibc-static-nss.patch \ %D%/packages/patches/glibc-static-nss.patch \
%D%/packages/patches/glibc-supported-locales.patch \ %D%/packages/patches/glibc-supported-locales.patch \
%D%/packages/patches/glslang-install-static-libs.patch \
%D%/packages/patches/gmp-arm-asm-nothumb.patch \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \
%D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gmp-faulty-test.patch \
%D%/packages/patches/gnash-fix-giflib-version.patch \ %D%/packages/patches/gnash-fix-giflib-version.patch \
@ -1491,6 +1492,7 @@ dist_patch_DATA = \
%D%/packages/patches/lierolibre-newer-libconfig.patch \ %D%/packages/patches/lierolibre-newer-libconfig.patch \
%D%/packages/patches/lierolibre-remove-arch-warning.patch \ %D%/packages/patches/lierolibre-remove-arch-warning.patch \
%D%/packages/patches/lierolibre-try-building-other-arch.patch \ %D%/packages/patches/lierolibre-try-building-other-arch.patch \
%D%/packages/patches/libcdio-glibc-compat.patch \
%D%/packages/patches/linbox-fix-pkgconfig.patch \ %D%/packages/patches/linbox-fix-pkgconfig.patch \
%D%/packages/patches/linphone-desktop-without-sdk.patch \ %D%/packages/patches/linphone-desktop-without-sdk.patch \
%D%/packages/patches/linux-libre-infodocs-target.patch \ %D%/packages/patches/linux-libre-infodocs-target.patch \
@ -1523,7 +1525,6 @@ dist_patch_DATA = \
%D%/packages/patches/lvm2-static-link.patch \ %D%/packages/patches/lvm2-static-link.patch \
%D%/packages/patches/mailutils-variable-lookup.patch \ %D%/packages/patches/mailutils-variable-lookup.patch \
%D%/packages/patches/make-impure-dirs.patch \ %D%/packages/patches/make-impure-dirs.patch \
%D%/packages/patches/mariadb-link-libatomic.patch \
%D%/packages/patches/mars-install.patch \ %D%/packages/patches/mars-install.patch \
%D%/packages/patches/mars-sfml-2.3.patch \ %D%/packages/patches/mars-sfml-2.3.patch \
%D%/packages/patches/mathjax-disable-webpack.patch \ %D%/packages/patches/mathjax-disable-webpack.patch \
@ -1617,7 +1618,7 @@ dist_patch_DATA = \
%D%/packages/patches/onnx-skip-model-downloads.patch \ %D%/packages/patches/onnx-skip-model-downloads.patch \
%D%/packages/patches/openbios-aarch64-riscv64-support.patch \ %D%/packages/patches/openbios-aarch64-riscv64-support.patch \
%D%/packages/patches/openboardview-use-system-imgui.patch \ %D%/packages/patches/openboardview-use-system-imgui.patch \
%D%/packages/patches/openboardview-use-system-utf8.patch \ %D%/packages/patches/openboardview-use-system-mpc.patch \
%D%/packages/patches/openbox-python3.patch \ %D%/packages/patches/openbox-python3.patch \
%D%/packages/patches/openfoam-4.1-cleanup.patch \ %D%/packages/patches/openfoam-4.1-cleanup.patch \
%D%/packages/patches/openjdk-10-idlj-reproducibility.patch \ %D%/packages/patches/openjdk-10-idlj-reproducibility.patch \
@ -1632,6 +1633,7 @@ dist_patch_DATA = \
%D%/packages/patches/openssl-3.0-c-rehash-in.patch \ %D%/packages/patches/openssl-3.0-c-rehash-in.patch \
%D%/packages/patches/opentaxsolver-file-browser-fix.patch \ %D%/packages/patches/opentaxsolver-file-browser-fix.patch \
%D%/packages/patches/open-zwave-hidapi.patch \ %D%/packages/patches/open-zwave-hidapi.patch \
%D%/packages/patches/orangeduck-mpc-fix-pkg-config.patch \
%D%/packages/patches/orpheus-cast-errors-and-includes.patch \ %D%/packages/patches/orpheus-cast-errors-and-includes.patch \
%D%/packages/patches/osip-CVE-2017-7853.patch \ %D%/packages/patches/osip-CVE-2017-7853.patch \
%D%/packages/patches/ots-no-include-missing-file.patch \ %D%/packages/patches/ots-no-include-missing-file.patch \
@ -1732,7 +1734,6 @@ dist_patch_DATA = \
%D%/packages/patches/python-3-fix-tests.patch \ %D%/packages/patches/python-3-fix-tests.patch \
%D%/packages/patches/python-3-hurd-configure.patch \ %D%/packages/patches/python-3-hurd-configure.patch \
%D%/packages/patches/python-3-no-static-lib.patch \ %D%/packages/patches/python-3-no-static-lib.patch \
%D%/packages/patches/python-afdko-suppress-copyright-test.patch \
%D%/packages/patches/python-aionotify-0.2.0-py3.8.patch \ %D%/packages/patches/python-aionotify-0.2.0-py3.8.patch \
%D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \ %D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \
%D%/packages/patches/python-cross-compile.patch \ %D%/packages/patches/python-cross-compile.patch \
@ -1754,7 +1755,6 @@ dist_patch_DATA = \
%D%/packages/patches/python-pillow-CVE-2022-45199.patch \ %D%/packages/patches/python-pillow-CVE-2022-45199.patch \
%D%/packages/patches/python-pyfakefs-remove-bad-test.patch \ %D%/packages/patches/python-pyfakefs-remove-bad-test.patch \
%D%/packages/patches/python-pyflakes-test-location.patch \ %D%/packages/patches/python-pyflakes-test-location.patch \
%D%/packages/patches/python2-pyopenssl-openssl-compat.patch \
%D%/packages/patches/python-flint-includes.patch \ %D%/packages/patches/python-flint-includes.patch \
%D%/packages/patches/python-libxml2-utf8.patch \ %D%/packages/patches/python-libxml2-utf8.patch \
%D%/packages/patches/python-magic-python-bytecode.patch \ %D%/packages/patches/python-magic-python-bytecode.patch \
@ -2005,6 +2005,7 @@ dist_patch_DATA = \
%D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \ %D%/packages/patches/warsow-qfusion-fix-bool-return-type.patch \
%D%/packages/patches/wdl-link-libs-and-fix-jnetlib.patch \ %D%/packages/patches/wdl-link-libs-and-fix-jnetlib.patch \
%D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \ %D%/packages/patches/webkitgtk-adjust-bubblewrap-paths.patch \
%D%/packages/patches/webkitgtk-libelogind.patch \
%D%/packages/patches/webrtc-audio-processing-big-endian.patch \ %D%/packages/patches/webrtc-audio-processing-big-endian.patch \
%D%/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch \ %D%/packages/patches/webrtc-for-telegram-desktop-fix-gcc12-cstdint.patch \
%D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \

63
gnu/packages/audio.scm
View file

@ -2062,7 +2062,7 @@ follower.")
(define-public fluidsynth (define-public fluidsynth
(package (package
(name "fluidsynth") (name "fluidsynth")
(version "2.2.4") (version "2.3.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -2071,7 +2071,7 @@ follower.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1061rdj69503spkd8vmfl3fqvyg4l41k5xcc4gw7niy31hnpnjmn")))) "05lr9f0q4x1kvgfa3xrfmagpwvijv9m1s316aa9figqlkcc5vv4k"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:tests? #f ; no check target '(#:tests? #f ; no check target
@ -2092,7 +2092,6 @@ follower.")
(list alsa-lib (list alsa-lib
glib glib
jack-1 jack-1
lash
libsndfile libsndfile
readline)) readline))
(home-page "https://www.fluidsynth.org/") (home-page "https://www.fluidsynth.org/")
@ -2747,60 +2746,6 @@ plugin function as a JACK application.")
to be plugged into a wide range of audio synthesis and recording packages.") to be plugged into a wide range of audio synthesis and recording packages.")
(license license:lgpl2.1+))) (license license:lgpl2.1+)))
(define-public lash
(package
(name "lash")
(version "0.6.0-rc2")
(source (origin
(method url-fetch)
;; The tilde is not permitted in the builder name, but is used
;; in the tarball.
(uri (string-append
"mirror://savannah/lash/lash-"
(string-join (string-split version #\-) "~")
".tar.bz2"))
(file-name (string-append name "-" version ".tar.bz2"))
(sha256
(base32
"12z1vx3krrzsfccpah9xjs68900xvr7bw92wx8np5871i2yv47iw"))))
(build-system gnu-build-system)
(arguments
'(;; Glibc no longer includes Sun RPC support, so tell the build system
;; to use libtirpc instead.
#:make-flags (list (string-append "CFLAGS=-I"
(assoc-ref %build-inputs "libtirpc")
"/include/tirpc -ltirpc"))
#:phases
(modify-phases %standard-phases
;; lashd embeds an ancient version of sigsegv so we just skip it
(add-after 'unpack 'skip-lashd
(lambda _
(substitute* '("Makefile.am" "Makefile.in")
(("lashd ") ""))
#t)))
#:configure-flags '("--disable-static")))
(inputs
`(("bdb" ,bdb)
("gtk" ,gtk+-2)
("jack" ,jack-1)
("libtirpc" ,libtirpc)
("readline" ,readline)
("python" ,python-2)))
;; According to pkg-config, packages depending on lash also need to have
;; at least the following packages declared as inputs.
(propagated-inputs
(list alsa-lib dbus libxml2))
(native-inputs
(list pkg-config))
(home-page "https://www.nongnu.org/lash/")
(synopsis "Audio application session manager")
(description
"LASH is a session management system for audio applications. It allows
you to save and restore audio sessions consisting of multiple interconneced
applications, restoring program state (i.e. loaded patches) and the
connections between them.")
(license license:gpl2+)))
(define-public libbs2b (define-public libbs2b
(package (package
(name "libbs2b") (name "libbs2b")
@ -3313,7 +3258,7 @@ lv2-c++-tools.")
(define-public openal (define-public openal
(package (package
(name "openal") (name "openal")
(version "1.20.1") (version "1.22.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -3321,7 +3266,7 @@ lv2-c++-tools.")
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0vax0b1lgd4212bpxa1rciz52d4mv3dkfvcbbhzw4cjp698v1kmn")))) "081xgkma2a19dscwx21xdpklh8gq399w4f1fx737qsx7rnawr55f"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f ; no check target `(#:tests? #f ; no check target

41
gnu/packages/benchmark.scm
View file

@ -8,7 +8,7 @@
;;; Copyright © 2019, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2019, 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 malte Frank Gerdes <malte.f.gerdes@gmail.com> ;;; Copyright © 2020 malte Frank Gerdes <malte.f.gerdes@gmail.com>
;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Greg Hogan <code@greghogan.com> ;;; Copyright © 2020 Greg Hogan <code@greghogan.com>
;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2022 Tomasz Jeneralczyk <tj@schwi.pl> ;;; Copyright © 2022 Tomasz Jeneralczyk <tj@schwi.pl>
@ -382,39 +382,55 @@ setup against another one.")
(define-public python-locust (define-public python-locust
(package (package
(name "python-locust") (name "python-locust")
(version "2.8.6") (version "2.15.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "locust" version)) (uri (pypi-uri "locust" version))
(sha256 (sha256
(base32 (base32
"1gn13j758j36knlcdyyyggn60rpw98iqdkvl3kjsz34brysic6q1")))) "05cznfqda0yq2j351jjdssayvj5qc11xkbkwdvv81hcmz4xpyc56"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
'(#:phases '(#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'relax-requirements (add-before 'check 'increase-resource-limits
(lambda _ (lambda _
(substitute* "setup.py" ;; XXX: Copied from ungoogled-chromium.
(("setuptools_scm<=6.0.1") ;; Try increasing the soft resource limit of max open files to 2048,
"setuptools_scm") ;; or equal to the hard limit, whichever is lower.
(("Jinja2<3.1.0") (call-with-values (lambda () (getrlimit 'nofile))
"Jinja2")))) (lambda (soft hard)
(when (and soft (< soft 2048))
(if hard
(setrlimit 'nofile (min hard 2048) hard)
(setrlimit 'nofile 2048 #f))
(format #t
"increased maximum number of open files from ~d to ~d~%"
soft (if hard (min hard 2048) 2048)))))))
(replace 'check (replace 'check
(lambda* (#:key tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)
(when tests? (when tests?
(invoke "python" "-m" "pytest" "locust" (invoke "python" "-m" "pytest" "locust"
"-k" (string-join "-k" (string-join
'(;; These tests return "non-zero exit status 1". '( ;; These tests return "non-zero exit status 1".
"not test_default_headless_spawn_options" "not test_default_headless_spawn_options"
"not test_default_headless_spawn_options_with_shape" "not test_default_headless_spawn_options_with_shape"
"not test_headless_spawn_options_wo_run_time" "not test_headless_spawn_options_wo_run_time"
;; These tests fail with a HTTP return code of
;; 500 instead of 200, for unknown reasons.
"not test_autostart_mutliple_locustfiles_with_shape"
"not test_autostart_w_load_shape"
"not test_autostart_wo_run_time"
"not test_percentile_parameter"
;; These tests depend on networking. ;; These tests depend on networking.
"not test_html_report_option" "not test_html_report_option"
"not test_json_schema"
"not test_web_options" "not test_web_options"
;; This test fails because of the warning "System open ;; These tests fail because of the warning
;; file limit '1024' is below minimum setting '10000'". ;; "System open file limit '1024' is below
;; minimum setting '10000'".
"not test_autostart_w_run_time"
"not test_skip_logging" "not test_skip_logging"
;; On some (slow?) machines, the following tests ;; On some (slow?) machines, the following tests
;; fail, with the processes returning exit code ;; fail, with the processes returning exit code
@ -433,7 +449,6 @@ setup against another one.")
python-flask-cors python-flask-cors
python-gevent python-gevent
python-geventhttpclient python-geventhttpclient
python-jinja2
python-msgpack python-msgpack
python-psutil python-psutil
python-pyzmq python-pyzmq

2
gnu/packages/build-tools.scm
View file

@ -993,7 +993,7 @@ Makefiles, JSON Compilation Database, and experimentally Ninja.")
(list (list
bash-minimal python perl clisp bash-minimal python perl clisp
;; Unicode data: ;; Unicode data:
ucd-next ucd
;; Programs for the tests: ;; Programs for the tests:
cppi indent git-minimal/pinned autoconf)) cppi indent git-minimal/pinned autoconf))
(home-page "https://www.gnu.org/software/gnulib/") (home-page "https://www.gnu.org/software/gnulib/")

59
gnu/packages/c.scm
View file

@ -9,7 +9,7 @@
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020, 2021 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020, 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com> ;;; Copyright © 2020 Katherine Cox-Buday <cox.katherine.e@gmail.com>
;;; Copyright © 2020, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020, 2021 Greg Hogan <code@greghogan.com> ;;; Copyright © 2020, 2021 Greg Hogan <code@greghogan.com>
;;; Copyright © 2021 David Dashyan <mail@davie.li> ;;; Copyright © 2021 David Dashyan <mail@davie.li>
;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com> ;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo@hotmail.com>
@ -1145,6 +1145,54 @@ Telemetry Transport (MQTT) publish-subscribe messaging protocol.")
(home-page "https://microsoft.github.io/mimalloc/") (home-page "https://microsoft.github.io/mimalloc/")
(license license:expat))) (license license:expat)))
;;; The package is named orangeduck-mpc to differentiate it from GNU mpc.
(define-public orangeduck-mpc
;; The last release lacks an 'install' target.
(let ((commit "7c910e9303833c349f7432188ff77f2745254df2")
(revision "0"))
(package
(name "orangeduck-mpc")
(version (git-version "0.9.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/orangeduck/mpc")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"01a4vcxdnz0fbn90c9zc3jzklyqqvp9sfjpjwpq0f5r0l2pp37ad"))
(patches
(search-patches "orangeduck-mpc-fix-pkg-config.patch"))))
(build-system gnu-build-system)
(arguments
(list #:make-flags #~(list (string-append "CC=" #$(cc-for-target))
(string-append "PREFIX=" #$output))
#:phases #~(modify-phases %standard-phases
(add-after 'unpack 'patch-Makefile
(lambda _
(substitute* "Makefile"
;; Do not attempt to alter the permissions,
;; otherwise 'install' would error with
;; "cannot stat [...] Permission denied"
;; errors.
(("\\s\\-m[0-9]{3}\\s")
" "))))
(delete 'configure))))
(home-page "https://github.com/orangeduck/mpc")
(synopsis "Parser Combinator library for C ")
(description "@code{mpc} is a lightweight Parser Combinator library for C.
@code{mpc} can help with tasks such as:
@itemize
@item Building a new programming language
@item Building a new data format
@item Parsing an existing programming language
@item Parsing an existing data format
@item Embedding a Domain Specific Language
@item Implementing Greenspun's Tenth Rule.
@end itemize")
(license license:bsd-2))))
;;; Factored out of the ck package so that it can be adjusted and called on ;;; Factored out of the ck package so that it can be adjusted and called on
;;; the host side easily, without impacting the package definition. ;;; the host side easily, without impacting the package definition.
(define (gnu-triplet->ck-machine target) (define (gnu-triplet->ck-machine target)
@ -1317,8 +1365,9 @@ will take care of dispatching tasks to available cores.")
"0x9f7ivww8c7cigf4ck0hfx2bm79qgx6q4ccwzqbzkrmcrl9shfb")))) "0x9f7ivww8c7cigf4ck0hfx2bm79qgx6q4ccwzqbzkrmcrl9shfb"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:phases (list
(modify-phases %standard-phases #:phases
#~(modify-phases %standard-phases
(delete 'build) (delete 'build)
(delete 'configure) (delete 'configure)
(replace 'check (replace 'check
@ -1329,8 +1378,8 @@ will take care of dispatching tasks to available cores.")
(invoke "make"))))) (invoke "make")))))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (install-file "utf8.h"
(install-file "utf8.h" (string-append out "/include")))))))) (string-append #$output "/include/utf8")))))))
(home-page "https://github.com/sheredom/utf8.h") (home-page "https://github.com/sheredom/utf8.h")
(synopsis "Single header UTF-8 string functions for C and C++") (synopsis "Single header UTF-8 string functions for C and C++")
(description "A simple one header solution to supporting UTF-8 strings in (description "A simple one header solution to supporting UTF-8 strings in

4
gnu/packages/calendar.scm
View file

@ -121,7 +121,7 @@ the <tz.h> library for handling time zones and leap seconds.")
(define-public libical (define-public libical
(package (package
(name "libical") (name "libical")
(version "3.0.14") (version "3.0.16")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -129,7 +129,7 @@ the <tz.h> library for handling time zones and leap seconds.")
version "/libical-" version ".tar.gz")) version "/libical-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"13ycghsi4iv8mnm0xv97bs0x6qvfhdxkw20n3yhcc7bg6n0bg122")))) "0cqc1wpalxmxjx8dmcaga9w8kd5l7944hqmidz43hifaf7fhaixl"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:tests? #f ; test suite appears broken '(#:tests? #f ; test suite appears broken

1
gnu/packages/cdrom.scm
View file

@ -113,6 +113,7 @@ caching facility provided by the library.")
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://gnu/libcdio/libcdio-" (uri (string-append "mirror://gnu/libcdio/libcdio-"
version ".tar.bz2")) version ".tar.bz2"))
(patches (search-patches "libcdio-glibc-compat.patch"))
(sha256 (sha256
(base32 (base32
"0avi6apv5ydjy6b9c3z9a46rvp5i57qyr09vr7x4nndxkmcfjl45")))) "0avi6apv5ydjy6b9c3z9a46rvp5i57qyr09vr7x4nndxkmcfjl45"))))

4
gnu/packages/certs.scm
View file

@ -131,7 +131,7 @@ that was originally contributed to Debian.")
;; XXX We used to refer to the nss package here, but that eventually caused ;; XXX We used to refer to the nss package here, but that eventually caused
;; module cycles. The below is a quick copy-paste job that must be kept in ;; module cycles. The below is a quick copy-paste job that must be kept in
;; sync manually. Surely there's a better way…? ;; sync manually. Surely there's a better way…?
(version "3.81") (version "3.85")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (let ((version-with-underscores (uri (let ((version-with-underscores
@ -142,7 +142,7 @@ that was originally contributed to Debian.")
"nss-" version ".tar.gz"))) "nss-" version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"19ncvhz45dhr0nmymwkxspq9l44gaafkspxiwxbqs1hpnqxmzgx8")) "15yj2gddlp68wj1k9q4q70vs6r7zx5qkbavcppmls5di212xdndg"))
;; Create nss.pc and nss-config. ;; Create nss.pc and nss-config.
(patches (search-patches "nss-3.56-pkgconfig.patch" (patches (search-patches "nss-3.56-pkgconfig.patch"
"nss-getcwd-nonnull.patch" "nss-getcwd-nonnull.patch"

12
gnu/packages/check.scm
View file

@ -1586,13 +1586,13 @@ Python's @code{random.seed}.")
(define-public python-pytest-mock (define-public python-pytest-mock
(package (package
(name "python-pytest-mock") (name "python-pytest-mock")
(version "3.6.1") (version "3.10.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "pytest-mock" version)) (uri (pypi-uri "pytest-mock" version))
(sha256 (sha256
(base32 "0qhfmd05z3g88bnwq6644jl6p5wy01i4yy7h8883z9jjih2pl8a0")) (base32 "0kzdwwdjw001qzf1n4qzh7c364rvmb0cmkfqdwr2l9bwxy2v1ggv"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Some tests do a string match on Pytest output, and fails when ;; Some tests do a string match on Pytest output, and fails when
@ -1698,14 +1698,14 @@ result back.")
(define-public python-pytest-timeout (define-public python-pytest-timeout
(package (package
(name "python-pytest-timeout") (name "python-pytest-timeout")
(version "2.0.2") (version "2.1.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "pytest-timeout" version)) (uri (pypi-uri "pytest-timeout" version))
(sha256 (sha256
(base32 (base32
"04l1cd2qyp3fbccw95a8nqg682r647v7yil8807dgs7xv9a8pyg6")))) "1nf339zg6qam3681f72j9c8fbqk8qcilna92psmzh4n60isa0z60"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
'(#:phases (modify-phases %standard-phases '(#:phases (modify-phases %standard-phases
@ -2058,14 +2058,14 @@ have failed since the last commit or what tests are currently failing.")))
(define-public python-coverage (define-public python-coverage
(package (package
(name "python-coverage") (name "python-coverage")
(version "5.2.1") (version "5.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "coverage" version)) (uri (pypi-uri "coverage" version))
(sha256 (sha256
(base32 (base32
"16z8i18msgs8k74n73dj9x49wzkl0vk4vq8k5pl1bsj70y7b4k53")))) "0b112ly7vvplvm9l411aqknxhr7fzfyp28xhflhkcx78l3lqzrzb"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
;; FIXME: 95 tests failed, 539 passed, 6 skipped, 2 errors. ;; FIXME: 95 tests failed, 539 passed, 6 skipped, 2 errors.

7
gnu/packages/crates-graphics.scm
View file

@ -38,6 +38,7 @@
#:use-module (gnu packages assembly) #:use-module (gnu packages assembly)
#:use-module (gnu packages crates-io) #:use-module (gnu packages crates-io)
#:use-module (gnu packages freedesktop) #:use-module (gnu packages freedesktop)
#:use-module (gnu packages gl)
#:use-module (gnu packages llvm) #:use-module (gnu packages llvm)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python) #:use-module (gnu packages python)
@ -3103,7 +3104,7 @@ the platform-specific getters provided by winit, or another library.")
(define-public rust-x11-2 (define-public rust-x11-2
(package (package
(name "rust-x11") (name "rust-x11")
(version "2.18.2") (version "2.20.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -3111,12 +3112,14 @@ the platform-specific getters provided by winit, or another library.")
(file-name (file-name
(string-append name "-" version ".tar.gz")) (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 "0wz7l6dlbraa9zalh9i45v9wibvkir9m2m1sg0jnzcbcaj9d1v3p")))) (base32 "10pbvmcyqm6j6zr4zk7znk8silmilihv8jxmbxbl1b0pkidqsqy2"))))
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
`(#:cargo-inputs `(#:cargo-inputs
(("rust-libc" ,rust-libc-0.2) (("rust-libc" ,rust-libc-0.2)
("rust-pkg-config" ,rust-pkg-config-0.3)))) ("rust-pkg-config" ,rust-pkg-config-0.3))))
(propagated-inputs
(list mesa))
(home-page "https://github.com/erlepereira/x11-rs") (home-page "https://github.com/erlepereira/x11-rs")
(synopsis "X11 library bindings for Rust") (synopsis "X11 library bindings for Rust")
(description "This crate provides X11 library bindings for Rust.") (description "This crate provides X11 library bindings for Rust.")

2455
gnu/packages/crates-io.scm
View file

File diff suppressed because it is too large Load diff

106
gnu/packages/databases.scm
View file

@ -133,6 +133,7 @@
#:use-module (gnu packages perl-web) #:use-module (gnu packages perl-web)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages popt) #:use-module (gnu packages popt)
#:use-module (gnu packages pretty-print)
#:use-module (gnu packages protobuf) #:use-module (gnu packages protobuf)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-build) #:use-module (gnu packages python-build)
@ -900,7 +901,7 @@ Language.")
(define-public mariadb (define-public mariadb
(package (package
(name "mariadb") (name "mariadb")
(version "10.5.12") (version "10.10.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://downloads.mariadb.com/MariaDB" (uri (string-append "https://downloads.mariadb.com/MariaDB"
@ -908,21 +909,11 @@ Language.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1gg4h9ahmk78cx01zyw0fqr6hhd78fsyhs0s34p3gi9hkak1qkxb")) "1ciw7y08wms9g3hzhyria49r1b9n5wpbhkndazv95d925c8x1jsp"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
;; Delete bundled snappy and xz. ;; Delete bundled libraries, but preserve CMakeLists.txt.
(delete-file-recursively "storage/tokudb/PerconaFT/third_party")
(substitute* "storage/tokudb/PerconaFT/CMakeLists.txt"
;; This file checks that the bundled sources are present and
;; declares build procedures for them.
(("^include\\(TokuThirdParty\\)") ""))
(substitute* "storage/tokudb/PerconaFT/ft/CMakeLists.txt"
;; Don't attempt to use the procedures we just removed.
((" build_lzma build_snappy") ""))
;; Preserve CMakeLists.txt for these.
(for-each (lambda (file) (for-each (lambda (file)
(unless (string-suffix? "CMakeLists.txt" file) (unless (string-suffix? "CMakeLists.txt" file)
(delete-file file))) (delete-file file)))
@ -934,21 +925,10 @@ Language.")
`(#:configure-flags `(#:configure-flags
(list (list
"-DBUILD_CONFIG=mysql_release" "-DBUILD_CONFIG=mysql_release"
;; Linking with libarchive fails, like this:
;; ld: /gnu/store/...-libarchive-3.2.2/lib/libarchive.a(archive_entry.o):
;; relocation R_X86_64_32 against `.bss' can not be used when
;; making a shared object; recompile with -fPIC
;; For now, disable the features that that use libarchive (xtrabackup).
"-DWITH_LIBARCHIVE=OFF"
;; Disable the TokuDB engine, because its test suite frequently fails,
;; and loading it crashes the server: <https://bugs.gnu.org/35521>.
"-DTOKUDB_OK=OFF"
;; Ensure the system libraries are used. ;; Ensure the system libraries are used.
"-DWITH_JEMALLOC=yes" "-DWITH_JEMALLOC=yes"
"-DWITH_LIBFMT=system"
"-DWITH_PCRE=system" "-DWITH_PCRE=system"
"-DWITH_SSL=system" "-DWITH_SSL=system"
"-DWITH_ZLIB=system" "-DWITH_ZLIB=system"
@ -988,14 +968,6 @@ Language.")
#:parallel-tests? ,(target-x86-64?) #:parallel-tests? ,(target-x86-64?)
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
,@(if (target-ppc32?)
`((add-after 'unpack 'apply-libatomics-patch
(lambda* (#:key inputs #:allow-other-keys)
(let ((patch-file
(assoc-ref inputs
"mariadb-link-libatomic.patch")))
(invoke "patch" "-p1" "-i" patch-file)))))
'())
(add-after 'unpack 'adjust-output-references (add-after 'unpack 'adjust-output-references
(lambda _ (lambda _
;; The build system invariably prepends $CMAKE_INSTALL_PREFIX ;; The build system invariably prepends $CMAKE_INSTALL_PREFIX
@ -1031,6 +1003,9 @@ Language.")
"main.explain_non_select" "main.explain_non_select"
"main.upgrade_MDEV-19650" "main.upgrade_MDEV-19650"
"roles.acl_statistics" "roles.acl_statistics"
"main.stat_tables_innodb"
"main.stat_tables"
"main.mysql_upgrade"
;; Probably same as above, test failure reported upstream: ;; Probably same as above, test failure reported upstream:
;; <https://jira.mariadb.org/browse/MDEV-26320>. ;; <https://jira.mariadb.org/browse/MDEV-26320>.
@ -1057,36 +1032,19 @@ Language.")
disabled-tests) disabled-tests)
(close-port unstable-tests) (close-port unstable-tests)
;; XXX: These fail because they expect a latin1 charset and
;; collation. See <https://jira.mariadb.org/browse/MDEV-21264>.
(substitute* '("mysql-test/main/gis_notembedded.result"
"mysql-test/main/system_mysql_db.result")
(("latin1_swedish_ci") "utf8_general_ci")
(("\tlatin1") "\tutf8"))
(substitute* "mysql-test/suite/binlog/t/binlog_mysqlbinlog_stop_never.test" (substitute* "mysql-test/suite/binlog/t/binlog_mysqlbinlog_stop_never.test"
(("/bin/bash") (("/bin/bash")
(which "bash"))) (which "bash")))
(substitute* "mysql-test/mysql-test-run.pl" (substitute* "mysql-test/mariadb-test-run.pl"
(("/bin/ls") (which "ls")) (("/bin/ls") (which "ls"))
(("/bin/sh") (which "sh")))))) (("/bin/sh") (which "sh"))))))
(add-before 'configure 'disable-plugins
(lambda _
(let ((disable-plugin (lambda (name)
(call-with-output-file
(string-append "plugin/" name
"/CMakeLists.txt")
(lambda (port)
(format port "\n")))))
(disabled-plugins '(;; XXX: Causes a test failure.
"disks")))
(for-each disable-plugin disabled-plugins))))
(replace 'check (replace 'check
(lambda* (#:key (tests? #t) parallel-tests? #:allow-other-keys) (lambda* (#:key (tests? #t) parallel-tests? #:allow-other-keys)
(if tests? (if tests?
(with-directory-excursion "mysql-test" (with-directory-excursion "mysql-test"
(invoke "./mtr" "--verbose" (invoke "./mariadb-test-run"
"--verbose"
"--retry=3" "--retry=3"
"--suite=main" "--suite=main"
"--testcase-timeout=40" "--testcase-timeout=40"
@ -1100,13 +1058,12 @@ Language.")
"--skip-rpl" "--skip-rpl"
"--skip-test-list=unstable-tests")) "--skip-test-list=unstable-tests"))
(format #t "test suite not run~%")))) (format #t "test suite not run~%"))))
(add-after (add-after 'install 'post-install
'install 'post-install
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
(dev (assoc-ref outputs "dev")) (dev (assoc-ref outputs "dev"))
(lib (assoc-ref outputs "lib")) (lib (assoc-ref outputs "lib"))
(openssl (assoc-ref inputs "openssl"))) (openssl (dirname (search-input-file inputs "lib/libssl.so"))))
(substitute* (list (string-append out "/bin/mariadb-install-db") (substitute* (list (string-append out "/bin/mariadb-install-db")
(string-append out "/bin/mysql_install_db")) (string-append out "/bin/mysql_install_db"))
(("basedir=\"\"") (("basedir=\"\"")
@ -1133,7 +1090,7 @@ Language.")
(mkdir-p (string-append dev "/lib")) (mkdir-p (string-append dev "/lib"))
(rename-file (string-append lib "/lib/pkgconfig") (rename-file (string-append lib "/lib/pkgconfig")
(string-append dev "/lib/pkgconfig")) (string-append dev "/lib/pkgconfig"))
(rename-file (string-append lib "/bin/mariadb_config") (rename-file (string-append out "/bin/mariadb_config")
(string-append dev "/bin/mariadb_config")) (string-append dev "/bin/mariadb_config"))
(rename-file (string-append out "/bin/mysql_config") (rename-file (string-append out "/bin/mysql_config")
(string-append dev "/bin/mysql_config")) (string-append dev "/bin/mysql_config"))
@ -1144,25 +1101,20 @@ Language.")
(substitute* (list (string-append dev "/bin/mysql_config") (substitute* (list (string-append dev "/bin/mysql_config")
(string-append dev "/lib/pkgconfig/mariadb.pc")) (string-append dev "/lib/pkgconfig/mariadb.pc"))
(("-lssl -lcrypto" all) (("-lssl -lcrypto" all)
(string-append "-L" openssl "/lib " all))))))))) (string-append "-L" openssl " " all)))))))))
(native-inputs (native-inputs
(if (target-ppc32?) (list bison perl))
`(("mariadb-link-libatomic.patch"
,(search-patch "mariadb-link-libatomic.patch"))
("patch" ,patch)
("bison" ,bison)
("perl" ,perl))
(list bison perl)))
(inputs (inputs
`(("jemalloc" ,jemalloc) (list fmt
("libaio" ,libaio) jemalloc
("libxml2" ,libxml2) libaio
("ncurses" ,ncurses) libxml2
("openssl" ,openssl-1.1) ncurses
("pam" ,linux-pam) openssl
("pcre2" ,pcre2) linux-pam
("xz" ,xz) pcre2
("zlib" ,zlib))) xz
zlib))
;; The test suite is very resource intensive and can take more than three ;; The test suite is very resource intensive and can take more than three
;; hours on a x86_64 system. Give slow and busy machines some leeway. ;; hours on a x86_64 system. Give slow and busy machines some leeway.
(properties '((timeout . 64800))) ;18 hours (properties '((timeout . 64800))) ;18 hours
@ -1288,14 +1240,14 @@ pictures, sounds, or video.")
(package (package
(inherit postgresql-15) (inherit postgresql-15)
(name "postgresql") (name "postgresql")
(version "14.4") (version "14.6")
(source (origin (source (origin
(inherit (package-source postgresql-15)) (inherit (package-source postgresql-15))
(uri (string-append "https://ftp.postgresql.org/pub/source/v" (uri (string-append "https://ftp.postgresql.org/pub/source/v"
version "/postgresql-" version ".tar.bz2")) version "/postgresql-" version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0slg7ld5mldmv3pn1wxxwglm4s3xc6c91ixx24apj713qlvn4fy2")))))) "08nzkq321fzfi8ba8gck9zxxg7xvv8vz3mbl4avrmlq933y4122h"))))))
(define-public postgresql-13 (define-public postgresql-13
(package (package

22
gnu/packages/electronics.scm
View file

@ -4,7 +4,7 @@
;;; Copyright © 2019 Clément Lassieur <clement@lassieur.org> ;;; Copyright © 2019 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2021 Leo Famulari <leo@famulari.name> ;;; Copyright © 2021 Leo Famulari <leo@famulari.name>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -252,7 +252,7 @@ supported devices, as well as input/output file format support.")
(define-public openboardview (define-public openboardview
(package (package
(name "openboardview") (name "openboardview")
(version "8.95.2") (version "9.95.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -271,10 +271,10 @@ supported devices, as well as input/output file format support.")
(scandir "." (negate (cut member <> keep)))))) (scandir "." (negate (cut member <> keep))))))
(patches (patches
(search-patches "openboardview-use-system-imgui.patch" (search-patches "openboardview-use-system-imgui.patch"
"openboardview-use-system-utf8.patch")) "openboardview-use-system-mpc.patch"))
(sha256 (sha256
(base32 (base32
"1n2yfi8wpky0y231kq2zdgwn7f7kff8m53m904hxi5ppmwhx1d6q")))) "1safjd729a7591rigkiy3c678bivrj5q1qwg1f18sijhlsfkf5b3"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(list (list
@ -298,13 +298,6 @@ supported devices, as well as input/output file format support.")
"add_subdirectory(" "add_subdirectory("
(search-input-directory inputs "share/glad") ;source_dir (search-input-directory inputs "share/glad") ;source_dir
" src/glad)\n"))))) ;binary dir " src/glad)\n"))))) ;binary dir
(add-before 'configure 'fix-utf8-include-directive
;; Our utf8-h package makes the header available as "utf8.h"
;; directly rather than "utf8/utf8.h".
(lambda _
(substitute* '("src/openboardview/FileFormats/BRDFile.cpp"
"src/openboardview/BoardView.cpp")
(("utf8/utf8.h") "utf8.h"))))
(add-before 'configure 'dynamically-load-gtk-via-absolute-path (add-before 'configure 'dynamically-load-gtk-via-absolute-path
;; The GTK library is not linked thus not present in the RUNPATH of ;; The GTK library is not linked thus not present in the RUNPATH of
;; the produced binary; the absolute path of the libraries must to ;; the produced binary; the absolute path of the libraries must to
@ -327,11 +320,14 @@ supported devices, as well as input/output file format support.")
(inputs (inputs
(list fontconfig (list fontconfig
gtk+ gtk+
imgui ;; OpenBoardView can build with Dear ImGui 1.88, but there are some
;; usability problems such as the difficulty to register clicks.
imgui-1.87
orangeduck-mpc
sdl2 sdl2
sqlite sqlite
zlib)) zlib))
(home-page "https://openboardview.org/") (home-page "https://github.com/OpenBoardView/OpenBoardView")
(synopsis "Viewer for BoardView files") (synopsis "Viewer for BoardView files")
(description "OpenBoardView is a viewer for BoardView files, which present (description "OpenBoardView is a viewer for BoardView files, which present
the details of a printed circuit board (PCB). It comes with features the details of a printed circuit board (PCB). It comes with features

14
gnu/packages/fonts.scm
View file

@ -260,19 +260,24 @@ Cyrillic, Canadian Syllabics and most Latin based languages are supported.")
(license license:cc0))) (license license:cc0)))
(define-public font-abattis-cantarell (define-public font-abattis-cantarell
;; Use the latest commit, as the last released version, 0.303, has problems
;; with the newer statmake. The dependency has been removed in the latest
;; code base.
(let ((commit "e049149faf0c15b0711e8d790e2333be923f0486")
(revision "0"))
(package (package
(name "font-abattis-cantarell") (name "font-abattis-cantarell")
(version "0.303") (version (git-version "0.303" revision commit))
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://gitlab.gnome.org/GNOME/cantarell-fonts") (url "https://gitlab.gnome.org/GNOME/cantarell-fonts")
(commit (string-append "v" version)))) (commit commit)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1d1ay0fdqchk0wa5yqxis2c98imvzsbbd2kjv0x8sk4fm419847b")))) "032csq99bkmmgh9mmmbrgg4fzxgkcsvxv4wy595qms72mmlgmcc7"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
(list #:configure-flags #~(list "-Dbuildstatics=true"))) (list #:configure-flags #~(list "-Dbuildstatics=true")))
@ -282,7 +287,6 @@ Cyrillic, Canadian Syllabics and most Latin based languages are supported.")
python python
python-cffsubr python-cffsubr
python-fontmath python-fontmath
python-statmake
python-ufo2ft)) python-ufo2ft))
(home-page "https://wiki.gnome.org/Projects/CantarellFonts") (home-page "https://wiki.gnome.org/Projects/CantarellFonts")
(synopsis "Cantarell sans-serif typeface") (synopsis "Cantarell sans-serif typeface")
@ -290,7 +294,7 @@ Cyrillic, Canadian Syllabics and most Latin based languages are supported.")
sans-serif designed for on-screen reading. It is used by GNOME@tie{}3. sans-serif designed for on-screen reading. It is used by GNOME@tie{}3.
This package contains both the non-variable as well as the variable versions This package contains both the non-variable as well as the variable versions
of the font.") of the font.")
(license license:silofl1.1))) (license license:silofl1.1))))
(define-public font-lato (define-public font-lato
(package (package

77
gnu/packages/fontutils.scm
View file

@ -12,7 +12,7 @@
;;; Copyright © 2019, 2020, 2022 Marius Bakke <marius@gnu.org> ;;; Copyright © 2019, 2020, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2020 Roel Janssen <roel@gnu.org> ;;; Copyright © 2020 Roel Janssen <roel@gnu.org>
;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2020, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev> ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
;;; Copyright © 2022 Felipe Balbi <balbi@kernel.org> ;;; Copyright © 2022 Felipe Balbi <balbi@kernel.org>
;;; ;;;
@ -34,6 +34,7 @@
(define-module (gnu packages fontutils) (define-module (gnu packages fontutils)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages bash)
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
@ -139,14 +140,13 @@ them as it goes.")
(define-public python-afdko (define-public python-afdko
(package (package
(name "python-afdko") (name "python-afdko")
(version "3.9.1") (version "3.9.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "afdko" version)) (uri (pypi-uri "afdko" version))
(sha256 (sha256
(base32 "0k1204vykgx32saa495s1lgmz1dixcp8bjiv486imx77killvm02")) (base32 "1d3b1590gxlindh1sjhwvxnryn5zil98hgdwbgsr76fd657r3f99"))
(patches (search-patches "python-afdko-suppress-copyright-test.patch"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
#~(begin #~(begin
@ -172,27 +172,13 @@ them as it goes.")
(substitute* "CMakeLists.txt" (substitute* "CMakeLists.txt"
(("CMAKE_CXX_STANDARD 11") (("CMAKE_CXX_STANDARD 11")
"CMAKE_CXX_STANDARD 17")))) "CMAKE_CXX_STANDARD 17"))))
(add-after 'unpack 'use-system-libxml2
(lambda _
;; XXX: These horrifying substitutions revert this upstream
;; PR: <https://github.com/adobe-type-tools/afdko/pull/1527>.
;; Hopefully it's only temporary..!
(substitute* (find-files "." "^CMakeLists.txt$")
(("\\(\\(NOT \\$\\{LibXml2_FOUND\\}\\) OR \
\"\\$\\{CMAKE_SYSTEM\\}\" MATCHES \"Linux\"\\)")
"(NOT ${LibXml2_FOUND})")
(("\\(\\(\\$\\{LibXml2_FOUND\\}\\) AND \
\\(NOT \"\\$\\{CMAKE_SYSTEM\\}\" MATCHES \"Linux\"\\)\\)")
"(${LibXml2_FOUND})"))
(substitute* "cmake/ExternalLibXML2.cmake"
(("set\\(LIBXML2_STATIC_INCLUDE_DIR")
"set(LIBXML2_INCLUDE_DIR)"))))
(add-after 'unpack 'patch-problematic-requirements (add-after 'unpack 'patch-problematic-requirements
(lambda _ (lambda _
(substitute* "requirements.txt" (substitute* "requirements.txt"
;; Remove lxml because the version requested here is different ;; Remove lxml because the version requested here is different
;; than the one propagated by the python-fonttools package. ;; than the one propagated by the python-fonttools package.
(("^lxml==.*") "")))) (("^lxml==.*") "")
(("<=4.38.0") ">=4.38.0"))))
(add-after 'unpack 'patch-setup.py (add-after 'unpack 'patch-setup.py
(lambda _ (lambda _
;; There is no use for Python-provided CMake nor Ninja binaries. ;; There is no use for Python-provided CMake nor Ninja binaries.
@ -232,7 +218,14 @@ them as it goes.")
(number->string (parallel-job-count)) (number->string (parallel-job-count))
;; This test is known to fail on multiple architectures. ;; This test is known to fail on multiple architectures.
;; https://github.com/adobe-type-tools/afdko/issues/1163 ;; https://github.com/adobe-type-tools/afdko/issues/1163
"-k not test_type1mm_inputs")))) "-k"
(string-append
"not test_type1mm_inputs "
;; These tests fail for unknown reasons (see:
;; https://github.com/adobe-type-tools/afdko/issues/1635).
"and not test_rvrn_vf "
"and not test_cjk_vf "
"and not test_sparse_cjk_vf")))))
(add-after 'check 'wrap (add-after 'check 'wrap
(assoc-ref %standard-phases 'wrap)) (assoc-ref %standard-phases 'wrap))
(add-before 'wrap 'wrap-PATH (add-before 'wrap 'wrap-PATH
@ -257,7 +250,8 @@ them as it goes.")
python-setuptools-scm python-setuptools-scm
python-wheel)) python-wheel))
(inputs (inputs
(list java-antlr4-runtime-cpp (list bash-minimal
java-antlr4-runtime-cpp
libxml2 libxml2
`(,util-linux "lib"))) `(,util-linux "lib")))
(propagated-inputs (propagated-inputs
@ -444,23 +438,15 @@ converts any cubic curves to quadratic. The most useful function is probably
(define-public python-ufo2ft (define-public python-ufo2ft
(package (package
(name "python-ufo2ft") (name "python-ufo2ft")
(version "2.28.0") (version "2.31.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "ufo2ft" version)) (uri (pypi-uri "ufo2ft" version))
(sha256 (sha256
(base32 "068hm62s1iphyg66w96vgiif6ahpcsaf8fr44rk6jdf71f6fyqd5")))) (base32 "1rg2997af8blvswlwif0kpz2vxrlh555gzqslz6yv9y7i7v8lphl"))))
(build-system python-build-system) (build-system pyproject-build-system)
(arguments (native-inputs (list python-pytest python-setuptools-scm))
(list #:phases
#~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "pytest" "-vv")))))))
(native-inputs
(list python-pytest python-setuptools-scm))
(propagated-inputs (propagated-inputs
(list python-booleanoperations (list python-booleanoperations
python-cffsubr python-cffsubr
@ -482,13 +468,13 @@ to generate OpenType font binaries from Unified Font Objects (UFOs).")
(define-public python-fontmath (define-public python-fontmath
(package (package
(name "python-fontmath") (name "python-fontmath")
(version "0.9.2") (version "0.9.3")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "fontMath" version ".zip")) (uri (pypi-uri "fontMath" version ".zip"))
(sha256 (sha256
(base32 "014407hpvqdx123g06i664qrfq86bf9l621x7jllpgqw3rqir2sc")))) (base32 "070v1jz5f18g15if459ppwswq4w5hzffwp1gvdc5j47bgz5qflva"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (list python-fonttools)) (propagated-inputs (list python-fonttools))
(native-inputs (native-inputs
@ -555,13 +541,13 @@ implementing the pen protocol for manipulating glyphs.")
(hidden-package (hidden-package
(package (package
(name "python-fontparts-bootstrap") (name "python-fontparts-bootstrap")
(version "0.10.8") (version "0.11.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "fontParts" version ".zip")) (uri (pypi-uri "fontParts" version ".zip"))
(sha256 (sha256
(base32 "0i5ww6yl9m74wnjd7gyvjkdh7m56haql4gv7lasmppdipay2209g")))) (base32 "0j4h8hszky639gmfy1avmw670y80ya49kca8yc635h5ihl0c3v8x"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
(list python-booleanoperations (list python-booleanoperations
@ -754,9 +740,12 @@ suite of the @code{psautohint} package.")
(uri (pypi-uri "psautohint" version)) (uri (pypi-uri "psautohint" version))
(sha256 (sha256
(base32 "0zzz7hy1kkkjfrrm9ly2di3xv2x1ywdqhbyqy21k670jysldw3nm")))) (base32 "0zzz7hy1kkkjfrrm9ly2di3xv2x1ywdqhbyqy21k670jysldw3nm"))))
(build-system python-build-system) (build-system pyproject-build-system)
(arguments (arguments
(list (list
;; The CJKSparseVar.subset.hinted.otf test fails with slightly different
;; output caused by the newer fonttools version used in Guix.
#:test-flags #~(list "-k" "not CJKSparseVar.subset.hinted.otf")
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'copy-font-data (add-after 'unpack 'copy-font-data
@ -766,11 +755,7 @@ suite of the @code{psautohint} package.")
#$(this-package-native-input "psautohint-font-data") #$(this-package-native-input "psautohint-font-data")
"tests/integration/data") "tests/integration/data")
(for-each make-file-writable (for-each make-file-writable
(find-files "tests/integration/data")))) (find-files "tests/integration/data")))))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "pytest" "-vv")))))))
(propagated-inputs (list python-fonttools-next)) (propagated-inputs (list python-fonttools-next))
(native-inputs (native-inputs
(list psautohint-font-data (list psautohint-font-data
@ -1554,7 +1539,7 @@ generate bitmaps.")
(define-public python-statmake (define-public python-statmake
(package (package
(name "python-statmake") (name "python-statmake")
(version "0.5.1") (version "0.6.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -1563,7 +1548,7 @@ generate bitmaps.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0qavzspxhwnaayj5mxq6ncjjziggabxj157ls04h2rdrpq167706")))) "1k6fkzyhsfkgi599sb017wzf4jzbnp5wjg1kla1b33vgjpa7n5nw"))))
(build-system pyproject-build-system) (build-system pyproject-build-system)
(arguments (arguments
(list (list

206
gnu/packages/freedesktop.scm
View file

@ -27,7 +27,7 @@
;;; Copyright © 2021 Robby Zambito <contact@robbyzambito.me> ;;; Copyright © 2021 Robby Zambito <contact@robbyzambito.me>
;;; Copyright © 2021, 2022 Maxime Devos <maximedevos@telenet.be> ;;; Copyright © 2021, 2022 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2021, 2022 John Kehayias <john.kehayias@protonmail.com> ;;; Copyright © 2021, 2022 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2021, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de> ;;; Copyright © 2022 Daniel Meißner <daniel.meissner-i4k@ruhr-uni-bochum.de>
;;; Copyright © 2022 muradm <mail@muradm.net> ;;; Copyright © 2022 muradm <mail@muradm.net>
;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com> ;;; Copyright © 2022 Petr Hodina <phodina@protonmail.com>
@ -225,73 +225,75 @@ application-centers for distributions.")
(sha256 (sha256
(base32 "1sd8syldyq6bphfdm129s3gq554vfv7vh1vcwzk48gjryf101awk")) (base32 "1sd8syldyq6bphfdm129s3gq554vfv7vh1vcwzk48gjryf101awk"))
(patches (patches
(search-patches (search-patches "farstream-gupnp.patch" ;for test 'transmitter/rawudp'
"farstream-gupnp.patch" ;for test 'transmitter/rawudp'
"farstream-make.patch")))) "farstream-make.patch"))))
(build-system glib-or-gtk-build-system) (build-system glib-or-gtk-build-system)
(outputs '("out" "doc")) (outputs '("out" "doc"))
(arguments (arguments
`(#:configure-flags
(list (list
"--enable-gtk-doc" #:configure-flags
#~(list "--enable-gtk-doc"
"--enable-glib-asserts" "--enable-glib-asserts"
(string-append "--with-html-dir=" (string-append "--with-html-dir=" #$output
(assoc-ref %outputs "doc")
"/share/gtk-doc/html")) "/share/gtk-doc/html"))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'copy-common (add-after 'unpack 'copy-common
(lambda _ (lambda _
(delete-file "autogen.sh") (delete-file "autogen.sh")
(copy-recursively (copy-recursively
(assoc-ref %build-inputs "common") #$(origin
"common")
#t))
(add-after 'unpack 'disable-timeout-tests
(lambda _
(substitute* "tests/check/Makefile.am"
;; This test timeouts despite changing
;; the value of 'CK_DEFAULT_TIMEOUT' to 600,
;; as per %common-gstreamer-phases.
;; Reported to upstream:
;; https://gitlab.freedesktop.org/farstream/farstream/-/issues/20
(("[ \t]*transmitter/nice.*$") ""))))
(add-after 'unpack 'patch-docbook-xml
(lambda* (#:key inputs #:allow-other-keys)
(with-directory-excursion "docs"
(substitute* '("libs/farstream-libs-docs.sgml"
"plugins/farstream-plugins-docs.sgml")
(("http://www.oasis-open.org/docbook/xml/4.1.2/")
(string-append (assoc-ref inputs "docbook-xml")
"/xml/dtd/docbook/"))))
#t)))))
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("common"
,(origin
(method git-fetch) (method git-fetch)
(uri (uri
(git-reference (git-reference
(url "https://gitlab.freedesktop.org/gstreamer/common.git") (url "https://gitlab.freedesktop.org/gstreamer/common.git")
(commit "88e512ca7197a45c4114f7fa993108f23245bf50"))) (commit "52adcdb89a9eb527df38c569539d95c1c7aeda6e")))
(file-name (file-name (git-file-name "common" "latest.52adcdb"))
(git-file-name "common" "latest.88e512c"))
(sha256 (sha256
(base32 "1nk94pnskjyngqcfb9p32g4yvf4nzpjszisw24r9azl0pawqpsn6")))) (base32
("docbook-xml" ,docbook-xml-4.1.2) "1zlm1q1lgcb76gi82rial5bwy2j9sz1x6x48ijhiz89cml7xxd1r")))
("docbook-xsl" ,docbook-xsl) "common")))
("gobject-introspection" ,gobject-introspection) (add-after 'unpack 'disable-problematic-tests
("gtk-doc" ,gtk-doc/stable) (lambda _
("libtool" ,libtool) (substitute* "tests/check/Makefile.am"
("perl" ,perl) ;; This test fails since updating gstreamer to version 1.22.1
("pkg-config" ,pkg-config) ;; (see:
("python" ,python-wrapper) ;; https://gitlab.freedesktop.org/farstream/farstream/-/issues/25).
("xsltproc" ,libxslt))) (("^\trtp/recvcodecs.*") "")
;; This test timeouts despite changing the value of
;; 'CK_DEFAULT_TIMEOUT' to 600 (see:
;; https://gitlab.freedesktop.org/farstream/farstream/-/issues/20).
(("^\ttransmitter/nice.*") ""))))
(add-after 'unpack 'patch-docbook-xml
(lambda* (#:key native-inputs inputs #:allow-other-keys)
(with-directory-excursion "docs"
(substitute* '("libs/farstream-libs-docs.sgml"
"plugins/farstream-plugins-docs.sgml")
(("http://www.oasis-open.org/docbook/xml/4.1.2/")
(search-input-directory (or native-inputs inputs)
"xml/dtd/docbook/")))))))))
(native-inputs
(list autoconf
automake
docbook-xml-4.1.2
docbook-xsl
gobject-introspection
gtk-doc/stable
libtool
libxslt
perl
pkg-config
python-wrapper))
(inputs (inputs
(list glib gtk+ gupnp-igd libnice)) (list glib
gtk+
gupnp-igd
libnice))
(propagated-inputs (propagated-inputs
(list gstreamer gst-plugins-bad gst-plugins-base gst-plugins-good)) (list gstreamer
gst-plugins-bad
gst-plugins-base
gst-plugins-good))
(synopsis "The Farstream VVoIP framework") (synopsis "The Farstream VVoIP framework")
(description "Farstream is a collection of GStreamer modules and libraries (description "Farstream is a collection of GStreamer modules and libraries
for videoconferencing.") for videoconferencing.")
@ -486,67 +488,42 @@ display servers. It supports many different languages and emoji.")
(native-inputs (native-inputs
(list docbook-xsl docbook-xml-4.1.2 libxslt w3m-for-tests xmlto)) (list docbook-xsl docbook-xml-4.1.2 libxslt w3m-for-tests xmlto))
(inputs (inputs
`(("awk" ,gawk) (list bash-minimal ;for 'wrap-program'
;; TODO(staging): Make this unconditional, to avoid canonical packages, coreutils
;; see <https://lists.gnu.org/archive/html/guix-devel/2020-02/msg00148.html>. file
,@(if (%current-target-system) gawk
`(("bash-minimal" ,bash-minimal)) ; for 'wrap-program' grep
'()) inetutils ;xdg-screensaver uses `hostname'
("coreutils" ,coreutils) perl-file-mimeinfo ;for mimeopen fallback
,@(if (%current-target-system) sed
`(("file" ,file)) xprop ;for Xfce detecting
'()) xset)) ;for xdg-screensaver
("grep" ,grep)
("inetutils" ,inetutils) ; xdg-screensaver uses `hostname'
("perl-file-mimeinfo" ,perl-file-mimeinfo) ; for mimeopen fallback
("sed" ,sed)
("xprop" ,xprop) ; for Xfce detecting
("xset" ,xset))) ; for xdg-screensaver
(arguments (arguments
`(#:tests? #f ; no check target (list
#:modules ((srfi srfi-26) #:tests? #f ;no check target
#:modules `((srfi srfi-26)
,@%gnu-build-system-modules) ,@%gnu-build-system-modules)
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'patch-hardcoded-paths (add-after 'unpack 'patch-hardcoded-paths
;; TODO(staging): make unconditional (lambda* (#:key inputs #:allow-other-keys)
(,@(if (%current-target-system)
'(lambda* (#:key inputs #:allow-other-keys))
'(lambda _))
(substitute* "scripts/xdg-mime.in" (substitute* "scripts/xdg-mime.in"
(("/usr/bin/file") (("/usr/bin/file")
(,@(if (%current-target-system) (search-input-file inputs "bin/file")))
'(search-input-file inputs "bin/file")
'(which "file")))))
(substitute* "scripts/xdg-open.in" (substitute* "scripts/xdg-open.in"
(("/usr/bin/printf") (("/usr/bin/printf")
(,@(if (%current-target-system) (search-input-file inputs "bin/printf")))))
'(search-input-file inputs "bin/printf")
'(which "printf")))))
#t))
(add-before 'build 'locate-catalog-files (add-before 'build 'locate-catalog-files
;; TODO(staging): Make unconditional for simplicity. (lambda* (#:key native-inputs inputs #:allow-other-keys)
(lambda* (#:key inputs ,@(if (%current-target-system) (let* ((native (or native-inputs inputs))
'(native-inputs) (xmldoc (search-input-directory native
'()) #:allow-other-keys)
;; TODO(staging): Make unconditional for simplicity and
;; to avoid depending on input labels.
(let ,(if (%current-target-system)
`((native-inputs (or native-inputs inputs))
(xmldoc (search-input-directory native-inputs
"xml/dtd/docbook")) "xml/dtd/docbook"))
(xsldoc (xsldoc (search-input-directory
(search-input-directory native
native-inputs
(string-append "xml/xsl/docbook-xsl-" (string-append "xml/xsl/docbook-xsl-"
,(package-version docbook-xsl))))) #$(package-version
`((xmldoc (this-package-native-input
(string-append (assoc-ref inputs "docbook-xml") "docbook-xsl"))))))
"/xml/dtd/docbook"))
(xsldoc
(string-append (assoc-ref inputs "docbook-xsl")
"/xml/xsl/docbook-xsl-"
,(package-version docbook-xsl)))))
(for-each (lambda (file) (for-each (lambda (file)
(substitute* file (substitute* file
(("http://.*/docbookx\\.dtd") (("http://.*/docbookx\\.dtd")
@ -561,25 +538,20 @@ display servers. It supports many different languages and emoji.")
(string-append "$(XMLTO) -x " xsldoc (string-append "$(XMLTO) -x " xsldoc
"/manpages/docbook.xsl man"))) "/manpages/docbook.xsl man")))
(setenv "STYLESHEET" (setenv "STYLESHEET"
(string-append xsldoc "/html/docbook.xsl")) (string-append xsldoc "/html/docbook.xsl")))))
;; TODO(staging): Might as well remove the #t while we are at
;; it.
#t)))
(add-after 'install 'wrap-executables (add-after 'install 'wrap-executables
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let* ((dependencies '("awk" "grep" "hostname" "ls" "mimeopen"
(with-directory-excursion (string-append out "/bin") "sed" "xprop" "xset"))
(let ((path-ext (pkgs (map (lambda (cmd)
(map (cute string-append <> "/bin") (search-input-file inputs
(cons out (string-append "bin/" cmd)))
(map (cute assoc-ref inputs <>) dependencies))
'("awk" "coreutils" "grep" "inetutils" (bindirs (map dirname pkgs)))
"perl-file-mimeinfo" "sed" "xprop" (with-directory-excursion (string-append #$output "/bin")
"xset"))))))
(for-each (cute wrap-program <> (for-each (cute wrap-program <>
`("PATH" ":" prefix ,path-ext)) `("PATH" ":" prefix ,bindirs))
(find-files ".")))) (find-files ".")))))))))
#t))))))
(home-page "https://www.freedesktop.org/wiki/Software/xdg-utils/") (home-page "https://www.freedesktop.org/wiki/Software/xdg-utils/")
(synopsis "Freedesktop.org scripts for desktop integration") (synopsis "Freedesktop.org scripts for desktop integration")
(description "The xdg-utils package is a set of simple scripts that (description "The xdg-utils package is a set of simple scripts that
@ -1802,7 +1774,7 @@ which speak the Qualcomm MSM Interface (QMI) protocol.")
(define-public modem-manager (define-public modem-manager
(package (package
(name "modem-manager") (name "modem-manager")
(version "1.18.10") (version "1.18.12")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -1810,7 +1782,7 @@ which speak the Qualcomm MSM Interface (QMI) protocol.")
"ModemManager-" version ".tar.xz")) "ModemManager-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1sv53lvz9nfbq6jzprl5xhai0vylc01kglcdrgz2vszf5615y98n")))) "0c74n5jl1qvq2qlbwzfkgxny8smjcgkid1nhdnl6qnlmbn9f8r5l"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list

21
gnu/packages/gl.scm
View file

@ -110,7 +110,7 @@ as ASCII text.")
(define-public freeglut (define-public freeglut
(package (package
(name "freeglut") (name "freeglut")
(version "3.2.2") (version "3.4.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -118,7 +118,7 @@ as ASCII text.")
"/download/v" version "/freeglut-" version ".tar.gz")) "/download/v" version "/freeglut-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0l3s57zw51fy3mn5qfdm4z775kfhflgxppanaxmskfzh5l44m565")))) "1v7ayg3a03mv8b6lsr1qm21lbr8xg8dh3gdfxnbhl64vbn8wn2rw"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:tests? #f ;no test target '(#:tests? #f ;no test target
@ -615,14 +615,14 @@ glxdemo, glxgears, glxheads, and glxinfo.")
(define-public glew (define-public glew
(package (package
(name "glew") (name "glew")
(version "2.1.0") (version "2.2.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://sourceforge/glew/glew/" version (uri (string-append "mirror://sourceforge/glew/glew/" version
"/glew-" version ".tgz")) "/glew-" version ".tgz"))
(sha256 (sha256
(base32 (base32
"159wk5dc0ykjbxvag5i1m2mhp23zkk6ra04l26y3jc3nwvkr3ph4")) "1qak8f7g1iswgswrgkzc7idk7jmqgwrs58fhg2ai007v7j4q5z6l"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -632,11 +632,14 @@ glxdemo, glxgears, glxheads, and glxinfo.")
#t)))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases (modify-phases %standard-phases (delete 'configure)) (list #:make-flags #~(list (string-append "GLEW_PREFIX=" #$output)
#:make-flags (list (string-append "GLEW_PREFIX=" (string-append "GLEW_DEST=" #$output))
(assoc-ref %outputs "out")) #:phases
(string-append "GLEW_DEST=" #~(modify-phases %standard-phases
(assoc-ref %outputs "out"))) (delete 'configure)
(add-after 'install 'delete-static
(lambda _
(delete-file (string-append #$output "/lib/libGLEW.a")))))
#:tests? #f)) ;no 'check' target #:tests? #f)) ;no 'check' target
(inputs (inputs
(list libxi libxmu libx11 mesa)) (list libxi libxmu libx11 mesa))

6
gnu/packages/gnome.scm
View file

@ -5433,19 +5433,19 @@ and other secrets. It communicates with the \"Secret Service\" using DBus.")
(define-public gi-docgen (define-public gi-docgen
(package (package
(name "gi-docgen") (name "gi-docgen")
(version "2022.1") (version "2023.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "gi-docgen" version)) (uri (pypi-uri "gi-docgen" version))
(sha256 (sha256
(base32 (base32
"1v2wspm2ld27lq1n5v5pzrmkhchfa7p7ahp8rmjm4zcdyagqf7gr")))) "18vzbw1k531qxi9qcwlxl97xk9dg16has7khg6a5d0pqrflyvbc8"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (list python-jinja2 (propagated-inputs (list python-jinja2
python-markdown python-markdown
python-markupsafe python-markupsafe
python-pygments python-pygments
python-toml python-tomli
python-typogrify)) python-typogrify))
(home-page "https://gitlab.gnome.org/GNOME/gi-docgen") (home-page "https://gitlab.gnome.org/GNOME/gi-docgen")
(synopsis "Documentation tool for GObject-based libraries") (synopsis "Documentation tool for GObject-based libraries")

35
gnu/packages/gnunet.scm
View file

@ -13,6 +13,7 @@
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be> ;;; Copyright © 2022 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2023 Adam Faiz <adam.faiz@disroot.org> ;;; Copyright © 2023 Adam Faiz <adam.faiz@disroot.org>
;;; Copyright © 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -31,6 +32,7 @@
(define-module (gnu packages gnunet) (define-module (gnu packages gnunet)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages base)
#:use-module (gnu packages file) #:use-module (gnu packages file)
#:use-module (gnu packages aidc) #:use-module (gnu packages aidc)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
@ -260,7 +262,7 @@ supports HTTP, HTTPS and GnuTLS.")
(define-public gnunet (define-public gnunet
(package (package
(name "gnunet") (name "gnunet")
(version "0.19.3") (version "0.19.4")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -268,7 +270,7 @@ supports HTTP, HTTPS and GnuTLS.")
".tar.gz")) ".tar.gz"))
(sha256 (sha256
(base32 (base32
"09bspbjl6cll8wcrl1vnb56jwp30pcrg1yyj6xy3i0fl2bzdbdw2")) "16q0mkkr9b33wlm307ignfgvv0kilzr42155m5dpz66m13s3v9h0"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
#~(begin #~(begin
@ -307,21 +309,32 @@ supports HTTP, HTTPS and GnuTLS.")
python-sphinx python-sphinx
python-sphinx-rtd-theme python-sphinx-rtd-theme
xxd xxd
(@ (gnu packages base) which))) which))
(arguments (arguments
'(#:parallel-tests? #f ; Parallel tests aren't supported. (list
#:parallel-tests? #f ;parallel tests aren't supported
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'disable-problematic-tests
(lambda _
(substitute* "src/cadet/Makefile.in"
;; The speed_reliable tests appear to be unreliable (see:
;; https://bugs.gnunet.org/view.php?id=7787).
(("test_cadet_[0-9]+_speed_reliable\\$\\(EXEEXT)")
""))
(substitute* "src/core/Makefile.in"
;; The 'test_core_api' test fails non-deterministically (see:
;; https://bugs.gnunet.org/view.php?id=7784).
(("test_core_api\\$\\(EXEEXT) ") ""))))
(add-before 'check 'set-env-var-for-tests (add-before 'check 'set-env-var-for-tests
(lambda _ (lambda _
(setenv "LANG" "en_US.UTF-8"))) (setenv "LANG" "en_US.UTF-8")))
;; Swap 'check and 'install phases and add installed binaries to $PATH. ;; Swap 'check and 'install phases and add installed binaries to $PATH.
(add-before 'check 'set-path-for-check (add-before 'check 'set-path-for-check
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(let ((out (assoc-ref outputs "out"))) (setenv "GNUNET_PREFIX" (string-append #$output "/lib"))
(setenv "GNUNET_PREFIX" (string-append out "/lib")) (setenv "PATH" (string-append (getenv "PATH") ":"
(setenv "PATH" (string-append (getenv "PATH") ":" out "/bin"))) #$output "/bin"))))
#t))
(delete 'check) (delete 'check)
(add-after 'install 'check (add-after 'install 'check
(assoc-ref %standard-phases 'check))))) (assoc-ref %standard-phases 'check)))))
@ -334,7 +347,7 @@ that sense aims to replace the current internet protocol stack. Along with
an application for secure publication of files, it has grown to include all an application for secure publication of files, it has grown to include all
kinds of basic applications for the foundation of a GNU internet.") kinds of basic applications for the foundation of a GNU internet.")
(license license:agpl3+) (license license:agpl3+)
(home-page "https://gnunet.org/en/"))) (home-page "https://www.gnunet.org/en/")))
(define-public guile-gnunet ;GSoC 2015! (define-public guile-gnunet ;GSoC 2015!
(let ((commit "d12167ab3c8d7d6caffd9c606e389ef043760602") (let ((commit "d12167ab3c8d7d6caffd9c606e389ef043760602")

181
gnu/packages/gnuzilla.scm
View file

@ -704,9 +704,11 @@ variable defined below. It requires guile-json to be installed."
libxcomposite libxcomposite
libxt libxt
libffi libffi
ffmpeg ;; Support for FFmpeg 6 was only added in version 112 (see:
;; https://bugzilla.mozilla.org/show_bug.cgi?id=1819374).
ffmpeg-5
libvpx libvpx
icu4c-71 ; TODO: Change to 'icu4c' when its version is >= 71. icu4c-71 ;TODO: Change to 'icu4c' when its version is >= 71.
pixman pixman
pulseaudio pulseaudio
mesa mesa
@ -1116,6 +1118,176 @@ standards of the IceCat project.")
"ru" "sco" "si" "sk" "sl" "son" "sq" "sr" "sv-SE" "szl" "ta" "te" "th" "tl" "ru" "sco" "si" "sk" "sl" "son" "sq" "sr" "sv-SE" "szl" "ta" "te" "th" "tl"
"tr" "trs" "uk" "ur" "uz" "vi" "xh" "zh-CN" "zh-TW")) "tr" "trs" "uk" "ur" "uz" "vi" "xh" "zh-CN" "zh-TW"))
(define icecat-102.9.0-source
(let* ((base-version "102.9.0")
(version "102.9.0-guix0-preview1")
(major-version (first (string-split base-version #\.)))
(minor-version (second (string-split base-version #\.)))
(sub-version (third (string-split base-version #\.)))
(upstream-firefox-version (string-append base-version "esr"))
(upstream-firefox-source
(origin
(method url-fetch)
(uri (string-append
"https://ftp.mozilla.org/pub/firefox/releases/"
upstream-firefox-version "/source/"
"firefox-" upstream-firefox-version ".source.tar.xz"))
(sha256
(base32
"1l8xlbba8sa9dg132k96ch8mz97i5lyhpvkxi8d85jh97xi79c1i"))))
;; The upstream-icecat-base-version may be older than the
;; base-version.
(upstream-icecat-base-version base-version)
(gnuzilla-commit "f55ede39713d1533734f37e39927cbb78abe1604")
(gnuzilla-source
(origin
(method git-fetch)
(uri (git-reference
(url "git://git.savannah.gnu.org/gnuzilla.git")
(commit gnuzilla-commit)))
(file-name (git-file-name "gnuzilla"
;;upstream-icecat-base-version
(string-take gnuzilla-commit 8)))
(sha256
(base32
"0z15h3lxfn9pmj5bj62qim3h320dcd2v69xrg1phb7lh5gq0bylf"))))
;; 'search-patch' returns either a valid file name or #f, so wrap it
;; in 'assume-valid-file-name' to avoid 'local-file' warnings.
(makeicecat-patch
(local-file (assume-valid-file-name
(search-patch "icecat-makeicecat.patch")))))
(origin
(method computed-origin-method)
(file-name (string-append "icecat-" version ".tar.xz"))
(sha256 #f)
(uri
(delay
(with-imported-modules '((guix build utils))
#~(begin
(use-modules (guix build utils))
(let ((firefox-dir
(string-append "firefox-" #$base-version))
(icecat-dir
(string-append "icecat-" #$version)))
(set-path-environment-variable
"PATH" '("bin")
(list #+python
#+(canonical-package bash)
#+(canonical-package coreutils)
#+(canonical-package findutils)
#+(canonical-package patch)
#+(canonical-package xz)
#+(canonical-package sed)
#+(canonical-package grep)
#+(canonical-package bzip2)
#+(canonical-package gzip)
#+(canonical-package tar)))
(set-path-environment-variable
"PYTHONPATH"
(list #+(format #f "lib/python~a/site-packages"
(version-major+minor
(package-version python))))
'#+(cons python-jsonschema
(map second
(package-transitive-propagated-inputs
python-jsonschema))))
;; Needed by the 'makeicecat' script.
(setenv "RENAME_CMD" "rename")
;; We copy the gnuzilla source directory because it is
;; read-only in 'gnuzilla-source', and the makeicecat script
;; uses "cp -a" to copy parts of it and assumes that the
;; copies will be writable.
(copy-recursively #+gnuzilla-source "/tmp/gnuzilla"
#:log (%make-void-port "w"))
(with-directory-excursion "/tmp/gnuzilla"
(make-file-writable "makeicecat")
(invoke "patch" "--force" "--no-backup-if-mismatch"
"-p1" "--input" #+makeicecat-patch)
(patch-shebang "makeicecat")
(substitute* "makeicecat"
(("^readonly FFMAJOR=(.*)" all ffmajor)
(unless (string=? #$major-version
(string-trim-both ffmajor))
;; The makeicecat script cannot be expected to work
;; properly on a different version of Firefox, even if
;; no errors occur during execution.
(error "makeicecat major version mismatch"))
(string-append "readonly FFMAJOR=" #$major-version "\n"))
(("^readonly FFMINOR=.*")
(string-append "readonly FFMINOR=" #$minor-version "\n"))
(("^readonly FFSUB=.*")
(string-append "readonly FFSUB=" #$sub-version "\n"))
(("^readonly DATADIR=.*")
"readonly DATADIR=/tmp/gnuzilla/data\n")
(("^readonly SOURCEDIR=.*")
(string-append "readonly SOURCEDIR=" icecat-dir "\n"))
(("/bin/sed")
#+(file-append (canonical-package sed) "/bin/sed"))))
(format #t "Unpacking upstream firefox tarball...~%")
(force-output)
(invoke "tar" "xf" #+upstream-firefox-source)
(rename-file firefox-dir icecat-dir)
(with-directory-excursion icecat-dir
(format #t "Populating l10n directory...~%")
(force-output)
(mkdir "l10n")
(with-directory-excursion "l10n"
(for-each
(lambda (locale-dir)
(let ((locale
(string-drop (basename locale-dir)
(+ 32 ; length of hash
(string-length "-mozilla-locale-")))))
(format #t " ~a~%" locale)
(force-output)
(copy-recursively locale-dir locale
#:log (%make-void-port "w"))
(for-each make-file-writable (find-files locale))
(with-directory-excursion locale
(when (file-exists? ".hgtags")
(delete-file ".hgtags"))
(mkdir-p "browser/chrome/browser/preferences")
(call-with-output-file
"browser/chrome/browser/preferences/advanced-scripts.dtd"
(lambda (port) #f)))))
'#+all-mozilla-locales)
(copy-recursively #+mozilla-compare-locales
"compare-locales"
#:log (%make-void-port "w"))
(delete-file "compare-locales/.gitignore")
(delete-file "compare-locales/.hgignore")
(delete-file "compare-locales/.hgtags")))
(format #t "Running makeicecat script...~%")
(force-output)
(invoke "bash" "/tmp/gnuzilla/makeicecat")
(format #t "Packing IceCat source tarball...~%")
(force-output)
(setenv "XZ_DEFAULTS" (string-join (%xz-parallel-args)))
(invoke "tar" "cfa" #$output
;; Avoid non-determinism in the archive. We set the
;; mtime of files in the archive to early 1980 because
;; the build process fails if the mtime of source
;; files is pre-1980, due to the creation of zip
;; archives.
"--mtime=@315619200" ; 1980-01-02 UTC
"--owner=root:0"
"--group=root:0"
"--sort=name"
icecat-dir)))))))))
(define %icedove-build-id "20230411000000") ;must be of the form YYYYMMDDhhmmss (define %icedove-build-id "20230411000000") ;must be of the form YYYYMMDDhhmmss
(define %icedove-version "102.10.0") (define %icedove-version "102.10.0")
@ -1191,7 +1363,7 @@ list of languages supported as well as the currently used changeset."
;; Extract the base Icecat tarball, renaming its top-level ;; Extract the base Icecat tarball, renaming its top-level
;; directory. ;; directory.
(invoke "tar" "--transform" (string-append "s,[^/]*," #$name ",") (invoke "tar" "--transform" (string-append "s,[^/]*," #$name ",")
"-xf" #$icecat-source) "-xf" #$icecat-102.9.0-source)
(chdir #$name) (chdir #$name)
;; Merge the Thunderdbird localization data. ;; Merge the Thunderdbird localization data.
@ -1494,7 +1666,8 @@ ca495991b7852b855"))
cairo cairo
cups cups
dbus-glib dbus-glib
ffmpeg ;; Support for FFmpeg 6 was only added in version 112 (see:
;; https://bugzilla.mozilla.org/show_bug.cgi?id=1819374).
freetype freetype
gdk-pixbuf gdk-pixbuf
glib glib

6
gnu/packages/golang.scm
View file

@ -244,7 +244,7 @@
(native-inputs (native-inputs
(list pkg-config which net-base perl)) (list pkg-config which net-base perl))
(home-page "https://golang.org/") (home-page "https://go.dev/")
(synopsis "Compiler and libraries for Go, a statically-typed language") (synopsis "Compiler and libraries for Go, a statically-typed language")
(description "Go, also commonly referred to as golang, is an imperative (description "Go, also commonly referred to as golang, is an imperative
programming language designed primarily for systems programming. Go is a programming language designed primarily for systems programming. Go is a
@ -631,7 +631,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
(package (package
(inherit go-1.16) (inherit go-1.16)
(name "go") (name "go")
(version "1.17.11") (version "1.17.13")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -641,7 +641,7 @@ in the style of communicating sequential processes (@dfn{CSP}).")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"11wy6092qm7v0n10cjkyp49sbchqazi3vnij8k2sq7k7jaj63z5p")))) "05m8gr050kagvn22lfnjrgms03l5iphd1m4v6z7yqlhn9gdp912d"))))
(outputs '("out" "tests")) ; 'tests' contains distribution tests. (outputs '("out" "tests")) ; 'tests' contains distribution tests.
(arguments (arguments
`(#:modules ((ice-9 match) `(#:modules ((ice-9 match)

119
gnu/packages/graphics.scm
View file

@ -480,21 +480,22 @@ typically encountered in feature film production.")
(define-public blender (define-public blender
(package (package
(name "blender") (name "blender")
(version "3.3.1") (version "3.3.5") ;3.3.x is the current LTS version
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://download.blender.org/source/" (uri (string-append "https://download.blender.org/source/"
"blender-" version ".tar.xz")) "blender-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1jlc26axbhh97d2j6kfg9brgiq8j412mgmw7p41ah34apzq4inia")))) "1pwl4lbc00g0bj97rd8l9fnrv3w1gny9ci6mrma3pp2acgs56502"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
(let ((python-version (version-major+minor (package-version python)))) (list
`(;; Test files are very large and not included in the release tarball. ;; Test files are very large and not included in the release tarball.
#:tests? #f #:tests? #f
#:configure-flags #:configure-flags
(list "-DWITH_CODEC_FFMPEG=ON" (let ((python-version (version-major+minor (package-version python))))
#~(list "-DWITH_CODEC_FFMPEG=ON"
"-DWITH_CODEC_SNDFILE=ON" "-DWITH_CODEC_SNDFILE=ON"
"-DWITH_CYCLES=ON" "-DWITH_CYCLES=ON"
"-DWITH_DOC_MANPAGE=ON" "-DWITH_DOC_MANPAGE=ON"
@ -507,73 +508,67 @@ typically encountered in feature film production.")
"-DWITH_OPENVDB=ON" "-DWITH_OPENVDB=ON"
"-DWITH_OPENSUBDIV=ON" "-DWITH_OPENSUBDIV=ON"
"-DWITH_PYTHON_INSTALL=OFF" "-DWITH_PYTHON_INSTALL=OFF"
(string-append "-DPYTHON_LIBRARY=python" ,python-version) (string-append "-DPYTHON_LIBRARY=python" #$python-version)
(string-append "-DPYTHON_LIBPATH=" (assoc-ref %build-inputs "python") (string-append "-DPYTHON_LIBPATH="
(assoc-ref %build-inputs "python")
"/lib") "/lib")
(string-append "-DPYTHON_INCLUDE_DIR=" (assoc-ref %build-inputs "python") (string-append "-DPYTHON_INCLUDE_DIR="
"/include/python" ,python-version) (assoc-ref %build-inputs "python")
(string-append "-DPYTHON_VERSION=" ,python-version) "/include/python" #$python-version)
(string-append "-DPYTHON_VERSION=" #$python-version)
(string-append "-DPYTHON_NUMPY_INCLUDE_DIRS=" (string-append "-DPYTHON_NUMPY_INCLUDE_DIRS="
(assoc-ref %build-inputs "python-numpy") (assoc-ref %build-inputs "python-numpy")
"/lib/python" ,python-version "/site-packages/numpy/core/include/") "/lib/python" #$python-version
"/site-packages/numpy/core/include/")
(string-append "-DPYTHON_NUMPY_PATH=" (string-append "-DPYTHON_NUMPY_PATH="
(assoc-ref %build-inputs "python-numpy") (assoc-ref %build-inputs "python-numpy")
"/lib/python" ,python-version "/site-packages/")) "/lib/python" #$python-version
"/site-packages/")
;; OpenEXR propagates ilmbase, but its include files do not
;; appear in the C_INCLUDE_PATH, so we need to add
;; "$ilmbase/include/OpenEXR/" to the C_INCLUDE_PATH to
;; satisfy the dependency on "half.h" and "Iex.h".
(string-append "-DCMAKE_CXX_FLAGS=-I"
(search-input-directory %build-inputs
"include/OpenEXR"))))
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
;; XXX This file doesn't exist in the Git sources but will probably
;; exist in the eventual 2.80 source tarball.
(add-after 'unpack 'fix-broken-import (add-after 'unpack 'fix-broken-import
(lambda _ (lambda _
(substitute* "release/scripts/addons/io_scene_fbx/json2fbx.py" (substitute* "release/scripts/addons/io_scene_fbx/json2fbx.py"
(("import encode_bin") "from . import encode_bin")) (("import encode_bin")
#t)) "from . import encode_bin")))))))
(add-after 'set-paths 'add-ilmbase-include-path
(lambda* (#:key inputs #:allow-other-keys)
;; OpenEXR propagates ilmbase, but its include files do not
;; appear in the C_INCLUDE_PATH, so we need to add
;; "$ilmbase/include/OpenEXR/" to the C_INCLUDE_PATH to satisfy
;; the dependency on "half.h" and "Iex.h".
(let ((headers (string-append
(assoc-ref inputs "ilmbase")
"/include/OpenEXR")))
(setenv "C_INCLUDE_PATH"
(string-append headers ":"
(or (getenv "C_INCLUDE_PATH") "")))
(setenv "CPLUS_INCLUDE_PATH"
(string-append headers ":"
(or (getenv "CPLUS_INCLUDE_PATH") ""))))))))))
(inputs (inputs
`(("boost" ,boost) (list boost
("jemalloc" ,jemalloc) embree
("libx11" ,libx11) ffmpeg-5
("libxi" ,libxi) fftw
("libxrender" ,libxrender) freetype
("opencolorio" ,opencolorio) glew
("openimageio" ,openimageio) gmp ;needed for boolean operations on meshes
("openexr" ,openexr-2) ilmbase
("opensubdiv" ,opensubdiv) jack-1
("ilmbase" ,ilmbase) jemalloc
("openjpeg" ,openjpeg) libjpeg-turbo
("libjpeg" ,libjpeg-turbo) libpng
("libpng" ,libpng) libsndfile
("libtiff" ,libtiff) libtiff
("ffmpeg" ,ffmpeg) libx11
("fftw" ,fftw) libxi
("gmp" ,gmp) ;; needed for boolean operations on meshes libxrender
("jack" ,jack-1) openal
("libsndfile" ,libsndfile) opencolorio
("freetype" ,freetype) openexr-2
("glew" ,glew) openimageio
("openal" ,openal) openjpeg
("pugixml" ,pugixml) opensubdiv
("python" ,python) openvdb
("python-numpy" ,python-numpy) pugixml
("openvdb" ,openvdb) python
("tbb" ,tbb) python-numpy
("zlib" ,zlib) tbb
("zstd" ,zstd "lib") zlib
("embree" ,embree))) `(,zstd "lib")))
(home-page "https://blender.org/") (home-page "https://blender.org/")
(synopsis "3D graphics creation suite") (synopsis "3D graphics creation suite")
(description (description

91
gnu/packages/gstreamer.scm
View file

@ -44,6 +44,7 @@
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
#:use-module (gnu packages build-tools)
#:use-module (gnu packages cdrom) #:use-module (gnu packages cdrom)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
@ -403,7 +404,7 @@ arrays of data.")
(define-public gstreamer-docs (define-public gstreamer-docs
(package (package
(name "gstreamer-docs") (name "gstreamer-docs")
(version "1.20.3") (version "1.22.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -411,7 +412,7 @@ arrays of data.")
"/gstreamer-docs-" version ".tar.xz")) "/gstreamer-docs-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1gziccq5f4fy23q6dm8nwbmzh68gn9rfbqw0xcn4r8yn82545z3k")))) "1fljaydlinzw9jf5nkhwf7ihfzd5250k2cv220mi8dxxf7rgn18y"))))
(build-system trivial-build-system) (build-system trivial-build-system)
(arguments (arguments
`(#:modules ((guix build utils)) `(#:modules ((guix build utils))
@ -463,7 +464,7 @@ the GStreamer multimedia framework.")
(define-public gstreamer (define-public gstreamer
(package (package
(name "gstreamer") (name "gstreamer")
(version "1.20.3") (version "1.22.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -472,10 +473,12 @@ the GStreamer multimedia framework.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0aisl8nazcfi4b5j6fz8zwpp0k9csb022zniz65b2pxxpdjayzb0")))) "08cfz2vkf494rsg0bn75px26fxs3syvxnsc9lj5n074j0cvfgbxj"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
(list #:phases (list #:disallowed-references (list python)
#:meson meson-0.63
#:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
#$@%common-gstreamer-phases #$@%common-gstreamer-phases
#$@(if (string-prefix? "i686" (or (%current-target-system) #$@(if (string-prefix? "i686" (or (%current-target-system)
@ -491,12 +494,22 @@ test_stress_cleanup_unschedule.*")
(("tcase_add_test \\(tc_chain, \ (("tcase_add_test \\(tc_chain, \
test_stress_reschedule.*") test_stress_reschedule.*")
""))))) "")))))
'())))) '())
(add-after 'patch-shebangs 'do-not-capture-python
(lambda _
;; The patch-source-shebangs phase causes the following build
;; script to reference Python in its shebang, which is
;; unnecessary.
(substitute* (string-append
#$output "/libexec/gstreamer-1.0/"
"gst-plugins-doc-cache-generator")
(((which "python3"))
"/usr/bin/env python3")))))))
(propagated-inputs (propagated-inputs
;; In gstreamer-1.0.pc: ;; In gstreamer-1.0.pc:
;; Requires: glib-2.0, gobject-2.0 ;; Requires: glib-2.0, gobject-2.0
;; Requires.private: gmodule-no-export-2.0 libunwind libdw ;; Requires.private: gmodule-no-export-2.0 libunwind libdw
(list elfutils ; libdw (list elfutils ;libdw
glib libunwind)) glib libunwind))
(native-inputs (native-inputs
(list bash-completion (list bash-completion
@ -506,7 +519,7 @@ test_stress_reschedule.*")
gobject-introspection gobject-introspection
perl perl
pkg-config pkg-config
python-wrapper)) python))
(inputs (inputs
(list gmp libcap (list gmp libcap
;; For tests. ;; For tests.
@ -533,7 +546,7 @@ This package provides the core library and elements.")
(define-public gst-plugins-base (define-public gst-plugins-base
(package (package
(name "gst-plugins-base") (name "gst-plugins-base")
(version "1.20.3") (version "1.22.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -541,7 +554,7 @@ This package provides the core library and elements.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"17rw8wj1x1bg153m9z76pdvgz5k93m3riyalfpzq00x7h7fv6c3y")))) "0jcxcx4mgfjvfb3ixibwhx8j330mq3ap469w7hapm6z79q614rgb"))))
(build-system meson-build-system) (build-system meson-build-system)
(propagated-inputs (propagated-inputs
(list glib ;required by gstreamer-sdp-1.0.pc (list glib ;required by gstreamer-sdp-1.0.pc
@ -580,6 +593,7 @@ This package provides the core library and elements.")
xorg-server-for-tests)) xorg-server-for-tests))
(arguments (arguments
(list (list
#:meson meson-0.63
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
#$@%common-gstreamer-phases #$@%common-gstreamer-phases
@ -632,7 +646,7 @@ for the GStreamer multimedia library.")
(define-public gst-plugins-good (define-public gst-plugins-good
(package (package
(name "gst-plugins-good") (name "gst-plugins-good")
(version "1.20.3") (version "1.22.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -641,10 +655,11 @@ for the GStreamer multimedia library.")
"https://gstreamer.freedesktop.org/src/" name "/" "https://gstreamer.freedesktop.org/src/" name "/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "1dv8b2md1xk6d45ir1wzbvqhxbvm6mxv881rjl0brnjwpw3c5wzq")))) (base32 "1p8cpkk4dynglw0xswqyf57xl5fnxmb3xld71kv35cpj4nacb33w"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
(list (list
#:meson meson-0.63
#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
@ -659,6 +674,11 @@ for the GStreamer multimedia library.")
(string-append prefix "\"" libsoup "\"\n"))))) (string-append prefix "\"" libsoup "\"\n")))))
(add-after 'unpack 'skip-failing-tests (add-after 'unpack 'skip-failing-tests
(lambda _ (lambda _
(substitute* "tests/check/elements/flvmux.c"
;; This test randomly times out (see:
;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/786).
((".*tcase_add_test.*test_video_caps_late.*")
""))
(substitute* "tests/check/meson.build" (substitute* "tests/check/meson.build"
;; Reported as shaky upstream, see ;; Reported as shaky upstream, see
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/785> ;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/785>
@ -746,14 +766,14 @@ model to base your own plug-in on, here it is.")
(define-public gst-plugins-bad (define-public gst-plugins-bad
(package (package
(name "gst-plugins-bad") (name "gst-plugins-bad")
(version "1.20.3") (version "1.22.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://gstreamer.freedesktop.org/src/" (uri (string-append "https://gstreamer.freedesktop.org/src/"
name "/" name "-" version ".tar.xz")) name "/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0kys6m5hg5bc30wfg8qa3s7dmkdz3kj1j8lhvn3267fxalxw24bs")) "03rd09wsrf9xjianpnnvamb4n3lndhd4x31srqsqab20wcfaz3rx"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -762,21 +782,12 @@ model to base your own plug-in on, here it is.")
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
(list (list
#:meson meson-0.63
#:configure-flags #~(list "-Dsctp-internal-usrsctp=disabled") #:configure-flags #~(list "-Dsctp-internal-usrsctp=disabled")
#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
#$@%common-gstreamer-phases #$@%common-gstreamer-phases
#$@(if (string-prefix? "arm" (or (%current-target-system)
(%current-system)))
;; Disable test that fails on ARMv7.
;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/issues/1188
`((add-after 'unpack 'disable-asfmux-test
(lambda _
(substitute* "tests/check/meson.build"
(("\\[\\['elements/asfmux\\.c'\\]\\],")
"")))))
'())
(add-after 'unpack 'adjust-tests (add-after 'unpack 'adjust-tests
(lambda* (#:key native-inputs inputs #:allow-other-keys) (lambda* (#:key native-inputs inputs #:allow-other-keys)
(let ((gst-plugins-good (assoc-ref (or native-inputs inputs) (let ((gst-plugins-good (assoc-ref (or native-inputs inputs)
@ -788,18 +799,11 @@ model to base your own plug-in on, here it is.")
(string-append "'GST_PLUGIN_SYSTEM_PATH_1_0', '" (string-append "'GST_PLUGIN_SYSTEM_PATH_1_0', '"
gst-plugins-good "/lib/gstreamer-1.0'")) gst-plugins-good "/lib/gstreamer-1.0'"))
;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1136
((".*elements/msdkh264enc\\.c.*") "")
((".*elements/svthevcenc\\.c.*") "")
;; The 'elements_shm.test_shm_live' test sometimes times out ;; The 'elements_shm.test_shm_live' test sometimes times out
;; (see: ;; (see:
;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/790). ;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/790).
((".*'elements/shm\\.c'.*") "") ((".*'elements/shm\\.c'.*") "")
;; FIXME: Why is this failing.
((".*elements/dash_mpd\\.c.*") "")
;; This test is flaky on at least some architectures. ;; This test is flaky on at least some architectures.
;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1244 ;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1244
#$@(if (member (%current-system) #$@(if (member (%current-system)
@ -808,9 +812,6 @@ model to base your own plug-in on, here it is.")
"'elements/camerabin.c'], true, ],")) "'elements/camerabin.c'], true, ],"))
'()) '())
;; These tests are flaky and occasionally time out:
;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/932
((".*elements/curlhttpsrc\\.c.*") "")
;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1412 ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1412
((".*elements/dtls\\.c.*") "")) ((".*elements/dtls\\.c.*") ""))
(substitute* "tests/check/elements/zxing.c" (substitute* "tests/check/elements/zxing.c"
@ -949,7 +950,7 @@ par compared to the rest.")
(define-public gst-plugins-ugly (define-public gst-plugins-ugly
(package (package
(name "gst-plugins-ugly") (name "gst-plugins-ugly")
(version "1.20.3") (version "1.22.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -957,10 +958,11 @@ par compared to the rest.")
(string-append "https://gstreamer.freedesktop.org/src/" (string-append "https://gstreamer.freedesktop.org/src/"
name "/" name "-" version ".tar.xz")) name "/" name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "1zdfsq0zm1d3wj3w3z44bf3v28clr8yd6qzmkjs09hq9k9w21alc")))) (base32 "1486x08bwasq6l7kc75nph5az61siq9mbgkgpw4kf1mxn16z8c4g"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
(list #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas (list #:meson meson-0.63
#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
#$@%common-gstreamer-phases #$@%common-gstreamer-phases
@ -1006,7 +1008,7 @@ think twice about shipping them.")
(define-public gst-libav (define-public gst-libav
(package (package
(name "gst-libav") (name "gst-libav")
(version "1.20.3") (version "1.22.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1015,8 +1017,9 @@ think twice about shipping them.")
"https://gstreamer.freedesktop.org/src/" name "/" "https://gstreamer.freedesktop.org/src/" name "/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "1zkxybdzdkn07wwmj0rrgxyvbry472dggjv2chdsmpzwc02x3v9z")))) (base32 "1zfg7giwampmjxkqr5pqy66vck42b0akmwby661brwz8iy3zkapw"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (list #:meson meson-0.63))
(native-inputs (native-inputs
(list perl pkg-config python-wrapper ruby)) (list perl pkg-config python-wrapper ruby))
(inputs (inputs
@ -1032,7 +1035,7 @@ decoders, muxers, and demuxers provided by FFmpeg.")
(define-public gst-editing-services (define-public gst-editing-services
(package (package
(name "gst-editing-services") (name "gst-editing-services")
(version "1.20.3") (version "1.22.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -1040,10 +1043,11 @@ decoders, muxers, and demuxers provided by FFmpeg.")
"gst-editing-services-" version ".tar.xz")) "gst-editing-services-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"18msiadg6wi1636ylp02yfiwphxlz39gh3vbxchl9qpvd7g9dn2z")))) "1gyfw11ns2la1cm6gvvvv5qj3q5gcvcypc3wk8kdwmrqzij18fs5"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
(list (list
#:meson meson-0.63
#:tests? #f ; FIXME: 16/23 failing tests. #:tests? #f ; FIXME: 16/23 failing tests.
#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
#:phases #~(modify-phases %standard-phases #:phases #~(modify-phases %standard-phases
@ -1100,7 +1104,7 @@ binary, but none of the actual plugins.")))
(define-public python-gst (define-public python-gst
(package (package
(name "python-gst") (name "python-gst")
(version "1.20.3") (version "1.22.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -1108,10 +1112,11 @@ binary, but none of the actual plugins.")))
"gst-python-" version ".tar.xz")) "gst-python-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1p6g05k88nbbv5x9madsvphxcdkfl1z0lmp39p6bhmg9x8h82d6v")))) "1bak46bj92gyz613m99mnl0yw0qhbhq5dfxifnvldgp45kcb7wmy"))))
(build-system meson-build-system) (build-system meson-build-system)
(arguments (arguments
(list (list
#:meson meson-0.63
#:modules `((guix build meson-build-system) #:modules `((guix build meson-build-system)
(guix build utils) (guix build utils)
((guix build python-build-system) #:prefix python:)) ((guix build python-build-system) #:prefix python:))

36
gnu/packages/ibus.scm
View file

@ -10,7 +10,7 @@
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net> ;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2021 Songlin Jiang <hollowman@hollowman.ml> ;;; Copyright © 2021 Songlin Jiang <hollowman@hollowman.ml>
;;; Copyright © 2021 Taiju HIGASHI <higashi@taiju.info> ;;; Copyright © 2021 Taiju HIGASHI <higashi@taiju.info>
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2023 Luis Felipe López Acevedo <luis.felipe.la@protonmail.com> ;;; Copyright © 2023 Luis Felipe López Acevedo <luis.felipe.la@protonmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -91,7 +91,7 @@
(outputs '("out" "doc")) (outputs '("out" "doc"))
(arguments (arguments
(list (list
#:configure-flags #~(list "--enable-python-library" #:configure-flags #~(list "--disable-gtk2"
"--enable-gtk-doc" "--enable-gtk-doc"
"--enable-memconf" "--enable-memconf"
(string-append (string-append
@ -186,10 +186,8 @@
(string-append #$output:doc "/share/gtk-doc")))) (string-append #$output:doc "/share/gtk-doc"))))
(add-after 'wrap-program 'wrap-with-additional-paths (add-after 'wrap-program 'wrap-with-additional-paths
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Make sure 'ibus-setup' runs with the correct PYTHONPATH and ;; Make sure 'ibus-setup' runs with the correct GI_TYPELIB_PATH.
;; GI_TYPELIB_PATH.
(wrap-program (search-input-file outputs "bin/ibus-setup") (wrap-program (search-input-file outputs "bin/ibus-setup")
`("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))
`("GI_TYPELIB_PATH" ":" prefix `("GI_TYPELIB_PATH" ":" prefix
(,(getenv "GI_TYPELIB_PATH") (,(getenv "GI_TYPELIB_PATH")
,(string-append #$output "/lib/girepository-1.0"))))))))) ,(string-append #$output "/lib/girepository-1.0")))))))))
@ -198,7 +196,6 @@
dbus dbus
dconf dconf
glib glib
gtk+-2
gtk+ gtk+
iso-codes iso-codes
json-glib json-glib
@ -206,9 +203,6 @@
libx11 libx11
libxkbcommon libxkbcommon
libxtst libxtst
python-pygobject
python
python-dbus
setxkbmap setxkbmap
ucd ucd
unicode-cldr-common unicode-cldr-common
@ -244,11 +238,29 @@ may also simplify input method development.")
(define-public ibus (define-public ibus
(package/inherit ibus-minimal (package/inherit ibus-minimal
(arguments (substitute-keyword-arguments (package-arguments ibus-minimal) (arguments
(substitute-keyword-arguments (package-arguments ibus-minimal)
((#:configure-flags flags) ((#:configure-flags flags)
#~(cons* "--enable-gtk4" #$flags)))) #~(cons* "--enable-gtk4"
"--enable-python-library"
#$flags))
((#:phases phases '%standard-phases)
#~(modify-phases #$phases
(replace 'wrap-with-additional-paths
(lambda* (#:key outputs #:allow-other-keys)
;; Make sure 'ibus-setup' runs with the correct
;; GUIX_PYTHONPATH and GI_TYPELIB_PATH.
(wrap-program (search-input-file outputs "bin/ibus-setup")
`("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))
`("GI_TYPELIB_PATH" ":" prefix
(,(getenv "GI_TYPELIB_PATH")
,(string-append #$output "/lib/girepository-1.0"))))))))))
(inputs (modify-inputs (package-inputs ibus-minimal) (inputs (modify-inputs (package-inputs ibus-minimal)
(prepend gtk pango-next))) (prepend gtk
pango-next
python
python-dbus
python-pygobject)))
(properties (alist-delete 'hidden? (package-properties ibus-minimal))))) (properties (alist-delete 'hidden? (package-properties ibus-minimal)))))
(define-public ibus-libpinyin (define-public ibus-libpinyin

7
gnu/packages/image.scm
View file

@ -1303,7 +1303,7 @@ language bindings to VIGRA.")
(define-public libwebp (define-public libwebp
(package (package
(name "libwebp") (name "libwebp")
(version "1.2.2") (version "1.2.4")
(source (source
(origin (origin
;; No tarballs are provided for >0.6.1. ;; No tarballs are provided for >0.6.1.
@ -1314,7 +1314,7 @@ language bindings to VIGRA.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1khqkm5j9aiii9jfsbxzzyz3x33sifzcx537cyjyb3a2g2rl969k")))) "1jndbc99dd19a6d7h4ds51xyak7gfddkbi41nxdm8n23w7ks35r8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
(list freeglut (list freeglut
@ -2214,7 +2214,8 @@ This package can be used to create @code{favicon.ico} files for web sites.")
(string-append #$gdk-pixbuf "/bin/gdk-pixbuf-thumbnailer"))))) (string-append #$gdk-pixbuf "/bin/gdk-pixbuf-thumbnailer")))))
(add-after 'install 'install-readme (add-after 'install 'install-readme
(lambda _ (lambda _
(let ((doc (string-append #$output "/share/doc/libavif-" #$version))) (let ((doc (string-append #$output "/share/doc/libavif-"
#$(package-version this-package))))
(install-file "../source/README.md" doc)))) (install-file "../source/README.md" doc))))
(add-after 'install 'split (add-after 'install 'split
(lambda _ (lambda _

70
gnu/packages/jami.scm
View file

@ -68,7 +68,7 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils)) #:use-module (guix utils))
(define %jami-version "20230206.0") (define %jami-version "20230323.0")
(define %jami-sources (define %jami-sources
;; Return an origin object of the tarball release sources archive of the ;; Return an origin object of the tarball release sources archive of the
@ -85,7 +85,7 @@
'(delete-file-recursively "daemon/contrib/tarballs")) '(delete-file-recursively "daemon/contrib/tarballs"))
(sha256 (sha256
(base32 (base32
"1fx7c6q8j0x3q8cgzzd4kpsw3npqggsi1n493cv1jg7v5d01d3jz")) "0vjsjr37cb87j9hqbmipyxn4877k1wn3l0vzca3l3ldgknglz7v2"))
(patches (search-patches "jami-disable-integration-tests.patch" (patches (search-patches "jami-disable-integration-tests.patch"
"jami-libjami-headers-search.patch")))) "jami-libjami-headers-search.patch"))))
@ -107,8 +107,8 @@
patches)))) patches))))
(define-public pjproject-jami (define-public pjproject-jami
(let ((commit "20e00fcdd16459444bae2bae9c0611b63cf87297") (let ((commit "e4b83585a0bdf1523e808a4fc1946ec82ac733d0")
(revision "2")) (revision "3"))
(package (package
(inherit pjproject) (inherit pjproject)
(name "pjproject-jami") (name "pjproject-jami")
@ -127,7 +127,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1g8nkb5ln5y208k2hhmlcddv2dzf6plfrsvi4x8sa7iwgb4prgb8")))) "0gky5idyyqxhqk959lzys5l7x1i925db773lfdpvxxmkmfizdq21"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments pjproject) (substitute-keyword-arguments (package-arguments pjproject)
((#:phases phases '%standard-phases) ((#:phases phases '%standard-phases)
@ -179,6 +179,7 @@
"--enable-muxer=h264" "--enable-muxer=h264"
"--enable-muxer=hevc" "--enable-muxer=hevc"
"--enable-muxer=matroska" "--enable-muxer=matroska"
"--enable-muxer=wav"
"--enable-muxer=webm" "--enable-muxer=webm"
"--enable-muxer=ogg" "--enable-muxer=ogg"
"--enable-muxer=pcm_s16be" "--enable-muxer=pcm_s16be"
@ -257,40 +258,30 @@
"--enable-encoder=libopus" "--enable-encoder=libopus"
"--enable-decoder=libopus" "--enable-decoder=libopus"
;; Decoders for ringtones and audio streaming. ;; Encoders/decoders for ringtones and audio streaming.
"--enable-decoder=flac" "--enable-decoder=flac"
"--enable-decoder=vorbis" "--enable-decoder=vorbis"
"--enable-decoder=aac" "--enable-decoder=aac"
"--enable-decoder=ac3" "--enable-decoder=ac3"
"--enable-decoder=eac3" "--enable-decoder=eac3"
"--enable-decoder=mp3" "--enable-decoder=mp3"
"--enable-decoder=pcm_u24be"
"--enable-decoder=pcm_u24le" "--enable-decoder=pcm_u24le"
"--enable-decoder=pcm_u32be"
"--enable-decoder=pcm_u32le" "--enable-decoder=pcm_u32le"
"--enable-decoder=pcm_u8" "--enable-decoder=pcm_u8"
"--enable-decoder=pcm_f16le" "--enable-decoder=pcm_f16le"
"--enable-decoder=pcm_f24le"
"--enable-decoder=pcm_f32be"
"--enable-decoder=pcm_f32le" "--enable-decoder=pcm_f32le"
"--enable-decoder=pcm_f64be"
"--enable-decoder=pcm_f64le" "--enable-decoder=pcm_f64le"
"--enable-decoder=pcm_s16be"
"--enable-decoder=pcm_s16be_planar"
"--enable-decoder=pcm_s16le" "--enable-decoder=pcm_s16le"
"--enable-decoder=pcm_s16le_planar"
"--enable-decoder=pcm_s24be"
"--enable-decoder=pcm_s24le" "--enable-decoder=pcm_s24le"
"--enable-decoder=pcm_s24le_planar"
"--enable-decoder=pcm_s32be"
"--enable-decoder=pcm_s32le" "--enable-decoder=pcm_s32le"
"--enable-decoder=pcm_s32le_planar"
"--enable-decoder=pcm_s64be"
"--enable-decoder=pcm_s64le" "--enable-decoder=pcm_s64le"
"--enable-decoder=pcm_s8"
"--enable-decoder=pcm_s8_planar"
"--enable-decoder=pcm_u16be"
"--enable-decoder=pcm_u16le" "--enable-decoder=pcm_u16le"
"--enable-encoder=pcm_u8"
"--enable-encoder=pcm_f32le"
"--enable-encoder=pcm_f64le"
"--enable-encoder=pcm_s16le"
"--enable-encoder=pcm_s32le"
"--enable-encoder=pcm_s64le"
;; Encoders/decoders for images. ;; Encoders/decoders for images.
"--enable-encoder=gif" "--enable-encoder=gif"
@ -349,21 +340,10 @@
(define-public ffmpeg-jami (define-public ffmpeg-jami
(package (package
(inherit ffmpeg-5) (inherit ffmpeg)
(name "ffmpeg-jami") (name "ffmpeg-jami")
;; XXX: Use a slightly older version, otherwise the
;; 'libopusdec-enable-FEC' patch doesn't apply.
(version "5.0.1")
(source (origin
(method url-fetch)
(uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
version ".tar.xz"))
(sha256
(base32
"0yq0jcdc4qm5znrzylj3dsicrkk2n3n8bv28vr0a506fb7iglbpg"))))
(outputs '("out" "debug"))
(arguments (arguments
(substitute-keyword-arguments (package-arguments ffmpeg-5) (substitute-keyword-arguments (package-arguments ffmpeg)
((#:configure-flags _ '()) ((#:configure-flags _ '())
#~(cons* "--disable-static" #~(cons* "--disable-static"
"--enable-shared" "--enable-shared"
@ -382,19 +362,7 @@
"rtp_ext_abs_send_time" "rtp_ext_abs_send_time"
"libopusdec-enable-FEC" "libopusdec-enable-FEC"
"libopusenc-reload-packet-loss-at-encode" "libopusenc-reload-packet-loss-at-encode"
"screen-sharing-x11-fix")))) "screen-sharing-x11-fix"))))))))))
(add-after 'apply-patches 'disable-problematic-tests
(lambda _
;; The "rtp_ext_abs_send_time" patch causes the 'lavf-mov_rtphint'
;; test to fail (see:
;; https://git.jami.net/savoirfairelinux/jami-daemon/-/issues/685).
(substitute* "tests/fate/lavf-container.mak"
(("mov mov_rtphint ismv")
"mov ismv")
(("fate-lavf-mov_rtphint:.*") ""))))))))
(inputs (modify-inputs (package-inputs ffmpeg-5)
(replace "libvpx" libvpx-next)
(replace "libx264" libx264-next)))))
(define-public libjami (define-public libjami
(package (package
@ -570,8 +538,8 @@ P2P-DHT.")
(define-public jami-docs (define-public jami-docs
;; There aren't any tags, so use the latest commit. ;; There aren't any tags, so use the latest commit.
(let ((revision "0") (let ((revision "1")
(commit "b00574bcc46538c4b405b5edb3b43bf5404ff511")) (commit "ff466ebadb9b99a1672a814126793de670c3099b"))
(package (package
(name "jami-docs") (name "jami-docs")
(version (git-version "0.0.0" revision commit)) (version (git-version "0.0.0" revision commit))
@ -583,7 +551,7 @@ P2P-DHT.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0iayi6yrb6djk0l2dwdxzlsga9c18ra8adplh8dad3zjdi75wnsq")))) "1n8a9dk8mi617rk3ycz5jrzbwv9ybfynlci5faz1klckx0aqdf6q"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
(list (list

14
gnu/packages/kde-frameworks.scm
View file

@ -97,7 +97,7 @@
(define-public extra-cmake-modules (define-public extra-cmake-modules
(package (package
(name "extra-cmake-modules") (name "extra-cmake-modules")
(version "5.98.0") (version "5.104.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -106,7 +106,7 @@
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0669m98vqy4hpacfjs7xpgjj1bns24kjybrjipxzp82092g8y69w")))) "1nc5ynfz903jc87xawnww3pf1y73x9jvmxnbrj24nqv6vcgv57p4"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
;; Add test dependency, except on armhf where building it is too ;; Add test dependency, except on armhf where building it is too
@ -523,7 +523,7 @@ and the older vCalendar.")
(define-public kcodecs (define-public kcodecs
(package (package
(name "kcodecs") (name "kcodecs")
(version "5.98.0") (version "5.104.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -532,12 +532,10 @@ and the older vCalendar.")
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0n10r7s9r25xp7vlym41qi421kld00niig73yark7yghj0r41jcz")))) "0swxj2kr37pnwdxsipfii8q02g58lvm9lsh4kflqgfjyhvv0kjby"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs (list extra-cmake-modules gperf qttools-5))
(list extra-cmake-modules gperf qttools-5)) (inputs (list qtbase-5))
(inputs
(list qtbase-5))
(home-page "https://community.kde.org/Frameworks") (home-page "https://community.kde.org/Frameworks")
(synopsis "String encoding and manipulating library") (synopsis "String encoding and manipulating library")
(description "KCodecs provide a collection of methods to manipulate (description "KCodecs provide a collection of methods to manipulate

5
gnu/packages/less.scm
View file

@ -4,6 +4,7 @@
;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2020, 2021, 2022 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020, 2021, 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2022 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2022 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2022 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -36,7 +37,7 @@
(define-public less (define-public less
(package (package
(name "less") (name "less")
(version "590") (version "608")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -46,7 +47,7 @@
version ".tar.gz"))) version ".tar.gz")))
(patches (search-patches "less-hurd-path-max.patch")) (patches (search-patches "less-hurd-path-max.patch"))
(sha256 (sha256
(base32 "044fl3izmsi8n1vqzsqdp65q0qyyn5kmsg4sk7id0mxzx15zbbba")))) (base32 "02f2d9d6hyf03va28ip620gjc6rf4aikmdyk47h7frqj18pbx6m6"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (list ncurses)) (inputs (list ncurses))
(home-page "https://www.gnu.org/software/less/") (home-page "https://www.gnu.org/software/less/")

6
gnu/packages/libcanberra.scm
View file

@ -104,12 +104,6 @@ GNOME. It comes with several backends (ALSA, PulseAudio, OSS, GStreamer,
null) and is designed to be portable.") null) and is designed to be portable.")
(license lgpl2.1+))) (license lgpl2.1+)))
(define-public libcanberra/gtk+-2
(package/inherit libcanberra
(name "libcanberra-gtk2")
(inputs `(,@(alist-delete "gtk+" (package-inputs libcanberra))
("gtk+" ,gtk+-2)))))
(define-public sound-theme-freedesktop (define-public sound-theme-freedesktop
(package (package
(name "sound-theme-freedesktop") (name "sound-theme-freedesktop")

8
gnu/packages/linux.scm
View file

@ -5727,7 +5727,7 @@ Bluetooth audio output devices like headphones or loudspeakers.")
(define-public bluez (define-public bluez
(package (package
(name "bluez") (name "bluez")
(version "5.64") (version "5.66")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -5735,7 +5735,7 @@ Bluetooth audio output devices like headphones or loudspeakers.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0d6yl7l5zrlx5w3y503k72m9xsydx6gi1c65icchq1xknrjpwhxf")))) "0x5mn9x6g626izxnw236933wvq83qagsh9qc9ac9550cb55sdzir"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list
@ -7146,7 +7146,7 @@ of flash storage.")
(define-public libseccomp (define-public libseccomp
(package (package
(name "libseccomp") (name "libseccomp")
(version "2.5.3") (version "2.5.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/seccomp/libseccomp/" (uri (string-append "https://github.com/seccomp/libseccomp/"
@ -7154,7 +7154,7 @@ of flash storage.")
"/libseccomp-" version ".tar.gz")) "/libseccomp-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0xhan73zn4p0n7s8vx6s47wjmidvk4x8r90vfbljairn6f3mq1jr")))) "1nyb3lspc5bsirpsx89vah3n54pmwlgxrwsfaxl01kq50i004afq"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '("--disable-static") '(#:configure-flags '("--disable-static")

7
gnu/packages/lisp.scm
View file

@ -481,13 +481,6 @@ an interpreter, a compiler, a debugger, and much more.")
(srfi srfi-1)) (srfi srfi-1))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
,@(if (target-arm32?)
;; TODO: Move to snippet in staging.
`((add-after 'unpack 'dont-force-armv5
(lambda _
(substitute* "src/runtime/Config.arm-linux"
(("-march=armv5") "")))))
'())
(delete 'configure) (delete 'configure)
(add-after 'unpack 'fix-build-id (add-after 'unpack 'fix-build-id
;; One of the build scripts makes a build id using the current date. ;; One of the build scripts makes a build id using the current date.

4
gnu/packages/man.scm
View file

@ -107,7 +107,7 @@ textfiles to roff for terminal display, and also to HTML for the web.")
(define-public libpipeline (define-public libpipeline
(package (package
(name "libpipeline") (name "libpipeline")
(version "1.5.3") (version "1.5.6")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -115,7 +115,7 @@ textfiles to roff for terminal display, and also to HTML for the web.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1c5dl017xil2ssb6a5vg927bnsbc9vymfgi9ahvqbb8gypx0igsx")))) "15xpx7kbzkn63ab8mkghv7jkzji8pdbsyxm7ygjji19rvkkvkyv0"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(home-page "https://libpipeline.nongnu.org/") (home-page "https://libpipeline.nongnu.org/")
(synopsis "C library for manipulating pipelines of subprocesses") (synopsis "C library for manipulating pipelines of subprocesses")

44
gnu/packages/maths.scm
View file

@ -1387,7 +1387,7 @@ incompatible with HDF5.")
(define-public hdf5-1.8 (define-public hdf5-1.8
(package (package
(name "hdf5") (name "hdf5")
(version "1.8.22") (version "1.8.23")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1402,7 +1402,7 @@ incompatible with HDF5.")
(string-append major minor))) (string-append major minor)))
"/src/hdf5-" version ".tar.bz2"))) "/src/hdf5-" version ".tar.bz2")))
(sha256 (sha256
(base32 "194ki2s5jrgl4czkvy5nc9nwjyapah0fj72l0gb0aysplp38i6v8")) (base32 "0km65mr6dgk4ia2dqr1b9dzw9qg15j5z35ymbys9cnny51z1zb39"))
(patches (search-patches "hdf5-config-date.patch")))) (patches (search-patches "hdf5-config-date.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
@ -1442,8 +1442,7 @@ incompatible with HDF5.")
(substitute* "hl/fortran/src/Makefile.in" (substitute* "hl/fortran/src/Makefile.in"
(("libhdf5hl_fortran_la_LDFLAGS =") (("libhdf5hl_fortran_la_LDFLAGS =")
(string-append "libhdf5hl_fortran_la_LDFLAGS = -Wl,-rpath=" (string-append "libhdf5hl_fortran_la_LDFLAGS = -Wl,-rpath="
(assoc-ref outputs "fortran") "/lib"))) (assoc-ref outputs "fortran") "/lib")))))
#t))
(add-after 'configure 'patch-settings (add-after 'configure 'patch-settings
(lambda _ (lambda _
;; libhdf5.settings contains the full path of the ;; libhdf5.settings contains the full path of the
@ -1456,16 +1455,14 @@ incompatible with HDF5.")
;; Don't record the build-time kernel version to make the ;; Don't record the build-time kernel version to make the
;; settings file reproducible. ;; settings file reproducible.
(("Uname information:.*") (("Uname information:.*")
"Uname information: Linux\n")) "Uname information: Linux\n"))))
#t))
(add-after 'install 'patch-references (add-after 'install 'patch-references
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((bin (string-append (assoc-ref outputs "out") "/bin")) (let ((bin (string-append (assoc-ref outputs "out") "/bin"))
(zlib (assoc-ref inputs "zlib"))) (zlib (assoc-ref inputs "zlib")))
(substitute* (find-files bin "h5p?cc") (substitute* (find-files bin "h5p?cc")
(("-lz" lib) (("-lz" lib)
(string-append "-L" zlib "/lib " lib))) (string-append "-L" zlib "/lib " lib))))))
#t)))
(add-after 'install 'split (add-after 'install 'split
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
;; Move all fortran-related files ;; Move all fortran-related files
@ -1500,8 +1497,7 @@ incompatible with HDF5.")
(rename-file file (rename-file file
(string-append fex "/" (basename file)))) (string-append fex "/" (basename file))))
(find-files ex ".*")) (find-files ex ".*"))
(delete-file-recursively ex)) (delete-file-recursively ex)))))))
#t)))))
(home-page "https://www.hdfgroup.org") (home-page "https://www.hdfgroup.org")
(synopsis "Management suite for extremely large and complex data") (synopsis "Management suite for extremely large and complex data")
(description "HDF5 is a suite that makes possible the management of (description "HDF5 is a suite that makes possible the management of
@ -1512,7 +1508,7 @@ extremely large and complex data collections.")
(define-public hdf5-1.10 (define-public hdf5-1.10
(package (package
(inherit hdf5-1.8) (inherit hdf5-1.8)
(version "1.10.7") (version "1.10.9")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1526,13 +1522,13 @@ extremely large and complex data collections.")
(take (string-split version #\.) 2)) (take (string-split version #\.) 2))
"/src/hdf5-" version ".tar.bz2"))) "/src/hdf5-" version ".tar.bz2")))
(sha256 (sha256
(base32 "0pm5xxry55i0h7wmvc7svzdaa90rnk7h78rrjmnlkz2ygsn8y082")) (base32 "14gih7kmjx4h3lc7pg4fwcl28hf1qqkf2x7rljpxqvzkjrqbxi00"))
(patches (search-patches "hdf5-config-date.patch")))))) (patches (search-patches "hdf5-config-date.patch"))))))
(define-public hdf5-1.12 (define-public hdf5-1.12
(package (package
(inherit hdf5-1.8) (inherit hdf5-1.8)
(version "1.12.1") (version "1.12.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1546,7 +1542,27 @@ extremely large and complex data collections.")
(take (string-split version #\.) 2)) (take (string-split version #\.) 2))
"/src/hdf5-" version ".tar.bz2"))) "/src/hdf5-" version ".tar.bz2")))
(sha256 (sha256
(base32 "074g3z504xf77ff38igs30i1aqxpm508p7yw78ykva7dncrgbyda")) (base32 "1zlawdzb0gsvcxif14fwr5ap2gk4b6j02wirr2hcx8hkcbivp20s"))
(patches (search-patches "hdf5-config-date.patch"))))))
(define-public hdf5-1.14
(package
(inherit hdf5-1.8)
(version "1.14.0")
(source
(origin
(method url-fetch)
(uri (list (string-append "https://support.hdfgroup.org/ftp/HDF5/releases/"
"hdf5-" (version-major+minor version)
"/hdf5-" version "/src/hdf5-"
version ".tar.bz2")
(string-append "https://support.hdfgroup.org/ftp/HDF5/"
"current"
(apply string-append
(take (string-split version #\.) 2))
"/src/hdf5-" version ".tar.bz2")))
(sha256
(base32 "181bdh8hp7v9xqwcby3lknr92lxlicc2hqscba3f5nhf8lrr9rz4"))
(patches (search-patches "hdf5-config-date.patch")))))) (patches (search-patches "hdf5-config-date.patch"))))))
(define-public hdf5 (define-public hdf5

10
gnu/packages/nss.scm
View file

@ -40,7 +40,7 @@
(define-public nspr (define-public nspr
(package (package
(name "nspr") (name "nspr")
(version "4.34") (version "4.35")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -48,7 +48,7 @@
version "/src/nspr-" version ".tar.gz")) version "/src/nspr-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"177rxcf3lglabs7sgwcvf72ww4v56qa71lc495wl13sxs4f03vxy")))) "13xwda56yhp1w7v02qvlxvlqiniw8kr4g3fxlljmv6wnlmz2k8vy"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
(list perl ;for 'compile-et.pl' (list perl ;for 'compile-et.pl'
@ -126,7 +126,7 @@ in the Mozilla clients.")
(replacement nss/fixed) (replacement nss/fixed)
;; Also update and test the nss-certs package, which duplicates version and ;; Also update and test the nss-certs package, which duplicates version and
;; source to avoid a top-level variable reference & module cycle. ;; source to avoid a top-level variable reference & module cycle.
(version "3.81") (version "3.85")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (let ((version-with-underscores (uri (let ((version-with-underscores
@ -137,7 +137,7 @@ in the Mozilla clients.")
"nss-" version ".tar.gz"))) "nss-" version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"19ncvhz45dhr0nmymwkxspq9l44gaafkspxiwxbqs1hpnqxmzgx8")) "15yj2gddlp68wj1k9q4q70vs6r7zx5qkbavcppmls5di212xdndg"))
;; Create nss.pc and nss-config. ;; Create nss.pc and nss-config.
(patches (search-patches "nss-3.56-pkgconfig.patch" (patches (search-patches "nss-3.56-pkgconfig.patch"
"nss-getcwd-nonnull.patch" "nss-getcwd-nonnull.patch"
@ -200,7 +200,7 @@ in the Mozilla clients.")
;; leading to test failures: ;; leading to test failures:
;; <https://bugzilla.mozilla.org/show_bug.cgi?id=609734>. To ;; <https://bugzilla.mozilla.org/show_bug.cgi?id=609734>. To
;; work around that, set the time to roughly the release date. ;; work around that, set the time to roughly the release date.
(invoke "faketime" "2022-06-01" "./nss/tests/all.sh")) (invoke "faketime" "2022-11-01" "./nss/tests/all.sh"))
(format #t "test suite not run~%")))) (format #t "test suite not run~%"))))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)

61
gnu/packages/patches/glslang-install-static-libs.patch Normal file
View file

@ -0,0 +1,61 @@
Install OGLCompiler et.al. even when building shared libraries. Also fix
CMake file locations.
Patch taken from Gentoo:
https://gitweb.gentoo.org/repo/gentoo.git/tree/dev-util/glslang/files/glslang-1.3.231-Install-static-libs.patch
diff --git a/OGLCompilersDLL/CMakeLists.txt b/OGLCompilersDLL/CMakeLists.txt
--- a/OGLCompilersDLL/CMakeLists.txt
+++ b/OGLCompilersDLL/CMakeLists.txt
@@ -41,7 +41,7 @@ if(WIN32)
source_group("Source" FILES ${SOURCES})
endif(WIN32)
-if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS)
+if(ENABLE_GLSLANG_INSTALL)
install(TARGETS OGLCompiler EXPORT glslang-targets)
# Backward compatibility
@@ -49,7 +49,7 @@ if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS)
message(WARNING \"Using `OGLCompilerTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
if (NOT TARGET glslang::OGLCompiler)
- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\")
+ include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\")
endif()
add_library(OGLCompiler ALIAS glslang::OGLCompiler)
diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
--- a/glslang/CMakeLists.txt
+++ b/glslang/CMakeLists.txt
@@ -203,7 +203,7 @@ endif()
################################################################################
if(ENABLE_GLSLANG_INSTALL)
install(TARGETS glslang EXPORT glslang-targets)
- if(NOT BUILD_SHARED_LIBS)
+ if(BUILD_SHARED_LIBS)
install(TARGETS MachineIndependent EXPORT glslang-targets)
install(TARGETS GenericCodeGen EXPORT glslang-targets)
diff --git a/glslang/OSDependent/Unix/CMakeLists.txt b/glslang/OSDependent/Unix/CMakeLists.txt
--- a/glslang/OSDependent/Unix/CMakeLists.txt
+++ b/glslang/OSDependent/Unix/CMakeLists.txt
@@ -52,7 +52,7 @@ else()
target_link_libraries(OSDependent Threads::Threads)
endif()
-if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS)
+if(ENABLE_GLSLANG_INSTALL)
install(TARGETS OSDependent EXPORT glslang-targets)
# Backward compatibility
@@ -60,7 +60,7 @@ if(ENABLE_GLSLANG_INSTALL AND NOT BUILD_SHARED_LIBS)
message(WARNING \"Using `OSDependentTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
if (NOT TARGET glslang::OSDependent)
- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\")
+ include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\")
endif()
add_library(OSDependent ALIAS glslang::OSDependent)

45
gnu/packages/patches/jami-libjami-headers-search.patch
View file

@ -1,30 +1,10 @@
From 1168aba6181e30ee4c322e5f437bde22bece5698 Mon Sep 17 00:00:00 2001 Upstream status: https://review.jami.net/c/jami-client-qt/+/24273.
From: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
Date: Sat, 5 Nov 2022 23:18:13 -0400
Subject: [PATCH 1/3] cmake: Simplify lookup logic for libjami headers.
* extras/build/cmake/modules/FindLibJami.cmake: Rename
LIBJAMI_INCLUDE_DIRS to LIBJAMI_INCLUDE_DIR. Use find_path to search
for jami.h directory.
* CMakeLists.txt: Adjust accordingly.
* src/libclient/CMakeLists.txt: Likewise.
* src/libclient/qtwrapper/CMakeLists.txt: Likewise.
Change-Id: I494358f9bfafb41f000daeec4196747b2c184401
---
Upstream status: https://review.jami.net/c/jami-client-qt/+/22973
CMakeLists.txt | 2 +-
extras/build/cmake/modules/FindLibJami.cmake | 21 ++++++--------------
src/libclient/CMakeLists.txt | 2 +-
src/libclient/qtwrapper/CMakeLists.txt | 2 +-
4 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0a8fd70..94ac6074 100644 index 8d71b84b..36729698 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -118,7 +118,7 @@ set(CMAKE_MODULE_PATH @@ -136,7 +136,7 @@ set(CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH} "${EXTRAS_DIR}/build/cmake/modules") ${CMAKE_MODULE_PATH} "${EXTRAS_DIR}/build/cmake/modules")
find_package(LibJami REQUIRED) find_package(LibJami REQUIRED)
if(LIBJAMI_FOUND) if(LIBJAMI_FOUND)
@ -34,15 +14,15 @@ index d0a8fd70..94ac6074 100644
include(FindPython3) include(FindPython3)
diff --git a/extras/build/cmake/modules/FindLibJami.cmake b/extras/build/cmake/modules/FindLibJami.cmake diff --git a/extras/build/cmake/modules/FindLibJami.cmake b/extras/build/cmake/modules/FindLibJami.cmake
index ddb05319..9ad20d2b 100644 index 5cce45fc..11746cd8 100644
--- a/extras/build/cmake/modules/FindLibJami.cmake --- a/extras/build/cmake/modules/FindLibJami.cmake
+++ b/extras/build/cmake/modules/FindLibJami.cmake +++ b/extras/build/cmake/modules/FindLibJami.cmake
@@ -20,28 +20,19 @@ @@ -20,30 +20,19 @@
# Once done, this find module will set: # Once done, this find module will set:
# #
-# LIBJAMI_INCLUDE_DIRS - libjami include directories -# LIBJAMI_INCLUDE_DIRS - libjami include directories
+# LIBJAMI_INCLUDE_DIR - libjami include directories +# LIBJAMI_INCLUDE_DIR - libjami include directory
# LIBJAMI_FOUND - whether it was able to find the include directories # LIBJAMI_FOUND - whether it was able to find the include directories
# LIBJAMI_LIB - path to libjami or libring library # LIBJAMI_LIB - path to libjami or libring library
@ -62,16 +42,18 @@ index ddb05319..9ad20d2b 100644
- set(LIBJAMI_INCLUDE_DIRS ${RING_BUILD_DIR}/jami) - set(LIBJAMI_INCLUDE_DIRS ${RING_BUILD_DIR}/jami)
- elseif(EXISTS ${CMAKE_INSTALL_PREFIX}/include/jami/jami.h) - elseif(EXISTS ${CMAKE_INSTALL_PREFIX}/include/jami/jami.h)
- set(LIBJAMI_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include/jami) - set(LIBJAMI_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include/jami)
- elseif(EXISTS ${CMAKE_INSTALL_PREFIX}/daemon/include/jami/jami.h)
- set(LIBJAMI_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/daemon/include/jami)
- else() - else()
+ find_path(LIBJAMI_INCLUDE_DIR jami.h PATH_SUFFIXES jami) + find_path(LIBJAMI_INCLUDE_DIR jami.h PATH_SUFFIXES jami)
+ if(NOT LIBJAMI_INCLUDE_DIR) + if(NOT LIBJAMI_INCLUDE_DIR)
message(STATUS "Jami daemon headers not found! message(STATUS "Jami daemon headers not found!
-Set -DLIBJAMI_BUILD_DIR or -DCMAKE_INSTALL_PREFIX") -Set -DLIBJAMI_BUILD_DIR or -DCMAKE_INSTALL_PREFIX")
+Set -DCMAKE_INSTALL_PREFIX or use -DWITH_DAEMON_SUBMODULE") +To build using the daemon git submodule, set -DWITH_DAEMON_SUBMODULE")
set(LIBJAMI_FOUND false) set(LIBJAMI_FOUND false)
endif() endif()
endif() endif()
@@ -102,5 +93,5 @@ endif() @@ -115,5 +104,5 @@ endif()
# Restore the original value of CMAKE_FIND_LIBRARY_SUFFIXES. # Restore the original value of CMAKE_FIND_LIBRARY_SUFFIXES.
set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_orig}) set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_orig})
@ -79,7 +61,7 @@ index ddb05319..9ad20d2b 100644
+message(STATUS "Jami daemon headers are in " ${LIBJAMI_INCLUDE_DIR}) +message(STATUS "Jami daemon headers are in " ${LIBJAMI_INCLUDE_DIR})
message(STATUS "Jami daemon library is at " ${LIBJAMI_LIB}) message(STATUS "Jami daemon library is at " ${LIBJAMI_LIB})
diff --git a/src/libclient/CMakeLists.txt b/src/libclient/CMakeLists.txt diff --git a/src/libclient/CMakeLists.txt b/src/libclient/CMakeLists.txt
index 2676c9c4..ac58ea2b 100644 index 144efaf5..cb87fc2a 100644
--- a/src/libclient/CMakeLists.txt --- a/src/libclient/CMakeLists.txt
+++ b/src/libclient/CMakeLists.txt +++ b/src/libclient/CMakeLists.txt
@@ -62,7 +62,7 @@ set(CMAKE_MODULE_PATH @@ -62,7 +62,7 @@ set(CMAKE_MODULE_PATH
@ -92,7 +74,7 @@ index 2676c9c4..ac58ea2b 100644
string(SUBSTRING ${CMAKE_GENERATOR} 0 14 CMAKE_GENERATOR_SHORT) string(SUBSTRING ${CMAKE_GENERATOR} 0 14 CMAKE_GENERATOR_SHORT)
diff --git a/src/libclient/qtwrapper/CMakeLists.txt b/src/libclient/qtwrapper/CMakeLists.txt diff --git a/src/libclient/qtwrapper/CMakeLists.txt b/src/libclient/qtwrapper/CMakeLists.txt
index acee0d0c..ba68aac4 100644 index 46887051..a20658ad 100644
--- a/src/libclient/qtwrapper/CMakeLists.txt --- a/src/libclient/qtwrapper/CMakeLists.txt
+++ b/src/libclient/qtwrapper/CMakeLists.txt +++ b/src/libclient/qtwrapper/CMakeLists.txt
@@ -46,7 +46,7 @@ else() @@ -46,7 +46,7 @@ else()
@ -104,6 +86,3 @@ index acee0d0c..ba68aac4 100644
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../dbus) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../dbus)
--
2.37.3

43
gnu/packages/patches/libcdio-glibc-compat.patch Normal file
View file

@ -0,0 +1,43 @@
Fix test failure with glibc 2.36:
https://savannah.gnu.org/bugs/?62948
Patch taken from upstream:
https://git.savannah.gnu.org/cgit/libcdio.git/commit/?id=56335fff0f21d294cd0e478d49542a43e9495ed0
diff --git a/test/driver/realpath.c b/test/driver/realpath.c
index 289253e..cd46d62 100644
--- a/test/driver/realpath.c
+++ b/test/driver/realpath.c
@@ -1,5 +1,7 @@
/* -*- C -*-
- Copyright (C) 2010-2012, 2015, 2017 Rocky Bernstein <rocky@gnu.org>
+
+ Copyright (C) 2010-2012, 2015, 2017, 2022 Rocky Bernstein
+ <rocky@gnu.org>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -175,16 +177,17 @@ main(int argc, const char *argv[])
rc = check_rc(symlink(psz_symlink_file, psz_symlink_file),
"symlink", psz_symlink_file);
if (0 == rc) {
- cdio_realpath(psz_symlink_file, psz_file_check);
- if (0 != strncmp(psz_file_check, symlink_file, PATH_MAX)) {
+ char *retvalue = cdio_realpath(psz_symlink_file, psz_file_check);
+ if (0 != retvalue) {
+ if (0 != strncmp(psz_file_check, symlink_file, PATH_MAX)) {
fprintf(stderr, "direct cdio_realpath cycle test failed. %s vs %s\n",
psz_file_check, symlink_file);
rc = 5;
goto err_exit;
+ }
+ check_rc(unlink(psz_symlink_file), "unlink", psz_symlink_file);
}
- check_rc(unlink(psz_symlink_file), "unlink", psz_symlink_file);
}
-
}
check_rc(unlink(psz_orig_file), "unlink", psz_orig_file);

83
gnu/packages/patches/mariadb-link-libatomic.patch
View file

@ -1,83 +0,0 @@
https://github.com/MariaDB/server/commit/f502ccbcb5dfce29067434885a23db8d1bd5f134.patch
This was apparently merged in 10.8.2.
From f502ccbcb5dfce29067434885a23db8d1bd5f134 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= <cvicentiu@gmail.com>
Date: Fri, 15 Oct 2021 16:51:05 +0300
Subject: [PATCH] Link with libatomic to enable C11 atomics support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Some architectures (mips) require libatomic to support proper
atomic operations. Check first if support is available without
linking, otherwise use the library.
Contributors:
James Cowgill <jcowgill@debian.org>
Jessica Clarke <jrtc27@debian.org>
Vicențiu Ciorbaru <vicentiu@mariadb.org>
---
configure.cmake | 20 +++++++++++++++++++-
mysys/CMakeLists.txt | 4 ++++
sql/CMakeLists.txt | 1 -
3 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/configure.cmake b/configure.cmake
index 7a1369d77703f..db8742bb93b5a 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -895,7 +895,25 @@ int main()
long long int *ptr= &var;
return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
}"
-HAVE_GCC_C11_ATOMICS)
+HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
+IF (HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC)
+ SET(HAVE_GCC_C11_ATOMICS True)
+ELSE()
+ SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
+ LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic")
+ CHECK_CXX_SOURCE_COMPILES("
+ int main()
+ {
+ long long int var= 1;
+ long long int *ptr= &var;
+ return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
+ }"
+ HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
+ IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
+ SET(HAVE_GCC_C11_ATOMICS True)
+ ENDIF()
+ SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES})
+ENDIF()
IF(WITH_VALGRIND)
SET(HAVE_valgrind 1)
diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt
index f97e3b4d3904c..09d3f726ffc74 100644
--- a/mysys/CMakeLists.txt
+++ b/mysys/CMakeLists.txt
@@ -78,6 +78,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY}
${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO} ${CRC32_LIBRARY})
DTRACE_INSTRUMENT(mysys)
+IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC)
+ TARGET_LINK_LIBRARIES(mysys atomic)
+ENDIF()
+
IF(HAVE_BFD_H)
TARGET_LINK_LIBRARIES(mysys bfd)
ENDIF(HAVE_BFD_H)
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index 5f5d7daf1a5bc..f574f1f20295d 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -307,7 +307,6 @@ IF(WITH_MYSQLD_LDFLAGS)
"${MYSQLD_LINK_FLAGS} ${WITH_MYSQLD_LDFLAGS}")
ENDIF()
-
FIND_PACKAGE(BISON 2.0)

42
gnu/packages/patches/openboardview-use-system-mpc.patch Normal file
View file

@ -0,0 +1,42 @@
Upstream status: https://github.com/OpenBoardView/OpenBoardView/pull/281
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 452dfa9..e30c3cf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -206,13 +206,15 @@ endif()
add_definitions(-DSTBI_FAILURE_USERMSG)
## mpc - Micro Parser Combinators ##
-execute_process(
- COMMAND git submodule update --init src/mpc
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-)
-
-add_library(mpc STATIC "mpc/mpc.c")
-
+pkg_check_modules(MPC QUIET mpc)
+if(NOT MPC_FOUND)
+ execute_process(
+ COMMAND git submodule update --init src/mpc
+ WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+ )
+ add_library(mpc STATIC "mpc/mpc.c")
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/mpc)
+endif()
## OpenBoardView ##
add_subdirectory(openboardview)
diff --git a/src/openboardview/FileFormats/GenCADFile.h b/src/openboardview/FileFormats/GenCADFile.h
index 1ccf8df..c57f7ff 100644
--- a/src/openboardview/FileFormats/GenCADFile.h
+++ b/src/openboardview/FileFormats/GenCADFile.h
@@ -5,7 +5,7 @@
#include "build-generated/GenCADFileGrammar.h"
-#include "mpc/mpc.h"
+#include "mpc.h"
#include <map>
#include <string>

48
gnu/packages/patches/openboardview-use-system-utf8.patch
View file

@ -1,48 +0,0 @@
From 251e23422f37c93a3f460fb660c5e5bfa8200d91 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Sun, 2 Dec 2018 16:40:39 -0500
Subject: [PATCH] build system: Allow using utf8.h from the system.
---
src/CMakeLists.txt | 12 ++++++++----
src/openboardview/CMakeLists.txt | 1 +
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 90442ed..26d4a69 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,10 +8,14 @@ if(NOT WIN32 OR MINGW)
endif()
## utf8.h ##
-execute_process(
- COMMAND git submodule update --init src/utf8
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-)
+FIND_PATH(UTF8_INCLUDE_DIR utf8.h)
+if(NOT UTF8_INCLUDE_DIR)
+ execute_process(
+ COMMAND git submodule update --init src/utf8
+ WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+ )
+ set(UTF8_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/utf8)
+endif()
## zlib ##
find_package(ZLIB)
diff --git a/src/openboardview/CMakeLists.txt b/src/openboardview/CMakeLists.txt
index b0bdbe3..6c4564c 100644
--- a/src/openboardview/CMakeLists.txt
+++ b/src/openboardview/CMakeLists.txt
@@ -44,6 +44,7 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/..
${IMGUI_INCLUDE_DIRS}
+ ${UTF8_INCLUDE_DIR}
${GLAD_INCLUDE_DIRS}
${GTK_INCLUDE_DIRS}
${OPENGL_INCLUDE_DIR}
--
2.34.0

25
gnu/packages/patches/orangeduck-mpc-fix-pkg-config.patch Normal file
View file

@ -0,0 +1,25 @@
Upstream status: https://github.com/orangeduck/mpc/pull/160
diff --git a/Makefile b/Makefile
index 7719acc..fe798c5 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ EXAMPLESEXE = $(EXAMPLES:.c=)
.PHONY: all check clean libs $(DIST)/$(PROJ).pc
-all: $(EXAMPLESEXE) check
+all: $(EXAMPLESEXE) check libs $(DIST)/$(PROJ).pc
$(DIST):
$(MKDIR) $(DIST)
@@ -65,7 +65,8 @@ install: all
install -m755 -t $(DESTDIR)$(PREFIX)/lib $(DIST)/lib*
install -m644 -t $(DESTDIR)$(PREFIX)/share/$(PROJ) $(PROJ).c $(PROJ).h
install -m644 $(PROJ).h $(DESTDIR)$(PREFIX)/include/$(PROJ).h
- install -m644 $(PROJ).pc $(DESTDIR)$(PREFIX)/lib/pkgconfig/$(PROJ).pc
+ install -m644 $(DIST)/$(PROJ).pc \
+ $(DESTDIR)$(PREFIX)/lib/pkgconfig/$(PROJ).pc
uninstall:
rm -rf -- \

20
gnu/packages/patches/python-afdko-suppress-copyright-test.patch
View file

@ -1,20 +0,0 @@
Supress copyright check in tests which can differ based on current year.
https://github.com/adobe-type-tools/afdko/issues/1589
Adapted from upstream:
https://github.com/adobe-type-tools/afdko/commit/feebd77d9b6507a0b32f837535511be3c94d9c6f
diff --git a/tests/tx_test.py b/tests/tx_test.py
--- a/tests/tx_test.py
+++ b/tests/tx_test.py
@@ -1246,7 +1246,7 @@ def test_ufo_fontinfo_parsing(file, msg, ret_code):
if (ret_code == 0):
expected_path = generate_ps_dump(expected_path)
output_path = generate_ps_dump(output_path)
- assert differ([expected_path, output_path])
+ assert differ([expected_path, output_path, '-s'] + PFA_SKIP)
else:
arg = [TOOL, '-t1', '-f', ufo_input_path]
assert subprocess.call(arg) == 6

51
gnu/packages/patches/python2-pyopenssl-openssl-compat.patch
View file

@ -1,51 +0,0 @@
Adjust for OpenSSL 1.1.1:
https://github.com/pyca/pyopenssl/issues/1043
Taken from upstream:
https://github.com/pyca/pyopenssl/commit/cc5c00ae5fd3c19d07fff79b5c4a08f5e58697ad
diff --git a/src/OpenSSL/SSL.py b/src/OpenSSL/SSL.py
index 59f21cec..fcdee047 100644
--- a/src/OpenSSL/SSL.py
+++ b/src/OpenSSL/SSL.py
@@ -1421,6 +1421,12 @@ def set_alpn_protos(self, protos):
This list should be a Python list of bytestrings representing the
protocols to offer, e.g. ``[b'http/1.1', b'spdy/2']``.
"""
+ # Different versions of OpenSSL are inconsistent about how they handle empty
+ # proto lists (see #1043), so we avoid the problem entirely by rejecting them
+ # ourselves.
+ if not protos:
+ raise ValueError("at least one protocol must be specified")
+
# Take the list of protocols and join them together, prefixing them
# with their lengths.
protostr = b"".join(
@@ -2449,6 +2455,12 @@ def set_alpn_protos(self, protos):
This list should be a Python list of bytestrings representing the
protocols to offer, e.g. ``[b'http/1.1', b'spdy/2']``.
"""
+ # Different versions of OpenSSL are inconsistent about how they handle empty
+ # proto lists (see #1043), so we avoid the problem entirely by rejecting them
+ # ourselves.
+ if not protos:
+ raise ValueError("at least one protocol must be specified")
+
# Take the list of protocols and join them together, prefixing them
# with their lengths.
protostr = b"".join(
diff --git a/tests/test_ssl.py b/tests/test_ssl.py
index ffc505d8..ca363b45 100644
--- a/tests/test_ssl.py
+++ b/tests/test_ssl.py
@@ -1928,7 +1928,7 @@ def test_alpn_call_failure(self):
protocols list. Ensure that we produce a user-visible error.
"""
context = Context(SSLv23_METHOD)
- with pytest.raises(Error):
+ with pytest.raises(ValueError):
context.set_alpn_protos([])
def test_alpn_set_on_connection(self):

26
gnu/packages/patches/rust-openssl-sys-no-vendor.patch
View file

@ -1,12 +1,17 @@
https://sources.debian.org/data/main/r/rust-openssl-sys/0.9.53-1/debian/patches/disable-vendor.patch --- openssl-sys-0.9.84/Cargo.toml.orig 2023-04-03 09:10:11.979197979 -0400
"MIT" licensed according to debian/copyright file +++ openssl-sys-0.9.84/Cargo.toml 2023-04-03 12:07:30.285315609 -0400
slightly modified to only change the vendored openssl-src dependency @@ -31,10 +31,6 @@
[package.metadata.pkg-config]
openssl = "1.0.1"
Starting from rust-openssl-sys@0.9.69 Cargo.toml starts searching for openssl-3.0. -[dependencies.bssl-sys]
-version = "0.1.0"
-optional = true
-
[dependencies.libc]
version = "0.2"
--- a/Cargo.toml @@ -46,16 +42,12 @@
+++ b/Cargo.toml
@@ -31,15 +31,12 @@
[build-dependencies.cc] [build-dependencies.cc]
version = "1.0" version = "1.0"
@ -18,9 +23,10 @@ Starting from rust-openssl-sys@0.9.69 Cargo.toml starts searching for openssl-3.
version = "0.3.9" version = "0.3.9"
[features] [features]
vendored = ["openssl-src"] -unstable_boringssl = ["bssl-sys"]
+openssl-src = [] -vendored = ["openssl-src"]
+unstable_boringssl = []
+vendored = []
[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] [target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg]
version = "0.2.8" version = "0.2.8"

38
gnu/packages/patches/webkitgtk-libelogind.patch Normal file
View file

@ -0,0 +1,38 @@
From 8d46803c09edc2b6d4e35c778a3d2f90e5baad0b Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Sat, 25 Mar 2023 22:55:16 -0400
Subject: [PATCH] Fallback to elogind when systemd is unavailable at build time
https://bugs.webkit.org/show_bug.cgi?id=254475
Reviewed by NOBODY (OOPS!).
The build system supports elogind, but it only considers the
'libsystemd' library name for the pkg-config lookup and not
'libelogind'. This change makes the build system fallback to search
for libelogind when libsystemd was not found.
* Source/cmake/FindJournald.cmake [!PC_SYSTEMD_FOUND]: Search for libelogind.
---
Source/cmake/FindJournald.cmake | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Source/cmake/FindJournald.cmake b/Source/cmake/FindJournald.cmake
index 18dd6b50908c..e0dc9ce1d397 100644
--- a/Source/cmake/FindJournald.cmake
+++ b/Source/cmake/FindJournald.cmake
@@ -55,6 +55,10 @@ find_package(PkgConfig QUIET)
# libelogind provides compatible pc and header files
pkg_check_modules(PC_SYSTEMD QUIET libsystemd)
+if (NOT PC_SYSTEMD_FOUND)
+ pkg_check_modules(PC_SYSTEMD QUIET libelogind)
+endif ()
+
set(Journald_COMPILE_OPTIONS ${PC_SYSTEMD_CFLAGS_OTHER})
set(Journald_VERSION ${PC_SYSTEMD_VERSION})
base-commit: 43ea8744bc6065aad7ae5988e32d31d253905e5f
--
2.39.2

4
gnu/packages/perl-check.scm
View file

@ -546,7 +546,7 @@ Test::More and friends.")
(define-public perl-test-fatal (define-public perl-test-fatal
(package (package
(name "perl-test-fatal") (name "perl-test-fatal")
(version "0.014") (version "0.016")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -554,7 +554,7 @@ Test::More and friends.")
"Test-Fatal-" version ".tar.gz")) "Test-Fatal-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1c6bs68mss4q7cyapkv2c0jn66i21050p0faxf3s3417gdffzp5w")))) "13vqdyk95y89msk1r8g1vp1jw6rzkl1y76lprnw3085sy8qd90vj"))))
(build-system perl-build-system) (build-system perl-build-system)
(propagated-inputs (list perl-try-tiny)) (propagated-inputs (list perl-try-tiny))
(home-page "https://metacpan.org/release/Test-Fatal") (home-page "https://metacpan.org/release/Test-Fatal")

4
gnu/packages/perl.scm
View file

@ -11318,7 +11318,7 @@ Tree::Simple::Visitor::* objects.")
(define-public perl-try-tiny (define-public perl-try-tiny
(package (package
(name "perl-try-tiny") (name "perl-try-tiny")
(version "0.30") (version "0.31")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -11326,7 +11326,7 @@ Tree::Simple::Visitor::* objects.")
"Try-Tiny-" version ".tar.gz")) "Try-Tiny-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0szgvlz19yz3mq1lbzmwh8w5dh6agg5s16xv22zrnl83r7ax0nys")))) "1ghidhh2wasxbmjsdsyfcy20wgli3m58dkj6ixnv4xa0i8fx601k"))))
(build-system perl-build-system) (build-system perl-build-system)
(home-page "https://metacpan.org/release/Try-Tiny") (home-page "https://metacpan.org/release/Try-Tiny")
(synopsis "Minimal try/catch with proper preservation of $@@") (synopsis "Minimal try/catch with proper preservation of $@@")

6
gnu/packages/photo.scm
View file

@ -207,7 +207,6 @@ cameras (CRW/CR2, NEF, RAF, DNG, and others).")
;; both two licensing modes for your changes/additions." ;; both two licensing modes for your changes/additions."
(license (list license:lgpl2.1 license:cddl1.0)))) (license (list license:lgpl2.1 license:cddl1.0))))
(define-public libexif (define-public libexif
(package (package
(name "libexif") (name "libexif")
@ -222,9 +221,8 @@ cameras (CRW/CR2, NEF, RAF, DNG, and others).")
(base32 (base32
"0zi5vvb0khlzc6xyfayk6mjx5lgkrj8r7s8lfv4j7wkcgndjga0j")))) "0zi5vvb0khlzc6xyfayk6mjx5lgkrj8r7s8lfv4j7wkcgndjga0j"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs (list autoconf automake gettext-minimal libtool))
(list autoconf automake gettext-minimal libtool)) (home-page "https://github.com/libexif/libexif")
(home-page "https://libexif.github.io/")
(synopsis "Read and manipulate EXIF data in digital photographs") (synopsis "Read and manipulate EXIF data in digital photographs")
(description (description
"The libexif C library allows applications to read, edit, and save EXIF "The libexif C library allows applications to read, edit, and save EXIF

9
gnu/packages/python-check.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2019, 2021, 2022 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019, 2021, 2022 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2019, 2020, 2021 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019, 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2019, 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019, 2021 Hartmut Goebel <h.goebel@crazy-compilers.com> ;;; Copyright © 2019, 2021 Hartmut Goebel <h.goebel@crazy-compilers.com>
;;; Copyright © 2020, 2022 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2020, 2022 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org> ;;; Copyright © 2020, 2022 Marius Bakke <marius@gnu.org>
@ -941,13 +941,13 @@ in Pytest.")
(define-public python-pytest-subtests (define-public python-pytest-subtests
(package (package
(name "python-pytest-subtests") (name "python-pytest-subtests")
(version "0.5.0") (version "0.10.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "pytest-subtests" version)) (uri (pypi-uri "pytest-subtests" version))
(sha256 (sha256
(base32 "087i03nmkmfnrpc7mmizvr40ijnjw4lfxc22rnk8jk6s1szy9lav")))) (base32 "05zvnxx0hdrd9w4z51qhchg3nkz5s47agryw68g8q7krq5kim5nr"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -957,8 +957,7 @@ in Pytest.")
(when tests? (when tests?
(add-installed-pythonpath inputs outputs) (add-installed-pythonpath inputs outputs)
(invoke "python" "-m" "pytest"))))))) (invoke "python" "-m" "pytest")))))))
(native-inputs (native-inputs (list python-pytest-7.1 python-setuptools-scm))
(list python-pytest python-setuptools-scm))
(home-page "https://github.com/pytest-dev/pytest-subtests") (home-page "https://github.com/pytest-dev/pytest-subtests")
(synopsis "Unittest subTest() support and subtests fixture") (synopsis "Unittest subTest() support and subtests fixture")
(description "This Pytest plugin provides unittest @code{subTest()} (description "This Pytest plugin provides unittest @code{subTest()}

14
gnu/packages/python-compression.scm
View file

@ -342,20 +342,18 @@ Python strings.")
(define-public python-lz4 (define-public python-lz4
(package (package
(name "python-lz4") (name "python-lz4")
(version "4.0.2") (version "4.3.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "lz4" version)) (uri (pypi-uri "lz4" version))
(sha256 (sha256
(base32 (base32
"16vj2bnhhdkcz2a2ai2mx2kf9ngx1cjr18636yp1514kq9r72fq8")) "1nmc36j5xnk7mvwwpm0nb1sddjk5iv77h877fdkkxcngm621shz1"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet '(begin
'(begin
;; Remove bundled copy of lz4. ;; Remove bundled copy of lz4.
(delete-file-recursively "lz4libs") (delete-file-recursively "lz4libs")))))
#t))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
(list #:phases (list #:phases
@ -510,13 +508,13 @@ wrapper. It provides a backport of the @code{Path} object.")
(define-public python-zopfli (define-public python-zopfli
(package (package
(name "python-zopfli") (name "python-zopfli")
(version "0.2.1") (version "0.2.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "zopfli" version ".zip")) (uri (pypi-uri "zopfli" version ".zip"))
(sha256 (sha256
(base32 "1ipjkcgdbplsrhr31ypk48px8cax4cm9gcjj7yrcrhg20ql3s9p5")))) (base32 "1z1akqx3fjnwa75insch9p08hafikqdvqkj6mxv1k6fr81sxnj9d"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
(list (list

284
gnu/packages/python-crypto.scm
View file

@ -24,7 +24,7 @@
;;; Copyright © 2020 Alexandros Theodotou <alex@zrythm.org> ;;; Copyright © 2020 Alexandros Theodotou <alex@zrythm.org>
;;; Copyright © 2020 Justus Winter <justus@sequoia-pgp.org> ;;; Copyright © 2020 Justus Winter <justus@sequoia-pgp.org>
;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
;;; Copyright © 2022 Antero Mejr <antero@mailbox.org> ;;; Copyright © 2022 Antero Mejr <antero@mailbox.org>
;;; ;;;
@ -60,6 +60,7 @@
#:use-module (gnu packages libffi) #:use-module (gnu packages libffi)
#:use-module (gnu packages multiprecision) #:use-module (gnu packages multiprecision)
#:use-module (gnu packages password-utils) #:use-module (gnu packages password-utils)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages protobuf) #:use-module (gnu packages protobuf)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-build) #:use-module (gnu packages python-build)
@ -524,17 +525,17 @@ for example, for recording or replaying web content.")
is used by the Requests library to verify HTTPS requests.") is used by the Requests library to verify HTTPS requests.")
(license license:asl2.0))) (license license:asl2.0)))
(define-public python-cryptography-vectors-next (define-public python-cryptography-vectors
(package (package
(name "python-cryptography-vectors") (name "python-cryptography-vectors")
(version "37.0.4") (version "40.0.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "cryptography_vectors" version)) (uri (pypi-uri "cryptography_vectors" version))
(sha256 (sha256
(base32 (base32
"1a1yi37ygw0jp72q280cmxd3qn9y9vmcch2bcnjkg2g2202l0qas")))) "0hd0ppss5xg0kzf36q8cdaxh1xw8ry4k7jkianlf832xbdmp0q44"))))
(build-system python-build-system) (build-system python-build-system)
(home-page "https://github.com/pyca/cryptography") (home-page "https://github.com/pyca/cryptography")
(synopsis "Test vectors for the cryptography package") (synopsis "Test vectors for the cryptography package")
@ -543,179 +544,127 @@ is used by the Requests library to verify HTTPS requests.")
;; Distributed under either BSD-3 or ASL2.0 ;; Distributed under either BSD-3 or ASL2.0
(license (list license:bsd-3 license:asl2.0)))) (license (list license:bsd-3 license:asl2.0))))
(define-public python-cryptography-vectors (define-public python-cryptography
(package
(inherit python-cryptography-vectors-next)
(version "3.4.8")
(source (origin
(method url-fetch)
(uri (pypi-uri "cryptography_vectors" version))
(sha256
(base32 "1wl0ynh3lzhc6q59g8mybvijmnp195x7fjxlb3h3sgcraw14312c"))))))
(define-public python-cryptography-next
(package (package
(name "python-cryptography") (name "python-cryptography")
(version "37.0.4") (version "40.0.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "cryptography" version)) (uri (pypi-uri "cryptography" version))
(sha256 (sha256
(base32 (base32
"10haq7sn8mrdlhcfs791rczknnxm0wpww0lkpjzcqx141ryc3yb3")))) "0wilrilfcyl78caxcpna2k3aya6qamppwv4j35262pz9n7wg40r8"))))
(build-system python-build-system) (build-system pyproject-build-system)
(arguments (arguments
(list (list
#:imported-modules (append %cargo-build-system-modules #:phases #~(modify-phases %standard-phases
%python-build-system-modules) (add-after 'unpack 'disable-rust-extension-build
#:modules `(((guix build cargo-build-system) #:prefix cargo:)
,@%python-build-system-modules
(srfi srfi-1)
(ice-9 match))
#:phases
#~(modify-phases (@ (guix build python-build-system) %standard-phases)
(add-after 'unpack 'adjust-pyo3-requirement
(lambda _ (lambda _
;; The package depends on 0.15.2, which is not on crates.io(!?). ;; The Rust extension is built separately as
;; Downgrade to 0.15.1... ;; 'python-cryptography-rust', so there's no need
(substitute* "src/rust/Cargo.toml" ;; to build it here.
(("pyo3 = \\{ version = \"0\\.15\\.2\"") (substitute* "pyproject.toml"
"pyo3 = { version = \"0.15.1\"")))) ((".*setuptools-rust.*") ""))
(add-before 'build 'configure-cargo (delete-file "setup.py")))
(lambda* (#:key inputs #:allow-other-keys) (add-before 'check 'symlink-rust-library
;; Hide irrelevant inputs from cargo-build-system so it does (lambda* (#:key inputs outputs #:allow-other-keys)
;; not try to unpack sanity-check.py, etc. (symlink (search-input-file
(let ((cargo-inputs (filter (match-lambda inputs "lib/libcryptography_rust.so")
((name . path) (string-append (site-packages inputs outputs)
(or (string-prefix? "rust-" name) "/cryptography/hazmat/bindings/"
(string=? "gcc" name)))) "_rust.abi3.so")))))))
inputs)))
(with-directory-excursion "src/rust"
((assoc-ref cargo:%standard-phases 'unpack-rust-crates)
#:inputs cargo-inputs
#:vendor-dir "guix-vendor")
((assoc-ref cargo:%standard-phases 'configure)
#:inputs cargo-inputs)
((assoc-ref cargo:%standard-phases 'patch-cargo-checksums)
#:vendor-dir "guix-vendor"))
(rename-file "src/rust/.cargo" ".cargo"))))
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "pytest" "-vv" "tests")))))))
(inputs
(list openssl
;; TODO: Most of these inputs are transitive dependencies of
;; the Rust requirements (see src/rust/cargo.toml). Surely
;; there is a better way than manually listing everything..?
rust-aliasable-0.1
rust-asn1-0.8
rust-asn1-derive-0.8
rust-autocfg-1
rust-base64-0.13
rust-bitflags-1
rust-cfg-if-0.1
rust-cfg-if-1
rust-chrono-0.4
rust-cloudabi-0.1
rust-lazy-static-1
rust-libc-0.2
rust-indoc-0.3
rust-indoc-impl-0.3
rust-inflector-0.11
rust-instant-0.1
rust-lock-api-0.4
rust-num-integer-0.1
rust-num-traits-0.2
rust-once-cell-1
rust-ouroboros-0.15
rust-ouroboros-macro-0.15
rust-parking-lot-0.11
rust-parking-lot-core-0.8
rust-paste-0.1
rust-paste-impl-0.1
rust-pem-1
rust-proc-macro-error-1
rust-proc-macro-error-attr-1
rust-proc-macro-hack-0.5
rust-proc-macro2-1
rust-pyo3-0.15
rust-pyo3-build-config-0.15
rust-pyo3-macros-0.15
rust-pyo3-macros-backend-0.15
rust-quote-1
rust-redox-syscall-0.2
rust-scopeguard-1
rust-smallvec-1
rust-stable-deref-trait-1
rust-syn-1
rust-unicode-xid-0.2
rust-unindent-0.1
rust-version-check-0.9
rust-winapi-0.3))
(propagated-inputs
(list python-asn1crypto python-cffi python-six python-idna
python-iso8601))
(native-inputs
(list python-cryptography-vectors-next
python-hypothesis
python-pretend
python-pytz
python-pytest
python-pytest-benchmark
python-pytest-subtests
python-setuptools-rust
rust
`(,rust "cargo")))
(home-page "https://github.com/pyca/cryptography")
(synopsis "Cryptographic recipes and primitives for Python")
(description
"cryptography is a package which provides cryptographic recipes and
primitives to Python developers. It aims to be the “cryptographic standard
library” for Python. The package includes both high level recipes, and low
level interfaces to common cryptographic algorithms such as symmetric ciphers,
message digests and key derivation functions.")
;; Distributed under either BSD-3 or ASL2.0
(license (list license:bsd-3 license:asl2.0))))
(define-public python-cryptography
(package
(inherit python-cryptography-next)
(version "3.4.8")
(source (origin
(method url-fetch)
(uri (pypi-uri "cryptography" version))
(sha256
(base32 "072awar70cwfd2hnx0pvp1dkc7gw45mbm3wcyddvxz5frva5xk4l"))))
(arguments
(list #:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'set-no-rust
(lambda _
(setenv "CRYPTOGRAPHY_DONT_BUILD_RUST" "1"))))))
(inputs (list openssl-1.1))
(native-inputs (native-inputs
(list python-cryptography-vectors (list python-cryptography-vectors
python-hypothesis python-hypothesis
python-iso8601
python-pretend python-pretend
python-pytz python-pytest-7.1 ;for subtests
python-pytest python-pytest-benchmark
python-setuptools-rust)))) python-pytest-subtests))
(inputs (list python-cryptography-rust))
(propagated-inputs (list python-cffi))
(home-page "https://github.com/pyca/cryptography")
(synopsis "Cryptographic recipes and primitives for Python")
(description
"@code{cryptography} is a package which provides cryptographic recipes
and primitives to Python developers. It aims to be the “cryptographic
standard library” for Python. The package includes both high level recipes,
and low level interfaces to common cryptographic algorithms such as symmetric
ciphers, message digests and key derivation functions.")
;; Distributed under either BSD-3 or ASL2.0
(license (list license:bsd-3 license:asl2.0))))
;;; This is the Rust component of the python-cryptography library, extracted
;;; as a separate package to ease the Rust build.
(define-public python-cryptography-rust
(package
(inherit python-cryptography)
(name "python-cryptography-rust")
(build-system cargo-build-system)
(arguments
(list
#:modules '((guix build cargo-build-system)
(guix build utils)
(srfi srfi-1)
(ice-9 match))
;; XXX: Building the test objects appear to fail due to a missing link
;; directive to Python's shared library (e.g.: "ld:
;; cryptography_rust.c950d742-cgu.11:(.text._ZN3...+0x57): undefined
;; reference to `PyLong_FromLong'").
#:tests? #f
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'chdir
(lambda _
(chdir "src/rust")))
(replace 'unpack-rust-crates
;; This is to avoid the non-crate source from being erroneously
;; unpacked by this phase, causing an error.
(lambda* (#:key inputs #:allow-other-keys #:rest args)
(apply (assoc-ref %standard-phases 'unpack-rust-crates)
(append args
(list #:inputs (alist-delete "source" inputs))))))
(replace 'configure
(lambda* (#:key inputs #:allow-other-keys #:rest args)
(apply (assoc-ref %standard-phases 'configure)
(append args
(list #:inputs (alist-delete "source" inputs))))))
(add-after 'install 'install-shared-library
(lambda _
(install-file "target/release/libcryptography_rust.so"
(string-append #$output "/lib")))))
#:cargo-inputs
`(("rust-asn1-0.13" ,rust-asn1-0.13)
("rust-chrono-0.4" ,rust-chrono-0.4)
("rust-foreign-types-shared-0.1" ,rust-foreign-types-shared-0.1)
("rust-once-cell-1" ,rust-once-cell-1)
("rust-openssl-0.10" ,rust-openssl-0.10)
("rust-openssl-sys-0.9" ,rust-openssl-sys-0.9)
("rust-ouroboros-0.15" ,rust-ouroboros-0.15)
("rust-pem-1" ,rust-pem-1)
("rust-pyo3-0.15" ,rust-pyo3-0.15))
#:cargo-development-inputs
`(("rust-cc" ,rust-cc-1))))
(native-inputs (list pkg-config python python-cffi))
;; XXX: Adding rust-openssl-sys-0.9 is needed because #:cargo-inputs
;; doesn't honor propagated-inputs.
(inputs (list python rust-openssl-sys-0.9))
(propagated-inputs '())
(synopsis "Core implementation of the Cryptography Python library")))
;; This is the last version which is compatable with python-cryptography < 35.
(define-public python-pyopenssl (define-public python-pyopenssl
(package (package
(name "python-pyopenssl") (name "python-pyopenssl")
(version "21.0.0") (version "23.1.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "pyOpenSSL" version)) (uri (pypi-uri "pyOpenSSL" version))
(sha256 (sha256
(base32 (base32
"1cqcc20fwl521z3fxsc1c98gbnhb14q55vrvjfp6bn6h8rg8qbay")) "1dxhip610zw1j2bz35g1w1h7vh374g0bnzn4nsqj65n6pswrh544"))))
(patches (search-patches "python2-pyopenssl-openssl-compat.patch"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
(list (list
@ -727,7 +676,7 @@ message digests and key derivation functions.")
;; PyOpenSSL runs tests against a certificate with a fixed ;; PyOpenSSL runs tests against a certificate with a fixed
;; expiry time. To ensure successful builds in the future, ;; expiry time. To ensure successful builds in the future,
;; set the time to roughly the release date. ;; set the time to roughly the release date.
(invoke "faketime" "2022-02-01" "py.test" "-v" "-k" (invoke "faketime" "2023-03-25" "pytest" "-vv" "-k"
(string-append (string-append
;; This test tries to look up certificates from ;; This test tries to look up certificates from
;; the compiled-in default path in OpenSSL, which ;; the compiled-in default path in OpenSSL, which
@ -739,17 +688,13 @@ message digests and key derivation functions.")
;; Fails on i686-linux and possibly other 32-bit platforms ;; Fails on i686-linux and possibly other 32-bit platforms
;; https://github.com/pyca/pyopenssl/issues/974 ;; https://github.com/pyca/pyopenssl/issues/974
"and not test_verify_with_time")))))))) "and not test_verify_with_time"))))))))
(propagated-inputs (propagated-inputs (list python-cryptography))
(list python-cryptography python-six)) (inputs (list openssl))
(inputs (native-inputs (list libfaketime python-flaky python-pretend python-pytest))
(list openssl))
(native-inputs
(list libfaketime python-flaky python-pretend python-pytest))
(home-page "https://github.com/pyca/pyopenssl") (home-page "https://github.com/pyca/pyopenssl")
(synopsis "Python wrapper module around the OpenSSL library") (synopsis "Python wrapper module around the OpenSSL library")
(description (description "PyOpenSSL is a high-level wrapper around a subset of the
"PyOpenSSL is a high-level wrapper around a subset of the OpenSSL OpenSSL library.")
library.")
(license license:asl2.0))) (license license:asl2.0)))
(define-public python-ed25519 (define-public python-ed25519
@ -1291,18 +1236,17 @@ derivation function.")
(define-public python-service-identity (define-public python-service-identity
(package (package
(name "python-service-identity") (name "python-service-identity")
(version "18.1.0") (version "21.1.0")
(source (source (origin
(origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "service_identity" version)) (uri (pypi-uri "service-identity" version))
(sha256 (sha256
(base32 (base32
"0b9f5qiqjy8ralzgwjgkhx82h6h8sa7532psmb8mkd65md5aan08")))) "0d4x84crbz0a17d8gi90z6zlxwm9pslc65rx0cdw2797ra360v3f"))))
(build-system python-build-system) (build-system pyproject-build-system)
(propagated-inputs (native-inputs (list python-idna python-pytest))
(list python-attrs python-pyasn1 python-pyasn1-modules (propagated-inputs (list python-attrs python-cryptography python-pyasn1
python-pyopenssl)) python-pyasn1-modules python-six))
(home-page "https://service-identity.readthedocs.io/") (home-page "https://service-identity.readthedocs.io/")
(synopsis "Service identity verification for PyOpenSSL") (synopsis "Service identity verification for PyOpenSSL")
(description (description

15
gnu/packages/python-web.scm
View file

@ -26,7 +26,7 @@
;;; Copyright © 2018 Tomáš Čech <sleep_walker@gnu.org> ;;; Copyright © 2018 Tomáš Čech <sleep_walker@gnu.org>
;;; Copyright © 2018, 2019, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2018, 2019, 2021 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2018, 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2018, 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019 Vagrant Cascadian <vagrant@debian.org> ;;; Copyright © 2019 Vagrant Cascadian <vagrant@debian.org>
;;; Copyright © 2019 Brendan Tildesley <mail@brendan.scot> ;;; Copyright © 2019 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2019 Pierre Langlois <pierre.langlois@gmx.com>
@ -3765,13 +3765,13 @@ for the basic TCP/IP protocols.")
(define-public python-geventhttpclient (define-public python-geventhttpclient
(package (package
(name "python-geventhttpclient") (name "python-geventhttpclient")
(version "1.5.3") (version "2.0.9")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "geventhttpclient" version)) (uri (pypi-uri "geventhttpclient" version))
(sha256 (sha256
(base32 (base32
"104p14p67xa5gch8dy2zqmzmjra31fflk1c1alrry8dp8bzwj3nq")) "04qmcc7qpnif70ph61339dcld4g107fkhpa0gdmbs8z98v9kkg4a"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -3798,11 +3798,10 @@ for the basic TCP/IP protocols.")
;; Append the test modules to sys.path to avoid ;; Append the test modules to sys.path to avoid
;; namespace conflict which breaks SSL tests. ;; namespace conflict which breaks SSL tests.
"--import-mode=append"))))))) "--import-mode=append")))))))
(native-inputs (native-inputs (list python-dpkt python-pytest))
(list python-dpkt python-pytest)) (propagated-inputs (list python-brotli python-certifi python-gevent
(propagated-inputs python-six python-urllib3))
(list python-brotli python-certifi python-gevent python-six)) (home-page "https://github.com/geventhttpclient/geventhttpclient")
(home-page "https://github.com/gwik/geventhttpclient")
(synopsis "HTTP client library for gevent") (synopsis "HTTP client library for gevent")
(description "@code{python-geventhttpclient} is a high performance, (description "@code{python-geventhttpclient} is a high performance,
concurrent HTTP client library for python using @code{gevent}.") concurrent HTTP client library for python using @code{gevent}.")

98
gnu/packages/python-xyz.scm
View file

@ -968,7 +968,7 @@ Markdown. All extensions are found under the module namespace of pymdownx.")
"0rv0cbala7ibjbaf6kkcn0mdhqdbajnvlcw0f15gwzfwg10g0z1q")))) "0rv0cbala7ibjbaf6kkcn0mdhqdbajnvlcw0f15gwzfwg10g0z1q"))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs (native-inputs
(list python-pytest (list python-pytest-7.1 ;for pytest-subtests
python-pytest-cov python-pytest-cov
python-pytest-mpl python-pytest-mpl
python-pytest-subtests python-pytest-subtests
@ -1863,14 +1863,14 @@ library.")
(define-public python-h5py (define-public python-h5py
(package (package
(name "python-h5py") (name "python-h5py")
(version "3.6.0") (version "3.8.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "h5py" version)) (uri (pypi-uri "h5py" version))
(sha256 (sha256
(base32 (base32
"0afv805vqrm5071g7alwv41920nhh8kjv4m5nbia9awj9a0x4ll7")))) "0pyr6z4h2xqbp49yx2i1401gl6yqh03h771zslwcy0201hpxiskg"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:tests? #f ; no test target `(#:tests? #f ; no test target
@ -3542,7 +3542,7 @@ and is not compatible with JSON.")
(define-public python-exceptiongroup (define-public python-exceptiongroup
(package (package
(name "python-exceptiongroup") (name "python-exceptiongroup")
(version "1.0.0rc8") (version "1.1.1")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -3551,7 +3551,7 @@ and is not compatible with JSON.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0xsbpv22n51p6yvyvz231mf8zhbi1i88b4zmacaxxx31zrq5ifv4")))) "0wcvzwgjs0xmggs6dh92jxdqi988gafzh10hrzvw10kasy0xakfj"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
(list (list
@ -12164,36 +12164,17 @@ the @code{sendfile(2)} system call.")
(define-public python-pyftpdlib (define-public python-pyftpdlib
(package (package
(name "python-pyftpdlib") (name "python-pyftpdlib")
(version "1.5.6") (version "1.5.7")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "pyftpdlib" version)) (uri (pypi-uri "pyftpdlib" version))
(sha256 (sha256
(base32 "0pnv2byzmzg84q5nmmhn1xafvfil85qa5y52bj455br93zc5b9px")))) (base32 "0vk5gcx4svjrpm014ykwxmijqihgb4ha17kb3yphk0nv6x0wx8vy"))))
(build-system python-build-system) (build-system pyproject-build-system)
(arguments ;; Using Pytest instead of the Makefile causes the command line tests to
(list ;; fail on unknown Pytest arguments.
#:phases (arguments (list #:test-flags #~(list "-k" "not TestCommandLineParser")))
#~(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke
"pytest"
;; Deselect failing tests.
"-k" (string-append
;; Using Pytest instead of the Makefile causes the
;; command line tests to fail on unknown Pytest
;; arguments.
"not TestCommandLineParser "
;; https://github.com/giampaolo/pyftpdlib/issues/478
"and not test_use_gmt_times "
;; https://github.com/giampaolo/pyftpdlib/issues/550
"and not test_masquerade_address "
;; https://github.com/giampaolo/pyftpdlib/issues/500
"and not test_rest_on_stor "
"and not test_stor_ascii"))))))))
(native-inputs (list python-psutil python-pytest)) (native-inputs (list python-psutil python-pytest))
(propagated-inputs (list python-pyopenssl python-pysendfile)) (propagated-inputs (list python-pyopenssl python-pysendfile))
(home-page "https://github.com/giampaolo/pyftpdlib/") (home-page "https://github.com/giampaolo/pyftpdlib/")
@ -12302,7 +12283,12 @@ from an XML-based format.")
"test_read_fontdimens_mathex" "test_read_fontdimens_mathex"
"test_read_fontdimens_vanilla" "test_read_fontdimens_vanilla"
"test_read_boundary_char" "test_read_boundary_char"
"fontTools.tfmLib") "fontTools.tfmLib"
;; The MtiTest tests fail for unknown
;; reasons (see:
;; https://github.com/fonttools/
;; fonttools/issues/3078)
"MtiTest")
" and not ")))))))))) " and not "))))))))))
(native-inputs (native-inputs
(modify-inputs (package-native-inputs python-fonttools) (modify-inputs (package-native-inputs python-fonttools)
@ -12320,14 +12306,14 @@ from an XML-based format.")
(define-public python-fonttools-next (define-public python-fonttools-next
(package (package
(inherit python-fonttools-full) (inherit python-fonttools-full)
(version "4.37.1") (version "4.39.3")
(source (origin (source (origin
(inherit (package-source python-fonttools-full)) (inherit (package-source python-fonttools-full))
(method url-fetch) (method url-fetch)
(uri (pypi-uri "fonttools" version ".zip")) (uri (pypi-uri "fonttools" version ".zip"))
(sha256 (sha256
(base32 (base32
"1ryc1wca2v92wn24baryj5fr32lspl8rbsig32fnkxp1islf21j6")))))) "1msibi5cmi5znykkg66dq7xshl07lkqjxhrz5hcipqvlggsvjd4j"))))))
(define-public python-ly (define-public python-ly
(package (package
@ -14608,26 +14594,24 @@ simulation, statistical modeling, machine learning and much more.")
(define-public python-chardet (define-public python-chardet
(package (package
(name "python-chardet") (name "python-chardet")
(version "5.0.0") (version "5.1.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "chardet" version)) (uri (pypi-uri "chardet" version))
(sha256 (sha256
(base32 (base32
"1amqmz8731ly6f9rkbk09w4jqgmmgyxykd1bawhgrdbqzlmxys03")))) "1r9ixxnish9j3dq4h0z0cwlkr4f5lgi6d8mhbzw59hbbjlmp2qhd"))))
(native-inputs (native-inputs
(list python-pytest)) (list python-pytest))
(build-system python-build-system) (build-system pyproject-build-system)
(arguments (arguments
(list #:phases (list #:test-flags
#~(modify-phases %standard-phases
(replace 'check
(lambda _
(invoke "pytest" "-vv" "-k"
;; Disable test that fails sporadically: ;; Disable test that fails sporadically:
;; https://github.com/chardet/chardet/issues/256 ;; https://github.com/chardet/chardet/issues/256
"not test_detect_all_and_detect_one_should_agree"))) #~'("-k" "not test_detect_all_and_detect_one_should_agree")
#:phases
#~(modify-phases %standard-phases
;; This package provides a 'chardetect' executable that only ;; This package provides a 'chardetect' executable that only
;; depends on Python, so customize the wrap phase to avoid ;; depends on Python, so customize the wrap phase to avoid
;; adding pytest and friends in order to save size. ;; adding pytest and friends in order to save size.
@ -15750,13 +15734,13 @@ expression.")
(define-public python-unicodedata2 (define-public python-unicodedata2
(package (package
(name "python-unicodedata2") (name "python-unicodedata2")
(version "14.0.0") (version "15.0.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "unicodedata2" version)) (uri (pypi-uri "unicodedata2" version))
(sha256 (sha256
(base32 "110nnvh02ssp92xbmswy39aa186jrmb7m41x4220wigl8c0dzxs1")))) (base32 "0bcgls7m2zndpd8whgznnd5908jbsa50si2bh88wsn0agcznhv7d"))))
(build-system python-build-system) (build-system python-build-system)
(home-page "https://github.com/fonttools/unicodedata2") (home-page "https://github.com/fonttools/unicodedata2")
(synopsis "Python unicodedata backport") (synopsis "Python unicodedata backport")
@ -16425,7 +16409,7 @@ Python 2.4 and 2.5, and will draw its fixes/improvements from python-trunk.")
python-iniconfig python-iniconfig
python-moto python-moto
python-msgpack python-msgpack
python-pytest python-pytest-7.1 ;for pytest-subtests
python-pytest-celery python-pytest-celery
python-pytest-subtests python-pytest-subtests
python-pytest-timeout python-pytest-timeout
@ -24828,13 +24812,13 @@ project.")
(define-public python-trio (define-public python-trio
(package (package
(name "python-trio") (name "python-trio")
(version "0.20.0") (version "0.22.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "trio" version)) (uri (pypi-uri "trio" version))
(sha256 (sha256
(base32 "0w30cwmdwfa8zq2agqv3h62jzwwsk7ms8f683ag8f3jx279m42k7")))) (base32 "1kxa9v0cds0xnklvzppv4ix4xg81r73p5pm4qlvv2iqa832z2s6f"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -24860,7 +24844,8 @@ project.")
;; Assertion errors. ;; Assertion errors.
" and not test_guest_mode_ki" " and not test_guest_mode_ki"
" and not test_run_in_trio_thread_ki" " and not test_run_in_trio_thread_ki"
" and not test_simple_cancel_scope_usage_doesnt_create_cyclic_garbage" " and not test_simple_cancel_scope_usage_doesnt_create\
_cyclic_garbage"
" and not test_nursery_cancel_doesnt_create_cyclic_garbage" " and not test_nursery_cancel_doesnt_create_cyclic_garbage"
" and not test_cancel_scope_exit_doesnt_create_cyclic_garbage" " and not test_cancel_scope_exit_doesnt_create_cyclic_garbage"
" and not test_locals_destroyed_promptly_on_cancel" " and not test_locals_destroyed_promptly_on_cancel"
@ -24890,6 +24875,8 @@ project.")
(propagated-inputs (propagated-inputs
(list python-async-generator (list python-async-generator
python-attrs python-attrs
python-cffi
python-exceptiongroup
python-idna python-idna
python-outcome python-outcome
python-sniffio python-sniffio
@ -24906,22 +24893,15 @@ programs that do multiple things at the same time with parallelized I/O.")
(define-public python-trio-typing (define-public python-trio-typing
(package (package
(name "python-trio-typing") (name "python-trio-typing")
(version "0.5.0") (version "0.8.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (pypi-uri "trio-typing" version)) (uri (pypi-uri "trio-typing" version))
(sha256 (sha256
(base32 "1yvlj4vf3wyvp16dw6vyfm4i2idm8lvdc3fvjhi6mhm62zv7s07j")))) (base32 "15wa66cs165wawh4pi808ac43n67b8jqddi5ppdcbkj5gfi68hpi"))))
(build-system python-build-system) (build-system pyproject-build-system)
(arguments (native-inputs (list python-attrs python-pytest))
`(#:phases
(modify-phases %standard-phases
(replace 'check
(lambda _
(invoke "pytest" "-vv"))))))
(native-inputs
(list python-attrs python-pytest))
(propagated-inputs (propagated-inputs
(list python-mypy python-mypy-extensions python-trio (list python-mypy python-mypy-extensions python-trio
python-typing-extensions)) python-typing-extensions))

455
gnu/packages/qt.scm
View file

@ -337,13 +337,13 @@ system, and the core design of Django is reused in Grantlee.")
(define-public qtbase-5 (define-public qtbase-5
(package (package
(name "qtbase") (name "qtbase")
(version "5.15.5") (version "5.15.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
(sha256 (sha256
(base32 (base32
"1p2fa94m1y8qzhdfi2d7dck93qh1lgsinibwl1wy92bwmacwfhhc")) "175ynjndpzsw69vnsq4swykn9f48568ww9b4z3yw7azkqwk13cdz"))
;; Use TZDIR to avoid depending on package "tzdata". ;; Use TZDIR to avoid depending on package "tzdata".
(patches (search-patches "qtbase-use-TZDIR.patch" (patches (search-patches "qtbase-use-TZDIR.patch"
"qtbase-moc-ignore-gcc-macro.patch" "qtbase-moc-ignore-gcc-macro.patch"
@ -364,50 +364,50 @@ system, and the core design of Django is reused in Grantlee.")
;; Use which the package, not the function ;; Use which the package, not the function
(@ (gnu packages base) which))) (@ (gnu packages base) which)))
(inputs (inputs
`(("alsa-lib" ,alsa-lib) (list alsa-lib
("cups" ,cups) cups
("dbus" ,dbus) dbus
("double-conversion" ,double-conversion) double-conversion
("eudev" ,eudev) eudev
("expat" ,expat) expat
("fontconfig" ,fontconfig) fontconfig
("freetype" ,freetype) freetype
("glib" ,glib) glib
("gtk+" ,gtk+) ;for GTK theme support gtk+ ;for GTK theme support
("harfbuzz" ,harfbuzz) harfbuzz
("icu4c" ,icu4c) icu4c
("libinput" ,libinput-minimal) libinput-minimal
("libjpeg" ,libjpeg-turbo) libjpeg-turbo
("libmng" ,libmng) libmng
("libpng" ,libpng) libpng
("libx11" ,libx11) libx11
("libxcomposite" ,libxcomposite) libxcomposite
("libxcursor" ,libxcursor) libxcursor
("libxfixes" ,libxfixes) libxfixes
("libxi" ,libxi) libxi
("libxinerama" ,libxinerama) libxinerama
("libxkbcommon" ,libxkbcommon) libxkbcommon
("libxml2" ,libxml2) libxml2
("libxrandr" ,libxrandr) libxrandr
("libxrender" ,libxrender) libxrender
("libxslt" ,libxslt) libxslt
("libxtst" ,libxtst) libxtst
("mtdev" ,mtdev) mtdev
("mariadb-dev" ,mariadb "dev") `(,mariadb "dev")
("nss" ,nss) nss
("openssl" ,openssl) openssl
("pcre2" ,pcre2) pcre2
("postgresql" ,postgresql) postgresql
("pulseaudio" ,pulseaudio) pulseaudio
("sqlite" ,sqlite) sqlite
("unixodbc" ,unixodbc) unixodbc
("xcb-util" ,xcb-util) xcb-util
("xcb-util-image" ,xcb-util-image) xcb-util-image
("xcb-util-keysyms" ,xcb-util-keysyms) xcb-util-keysyms
("xcb-util-renderutil" ,xcb-util-renderutil) xcb-util-renderutil
("xcb-util-wm" ,xcb-util-wm) xcb-util-wm
("xdg-utils" ,xdg-utils) xdg-utils
("zlib" ,zlib))) zlib))
(native-inputs (native-inputs
(list bison (list bison
flex flex
@ -772,6 +772,9 @@ developers using C++ or QML, a CSS & JavaScript like language.")
;; Actual (dt5.offsetFromUtc()): 0 ;; Actual (dt5.offsetFromUtc()): 0
;; Expected (46800) : 46800 ;; Expected (46800) : 46800
"tst_qdatetime" "tst_qdatetime"
;; The tst_QObjectRace::destroyRace is flaky (see:
;; https://bugreports.qt.io/browse/QTBUG-103489).
"tst_qobjectrace"
;; The 'tst_QSettings::fromFile' assumes the data ;; The 'tst_QSettings::fromFile' assumes the data
;; location to be relative to the root directory and ;; location to be relative to the root directory and
;; fails. ;; fails.
@ -872,13 +875,13 @@ developers using C++ or QML, a CSS & JavaScript like language.")
(package (package
(inherit qtbase-5) (inherit qtbase-5)
(name "qt3d") (name "qt3d")
(version "5.15.5") (version "5.15.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
(sha256 (sha256
(base32 (base32
"1m3y7d58crn0qgfwkimxcggssn2pbs8nj5b9diwns6rwqg4aqk20")))) "18hbv4l9w0czaxcch6af9130fgs4sf400xp0pfzl81c78fwrkfsb"))))
(propagated-inputs `()) (propagated-inputs `())
(native-inputs (list perl)) (native-inputs (list perl))
(inputs (list mesa qtbase-5 vulkan-headers zlib)) (inputs (list mesa qtbase-5 vulkan-headers zlib))
@ -964,13 +967,13 @@ came with the @{qtgraphicaleffects} Qt 5 package.")
(package (package
(inherit qtbase-5) (inherit qtbase-5)
(name "qtsvg") (name "qtsvg")
(version "5.15.5") (version "5.15.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
(sha256 (sha256
(base32 (base32
"0cdhmhxngv4y7kl5vbcii4l4anbz0hj7dvhlddy1agyl19j9xky4")))) "0qnmcvp5jap4qq9w7xak66g6fsb48q1lg02rn4lycvnhgwzblbww"))))
(propagated-inputs `()) (propagated-inputs `())
(native-inputs (list perl)) (native-inputs (list perl))
(inputs (inputs
@ -1063,13 +1066,13 @@ HostData=lib/qt5
(define-public qtimageformats (define-public qtimageformats
(package (inherit qtsvg-5) (package (inherit qtsvg-5)
(name "qtimageformats") (name "qtimageformats")
(version "5.15.5") (version "5.15.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
(sha256 (sha256
(base32 (base32
"1xjb2z2h1ajw7z9cwq8djpdvjwalpnmirwcwrlbjqv5r4ghmi82a")) "0c6fq9zcw5hbkiny56wx2fbm123x14l7habydv6zhvnhn3rhwi31"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -1090,13 +1093,13 @@ support for MNG, TGA, TIFF and WBMP image formats.")))
(define-public qtx11extras (define-public qtx11extras
(package (inherit qtsvg-5) (package (inherit qtsvg-5)
(name "qtx11extras") (name "qtx11extras")
(version "5.15.5") (version "5.15.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
(sha256 (sha256
(base32 (base32
"0wxsrnnkkn68myy211rfz98brs7j3qmx3hmy097vh5avgsmw11bn")))) "1gzmf0y2byzrgfbing7xk3cwlbk1cyjlhqjbfh8n37y09gg65maf"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg-5) (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests ((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -1155,13 +1158,13 @@ XLSX document format.")
(define-public qtxmlpatterns (define-public qtxmlpatterns
(package (inherit qtsvg-5) (package (inherit qtsvg-5)
(name "qtxmlpatterns") (name "qtxmlpatterns")
(version "5.15.5") (version "5.15.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
(sha256 (sha256
(base32 (base32
"065vj1gk5i4cg0f9spksyb9ps4px0vssx262y77aakvw408vfmq5")))) "1inf7ar32a557faqpwdsmafhz1p6k8hywpw3wbsdjlj74dkgdq35"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg-5) (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases) ((#:phases phases)
@ -1181,38 +1184,35 @@ XML and custom data models. It contains programs such as xmlpatterns and
xmlpatternsvalidator."))) xmlpatternsvalidator.")))
(define-public qtdeclarative-5 (define-public qtdeclarative-5
(package (inherit qtsvg-5) (package
(inherit qtsvg-5)
(name "qtdeclarative") (name "qtdeclarative")
(version "5.15.5") (version "5.15.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
(sha256 (sha256
(base32 (base32
"0ji5131g7h2mrgxw1wxc5mcvmsn3fbw64j28gzpa25gv3vcnkhaw")))) "1kb8nj17vmnky0ayiwypim7kf6rmlmfcjf6gnrw8rydmp61w0vh2"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg-5) (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f) ;TODO: Enable the tests ((#:tests? _ #f) #f) ;TODO: Enable the tests
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases #~(modify-phases #$phases
(add-after 'build 'fix-qt5core-install-prefix (add-after 'build 'fix-qt5core-install-prefix
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(let ((out (assoc-ref outputs "out")))
;; The Qt5Core install prefix is set to qtbase, but qmlcachegen ;; The Qt5Core install prefix is set to qtbase, but qmlcachegen
;; is provided by qtdeclarative-5. ;; is provided by qtdeclarative-5.
(substitute* (substitute*
"lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake" "lib/cmake/Qt5QuickCompiler/Qt5QuickCompilerConfig.cmake"
(("\\$\\{_qt5Core_install_prefix\\}") out))))) (("\\$\\{_qt5Core_install_prefix\\}") #$output))))
;; TODO: Add phase unconditionally. (add-after 'unpack 'fix-linking-riscv64
,@(if (target-riscv64?)
'((add-after 'unpack 'fix-linking-riscv64
(lambda _ (lambda _
(substitute* "src/qml/qml.pro" (substitute* "src/qml/qml.pro"
(("DEFINES \\+= QT_NO_FOREACH") (("DEFINES \\+= QT_NO_FOREACH")
(string-append (string-append
"isEqual(QT_ARCH, \"riscv64\"): QMAKE_LIBS += -latomic\n\n" "isEqual(QT_ARCH, \"riscv64\"): QMAKE_LIBS += -latomic\n\n"
"DEFINES += QT_NO_FOREACH")))))) "DEFINES += QT_NO_FOREACH")))))))))
'())))))
(native-inputs (native-inputs
(list perl (list perl
pkg-config pkg-config
@ -1362,15 +1362,16 @@ integrate QML code with JavaScript and C++.")
(license (package-license qtbase)))) (license (package-license qtbase))))
(define-public qtconnectivity (define-public qtconnectivity
(package (inherit qtsvg-5) (package
(inherit qtsvg-5)
(name "qtconnectivity") (name "qtconnectivity")
(version "5.15.5") (version "5.15.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
(sha256 (sha256
(base32 (base32
"0b2dnxw1rjbp1srhgns148cwl99f50mx29588dal3avv0f73s597")))) "1j6qgkg77ycwcjxnhh38i9np1z8pjsqrzvfk3zsyq07f6k563fnc"))))
(native-inputs (native-inputs
(list perl pkg-config qtdeclarative-5)) (list perl pkg-config qtdeclarative-5))
(inputs (inputs
@ -1382,13 +1383,13 @@ with Bluetooth and NFC.")))
(define-public qtwebsockets-5 (define-public qtwebsockets-5
(package (inherit qtsvg-5) (package (inherit qtsvg-5)
(name "qtwebsockets") (name "qtwebsockets")
(version "5.15.5") (version "5.15.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
(sha256 (sha256
(base32 (base32
"0f120rfqnmlffjhrm5jbpipk1qsbzp1a2v3q8gz94hz6n9dqpav6")))) "12h520lpj2pljgkyq36p1509mw4pxgb76n30d32kg52crjsk34pa"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg-5) (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests ((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -1442,15 +1443,16 @@ consume data received from the server, or both.")
(license (package-license qtbase)))) (license (package-license qtbase))))
(define-public qtsensors (define-public qtsensors
(package (inherit qtsvg-5) (package
(inherit qtsvg-5)
(name "qtsensors") (name "qtsensors")
(version "5.15.5") (version "5.15.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
(sha256 (sha256
(base32 (base32
"0zlhm4js02niibb23rw87wf4ik0gy4ai08fwprnwy7zf4rm1ss3d")))) "1fdpgbikvxjacyipcyac0czqhv96pvc75dl9cyafslws8m53fm56"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg-5) (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:parallel-tests? _ #f) #f) ; can lead to race condition ((#:parallel-tests? _ #f) #f) ; can lead to race condition
@ -1473,13 +1475,13 @@ recognition API for devices.")))
(package (package
(inherit qtsvg-5) (inherit qtsvg-5)
(name "qtmultimedia") (name "qtmultimedia")
(version "5.15.5") (version "5.15.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
(sha256 (sha256
(base32 (base32
"0q76iy1frcgm85mid17lh4p6gnn04n19n6zklgpv4w3md1ng97xw")) "1fz0ffpckvbg6qfhab2rrzfnvh4mlalqxcn0kbkd21mi44apjirk"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -1609,9 +1611,10 @@ set of plugins for interacting with pulseaudio and GStreamer.")
(license (package-license qtbase)))) (license (package-license qtbase))))
(define-public qtwayland-5 (define-public qtwayland-5
(package (inherit qtsvg-5) (package
(inherit qtsvg-5)
(name "qtwayland") (name "qtwayland")
(version "5.15.5") (version "5.15.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
@ -1620,11 +1623,11 @@ set of plugins for interacting with pulseaudio and GStreamer.")
"qtwayland-cleanup-callbacks.patch")) "qtwayland-cleanup-callbacks.patch"))
(sha256 (sha256
(base32 (base32
"0yy8qf9kn15iqsxi2r7jbcsc0vsdyfz7bbxmfn4i9qmz1yvg0jgr")))) "0aa5jcvvap6qca6imdkhs1mhv5bnaxn466mmpl7x78jx1za7n3ps"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg-5) (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases #~(modify-phases #$phases
(add-after 'unpack 'disable-failing-tests (add-after 'unpack 'disable-failing-tests
(lambda _ (lambda _
;; FIXME: tst_seatv4::animatedCursor() fails for no good ;; FIXME: tst_seatv4::animatedCursor() fails for no good
@ -1639,8 +1642,7 @@ set of plugins for interacting with pulseaudio and GStreamer.")
(lambda _ (lambda _
;; Do not fail just because /etc/machine-id is missing. ;; Do not fail just because /etc/machine-id is missing.
(setenv "DBUS_FATAL_WARNINGS" "0"))))))) (setenv "DBUS_FATAL_WARNINGS" "0")))))))
(native-inputs (native-inputs (list glib perl pkg-config qtdeclarative-5))
(list glib perl pkg-config qtdeclarative-5))
(inputs (inputs
(list fontconfig (list fontconfig
freetype freetype
@ -1709,58 +1711,59 @@ compositor libraries.")
(license (package-license qtbase)))) (license (package-license qtbase))))
(define-public qtserialport (define-public qtserialport
(package (inherit qtsvg-5) (package
(inherit qtsvg-5)
(name "qtserialport") (name "qtserialport")
(version "5.15.5") (version "5.15.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
(sha256 (sha256
(base32 (base32
"0xg2djwhrj5jqamawlp75g70nmwbp2ph2hh1pm45s36jkxm0k7al")))) "04i8pdyml1sw4dkk9vyw2xy5bz3fp6f90fws7ag5y8iizfgs5v2v"))))
(native-inputs (list perl)) (native-inputs (list perl))
(inputs (inputs (list qtbase-5 eudev))
(list qtbase-5 eudev))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg-5) (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases #~(modify-phases #$phases
(add-after 'unpack 'patch-dlopen-paths (add-after 'unpack 'patch-dlopen-paths
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* "src/serialport/qtudev_p.h" (substitute* "src/serialport/qtudev_p.h"
;; Use the absolute paths for dynamically loaded libs, ;; Use the absolute paths for dynamically loaded libs,
;; otherwise the lib will be searched in LD_LIBRARY_PATH which ;; otherwise the lib will be searched in LD_LIBRARY_PATH which
;; typically is not set in guix. ;; typically is not set in guix.
(("^\\s*(udevLibrary->setFileNameAndVersion\\(QStringLiteral\\(\")(udev\"\\),\\s*[0-9]+\\);)" _ a b) (("setFileNameAndVersion\\(QStringLiteral\\(\"udev\")")
(string-append a (assoc-ref inputs "eudev") "/lib/lib" b))))))))) (format #f "setFileNameAndVersion(QStringLiteral(~s))"
(string-append #$(this-package-input "eudev")
"/lib/libudev"))))))))))
(synopsis "Qt Serial Port module") (synopsis "Qt Serial Port module")
(description "The Qt Serial Port module provides the library for (description "The Qt Serial Port module provides the library for
interacting with serial ports from within Qt."))) interacting with serial ports from within Qt.")))
(define-public qtserialbus (define-public qtserialbus
(package (inherit qtsvg-5) (package
(inherit qtsvg-5)
(name "qtserialbus") (name "qtserialbus")
(version "5.15.5") (version "5.15.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
(sha256 (sha256
(base32 (base32
"180gm1jvqfn0h3251zafdd1wd3af00phwaa5qljsbrj6s6ywj79j")))) "0ws3pjbp4g8f49k8q0qa5hgyisbyk3m7kl8pwzkfws048glvz570"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg-5) (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases '%standard-phases) ((#:phases phases '%standard-phases)
`(modify-phases ,phases #~(modify-phases #$phases
(add-after 'unpack 'patch-libsocketcan-reference (add-after 'unpack 'patch-libsocketcan-reference
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let* ((libcansocket (assoc-ref inputs "libsocketcan"))
(libcansocket.so (string-append libcansocket
"/lib/libsocketcan.so")))
(substitute* "src/plugins/canbus/socketcan/libsocketcan.cpp" (substitute* "src/plugins/canbus/socketcan/libsocketcan.cpp"
(("QStringLiteral\\(\"socketcan\"\\)") (("QStringLiteral\\(\"socketcan\"\\)")
(format #f "QStringLiteral(~s)" libcansocket.so)))))))))) (format #f "QStringLiteral(~s)"
(inputs (search-input-file inputs
(list libsocketcan qtbase-5 qtserialport)) "lib/libsocketcan.so"))))))))))
(inputs (list libsocketcan qtbase-5 qtserialport))
(synopsis "Qt Serial Bus module") (synopsis "Qt Serial Bus module")
(description "The Qt Serial Bus API provides classes and functions to (description "The Qt Serial Bus API provides classes and functions to
access the various industrial serial buses and protocols, such as CAN, ModBus, access the various industrial serial buses and protocols, such as CAN, ModBus,
@ -1769,15 +1772,14 @@ and others.")))
(define-public qtwebchannel-5 (define-public qtwebchannel-5
(package (inherit qtsvg-5) (package (inherit qtsvg-5)
(name "qtwebchannel") (name "qtwebchannel")
(version "5.15.5") (version "5.15.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
(sha256 (sha256
(base32 (base32
"1w8mcpdqlphgg3a6yfq18liwlj2nkwrafv0n80h242x5l2mk3ljf")))) "1pfmy6fqis47awjb590r63y13vvsfm0fq70an3ylsknhyq3firgn"))))
(native-inputs (native-inputs (list perl qtdeclarative-5 qtwebsockets-5))
(list perl qtdeclarative-5 qtwebsockets-5))
(inputs (list qtbase-5)) (inputs (list qtbase-5))
(synopsis "Web communication library for Qt") (synopsis "Web communication library for Qt")
(description "The Qt WebChannel module enables peer-to-peer communication (description "The Qt WebChannel module enables peer-to-peer communication
@ -1823,25 +1825,26 @@ application).")
(license (package-license qtbase)))) (license (package-license qtbase))))
(define-public qtwebglplugin (define-public qtwebglplugin
(package (inherit qtsvg-5) (package
(inherit qtsvg-5)
(name "qtwebglplugin") (name "qtwebglplugin")
(version "5.15.5") (version "5.15.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
(sha256 (sha256
(base32 (base32
"1m0p4ssykw07lbip2qyv6w34f8ng13bxb63j0w446f5w0492nn9f")))) "1gvzhgfn55kdp5g11fg5yja5xb6wghx5sfc8vfp8zzpxnak7pbn1"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg-5) (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases #~(modify-phases #$phases
(add-after 'unpack 'disable-network-tests (add-after 'unpack 'disable-network-tests
(lambda _ (substitute* "tests/plugins/platforms/platforms.pro" (lambda _
(substitute* "tests/plugins/platforms/platforms.pro"
(("webgl") "# webgl")))))))) (("webgl") "# webgl"))))))))
(native-inputs '()) (native-inputs '())
(inputs (inputs (list mesa qtbase-5 qtdeclarative-5 qtwebsockets-5 zlib))
(list mesa qtbase-5 qtdeclarative-5 qtwebsockets-5 zlib))
(synopsis "QPA plugin for running applications via a browser using (synopsis "QPA plugin for running applications via a browser using
streamed WebGL commands") streamed WebGL commands")
(description "Qt back end that uses WebGL for rendering. It allows Qt (description "Qt back end that uses WebGL for rendering. It allows Qt
@ -1851,26 +1854,26 @@ compatible web browser without the use of plug-ins. The API is similar to
OpenGL ES 2.0 and can be used in HTML5 canvas elements"))) OpenGL ES 2.0 and can be used in HTML5 canvas elements")))
(define-public qtwebview (define-public qtwebview
(package (inherit qtsvg-5) (package
(inherit qtsvg-5)
(name "qtwebview") (name "qtwebview")
(version "5.15.5") (version "5.15.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
(sha256 (sha256
(base32 (base32
"0arwaky3jy5ql3z4d8f7k7diidzb1kncdans7pn50hsa1bzacfal")))) "1b03dzlff840n2i53r105c7sv91ivwzxn7ldpgnhiyrhr897i9kj"))))
(native-inputs (native-inputs (list perl))
(list perl)) (inputs (list qtbase-5 qtdeclarative-5))
(inputs
(list qtbase-5 qtdeclarative-5))
(synopsis "Display web content in a QML application") (synopsis "Display web content in a QML application")
(description "Qt WebView provides a way to display web content in a QML (description "Qt WebView provides a way to display web content in a QML
application without necessarily including a full web browser stack by using application without necessarily including a full web browser stack by using
native APIs where it makes sense."))) native APIs where it makes sense.")))
(define-public qtlocation (define-public qtlocation
(package (inherit qtsvg-5) (package
(inherit qtsvg-5)
(name "qtlocation") (name "qtlocation")
(version "5.15.5") (version "5.15.5")
(source (origin (source (origin
@ -1883,14 +1886,12 @@ native APIs where it makes sense.")))
(substitute-keyword-arguments (package-arguments qtsvg-5) (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f) ; TODO: Enable the tests ((#:tests? _ #f) #f) ; TODO: Enable the tests
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases #~(modify-phases #$phases
(add-before 'check 'pre-check (add-before 'check 'pre-check
(lambda _ (lambda _
(setenv "HOME" "/tmp"))))))) (setenv "HOME" "/tmp")))))))
(native-inputs (native-inputs (list perl qtdeclarative-5 qtquickcontrols-5 qtserialport))
(list perl qtdeclarative-5 qtquickcontrols-5 qtserialport)) (inputs (list icu4c openssl qtbase-5 zlib))
(inputs
(list icu4c openssl qtbase-5 zlib))
(synopsis "Qt Location and Positioning modules") (synopsis "Qt Location and Positioning modules")
(description "The Qt Location module provides an interface for location, (description "The Qt Location module provides an interface for location,
positioning and geolocation plugins."))) positioning and geolocation plugins.")))
@ -1928,22 +1929,21 @@ plugin for Adobe After Effects.")
(license (package-license qtbase)))) (license (package-license qtbase))))
(define-public qttools-5 (define-public qttools-5
(package (inherit qtsvg-5) (package
(inherit qtsvg-5)
(name "qttools") (name "qttools")
(version "5.15.5") (version "5.15.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
(sha256 (sha256
(base32 (base32
"0v7wkzq9i8w3qrw0z8al7lb6clr57lfisyb1fm9cnhi73fvph1vd")))) "1i79fwsn799x3n3jidp3f4gz9d5vi9gg6p8g8lbswb832gggigm3"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg-5) (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests ((#:tests? _ #f) #f))) ; TODO: Enable the tests
(native-inputs (native-inputs (list perl qtdeclarative-5 vulkan-headers))
(list perl qtdeclarative-5 vulkan-headers)) (inputs (list mesa qtbase-5))
(inputs
(list mesa qtbase-5))
(synopsis "Qt Tools and Designer modules") (synopsis "Qt Tools and Designer modules")
(description "The Qt Tools module provides a set of applications to browse (description "The Qt Tools module provides a set of applications to browse
the documentation, translate applications, generate help files and other stuff the documentation, translate applications, generate help files and other stuff
@ -2011,60 +2011,59 @@ the Qt community.")
(license (list license:gpl3)))) (license (list license:gpl3))))
(define-public qtscript (define-public qtscript
(package (inherit qtsvg-5) (package
(inherit qtsvg-5)
(name "qtscript") (name "qtscript")
(version "5.15.5") (version "5.15.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
(sha256 (sha256
(base32 (base32
"17yk0p8ci47xlfpllc17arlycng47wrnnskimskzz85bspabc8pm")) "0rjj1pn0fwdq0qz0nzisxza671ywfrq5cv6iplywfyflh7q4dmcs"))
(patches (search-patches "qtscript-disable-tests.patch")))) (patches (search-patches "qtscript-disable-tests.patch"))))
(native-inputs (native-inputs (list perl qttools-5))
(list perl qttools-5)) (inputs (list qtbase-5))
(inputs
(list qtbase-5))
(synopsis "Qt Script module") (synopsis "Qt Script module")
(description "Qt provides support for application scripting with ECMAScript. (description "Qt provides support for application scripting with ECMAScript.
The following guides and references cover aspects of programming with The following guides and references cover aspects of programming with
ECMAScript and Qt."))) ECMAScript and Qt.")))
(define-public qtquickcontrols-5 (define-public qtquickcontrols-5
(package (inherit qtsvg-5) (package
(inherit qtsvg-5)
(name "qtquickcontrols") (name "qtquickcontrols")
(version "5.15.5") (version "5.15.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
(sha256 (sha256
(base32 (base32
"0mjw25wcgd2bvjz9rr4qjydb423c63615rcx1vws4jmydqdihssr")))) "0yp47bpkfckms76vw0hrwnzchy8iak23ih6w9pnwrnjkmbc65drc"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg-5) (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests ((#:tests? _ #f) #f))) ; TODO: Enable the tests
(inputs (inputs (list qtbase-5 qtdeclarative-5))
(list qtbase-5 qtdeclarative-5))
(synopsis "Qt Quick Controls and other Quick modules") (synopsis "Qt Quick Controls and other Quick modules")
(description "The QtScript module provides classes for making Qt (description "The QtScript module provides classes for making Qt
applications scriptable. This module provides a set of extra components that applications scriptable. This module provides a set of extra components that
can be used to build complete interfaces in Qt Quick."))) can be used to build complete interfaces in Qt Quick.")))
(define-public qtquickcontrols2-5 (define-public qtquickcontrols2-5
(package (inherit qtsvg-5) (package
(inherit qtsvg-5)
(name "qtquickcontrols2") (name "qtquickcontrols2")
(version "5.15.5") (version "5.15.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
(sha256 (sha256
(base32 (base32
"1cxg4ml07k1zcyi5m4lx06sz8f5l67isb5vhk7nakxm0wnn7p8y4")))) "058dkj6272za47vnz3mxsmwsj85gxf6g0ski645fphk8s3jp2bk5"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg-5) (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests ((#:tests? _ #f) #f))) ; TODO: Enable the tests
(inputs (inputs (list qtbase-5 qtdeclarative-5))
(list qtbase-5 qtdeclarative-5))
(synopsis "Qt Quick Controls 2 and other Quick 2 modules") (synopsis "Qt Quick Controls 2 and other Quick 2 modules")
(description "The Qt Quick Controls 2 module contains the Qt Labs Platform (description "The Qt Quick Controls 2 module contains the Qt Labs Platform
module that provides platform integration: native dialogs, menus and menu bars, module that provides platform integration: native dialogs, menus and menu bars,
@ -2078,20 +2077,20 @@ not available.")))
(deprecated-package "qtquickcontrols2" qtdeclarative)) (deprecated-package "qtquickcontrols2" qtdeclarative))
(define-public qtgraphicaleffects (define-public qtgraphicaleffects
(package (inherit qtsvg-5) (package
(inherit qtsvg-5)
(name "qtgraphicaleffects") (name "qtgraphicaleffects")
(version "5.15.5") (version "5.15.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
(sha256 (sha256
(base32 (base32
"0xznn5zqp6xrqfgl54l8cig9asqf9m2hz0p3ga514rh8spmdazr3")))) "0wypji8i19kjq18qd92z8kkd3fj2n0d5hgh6xiza96833afvibj9"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg-5) (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests ((#:tests? _ #f) #f))) ; TODO: Enable the tests
(inputs (inputs (list qtbase-5 qtdeclarative-5))
(list qtbase-5 qtdeclarative-5))
(synopsis "Qt Graphical Effects module") (synopsis "Qt Graphical Effects module")
(description "The Qt Graphical Effects module provides a set of QML types (description "The Qt Graphical Effects module provides a set of QML types
for adding visually impressive and configurable effects to user interfaces. for adding visually impressive and configurable effects to user interfaces.
@ -2101,17 +2100,17 @@ types. The effects cover functional areas such as blending, masking, blurring,
coloring, and many more."))) coloring, and many more.")))
(define-public qtgamepad (define-public qtgamepad
(package (inherit qtsvg-5) (package
(inherit qtsvg-5)
(name "qtgamepad") (name "qtgamepad")
(version "5.15.5") (version "5.15.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
(sha256 (sha256
(base32 (base32
"0wa4d8f025hlp4bmdzdy5wcahm9wjg6bkwig8dpw9nrsj3idz5b0")))) "0vgxprgk7lak209wsg2ljzfkpwgjzscpbxmj5fyvvwm2pbnpspvk"))))
(native-inputs (native-inputs (list perl pkg-config))
(list perl pkg-config))
(inputs (inputs
(list fontconfig (list fontconfig
freetype freetype
@ -2127,15 +2126,16 @@ primary target audience are embedded devices with fullscreen user interfaces,
and mobile applications targeting TV-like form factors."))) and mobile applications targeting TV-like form factors.")))
(define-public qtscxml (define-public qtscxml
(package (inherit qtsvg-5) (package
(inherit qtsvg-5)
(name "qtscxml") (name "qtscxml")
(version "5.15.5") (version "5.15.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
(sha256 (sha256
(base32 (base32
"0xf5mqsrw16h8xjglymgfc8qg2qa5bi4fgdl4j3dkhvvpr7vrphp")) "17j6npvgr8q3lyrqmvfh1n47mkhfzk18r998hcjm2w75xj46km1n"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -2143,11 +2143,9 @@ and mobile applications targeting TV-like form factors.")))
;; the scion test refers to the bundled 3rd party test code. ;; the scion test refers to the bundled 3rd party test code.
(substitute* "tests/auto/auto.pro" (substitute* "tests/auto/auto.pro"
(("scion") "#")))))) (("scion") "#"))))))
(arguments (arguments (substitute-keyword-arguments (package-arguments qtsvg-5)
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests ((#:tests? _ #f) #f))) ; TODO: Enable the tests
(inputs (inputs (list qtbase-5 qtdeclarative-5))
(list qtbase-5 qtdeclarative-5))
(synopsis "Qt SCXML module") (synopsis "Qt SCXML module")
(description "The Qt SCXML module provides functionality to create state (description "The Qt SCXML module provides functionality to create state
machines from SCXML files. This includes both dynamically creating state machines from SCXML files. This includes both dynamically creating state
@ -2186,42 +2184,42 @@ information and perform area based monitoring.")
(license (package-license qtbase)))) (license (package-license qtbase))))
(define-public qtpurchasing (define-public qtpurchasing
(package (inherit qtsvg-5) (package
(inherit qtsvg-5)
(name "qtpurchasing") (name "qtpurchasing")
(version "5.15.5") (version "5.15.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
(sha256 (sha256
(base32 (base32
"04z6mwzn73gg56hgs7gividinfgndx4kmcnp7w6h3wamrdlkfdx7")))) "0bjky5ncg9yhz4a63g3jl1r5pa6i09f6g8wgzs591mhybrbmhcw8"))))
(inputs (inputs (list qtbase-5 qtdeclarative-5))
(list qtbase-5 qtdeclarative-5))
(synopsis "Qt Purchasing module") (synopsis "Qt Purchasing module")
(description "The Qt Purchasing module provides and in-app API for (description "The Qt Purchasing module provides and in-app API for
purchasing goods and services."))) purchasing goods and services.")))
(define-public qtcharts (define-public qtcharts
(package (inherit qtsvg-5) (package
(inherit qtsvg-5)
(name "qtcharts") (name "qtcharts")
(version "5.15.5") (version "5.15.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
(sha256 (sha256
(base32 (base32
"0y051i1837bfybkf8cm7cx8k5wjmbi47pxawaaz6wm0hd2z5b4qi")))) "1q11ank69l9qw3iks2svr0g2g6pzng9v8p87dpsmjs988f4ysmll"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg-5) (substitute-keyword-arguments (package-arguments qtsvg-5)
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases #~(modify-phases #$phases
(add-after 'unpack 'remove-failing-test (add-after 'unpack 'remove-failing-test
(lambda _ (lambda _
(substitute* "tests/auto/auto.pro" (substitute* "tests/auto/auto.pro"
(("qml") "# qml") (("qml") "# qml")
(("qml-qtquicktest") "# qml-qtquicktest")))))))) (("qml-qtquicktest") "# qml-qtquicktest"))))))))
(inputs (inputs (list qtbase-5 qtdeclarative-5))
(list qtbase-5 qtdeclarative-5))
(synopsis "Qt Charts module") (synopsis "Qt Charts module")
(description "The Qt Charts module provides a set of easy to use chart (description "The Qt Charts module provides a set of easy to use chart
components. It uses the Qt Graphics View Framework, therefore charts can be components. It uses the Qt Graphics View Framework, therefore charts can be
@ -2231,20 +2229,19 @@ selecting one of the charts themes.")
(license license:gpl3))) (license license:gpl3)))
(define-public qtdatavis3d (define-public qtdatavis3d
(package (inherit qtsvg-5) (package
(inherit qtsvg-5)
(name "qtdatavis3d") (name "qtdatavis3d")
(version "5.15.5") (version "5.15.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
(sha256 (sha256
(base32 (base32
"0sczwqlc36jdywf7bqxz0hm6mr7fn8p1fsnc33jliiqzn9yrg77x")))) "1mr2kdshahxrkjs9wlgpr59jbqvyvlax16rlnca4iq00w3v5hrdh"))))
(arguments (arguments (substitute-keyword-arguments (package-arguments qtsvg-5)
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests ((#:tests? _ #f) #f))) ; TODO: Enable the tests
(inputs (inputs (list qtbase-5 qtdeclarative-5))
(list qtbase-5 qtdeclarative-5))
(synopsis "Qt Data Visualization module") (synopsis "Qt Data Visualization module")
(description "The Qt Data Visualization module provides a way to visualize (description "The Qt Data Visualization module provides a way to visualize
data in 3D as bar, scatter, and surface graphs. It is especially useful for data in 3D as bar, scatter, and surface graphs. It is especially useful for
@ -2256,15 +2253,14 @@ customized by using themes or by adding custom items and labels to them.")
(define-public qtnetworkauth-5 (define-public qtnetworkauth-5
(package (inherit qtsvg-5) (package (inherit qtsvg-5)
(name "qtnetworkauth") (name "qtnetworkauth")
(version "5.15.5") (version "5.15.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
(sha256 (sha256
(base32 (base32
"0c7mz715rlpg0cqgs6s0aszmslyamkhnpamc1iij6i571sj5j2f1")))) "0fsmpjwkzzy3281shld7gs1gj217smb1f8ai63gdvnkp0jb2fhc5"))))
(inputs (inputs (list qtbase-5))
(list qtbase-5))
(synopsis "Qt Network Authorization module") (synopsis "Qt Network Authorization module")
(description "The Qt Network Authorization module provides an (description "The Qt Network Authorization module provides an
implementation of OAuth and OAuth2 authenticathon methods for Qt."))) implementation of OAuth and OAuth2 authenticathon methods for Qt.")))
@ -2290,54 +2286,57 @@ implementation of OAuth and OAuth2 authenticathon methods for Qt.")
(license (package-license qtbase)))) (license (package-license qtbase))))
(define-public qtremoteobjects (define-public qtremoteobjects
(package (inherit qtsvg-5) (package
(name "qtremoteobjects") (name "qtremoteobjects")
(version "5.15.5") (version "6.3.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
(sha256 (sha256
(base32 (base32
"1m0xcqlbxsfn0cd4ajin1h3i4l51dajmkw91v0r4a61xi14i0kks")))) "099b3vchi458i4fci9kfwan871jplqlk5l8q78mfnh33g80qnasi"))))
(build-system cmake-build-system)
(arguments (arguments
(substitute-keyword-arguments (package-arguments qtsvg-5) (list
((#:phases phases) #:phases
`(modify-phases ,phases #~(modify-phases %standard-phases
(add-after 'unpack 'remove-failing-test (add-before 'check 'set-display
(lambda _ (lambda _
;; This test can't find its imports. ;; Make Qt render "offscreen", required for tests.
(substitute* "tests/auto/qml/qml.pro" (setenv "QT_QPA_PLATFORM" "offscreen")))
(("integration") "# integration") (delete 'check) ;move after the install phase
(("usertypes") "# usertypes")) (add-after 'install 'check
;; disable failing tests: they need network (assoc-ref %standard-phases 'check))
(substitute* "tests/auto/auto.pro" (add-before 'check 'prepare-for-tests
(("integration_multiprocess proxy_multiprocess integration_external restart") (lambda _
"integration_multiprocess")))))))) (setenv "QML2_IMPORT_PATH"
(inputs (string-append #$output "/lib/qt6/qml:"
(list qtbase-5 qtdeclarative-5)) (getenv "QML2_IMPORT_PATH"))))))))
(native-inputs (list perl vulkan-headers))
(inputs (list libxkbcommon qtbase qtdeclarative))
(synopsis "Qt Remote Objects module") (synopsis "Qt Remote Objects module")
(description "The Qt Remote Objects module is an @dfn{inter-process (description "The Qt Remote Objects module is an @dfn{inter-process
communication} (IPC) module developed for Qt. The idea is to extend existing communication} (IPC) module developed for Qt. The idea is to extend existing
Qt's functionalities to enable an easy exchange of information between Qt's functionalities to enable an easy exchange of information between
processes or computers."))) processes or computers.")
(home-page (package-home-page qtbase))
(license (package-license qtbase))))
(define-public qtspeech (define-public qtspeech
(package (inherit qtsvg-5) (package
(inherit qtsvg-5)
(name "qtspeech") (name "qtspeech")
(version "5.15.5") (version "5.15.8")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
(sha256 (sha256
(base32 (base32
"0xskp9dzjy5nqszygk8gwvjyiylgynx5sq3nk2vi3zwgfdh5jpm4")))) "1q56lyj7s05sx52j5z6gcs000mni4c7mb7qyq4lfval7c06hw5p6"))))
(arguments (arguments (substitute-keyword-arguments (package-arguments qtsvg-5)
(substitute-keyword-arguments (package-arguments qtsvg-5)
((#:tests? _ #f) #f))) ; TODO: Enable the tests ((#:tests? _ #f) #f))) ; TODO: Enable the tests
(inputs (inputs (list qtbase-5))
(list qtbase-5)) (native-inputs (list perl qtdeclarative-5 qtmultimedia-5 qtxmlpatterns))
(native-inputs
(list perl qtdeclarative-5 qtmultimedia-5 qtxmlpatterns))
(synopsis "Qt Speech module") (synopsis "Qt Speech module")
(description "The Qt Speech module enables a Qt application to support (description "The Qt Speech module enables a Qt application to support
accessibility features such as text-to-speech, which is useful for end-users accessibility features such as text-to-speech, which is useful for end-users
@ -2434,14 +2433,14 @@ using the Enchant spell-checking library.")
(package (package
(inherit qtsvg-5) (inherit qtsvg-5)
(name "qtwebengine") (name "qtwebengine")
(version "5.15.5") (version "5.15.8")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (qt-urls name version)) (uri (qt-urls name version))
(sha256 (sha256
(base32 (base32
"0zahr9w6rqdxwh2whsgk3fhcszs7wa9j95lq4sqi8xzin2wcgl17")) "1qv15g5anhlfsdwnjxy21vc3zxxm8149vysi774l93iab6mxqmjg"))
(modules '((ice-9 ftw) (modules '((ice-9 ftw)
(ice-9 match) (ice-9 match)
(srfi srfi-1) (srfi srfi-1)
@ -2599,9 +2598,10 @@ using the Enchant spell-checking library.")
(substitute* (substitute*
"base/third_party/dynamic_annotations/dynamic_annotations.c" "base/third_party/dynamic_annotations/dynamic_annotations.c"
(("base/third_party/valgrind") "valgrind")) (("base/third_party/valgrind") "valgrind"))
(substitute* (substitute* '("third_party/breakpad/breakpad/src/common\
'("third_party/breakpad/breakpad/src/common/linux/http_upload.cc" /linux/http_upload.cc"
"third_party/breakpad/breakpad/src/common/linux/libcurl_wrapper.h") "third_party/breakpad/breakpad/src/common/\
linux/libcurl_wrapper.h")
(("third_party/curl") "curl")) (("third_party/curl") "curl"))
(substitute* (substitute*
'("components/viz/common/gpu/vulkan_context_provider.h" '("components/viz/common/gpu/vulkan_context_provider.h"
@ -2693,10 +2693,9 @@ using the Enchant spell-checking library.")
(guix build utils) (guix build utils)
(ice-9 textual-ports))) (ice-9 textual-ports)))
((#:phases phases) ((#:phases phases)
`(modify-phases ,phases #~(modify-phases #$phases
(add-before 'configure 'substitute-source (add-before 'configure 'substitute-source
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(with-atomic-file-replacement (with-atomic-file-replacement
"src/buildtools/config/linux.pri" "src/buildtools/config/linux.pri"
(lambda (in out) (lambda (in out)
@ -2709,9 +2708,11 @@ using the Enchant spell-checking library.")
;; translations and locales in the store. ;; translations and locales in the store.
(substitute* "src/core/web_engine_library_info.cpp" (substitute* "src/core/web_engine_library_info.cpp"
(("QLibraryInfo::location\\(QLibraryInfo::TranslationsPath\\)") (("QLibraryInfo::location\\(QLibraryInfo::TranslationsPath\\)")
(string-append "QLatin1String(\"" out "/share/qt5/translations\")")) (string-append "QLatin1String(\"" #$output
"/share/qt5/translations\")"))
(("QLibraryInfo::location\\(QLibraryInfo::DataPath\\)") (("QLibraryInfo::location\\(QLibraryInfo::DataPath\\)")
(string-append "QLatin1String(\"" out "/share/qt5\")"))) (string-append "QLatin1String(\"" #$output
"/share/qt5\")")))
;; Substitute full dynamic library path for nss. ;; Substitute full dynamic library path for nss.
(substitute* "src/3rdparty/chromium/crypto/nss_util.cc" (substitute* "src/3rdparty/chromium/crypto/nss_util.cc"
(("libnssckbi.so") (("libnssckbi.so")
@ -2719,7 +2720,7 @@ using the Enchant spell-checking library.")
;; Substitute full dynamic library path for udev. ;; Substitute full dynamic library path for udev.
(substitute* "src/3rdparty/chromium/device/udev_linux/udev1_loader.cc" (substitute* "src/3rdparty/chromium/device/udev_linux/udev1_loader.cc"
(("libudev.so.1") (("libudev.so.1")
(search-input-file inputs "lib/libudev.so.1")))))) (search-input-file inputs "lib/libudev.so.1")))))
(add-before 'configure 'set-env (add-before 'configure 'set-env
(lambda _ (lambda _
;; Avoids potential race conditions. ;; Avoids potential race conditions.

6
gnu/packages/rails.scm
View file

@ -81,6 +81,12 @@
"") "")
((".*behaviors/encoded_key_cache_behavior.*") ((".*behaviors/encoded_key_cache_behavior.*")
"")) ""))
(when #$(target-x86-32?)
;; This test fails on i686 (see:
;; https://github.com/rails/rails/issues/47832).
(substitute* "test/core_ext/duration_test.rb"
(("def test_iso8601_output_and_reparsing.*" all)
(string-append all " skip('fails on i686')\n"))))
(delete-file "test/evented_file_update_checker_test.rb") (delete-file "test/evented_file_update_checker_test.rb")
;; These tests require cache_store_behavior, disabled above. ;; These tests require cache_store_behavior, disabled above.
(delete-file "test/cache/stores/file_store_test.rb") (delete-file "test/cache/stores/file_store_test.rb")

22
gnu/packages/ruby.scm
View file

@ -6243,8 +6243,9 @@ to reproduce user environments.")
#~(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'install 'delete-mkmf.log (add-after 'install 'delete-mkmf.log
(lambda _ (lambda _
;; This build log captures non-deterministic file names (see: ;; Rubygems installs build log files that embed volatile file
;; https://github.com/sparklemotion/nokogiri/issues/2755). ;; names (see:
;; https://github.com/rubygems/rubygems/issues/6259).
(for-each delete-file (find-files #$output "^mkmf\\.log$"))))))) (for-each delete-file (find-files #$output "^mkmf\\.log$")))))))
(native-inputs (list ruby-hoe)) (native-inputs (list ruby-hoe))
(inputs (list zlib libxml2 libxslt)) (inputs (list zlib libxml2 libxslt))
@ -7818,10 +7819,8 @@ alternative to Marshal for Object serialization.")
(string-append (getenv "GEM_PATH") ":" new-gem)) (string-append (getenv "GEM_PATH") ":" new-gem))
(when tests? (when tests?
(invoke "rspec")))))))) (invoke "rspec"))))))))
(native-inputs (native-inputs (list ruby-rake-compiler ruby-hoe ruby-rspec))
(list ruby-rake-compiler ruby-hoe ruby-rspec)) (inputs (list postgresql))
(inputs
(list postgresql))
(synopsis "Ruby interface to PostgreSQL") (synopsis "Ruby interface to PostgreSQL")
(description "Pg is the Ruby interface to the PostgreSQL RDBMS. It works (description "Pg is the Ruby interface to the PostgreSQL RDBMS. It works
with PostgreSQL 9.3 and later.") with PostgreSQL 9.3 and later.")
@ -11526,7 +11525,7 @@ part of the Prawn PDF generator.")
(define-public ruby-puma (define-public ruby-puma
(package (package
(name "ruby-puma") (name "ruby-puma")
(version "6.1.1") (version "6.2.0")
(source (source
(origin (origin
(method git-fetch) ;for tests (method git-fetch) ;for tests
@ -11536,7 +11535,7 @@ part of the Prawn PDF generator.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0v4nn3z0bj0ry0gpx1hsf5mzkinsx9sv716j4jf2nb1x6hcwv993")))) "0d71h5ggvfgnxq9msd1hmcz3s8mspzf7kqas1hzr0w9pfafddyv3"))))
(build-system ruby-build-system) (build-system ruby-build-system)
(arguments (arguments
(list (list
@ -11572,6 +11571,12 @@ part of the Prawn PDF generator.")
(lambda* (#:key tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)
(when tests? (when tests?
(invoke "bundle" "exec" "rake" "test")))) (invoke "bundle" "exec" "rake" "test"))))
(add-after 'install 'delete-mkmf.log
(lambda _
;; Rubygems installs build log files that embed volatile file
;; names (see:
;; https://github.com/rubygems/rubygems/issues/6259).
(for-each delete-file (find-files #$output "^mkmf\\.log$"))))
(add-before 'check 'disable-problematic-tests (add-before 'check 'disable-problematic-tests
(lambda _ (lambda _
(let-syntax ((skip-tests (let-syntax ((skip-tests
@ -11594,6 +11599,7 @@ part of the Prawn PDF generator.")
"test_off_tls1_2") "test_off_tls1_2")
(skip-tests "test/test_integration_cluster.rb" (skip-tests "test/test_integration_cluster.rb"
"test_fork_worker_on_refork" "test_fork_worker_on_refork"
"test_hot_restart_does_not_drop_connections"
"test_culling_strategy_oldest_fork_worker" "test_culling_strategy_oldest_fork_worker"
"test_usr1_fork_worker") "test_usr1_fork_worker")
(skip-tests "test/test_integration_pumactl.rb" (skip-tests "test/test_integration_pumactl.rb"

24
gnu/packages/rust-apps.scm
View file

@ -12,7 +12,7 @@
;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.ccom> ;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.ccom>
;;; Copyright © 2021, 2022 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021, 2022 Zheng Junjie <873216071@qq.com>
;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro> ;;; Copyright © 2021 Alexandru-Sergiu Marton <brown121407@posteo.ro>
;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021, 2022 Petr Hodina <phodina@protonmail.com> ;;; Copyright © 2021, 2022 Petr Hodina <phodina@protonmail.com>
;;; Copyright © 2021 jgart <jgart@dismail.de> ;;; Copyright © 2021 jgart <jgart@dismail.de>
;;; Copyright © 2021 Nicolas Graves <ngraves@ngraves.fr> ;;; Copyright © 2021 Nicolas Graves <ngraves@ngraves.fr>
@ -1075,6 +1075,19 @@ rebase.")
(base32 (base32
"006rn3fn4njayjxr2vd24g1awssr9i3894nbmfzkybx07j728vav")))))) "006rn3fn4njayjxr2vd24g1awssr9i3894nbmfzkybx07j728vav"))))))
(define-public rust-cbindgen-0.20
(package
(inherit rust-cbindgen-0.24)
(name "rust-cbindgen")
(version "0.20.0")
(source (origin
(method url-fetch)
(uri (crate-uri "cbindgen" version))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1p67vvjkxh07yfizfkvm6bjlv2bywrnl57hshcsz9h2x2qxrgqsi"))))))
(define-public rust-cbindgen-0.19 (define-public rust-cbindgen-0.19
(package (package
(inherit rust-cbindgen) (inherit rust-cbindgen)
@ -1823,10 +1836,11 @@ language. It is a part of a larger rls-2.0 effort to create excellent IDE
support for Rust.") support for Rust.")
(license (list license:expat license:asl2.0)))) (license (list license:expat license:asl2.0))))
;;; Note: keep in sync with our current Rust/Cargo version.
(define-public rust-cargo-c (define-public rust-cargo-c
(package (package
(name "rust-cargo-c") (name "rust-cargo-c")
(version "0.8.1+cargo-0.53") (version "0.9.8+cargo-0.60")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -1835,12 +1849,12 @@ support for Rust.")
(string-append name "-" version ".tar.gz")) (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0fwdxhdj2963xr6xfqr56i7hikhsdv562vgxq2dj3h2mi3dil1k6")))) "1zdzs3drjr9p6chg32inyi05rfv1c12nkk4bi7qpha12m6rsn26d"))))
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
`(#:cargo-inputs `(#:cargo-inputs
(("rust-cbindgen" ,rust-cbindgen-0.19) (("rust-cbindgen" ,rust-cbindgen-0.20)
("rust-cargo" ,rust-cargo-0.53) ; ("rust-cargo" ,rust-cargo-0.60)
("rust-anyhow" ,rust-anyhow-1) ("rust-anyhow" ,rust-anyhow-1)
("rust-pretty-env-logger" ,rust-pretty-env-logger-0.4) ("rust-pretty-env-logger" ,rust-pretty-env-logger-0.4)
("rust-structopt" ,rust-structopt-0.3) ("rust-structopt" ,rust-structopt-0.3)

80
gnu/packages/sdl.scm
View file

@ -9,7 +9,7 @@
;;; Copyright © 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018, 2019, 2020 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2019 Kei Kebreau <kkebreau@posteo.net> ;;; Copyright © 2019 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr> ;;; Copyright © 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2019, 2022 Marius Bakke <marius@gnu.org>
;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2019 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si> ;;; Copyright © 2020 Timotej Lazar <timotej.lazar@araneo.si>
;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
@ -115,7 +115,7 @@ joystick, and graphics hardware.")
(package (package
(inherit sdl) (inherit sdl)
(name "sdl2") (name "sdl2")
(version "2.24.0") (version "2.26.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -123,7 +123,7 @@ joystick, and graphics hardware.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"15vd9najhjh6s9z9hhx7zp51iby690a1g3h7kcwjvyb82x5w7r4i")))) "1q4r1camsr17mnpv00d6h3qy93b481rp68r6fbxbszq3vv1rplwm"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments sdl) (substitute-keyword-arguments (package-arguments sdl)
((#:configure-flags flags) ((#:configure-flags flags)
@ -468,7 +468,7 @@ directory.")
(define-public sdl2-image (define-public sdl2-image
(package (inherit sdl-image) (package (inherit sdl-image)
(name "sdl2-image") (name "sdl2-image")
(version "2.0.5") (version "2.6.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -476,14 +476,15 @@ directory.")
(string-append "https://www.libsdl.org/projects/SDL_image/release/" (string-append "https://www.libsdl.org/projects/SDL_image/release/"
"SDL2_image-" version ".tar.gz")) "SDL2_image-" version ".tar.gz"))
(sha256 (sha256
(base32 "1l0864kas9cwpp2d32yxl81g98lx40dhbdp03dz7sbv84vhgdmdx")))) (base32 "0xs7h5cp0sz082rn1bqjqbrgwjhwcskz9i6ikiisq2yhv2s5yda8"))))
(propagated-inputs (propagated-inputs
(propagated-inputs-with-sdl2 sdl-image)))) (propagated-inputs-with-sdl2 sdl-image))
(properties '((upstream-name . "SDL2_image")))))
(define-public sdl2-mixer (define-public sdl2-mixer
(package (inherit sdl-mixer) (package (inherit sdl-mixer)
(name "sdl2-mixer") (name "sdl2-mixer")
(version "2.0.4") (version "2.6.2")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -496,32 +497,37 @@ directory.")
(delete-file-recursively "external") (delete-file-recursively "external")
#t)) #t))
(sha256 (sha256
(base32 "0694vsz5bjkcdgfdra6x9fq8vpzrl8m6q96gh58df7065hw5mkxl")))) (base32 "0wd35a9fcj1bv534k9cr4jdk076dpiqq0ayk6cybmv3d6q8aiplc"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments sdl-mixer) (list #:tests? #f ;no tests
((#:configure-flags flags) #:configure-flags
`(cons* #~'(;; Prefer system libraries to bundled codecs.
"--disable-music-opus-shared" "--enable-music-flac-libflac"
;; These options were renamed in SDL2 mixer. Keeping the inherited "--enable-music-midi-fluidsynth"
;; variants produces a harmless warning. "--enable-music-mod-modplug"
"--disable-music-mod-modplug-shared" "--enable-music-mp3-mpg123"
"--disable-music-midi-fluidsynth-shared" "--enable-music-ogg-vorbis"
,flags)))) "--enable-music-opus"
(inputs ;; Link the libraries instead of dlopening them.
(modify-inputs (package-inputs sdl-mixer) "--enable-music-flac-libflac-shared=no"
(delete "libmikmod") "--enable-music-midi-fluidsynth-shared=no"
(prepend opusfile "--enable-music-mod-modplug-shared=no"
;; The default MOD library changed in SDL2 mixer. "--enable-music-mp3-mpg123-shared=no"
libmodplug))) "--enable-music-ogg-vorbis-shared=no"
"--enable-music-opus-shared=no")))
(native-inputs (native-inputs
`(("pkgconfig" ,pkg-config))) ; Needed to find the opus library. (list pkg-config))
(inputs '())
(propagated-inputs (propagated-inputs
(propagated-inputs-with-sdl2 sdl-mixer)))) (modify-inputs (propagated-inputs-with-sdl2 sdl-mixer)
;; In Requires.private of SDL2_mixer.pc.
(append flac fluidsynth libmodplug libvorbis mpg123 opusfile)))
(properties '((upstream-name . "SDL2_mixer")))))
(define-public sdl2-net (define-public sdl2-net
(package (inherit sdl-net) (package (inherit sdl-net)
(name "sdl2-net") (name "sdl2-net")
(version "2.0.1") (version "2.2.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -530,29 +536,35 @@ directory.")
"SDL2_net-" version ".tar.gz")) "SDL2_net-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"08cxc1bicmyk89kiks7izw1rlx5ng5n6xpy8fy0zxni3b9z8mkhm")))) "1svzhpf7k48jfga8ph127l99lwpgs5g5isgl9ybp2qiii0cqjjjf"))))
(propagated-inputs (propagated-inputs
(propagated-inputs-with-sdl2 sdl-net)))) (propagated-inputs-with-sdl2 sdl-net))
(properties '((upstream-name . "SDL2_net")))))
(define-public sdl2-ttf (define-public sdl2-ttf
(package (inherit sdl-ttf) (package (inherit sdl-ttf)
(name "sdl2-ttf") (name "sdl2-ttf")
(version "2.0.15") (version "2.20.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
(string-append "https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-" (string-append "https://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-"
version ".tar.gz")) version ".tar.gz"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (begin (snippet
;; Remove bundled libraries. ;; Remove bundled libraries.
'(delete-file-recursively "external") '(delete-file-recursively "external"))
#t))
(sha256 (sha256
(base32 (base32
"0cyd48dipc0m399qy8s03lci8b0bpiy8xlkvrm2ia7wcv0dfpv59")))) "0mqcgpcvzp927xv1gs51f2wqly9k9f8nxfxi69lxlfncyd8svkbq"))))
(arguments
(list #:configure-flags #~'("--enable-freetype-builtin=no"
"--enable-harfbuzz-builtin=no")))
(propagated-inputs (propagated-inputs
(propagated-inputs-with-sdl2 sdl-ttf)))) (modify-inputs (propagated-inputs-with-sdl2 sdl-ttf)
;; In Requires.private of SDL2_ttf.pc.
(prepend harfbuzz freetype)))
(properties '((upstream-name . "SDL2_ttf")))))
(define-public guile-sdl (define-public guile-sdl
(package (package

6
gnu/packages/syndication.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016, 2017, 2019, 2020, 2021, 2022 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2019-2023 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018, 2019, 2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019, 2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net> ;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
@ -223,14 +223,14 @@ cards.")
(define-public newsboat (define-public newsboat
(package (package
(name "newsboat") (name "newsboat")
(version "2.29") (version "2.30.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://newsboat.org/releases/" version (uri (string-append "https://newsboat.org/releases/" version
"/newsboat-" version ".tar.xz")) "/newsboat-" version ".tar.xz"))
(sha256 (sha256
(base32 "0szx4pivkaja8v399m6v7ycp1xprm4cz7n5z929g4j191hg81f8q")))) (base32 "0bv0al3inay6jsggaz2zja4j9jp1ffn8bp4i4jr8wd1c9asgsgs1"))))
(build-system cargo-build-system) (build-system cargo-build-system)
(native-inputs (native-inputs
`(("gettext" ,gettext-minimal) `(("gettext" ,gettext-minimal)

11
gnu/packages/telephony.scm
View file

@ -17,7 +17,7 @@
;;; Copyright © 2020 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2020, 2022 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020, 2022 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org> ;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2021 LibreMiami <packaging-guix@libremiami.org> ;;; Copyright © 2021 LibreMiami <packaging-guix@libremiami.org>
;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev> ;;; Copyright © 2021 Sarah Morgensen <iskarian@mgsn.dev>
@ -729,7 +729,7 @@ your calls and messages.")
(define-public pjproject (define-public pjproject
(package (package
(name "pjproject") (name "pjproject")
(version "2.12.1") (version "2.13")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -739,7 +739,7 @@ your calls and messages.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"0xrj4sznbaip22y9hclff6y81l285bzkkj1smzifskpk3kiwp00w")) "0ld0adp9y2ydnz2ldwdzig3hpk4ayx1va6aqc3nja8zfdnd36fyb"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
@ -820,7 +820,10 @@ your calls and messages.")
"#define INCLUDE_TCP_TEST 0\n") "#define INCLUDE_TCP_TEST 0\n")
;; The TSX tests takes a very long time to run; skip them. ;; The TSX tests takes a very long time to run; skip them.
(("#define INCLUDE_TSX_GROUP.*") (("#define INCLUDE_TSX_GROUP.*")
"#define INCLUDE_TSX_GROUP 0\n")) "#define INCLUDE_TSX_GROUP 0\n")
;; The resolve test requires a working domain name resolver.
(("#define INCLUDE_RESOLVE_TEST.*")
"#define INCLUDE_RESOLVE_TEST 0\n"))
(substitute* "pjsip/src/test/dns_test.c" (substitute* "pjsip/src/test/dns_test.c"
;; The round_robin_test fails non-deterministically (depending ;; The round_robin_test fails non-deterministically (depending
;; on load); skip it (see: ;; on load); skip it (see:

58
gnu/packages/toolkits.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020, 2022 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2020, 2022 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com> ;;; Copyright © 2022 John Kehayias <john.kehayias@protonmail.com>
;;; ;;;
@ -32,7 +32,7 @@
(define-public imgui (define-public imgui
(package (package
(name "imgui") (name "imgui")
(version "1.88") (version "1.89.4")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -41,7 +41,7 @@
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"13cw4hx55y5z678r558hv7znfz666wh0w849c5padnj4nkpbihdi")) "1j79gsg9i969slygrwm0dp5mkzagglawxxagjpi3009wyp6lj6l8"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove bundled fonts. ;; Remove bundled fonts.
@ -66,7 +66,12 @@
(replace 'build (replace 'build
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Build main library. ;; Build main library.
(apply invoke #$(cc-for-target) "-I" (getcwd) (apply invoke #$(cc-for-target)
;; This option is necessary at least for OpenBoardView,
;; otherwise it would fail with the "Too many vertices in
;; ImDrawList using 16-bit indices".
"-DImDrawIdx=unsigned int"
"-I" (getcwd)
"-I" (search-input-directory inputs "include/freetype2") "-I" (search-input-directory inputs "include/freetype2")
"-g" "-O2" "-fPIC" "-shared" "-g" "-O2" "-fPIC" "-shared"
"-lGL" "-lSDL2" "-lglfw" "-lGL" "-lSDL2" "-lglfw"
@ -77,39 +82,42 @@
"imgui_widgets.cpp" "imgui_widgets.cpp"
;; Include the supported backends. ;; Include the supported backends.
"backends/imgui_impl_glfw.cpp" "backends/imgui_impl_glfw.cpp"
"backends/imgui_impl_sdl.cpp" (if (file-exists? "backends/imgui_impl_sdl2.cpp")
"backends/imgui_impl_sdl2.cpp"
"backends/imgui_impl_sdl.cpp")
"backends/imgui_impl_opengl2.cpp" "backends/imgui_impl_opengl2.cpp"
"backends/imgui_impl_opengl3.cpp" "backends/imgui_impl_opengl3.cpp"
;; Include wrappers for C++ standard library (STL) and ;; Include wrappers for C++ standard library (STL) and
;; fontconfig. ;; fontconfig.
(find-files "misc" "\\.cpp$")))) (find-files "misc" "\\.cpp$"))))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(let* ((out (assoc-ref outputs "out")) (let* ((header? (cut string-suffix? ".h" <>))
(doc (assoc-ref outputs "doc"))
(header? (cut string-suffix? ".h" <>))
(imgui-headers (scandir "." header?)) (imgui-headers (scandir "." header?))
(backend-headers (find-files (backend-headers (find-files
"backends" "backends"
"(glfw|opengl|sdl|vulkan).*\\.h$")) "(glfw|opengl|sdl|vulkan).*\\.h$"))
(misc-headers (find-files "misc" "\\.h$"))) (misc-headers (find-files "misc" "\\.h$")))
(install-file "libimgui.so" (string-append out "/lib")) (install-file "libimgui.so" (string-append #$output "/lib"))
;; Install headers. ;; Install headers.
(for-each (lambda (f) (for-each (lambda (f)
(install-file f (string-append out "/include/imgui"))) (install-file f (string-append #$output
"/include/imgui")))
imgui-headers) imgui-headers)
(for-each (lambda (f) (for-each (lambda (f)
(install-file f (string-append (install-file f (string-append
out "/include/imgui/backends"))) #$output
"/include/imgui/backends")))
backend-headers) backend-headers)
(for-each (lambda (f) (for-each (lambda (f)
(install-file f (string-append (install-file f (string-append #$output
out "/include/imgui/" (dirname f)))) "/include/imgui/"
(dirname f))))
misc-headers) misc-headers)
;; Install examples. ;; Install examples.
(copy-recursively (copy-recursively "examples"
"examples" (string-append (string-append #$output:doc
doc "/share/imgui/examples")))))))) "/share/imgui/examples"))))))))
(inputs (list fontconfig glfw mesa sdl2)) (inputs (list fontconfig glfw mesa sdl2))
(home-page "https://github.com/ocornut/imgui") (home-page "https://github.com/ocornut/imgui")
(synopsis "Immediate-mode C++ GUI library with minimal dependencies") (synopsis "Immediate-mode C++ GUI library with minimal dependencies")
@ -126,6 +134,22 @@ applications, full-screen applications, and embedded platforms without
standard operating system features.") standard operating system features.")
(license license:expat))) (license license:expat)))
(define-public imgui-1.87
(package
(inherit imgui)
(name "imgui")
(version "1.87")
(source (origin
(inherit (package-source imgui))
(method git-fetch)
(uri (git-reference
(url "https://github.com/ocornut/imgui")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"10qil22s5qak3as41787iz273sibpq1bq66bakgn7yvhj5fym6hz"))))))
(define-public imgui-1.86 (define-public imgui-1.86
(package (package
(inherit imgui) (inherit imgui)

18
gnu/packages/unicode.scm
View file

@ -77,14 +77,14 @@ renderer.")
(define-public ucd (define-public ucd
(package (package
(name "ucd") (name "ucd")
(version "14.0.0") (version "15.0.0")
(source (source
(origin (origin
(method url-fetch/zipbomb) (method url-fetch/zipbomb)
(uri (string-append "https://www.unicode.org/Public/zipped/" version (uri (string-append "https://www.unicode.org/Public/zipped/" version
"/UCD.zip")) "/UCD.zip"))
(sha256 (sha256
(base32 "001nq9w52ijma0vps40xwy2q6ylpyf1393lzb128ibypnmv54fh3")))) (base32 "133inqn33hcfvylmps63yjr6rrqrfq6x7a5hr5fd51z6yc0f9gaz"))))
(build-system copy-build-system) (build-system copy-build-system)
(arguments (arguments
'(#:install-plan '(#:install-plan
@ -97,20 +97,6 @@ files listing Unicode character properties and related data. It also includes
test data for conformance to several important Unicode algorithms.") test data for conformance to several important Unicode algorithms.")
(license unicode))) (license unicode)))
(define-public ucd-next
(package
(inherit ucd)
(name "ucd")
(version "15.0.0")
(source
(origin
(method url-fetch/zipbomb)
(uri (string-append "https://www.unicode.org/Public/zipped/" version
"/UCD.zip"))
(sha256
(base32
"133inqn33hcfvylmps63yjr6rrqrfq6x7a5hr5fd51z6yc0f9gaz"))))))
(define (unicode-emoji-file name version hash) (define (unicode-emoji-file name version hash)
(origin (origin
(method url-fetch) (method url-fetch)

4
gnu/packages/version-control.scm
View file

@ -2020,6 +2020,10 @@ following features:
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list
;; Running the tests in parallel causes test failures on i686-linux.
;; The issue was reported to users@subversion.apache.org, as suggested
;; at https://subversion.apache.org/reporting-issues.
#:parallel-tests? #f
#:configure-flags #~(list "--enable-static=no") #:configure-flags #~(list "--enable-static=no")
#:phases #:phases
#~(modify-phases %standard-phases #~(modify-phases %standard-phases

98
gnu/packages/video.scm
View file

@ -849,7 +849,7 @@ television and DVD. It is also known as AC-3.")
(define-public libaom (define-public libaom
(package (package
(name "libaom") (name "libaom")
(version "3.3.0") (version "3.5.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -858,7 +858,7 @@ television and DVD. It is also known as AC-3.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"024vhsx7bw9kajk65hhh5vmqrja0h33rmlcpngsj3yg4p8l29943")))) "0arn8a88jz4mj69n8cs4qmrdjwhbvzsqgnx20wr9mq01b06kqich"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
(list perl pkg-config python)) ; to detect the version (list perl pkg-config python)) ; to detect the version
@ -866,7 +866,6 @@ television and DVD. It is also known as AC-3.")
`(#:tests? #f ; downloads many video clips `(#:tests? #f ; downloads many video clips
#:configure-flags #:configure-flags
(list "-DBUILD_SHARED_LIBS=YES" (list "-DBUILD_SHARED_LIBS=YES"
"-DENABLE_PIC=TRUE"
"-DAOM_TARGET_CPU=generic" "-DAOM_TARGET_CPU=generic"
(string-append "-DCMAKE_INSTALL_PREFIX=" (string-append "-DCMAKE_INSTALL_PREFIX="
(assoc-ref %outputs "out"))) (assoc-ref %outputs "out")))
@ -916,8 +915,8 @@ shared library and encoder and decoder command-line executables.")
(define-public libx264 (define-public libx264
;; There are no tags in the repository, so we take the version number from ;; There are no tags in the repository, so we take the version number from
;; the X264_BUILD variable defined in x264.h. ;; the X264_BUILD variable defined in x264.h.
(let ((version "161") (let ((version "164")
(commit "4c2aafd864dd201832ec2be0fef4484925146650") (commit "b093bbe7d9bc642c8f24067cbdcc73bb43562eab")
(revision "0")) (revision "0"))
(package (package
(name "libx264") (name "libx264")
@ -930,7 +929,7 @@ shared library and encoder and decoder command-line executables.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"1i6v9h3xx9pi0zmlj3anwwjxqa63sbhy9crrif8dphipwfn9hyg5")))) "095pv8y6fqjg8mdvsfk12d0jqgyhip536a6vxhzm7qz8hfp96qhq"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list pkg-config nasm)) (list pkg-config nasm))
@ -980,27 +979,6 @@ H.264 (MPEG-4 AVC) video streams.")
"file://extras/cl.h" "file://extras/cl.h"
"See extras/cl.h in the distribution.")))))) "See extras/cl.h in the distribution."))))))
;;; TODO: Merge into libx264 on staging.
(define-public libx264-next
;; There are no tags in the repository, so we take the version number from
;; the X264_BUILD variable defined in x264.h.
(let ((version "164")
(commit "b093bbe7d9bc642c8f24067cbdcc73bb43562eab")
(revision "0"))
(package
(inherit libx264)
(name "libx264")
(version (git-version version revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://code.videolan.org/videolan/x264.git")
(commit commit)))
(file-name (git-file-name name version))
(sha256
(base32
"095pv8y6fqjg8mdvsfk12d0jqgyhip536a6vxhzm7qz8hfp96qhq")))))))
(define-public mkvtoolnix (define-public mkvtoolnix
(package (package
(name "mkvtoolnix") (name "mkvtoolnix")
@ -1523,14 +1501,14 @@ quality and performance.")
(define-public libva (define-public libva
(package (package
(name "libva") (name "libva")
(version "2.15.0") (version "2.16.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/intel/libva/releases/download/" (uri (string-append "https://github.com/intel/libva/releases/download/"
version "/libva-" version ".tar.bz2")) version "/libva-" version ".tar.bz2"))
(sha256 (sha256
(base32 "1jhy8qzfp4ydbxs9qd9km7k5wq8r4s2vq20r1q07lgld8l4x93i5")))) (base32 "070aj9nw681a4m7f5xb662hhyib0w9q0i0s9v8vplh9cvfhaqpqi"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
@ -1598,17 +1576,18 @@ These tools require a supported graphics chip, driver, and VA-API back end to
operate properly.") operate properly.")
(license license:expat))) (license license:expat)))
(define-public ffmpeg-5 (define-public ffmpeg
(package (package
(name "ffmpeg") (name "ffmpeg")
(version "5.1.2") (version "6.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://ffmpeg.org/releases/ffmpeg-" (uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1p7kxr0f9f9d0pyyxq9ciaj9ch2drmcw5p9jk22j111ccrnp17k1")))) "10kh2f4y4isfqj4xpcqqnzk611jh89ywcjyjnq9c2jcv5p18ggjp"))))
(outputs '("out" "debug"))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
(append (append
@ -1749,6 +1728,8 @@ operate properly.")
;; The static libraries are 23 MiB ;; The static libraries are 23 MiB
"--disable-static" "--disable-static"
"--disable-stripping"
#$@(if (target-riscv64?) #$@(if (target-riscv64?)
'("--extra-cflags=-fPIC") '("--extra-cflags=-fPIC")
'()) '())
@ -1792,6 +1773,18 @@ convert and stream audio and video. It includes the libavcodec
audio/video codec library.") audio/video codec library.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public ffmpeg-5
(package
(inherit ffmpeg)
(version "5.1.2")
(source (origin
(method url-fetch)
(uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
version ".tar.xz"))
(sha256
(base32
"1p7kxr0f9f9d0pyyxq9ciaj9ch2drmcw5p9jk22j111ccrnp17k1"))))))
(define-public ffmpeg-4 (define-public ffmpeg-4
(package (package
(inherit ffmpeg-5) (inherit ffmpeg-5)
@ -1803,10 +1796,10 @@ audio/video codec library.")
(sha256 (sha256
(base32 (base32
"14xadxm1yaamp216nq09xwasxg5g133v86dbb33mdg5di1zrlhdg")))) "14xadxm1yaamp216nq09xwasxg5g133v86dbb33mdg5di1zrlhdg"))))
(inputs (modify-inputs (package-inputs ffmpeg-5) (inputs (modify-inputs (package-inputs ffmpeg)
(replace "sdl2" sdl2-2.0))) (replace "sdl2" sdl2-2.0)))
(arguments (arguments
(substitute-keyword-arguments (package-arguments ffmpeg-5) (substitute-keyword-arguments (package-arguments ffmpeg)
((#:configure-flags flags ''()) ((#:configure-flags flags ''())
#~(cons "--enable-avresample" #$flags)))))) #~(cons "--enable-avresample" #$flags))))))
@ -1885,8 +1878,6 @@ audio/video codec library.")
(inputs (modify-inputs (package-inputs ffmpeg-3.4) (inputs (modify-inputs (package-inputs ffmpeg-3.4)
(delete "libwebp"))))) (delete "libwebp")))))
(define-public ffmpeg ffmpeg-5)
(define-public ffmpeg-for-stepmania (define-public ffmpeg-for-stepmania
(hidden-package (hidden-package
(package (package
@ -2395,7 +2386,7 @@ To load this plugin, specify the following option when starting mpv:
(define-public libvpx (define-public libvpx
(package (package
(name "libvpx") (name "libvpx")
(version "1.11.0") (version "1.12.0")
(source (origin (source (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
@ -2404,7 +2395,7 @@ To load this plugin, specify the following option when starting mpv:
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"00f1jrclai2b6ys78dpsg6r1mvcyxlna93vxcz8zjyia24c2pjsb")) "1x12f2bd4jqd532rnixmwvcx8d29yxiacpcxqqh86qczc49la8gm"))
(patches (search-patches "libvpx-CVE-2016-2818.patch")))) (patches (search-patches "libvpx-CVE-2016-2818.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -2434,22 +2425,6 @@ To load this plugin, specify the following option when starting mpv:
(license license:bsd-3) (license license:bsd-3)
(home-page "https://www.webmproject.org/"))) (home-page "https://www.webmproject.org/")))
;;; TODO: Merge into libvpx on staging.
(define-public libvpx-next
(package
(inherit libvpx)
(name "libvpx")
(version "1.12.0")
(source (origin
(inherit (package-source libvpx))
(uri (git-reference
(url "https://chromium.googlesource.com/webm/libvpx")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1x12f2bd4jqd532rnixmwvcx8d29yxiacpcxqqh86qczc49la8gm"))))))
(define-public orf-dl (define-public orf-dl
(let ((commit "2dbbe7ef4e0efe0f3c1d59c503108e22d9065999") (let ((commit "2dbbe7ef4e0efe0f3c1d59c503108e22d9065999")
(revision "1")) (revision "1"))
@ -5324,12 +5299,7 @@ result in several formats:
(string-append name "-" version ".tar.gz")) (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"006bfcmjwg0phg8gc25b1sl2ngjrb2bh1b3fd0s5gbf9nlkr8qsn")) "006bfcmjwg0phg8gc25b1sl2ngjrb2bh1b3fd0s5gbf9nlkr8qsn"))))
(modules '((guix build utils)))
(snippet
'(substitute* "Cargo.toml"
(("\\[package\\]" m)
(string-append "cargo-features = [\"rust-version\"]\n" m))))))
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
`(;; Strip the '--release' flag to work around the doctest failures with `(;; Strip the '--release' flag to work around the doctest failures with
@ -5392,14 +5362,8 @@ result in several formats:
(add-after 'unpack 'relax-versions (add-after 'unpack 'relax-versions
(lambda _ (lambda _
(substitute* "Cargo.toml" (substitute* "Cargo.toml"
;; Allow using more recent versions of ;; Allow using more recent versions of system-deps.
(("~3.1.2") "~3")))) (("~3.1.2") "~3"))))
(add-after 'configure 'force-rust-edition-2018
(lambda* (#:key vendor-dir #:allow-other-keys)
;; Force all the dependencies to not be higher than edition 2018.
(with-fluids ((%default-port-encoding #f))
(substitute* (find-files vendor-dir "Cargo.toml")
(("edition = \\\"2021\\\"") "edition = \"2018\"")))))
(replace 'build (replace 'build
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))

254
gnu/packages/vulkan.scm
View file

@ -2,8 +2,10 @@
;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2020, 2023 Marius Bakke <marius@gnu.org>
;;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org> ;;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org>
;;; Copyright © 2022 Kaelyn Takata <kaelyn.alexi@protonmail.com>
;;; Copyright © 2022 dan <i@dan.games>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -41,10 +43,13 @@
#:use-module (gnu packages wine) #:use-module (gnu packages wine)
#:use-module (gnu packages xorg)) #:use-module (gnu packages xorg))
;; Note: Remember to change vulkan-loader version when bumping this.
(define %vulkan-sdk-version "sdk-1.3.231.1")
(define-public spirv-headers (define-public spirv-headers
(package (package
(name "spirv-headers") (name "spirv-headers")
(version "1.5.3") (version %vulkan-sdk-version)
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -53,7 +58,7 @@
(commit version))) (commit version)))
(sha256 (sha256
(base32 (base32
"069sivqajp7z4p44lmrz23lvf237xpkjxd4lzrg27836pwqcz9bj")) "0z8b485hryya2g0jxv7amwg3fjj7pchbgnsa5ldf5fwgh5js0icm"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
@ -76,19 +81,22 @@ and for the GLSL.std.450 extended instruction set.
(define-public spirv-tools (define-public spirv-tools
(package (package
(name "spirv-tools") (name "spirv-tools")
(version "2020.2") (version %vulkan-sdk-version)
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/KhronosGroup/SPIRV-Tools") (url "https://github.com/KhronosGroup/SPIRV-Tools")
(commit (string-append "v" version)))) (commit version)))
(sha256 (sha256
(base32 "00b7xgyrcb2qq63pp3cnw5q1xqx2d9rfn65lai6n6r89s1vh3vg6")) (base32 "03d489ind2az7w7q1slj3mdc04372r3qqbnd7m9akxbg7yix1a5j"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON" `(#:configure-flags (list "-DBUILD_SHARED_LIBS=ON"
;; Some packages like mpv fail to link
;; when the static libraries are built.
"-DSPIRV_TOOLS_BUILD_STATIC=OFF"
(string-append (string-append
"-DSPIRV-Headers_SOURCE_DIR=" "-DSPIRV-Headers_SOURCE_DIR="
(assoc-ref %build-inputs "spirv-headers"))))) (assoc-ref %build-inputs "spirv-headers")))))
@ -105,7 +113,7 @@ parser,disassembler, validator, and optimizer for SPIR-V.")
(define-public spirv-cross (define-public spirv-cross
(package (package
(name "spirv-cross") (name "spirv-cross")
(version "2020-05-19") (version %vulkan-sdk-version)
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -113,7 +121,7 @@ parser,disassembler, validator, and optimizer for SPIR-V.")
(url "https://github.com/KhronosGroup/SPIRV-Cross") (url "https://github.com/KhronosGroup/SPIRV-Cross")
(commit version))) (commit version)))
(sha256 (sha256
(base32 "0zyijp9zx9wbd4i5lwjap7n793iz6yjkf27la60dsffxl75yy9pd")) (base32 "1ypbc1krkr0yywa1m976g3sjyb80l7hxwrnh6gp70w6va1dlnnn9"))
(file-name (git-file-name name version)))) (file-name (git-file-name name version))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
@ -146,19 +154,18 @@ SPIR-V, aiming to emit GLSL or MSL that looks like human-written code.")
(define-public glslang (define-public glslang
(package (package
(name "glslang") (name "glslang")
(version "10-11.0.0") (version %vulkan-sdk-version)
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/KhronosGroup/glslang") (url "https://github.com/KhronosGroup/glslang")
;; Tag "10-11.0.0" was moved to "11.0.0". (commit version)))
;; FIXME: Use (commit version) on next update. (patches (search-patches "glslang-install-static-libs.patch"))
(commit "11.0.0")))
(sha256 (sha256
(base32 (base32
"14mn2awswl022ls75mfpsnpsl0ai0jgfbqj3sxcsqawyj5f432py")) "12a1zl8qxa28nbf6m67260c0lwdw3bqbj0jz1382wgm5px1fpqw6"))
(file-name (string-append name "-" version "-checkout")))) (file-name (git-file-name name version))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
'(#:tests? #f ;FIXME: requires bundled SPIRV-Tools '(#:tests? #f ;FIXME: requires bundled SPIRV-Tools
@ -180,17 +187,17 @@ interpretation of the specifications for these languages.")
(define-public vulkan-headers (define-public vulkan-headers
(package (package
(name "vulkan-headers") (name "vulkan-headers")
(version "1.2.164") (version %vulkan-sdk-version)
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/KhronosGroup/Vulkan-Headers") (url "https://github.com/KhronosGroup/Vulkan-Headers")
(commit (string-append "v" version)))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"11wzxvwim4jna1yssbmprl211dhmz8vmrd498zww3bghzlj7bljv")))) "167zdank6pn66mzjdwgrdlmhmsy4v2k0nhw0nwg649k863rgi00j"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f)) ; No tests. `(#:tests? #f)) ; No tests.
@ -204,48 +211,55 @@ interpretation of the specifications for these languages.")
(define-public vulkan-loader (define-public vulkan-loader
(package (package
(name "vulkan-loader") (name "vulkan-loader")
(version "1.2.162") ;; XXX: Take a slightly newer commit to fix a test failure on i686:
;; https://github.com/KhronosGroup/Vulkan-Loader/pull/1036
(version "sdk-1.3.232")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/KhronosGroup/Vulkan-Loader") (url "https://github.com/KhronosGroup/Vulkan-Loader")
(commit (string-append "v" version)))) (commit "v1.3.232")))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"15gx9ab6w1sjq9hkpbas7z2f8f47j6mlln6p3w26qmydjj8gfjjv")))) "0w69sh669sx9pwlvv2rv92ds2hm2rbzsa6qqcmd8kcad0qfq7dz2"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:configure-flags (list
,#~(list #:configure-flags
(string-append "-DVULKAN_HEADERS_INSTALL_DIR=" #~(list (string-append "-DVULKAN_HEADERS_INSTALL_DIR="
#$(this-package-input "vulkan-headers")) (dirname (dirname
(string-append "-DCMAKE_INSTALL_INCLUDEDIR=" (search-input-directory
#$(this-package-input "vulkan-headers") %build-inputs "include/vulkan"))))
"/include")) "-DBUILD_TESTS=ON")
#:phases (modify-phases %standard-phases #:phases
(add-after 'unpack 'unpack-googletest #~(modify-phases %standard-phases
(add-after 'unpack 'fix-pkg-config-file
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((gtest (assoc-ref inputs "googletest:source"))) (let ((vulkan-headers (dirname (search-input-directory
(when gtest inputs "include/vulkan"))))
(copy-recursively gtest "external/googletest")) ;; Ensure the pkg-config file refers to vulkan-headers.
#t))) (substitute* "loader/vulkan.pc.in"
(add-after 'unpack 'disable-loader-tests (("^includedir=.*")
(string-append "includedir=" vulkan-headers "\n"))))))
(add-after 'unpack 'use-system-googletest
(lambda _ (lambda _
;; Many tests require a Vulkan driver. Skip those. ;; Inform the build system that googletest is already built.
(substitute* "tests/loader_validation_tests.cpp" (substitute* "CMakeLists.txt"
((".*= vkCreateInstance.*" all) ((".*if\\(TARGET gtest\\)")
(string-append "GTEST_SKIP();\n" all)) (string-append " find_package(GTest REQUIRED)\n"
(("TEST_F.*InstanceExtensionEnumerated.*" all) " if(true)")))
(string-append all "\nGTEST_SKIP();\n"))) ;; Use the namespaced variable.
#t))))) (substitute* "tests/framework/CMakeLists.txt"
(("PUBLIC gtest ")
"PUBLIC GTest::gtest ")))))))
(native-inputs (native-inputs
`(("googletest:source" ,(package-source googletest)) (list googletest
("libxrandr" ,libxrandr) libxrandr
("pkg-config" ,pkg-config) pkg-config
("python" ,python) python
("wayland" ,wayland))) wayland))
(inputs (inputs
(list vulkan-headers)) (list vulkan-headers))
(home-page (home-page
@ -266,20 +280,20 @@ and the ICD.")
(define-public vulkan-tools (define-public vulkan-tools
(package (package
(name "vulkan-tools") (name "vulkan-tools")
(version "1.2.162") (version %vulkan-sdk-version)
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/KhronosGroup/Vulkan-Tools") (url "https://github.com/KhronosGroup/Vulkan-Tools")
(commit (string-append "v" version)))) (commit version)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"129wzk7xj3vn3c8b4p7fzkd0npl58118s2i1d88gsfnlix54nagq")))) "0jzwjfx4c7y15wkwfhhc64rzljpi47bxrm5jw5blfsqjh8zsd27a"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(inputs (inputs
(list glslang libxrandr vulkan-loader wayland)) (list glslang libxrandr vulkan-loader wayland wayland-protocols))
(native-inputs (native-inputs
(list pkg-config python vulkan-headers)) (list pkg-config python vulkan-headers))
(arguments (arguments
@ -298,7 +312,8 @@ API.")
(define-public shaderc (define-public shaderc
(package (package
(name "shaderc") (name "shaderc")
(version "2020.4") ;; shaderc doesn't follow the versioning scheme of vulkan sdk
(version "2022.3")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -308,7 +323,7 @@ API.")
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"07h78nd964h2bdm4drzws8i1gvyal8a3wlhbcm5qxqk6vknv8hrk")))) "0sdbfi66zmqj0c5q5yv2zvcvry7557yzgxk2mwflyjgqh7kdhb8d"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(;; FIXME: Skip most of the tests, because enabling system gtest breaks `(;; FIXME: Skip most of the tests, because enabling system gtest breaks
@ -340,7 +355,16 @@ API.")
,version ,version
,(package-version spirv-tools) ,(package-version spirv-tools)
,(package-version glslang)))) ,(package-version glslang))))
#t))))) #t))
;; see: https://github.com/google/shaderc/pull/1276
(add-after 'do-not-look-for-bundled-sources 'drop-additional-glslang-deps
(lambda _
(substitute* "glslc/CMakeLists.txt"
(("OSDependent OGLCompiler") ""))
(substitute* "libshaderc/CMakeLists.txt"
(("OSDependent OGLCompiler") ""))
(substitute* "libshaderc_util/CMakeLists.txt"
(("OSDependent OGLCompiler") "")))))))
(inputs (inputs
(list glslang python spirv-headers spirv-tools)) (list glslang python spirv-headers spirv-tools))
(native-inputs (native-inputs
@ -399,3 +423,127 @@ shader compilation.")
(synopsis "Direct3D 12 to Vulkan translation library") (synopsis "Direct3D 12 to Vulkan translation library")
(description "vkd3d is a library for translating Direct3D 12 to Vulkan.") (description "vkd3d is a library for translating Direct3D 12 to Vulkan.")
(license license:lgpl2.1)))) (license license:lgpl2.1))))
(define-public vulkan-validationlayers
(package
(name "vulkan-validationlayers")
(version %vulkan-sdk-version)
(source (origin
(method git-fetch)
(uri (git-reference
(url
"https://github.com/KhronosGroup/Vulkan-ValidationLayers")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"07djrk6yym4vl2b52wr09r8y649v5lark5hnr5rwvlxwxdmd9g75"))))
(build-system cmake-build-system)
(inputs (list glslang
libxrandr
mesa
shaderc
spirv-tools
vulkan-loader
wayland))
(native-inputs (list pkg-config python spirv-headers vulkan-headers))
(arguments
(list #:tests? #f ;no tests
#:configure-flags
#~(list "-DUSE_ROBIN_HOOD_HASHING=OFF"
(string-append "-DGLSLANG_INSTALL_DIR="
(dirname (dirname
(search-input-directory
%build-inputs
"include/glslang"))))
(string-append "-DSPIRV_HEADERS_INSTALL_DIR="
(dirname (dirname
(search-input-directory
%build-inputs
"include/spirv"))))
(string-append "-DSPIRV_TOOLS_INSTALL_DIR="
(dirname (dirname
(search-input-directory
%build-inputs
"include/spirv-tools"))))
(string-append "-DVULKAN_HEADERS_INSTALL_DIR="
(dirname (dirname
(search-input-directory
%build-inputs
"include/vulkan"))))
"-Wno-dev")
#:phases #~(modify-phases %standard-phases
(add-after 'install 'set-layer-path-in-manifest
(lambda _
(let ((manifest (string-append #$output
"/share/vulkan/explicit_layer.d"
"/VkLayer_khronos_validation.json")))
(substitute* manifest
(("\"libVkLayer_khronos_validation.so\"")
(string-append "\"" #$output
"/lib/libVkLayer_khronos_validation.so\"")))))))))
(home-page "https://github.com/KhronosGroup/Vulkan-ValidationLayers")
(synopsis "Khronos official validation layers for Vulkan")
(description
"Vulkan-ValidationLayers provides the Khronos official validation layers that
can assist development by enabling developers to verify their applications correctly
use the Vulkan API.")
(license license:asl2.0)))
(define-public volk
(package
(name "volk")
(version %vulkan-sdk-version)
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/zeux/volk")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0xaw3kg754mknx8lfj1p74a9npjfvdvlpicvn0hla4495zpc10rq"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f ;no test
#:configure-flags '("-DVOLK_INSTALL=ON" "-DVOLK_PULL_IN_VULKAN=ON")))
(inputs (list vulkan-headers))
(synopsis "Meta loader for Vulkan API")
(description
"Volk is a meta-loader for Vulkan. It allows you to dynamically load
entrypoints required to use Vulkan without linking the Vulkan loader.
Additionally, volk simplifies the use of Vulkan extensions by automatically
loading all associated entrypoints. Finally, volk enables loading Vulkan
entrypoints directly from the driver which can increase performance by
skipping loader dispatch overhead.")
(home-page "https://github.com/zeux/volk")
(license license:expat)))
(define-public vulkan-memory-allocator
(package
(name "vulkan-memory-allocator")
(version "3.0.1")
(source
(origin
(method git-fetch)
(uri
(git-reference
(url "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
(base32
"1hpzjwl5bgqv9hmf1fdldihfllcbdg515f391a200klg0rnixdds"))))
(build-system cmake-build-system)
(arguments
;; no test
`(#:tests? #f))
(inputs (list vulkan-loader vulkan-headers))
(synopsis "Vulkan memory allocation library")
(description
"The Vulkan Memory Allocator (VMA) library provides a simple and easy to
integrate API to help users allocate memory for Vulkan buffer and image
storage.")
(home-page
"https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator")
(license license:expat)))

18
gnu/packages/web.scm
View file

@ -3535,16 +3535,18 @@ object knows about.")
(define-public perl-http-daemon (define-public perl-http-daemon
(package (package
(name "perl-http-daemon") (name "perl-http-daemon")
(version "6.01") (version "6.14")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"mirror://cpan/authors/id/G/GA/GAAS/HTTP-Daemon-" "mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Daemon-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1hmd2isrkilf0q0nkxms1q64kikjmcw9imbvrjgky6kh89vqdza3")))) "079fkcq2vdrzdf0bml52kz73n9gdv1xg0qf72c9v505v7izpwxph"))))
(build-system perl-build-system) (build-system perl-build-system)
(native-inputs
(list perl-module-build perl-test-needs))
(propagated-inputs (propagated-inputs
(list perl-http-message perl-lwp-mediatypes)) (list perl-http-message perl-lwp-mediatypes))
(license license:perl-license) (license license:perl-license)
@ -3607,7 +3609,7 @@ processing of request data as it arrives.")
(define-public perl-http-message (define-public perl-http-message
(package (package
(name "perl-http-message") (name "perl-http-message")
(version "6.18") (version "6.37")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -3615,10 +3617,10 @@ processing of request data as it arrives.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"04lih0fn89jpyk74c4aq1rzq18h8v4zd3x0lik2r9dl8sdqd2q6h")))) "00nq0xnpdba4valzgvzy3fgvck1ijrksdyzb4w9q6j72hl5dln8f"))))
(build-system perl-build-system) (build-system perl-build-system)
(native-inputs (native-inputs
(list perl-try-tiny)) (list perl-test-needs perl-try-tiny))
(propagated-inputs (propagated-inputs
(list perl-encode-locale perl-http-date perl-io-html (list perl-encode-locale perl-http-date perl-io-html
perl-lwp-mediatypes perl-uri)) perl-lwp-mediatypes perl-uri))
@ -3846,14 +3848,14 @@ and IPv6 sockets, intended as a replacement for IO::Socket::INET.")
(define-public perl-io-socket-ssl (define-public perl-io-socket-ssl
(package (package
(name "perl-io-socket-ssl") (name "perl-io-socket-ssl")
(version "2.068") (version "2.081")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://cpan/authors/id/S/SU/SULLR/" (uri (string-append "mirror://cpan/authors/id/S/SU/SULLR/"
"IO-Socket-SSL-" version ".tar.gz")) "IO-Socket-SSL-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1ycgzg1l7p07y5wc0vzgnj122vm51p5aqpi4s56pp0piaq0gq824")))) "0hw4c62abq0cs3ixi0ws96i2y0fij3452514dlqn7d6nm0kgig87"))))
(build-system perl-build-system) (build-system perl-build-system)
(propagated-inputs (propagated-inputs
(list perl-net-ssleay (list perl-net-ssleay

44
gnu/packages/webkit.scm
View file

@ -6,7 +6,7 @@
;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2022, 2023 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2022, 2023 Efraim Flashner <efraim@flashner.co.il>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -36,6 +36,7 @@
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
#:use-module (gnu packages c)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages docbook) #:use-module (gnu packages docbook)
#:use-module (gnu packages enchant) #:use-module (gnu packages enchant)
@ -123,20 +124,19 @@ the WPE-flavored port of WebKit.")
engine that uses Wayland for graphics output.") engine that uses Wayland for graphics output.")
(license license:bsd-2))) (license license:bsd-2)))
(define %webkit-version "2.38.5")
(define-public webkitgtk (define-public webkitgtk
(package (package
(name "webkitgtk") ; webkit2gtk4 (name "webkitgtk") ; webkit2gtk4
(version %webkit-version) (version "2.40.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://www.webkitgtk.org/releases/" (uri (string-append "https://www.webkitgtk.org/releases/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "19y1n05mp370mq4bp2bk0pm3wk49z9a10azjjdcdyx12091hrhj0")) (base32 "14xkgamqlshxqw6fcslvw0yzj4y5mvx66b6bn64rwrl9pyhpwq54"))
(patches (search-patches (patches (search-patches
"webkitgtk-adjust-bubblewrap-paths.patch")))) "webkitgtk-adjust-bubblewrap-paths.patch"
"webkitgtk-libelogind.patch"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(outputs '("out" "doc" "debug")) (outputs '("out" "doc" "debug"))
(arguments (arguments
@ -148,8 +148,8 @@ engine that uses Wayland for graphics output.")
;; binaries require 20 GiB of memory to link (even with ld.gold or lld) ;; binaries require 20 GiB of memory to link (even with ld.gold or lld)
;; and produce 4.6 GiB of debug symbols. ;; and produce 4.6 GiB of debug symbols.
#:build-type "Release" #:build-type "Release"
#:configure-flags #~(list #:configure-flags
"-DPORT=GTK" #~(list "-DPORT=GTK"
;; GTKDOC will be removed upstream soon in favor of ;; GTKDOC will be removed upstream soon in favor of
;; gi-docgen; it is normally disabled because the ;; gi-docgen; it is normally disabled because the
;; doc is rather expensive to build. ;; doc is rather expensive to build.
@ -159,7 +159,15 @@ engine that uses Wayland for graphics output.")
;; webkitgtk. ;; webkitgtk.
"-DENABLE_MINIBROWSER=ON" "-DENABLE_MINIBROWSER=ON"
;; The default lib installation prefix is lib64. ;; The default lib installation prefix is lib64.
(string-append "-DLIB_INSTALL_DIR=" #$output "/lib")) (string-append "-DLIB_INSTALL_DIR=" #$output "/lib")
;; XXX: WebKitGTK makes use of elogind's systemd-compatible
;; headers, which are under the include/elogind prefix. The WTF
;; component doesn't propagate the Journald header correctly
;; detected (stubs from elogind), hence the following hack (see:
;; https://bugs.webkit.org/show_bug.cgi?id=254495).
(string-append "-DCMAKE_CXX_FLAGS=-I"
(search-input-directory
%build-inputs "include/elogind")))
;; The build may fail with -j1 (see: ;; The build may fail with -j1 (see:
;; https://bugs.webkit.org/show_bug.cgi?id=195251). ;; https://bugs.webkit.org/show_bug.cgi?id=195251).
#:make-flags #~(list "-j" (number->string (max 2 (parallel-job-count)))) #:make-flags #~(list "-j" (number->string (max 2 (parallel-job-count))))
@ -186,13 +194,6 @@ engine that uses Wayland for graphics output.")
(substitute* "Source/cmake/OptionsCommon.cmake" (substitute* "Source/cmake/OptionsCommon.cmake"
(("if \\(LD_SUPPORTS_DISABLE_NEW_DTAGS\\)") (("if \\(LD_SUPPORTS_DISABLE_NEW_DTAGS\\)")
"if (FALSE)")))) "if (FALSE)"))))
(add-after 'unpack 'help-cmake-find-elogind
(lambda _
(substitute* "Source/cmake/FindJournald.cmake"
;; Otherwise, CMake would throw an error because it relies on
;; the pkg-config search to locate headers.
(("pkg_check_modules\\(PC_SYSTEMD QUIET libsystemd")
"pkg_check_modules(PC_SYSTEMD QUIET libelogind"))))
(add-after 'unpack 'embed-absolute-wpebackend-reference (add-after 'unpack 'embed-absolute-wpebackend-reference
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((wpebackend-fdo (assoc-ref inputs "wpebackend-fdo"))) (let ((wpebackend-fdo (assoc-ref inputs "wpebackend-fdo")))
@ -222,7 +223,8 @@ engine that uses Wayland for graphics output.")
pkg-config pkg-config
python-wrapper python-wrapper
gi-docgen gi-docgen
ruby)) ruby
unifdef))
(propagated-inputs (propagated-inputs
(list gtk+ libsoup)) (list gtk+ libsoup))
(inputs (inputs
@ -233,11 +235,11 @@ engine that uses Wayland for graphics output.")
geoclue geoclue
gst-plugins-base gst-plugins-base
gst-plugins-bad-minimal gst-plugins-bad-minimal
gtk+-2
harfbuzz harfbuzz
hyphen hyphen
icu4c icu4c
lcms lcms
libavif
libgcrypt libgcrypt
libgudev libgudev
libjpeg-turbo libjpeg-turbo
@ -290,7 +292,7 @@ propagated by default) such as @code{gst-plugins-good} and
(replace "gtk+" gtk))) (replace "gtk+" gtk)))
(inputs (inputs
(modify-inputs (package-inputs webkitgtk) (modify-inputs (package-inputs webkitgtk)
(delete "gtk+-2" "libnotify") (delete "libnotify")
(append pango-next))))) ;TODO: remove after it's the default (append pango-next))))) ;TODO: remove after it's the default
;;; Required by e.g. emacs-next-pgtk, emacs-xwidgets, and some other GNOME ;;; Required by e.g. emacs-next-pgtk, emacs-xwidgets, and some other GNOME
@ -310,13 +312,13 @@ propagated by default) such as @code{gst-plugins-good} and
(package (package
(inherit webkitgtk) (inherit webkitgtk)
(name "wpewebkit") (name "wpewebkit")
(version %webkit-version) (version "2.40.0")
(source (origin (source (origin
(inherit (package-source webkitgtk)) (inherit (package-source webkitgtk))
(uri (string-append "https://wpewebkit.org/releases/" (uri (string-append "https://wpewebkit.org/releases/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(sha256 (sha256
(base32 "0q8nmk9l6bqv2bhljm9wv7mvgdl393z7v2m7a0c5avac18yzs07z")))) (base32 "1dl663nbm011sx099x9gdhk3aj119yn5rxp77jmnhdv1l77jpv58"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments webkitgtk) (substitute-keyword-arguments (package-arguments webkitgtk)
((#:configure-flags flags) ((#:configure-flags flags)

8
gnu/packages/xiph.scm
View file

@ -130,7 +130,7 @@ compressed video format.")
(define-public speex (define-public speex
(package (package
(name "speex") (name "speex")
(version "1.2.0") (version "1.2.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -138,7 +138,7 @@ compressed video format.")
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"150047wnllz4r94whb9r73l5qf0z5z3rlhy98bawfbblmkq8mbpa")))) "1spy51kaxfhpj8171gn1s69wz82nzkz2k0x7k0nhldwangrd8i2b"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '("--disable-static"))) '(#:configure-flags '("--disable-static")))
@ -160,14 +160,14 @@ stereo encoding, and voice activity detection.")
(define-public speexdsp (define-public speexdsp
(package (package
(name "speexdsp") (name "speexdsp")
(version "1.2.0") (version "1.2.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://downloads.xiph.org/releases/speex/" (uri (string-append "https://downloads.xiph.org/releases/speex/"
"speexdsp-" version ".tar.gz")) "speexdsp-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0wa7sqpk3x61zz99m7lwkgr6yv62ml6lfgs5xja65vlvdzy44838")))) "0gadnnpg9994cindpnw35j45dnr4bflkig1aqxlrafd6wi1p6xwc"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags '("--disable-static" `(#:configure-flags '("--disable-static"

128
gnu/packages/xorg.scm
View file

@ -24,7 +24,7 @@
;;; Copyright © 2020 Liliana Marie Prikler <liliana.prikler@gmail.com> ;;; Copyright © 2020 Liliana Marie Prikler <liliana.prikler@gmail.com>
;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de> ;;; Copyright © 2020 Florian Pelz <pelzflorian@pelzflorian.de>
;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020, 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Jean-Baptiste Note <jean-baptiste.note@m4x.org> ;;; Copyright © 2020 Jean-Baptiste Note <jean-baptiste.note@m4x.org>
;;; Copyright © 2021 Matthew James Kraai <kraai@ftbfs.org> ;;; Copyright © 2021 Matthew James Kraai <kraai@ftbfs.org>
;;; Copyright © 2021 Nicolò Balzarotti <nicolo@nixo.xyz> ;;; Copyright © 2021 Nicolò Balzarotti <nicolo@nixo.xyz>
@ -6041,57 +6041,59 @@ basic eye-candy effects.")
(patches (search-patches "xpra-4.2-systemd-run.patch" (patches (search-patches "xpra-4.2-systemd-run.patch"
"xpra-4.2-install_libs.patch")))) "xpra-4.2-install_libs.patch"))))
(build-system python-build-system) (build-system python-build-system)
;; see also http://xpra.org/trac/wiki/Dependencies (inputs
(inputs `(("bash-minimal" ,bash-minimal) ; for wrap-program (list bash-minimal ; for wrap-program
;; Essential dependencies. ;; Essential dependencies.
("libjpeg" ,libjpeg-turbo) libjpeg-turbo
("libwebp" ,libwebp) libwebp
("ffmpeg" ,ffmpeg) ffmpeg
("libx11" ,libx11) libx11
("libxrandr" ,libxrandr) libxrandr
("libxtst" ,libxtst) libxtst
("libxfixes" ,libxfixes) libxfixes
("libxkbfile" ,libxkbfile) libxkbfile
("libxcomposite" ,libxcomposite) libxcomposite
("libxdamage" ,libxdamage) libxdamage
("libxext" ,libxext) libxext
("libxres" ,libxres) libxres
("lz4" ,lz4) lz4
("gtk+" ,gtk+) gtk+
("python-pycairo" ,python-pycairo) python-pycairo
("python-pygobject" ,python-pygobject) python-pygobject
("xauth" ,xauth) xauth
("xorg-server" ,xorg-server) xorg-server
("xf86-video-dummy" ,xf86-video-dummy) xf86-video-dummy
("xf86-input-mouse" ,xf86-input-mouse) xf86-input-mouse
("xf86-input-keyboard" ,xf86-input-keyboard) xf86-input-keyboard
("python-pillow" ,python-pillow) python-pillow
;; Optional dependencies. ;; Optional dependencies.
("libx264" ,libx264) libx264
("x265" ,x265) x265
("libvpx" ,libvpx) libvpx
("python-rencode" ,python-rencode) ; For speed. python-rencode ; For speed.
("python-numpy" ,python-numpy) python-numpy
("python-pyopengl" ,python-pyopengl) ; Drawing acceleration. python-pyopengl ; Drawing acceleration.
("python-pyopengl-accelerate" ,python-pyopengl-accelerate) ; Same. python-pyopengl-accelerate ; Same.
("python-paramiko" ,python-paramiko) ; Tunneling over SSH. python-paramiko ; Tunneling over SSH.
("python-dbus" ,python-dbus) ; For desktop notifications. python-dbus ; For desktop notifications.
("dbus" ,dbus) ; For dbus-launch command. dbus ; For dbus-launch command.
("python-lz4" ,python-lz4) ; Faster compression than zlib. python-lz4 ; Faster compression than zlib.
("python-netifaces" ,python-netifaces))) python-netifaces))
(native-inputs (list pkg-config pandoc python-cython)) (native-inputs (list pkg-config pandoc python-cython))
(arguments (arguments
`(#:configure-flags '("--without-Xdummy" (list
#:configure-flags #~(list "--without-Xdummy"
"--without-Xdummy_wrapper" "--without-Xdummy_wrapper"
"--with-opengl" "--with-opengl"
"--without-debug" "--without-debug"
"--without-strict") ; Ignore compiler warnings. "--without-strict") ; Ignore compiler warnings.
#:modules ((guix build python-build-system) #:modules '((guix build python-build-system)
(guix build utils)) (guix build utils))
#:tests? #f ; Do not run test-cases. This would rebuild all modules and ;; Do not run test-cases. This would rebuild all modules and they seem
; they seem to require python2. ;; to require python2.
#:tests? #f
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
;; Must pass the same flags as 'install, otherwise enabled modules may ;; Must pass the same flags as 'install, otherwise enabled modules may
;; not be built. ;; not be built.
(replace 'build (replace 'build
@ -6099,19 +6101,21 @@ basic eye-candy effects.")
(apply invoke (append (list "python" "setup.py" "build") (apply invoke (append (list "python" "setup.py" "build")
configure-flags)))) configure-flags))))
(add-before 'install 'fix-paths (add-before 'install 'fix-paths
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; Fix binary paths. ;; Fix binary paths.
(substitute* '("xpra/scripts/config.py" "xpra/x11/vfb_util.py") (substitute* '("xpra/scripts/config.py"
"xpra/x11/vfb_util.py")
(("\"Xvfb\"") (("\"Xvfb\"")
(string-append "\"" (assoc-ref inputs "xorg-server") "/bin/Xvfb\"")) (format #f "~s" (search-input-file inputs "bin/Xvfb")))
(("\"Xorg\"") (("\"Xorg\"")
(string-append "\"" (assoc-ref inputs "xorg-server") "/bin/Xorg\"")) (format #f "~s" (search-input-file inputs "bin/Xorg")))
(("\"xauth\"") (("\"xauth\"")
(string-append "\"" (assoc-ref inputs "xauth") "/bin/xauth\""))) (format #f "~s" (search-input-file inputs "bin/xauth"))))
;; Fix directory of config files. ;; Fix directory of config files.
(substitute* '("xpra/scripts/config.py" "xpra/platform/xposix/paths.py") (substitute* '("xpra/scripts/config.py"
"xpra/platform/xposix/paths.py")
(("\"/etc/xpra/?\"") (("\"/etc/xpra/?\"")
(string-append "\"" (assoc-ref outputs "out") "/etc/xpra/\""))) (string-append "\"" #$output "/etc/xpra/\"")))
;; XXX: Stolen from (gnu packages linux) ;; XXX: Stolen from (gnu packages linux)
(define (append-to-file name body) (define (append-to-file name body)
(let ((file (open-file name "a"))) (let ((file (open-file name "a")))
@ -6120,11 +6124,12 @@ basic eye-candy effects.")
;; Add Xorg module paths. ;; Add Xorg module paths.
(append-to-file (append-to-file
"fs/etc/xpra/xorg.conf" "fs/etc/xpra/xorg.conf"
(string-append "\nSection \"Files\"\nModulePath \"" (string-append
(assoc-ref inputs "xf86-video-dummy") "/lib/xorg/modules," "\nSection \"Files\"\nModulePath \""
(assoc-ref inputs "xf86-input-mouse") "/lib/xorg/modules," #$(this-package-input "xf86-video-dummy") "/lib/xorg/modules,"
(assoc-ref inputs "xf86-input-keyboard") "/lib/xorg/modules," #$(this-package-input "xf86-input-mouse") "/lib/xorg/modules,"
(assoc-ref inputs "xorg-server") "/lib/xorg/modules\"\n" #$(this-package-input "xf86-input-keyboard") "/lib/xorg/modules,"
#$(this-package-input "xorg-server") "/lib/xorg/modules\"\n"
"EndSection\n\n")) "EndSection\n\n"))
(substitute* '("xpra/scripts/config.py" (substitute* '("xpra/scripts/config.py"
"fs/etc/xpra/conf.d/60_server.conf.in" "fs/etc/xpra/conf.d/60_server.conf.in"
@ -6134,21 +6139,16 @@ basic eye-candy effects.")
(("dbus-launch --") (("dbus-launch --")
(string-append (search-input-file inputs "/bin/dbus-launch") (string-append (search-input-file inputs "/bin/dbus-launch")
" --"))) " --")))
;; /run/user does not exist on guix system ;; /run/user does not exist on guix system.
(substitute* "./xpra/scripts/config.py" (substitute* "./xpra/scripts/config.py"
(("socket-dir.*: \"\",") (("socket-dir.*: \"\",")
"socket-dir\" : \"~/.xpra\",")) "socket-dir\" : \"~/.xpra\","))))
#t))
;; GTK3 will not be found, if GI can’t find its typelibs. ;; GTK3 will not be found, if GI can’t find its typelibs.
(add-after (add-after 'install 'wrap-program
'install 'wrap-program
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((prog (string-append (assoc-ref outputs "out")
"/bin/xpra")))
;; XXX: only export typelibs in inputs ;; XXX: only export typelibs in inputs
(wrap-program prog (wrap-program (search-input-file outputs "bin/xpra")
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))) `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))))
#t))))))
(home-page "https://www.xpra.org/") (home-page "https://www.xpra.org/")
(synopsis "Remote access to individual applications or full desktops") (synopsis "Remote access to individual applications or full desktops")
(description "Xpra is a persistent remote display server and client for (description "Xpra is a persistent remote display server and client for

6
gnu/tests/databases.scm
View file

@ -389,7 +389,11 @@ data double PRECISION NULL
(define %mysql-os (define %mysql-os
(simple-operating-system (simple-operating-system
(service mysql-service-type))) (service mysql-service-type
(mysql-configuration
;; Disable O_DIRECT since it's not supported on overlayfs.
;; See <https://jira.mariadb.org/browse/MDEV-28751>.
(extra-content "innodb-flush-method = fsync")))))
(define* (run-mysql-test) (define* (run-mysql-test)
"Run tests in %MYSQL-OS." "Run tests in %MYSQL-OS."

5
guix/build/qt-utils.scm
View file

@ -4,6 +4,7 @@
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net> ;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot> ;;; Copyright © 2021 Brendan Tildesley <mail@brendan.scot>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -87,9 +88,7 @@
"/applications" "/cursors" "/fonts" "/icons" "/glib-2.0/schemas" "/applications" "/cursors" "/fonts" "/icons" "/glib-2.0/schemas"
"/mime" "/sounds" "/themes" "/wallpapers") "/mime" "/sounds" "/themes" "/wallpapers")
'("XDG_CONFIG_DIRS" suffix directory "/etc/xdg") '("XDG_CONFIG_DIRS" suffix directory "/etc/xdg")
;; We wrap exactly to avoid potentially mixing Qt5/Qt6 components, which `("QT_PLUGIN_PATH" prefix directory
;; would cause warnings, perhaps problems.
`("QT_PLUGIN_PATH" = directory
,(format #f "/lib/qt~a/plugins" qt-major-version)) ,(format #f "/lib/qt~a/plugins" qt-major-version))
`("QML2_IMPORT_PATH" = directory `("QML2_IMPORT_PATH" = directory
,(format #f "/lib/qt~a/qml" qt-major-version)) ,(format #f "/lib/qt~a/qml" qt-major-version))