diff options
| -rw-r--r-- | gnu/packages/curl.scm | 62 | ||||
| -rw-r--r-- | gnu/packages/game-development.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/gl.scm | 14 | ||||
| -rw-r--r-- | gnu/packages/graphics.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/qt.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/sdl.scm | 17 | ||||
| -rw-r--r-- | gnu/packages/tls.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/web.scm | 18 | ||||
| -rw-r--r-- | gnu/packages/xdisorg.scm | 35 | ||||
| -rw-r--r-- | gnu/packages/xorg.scm | 44 |
10 files changed, 90 insertions, 117 deletions
diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 9f06f35495..346bfc4e61 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2021 Jean-Baptiste Volatier <jbv@pm.me> ;;; Copyright © 2021 Felix Gruber <felgru@posteo.net> ;;; Copyright © 2023 Sharlatan Hellseher <sharlatanus@gmail.com> +;;; Copyright © 2023 John Kehayias <john.kehayias@protonmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -64,15 +65,14 @@ (define-public curl (package (name "curl") - (version "7.85.0") - (replacement curl/fixed) + (version "8.4.0") (source (origin (method url-fetch) (uri (string-append "https://curl.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "1rjbn0h5rddclhvxb8p5gddxszcrpbf5cw1whx6wnj4s9dnlmdc8")) + "0bd8y8v66biyqvg70ka1sdd0aixs6yzpnvfsig907xzh9af2mihn")) (patches (search-patches "curl-use-ssl-cert-env.patch")))) (build-system gnu-build-system) (outputs '("out" @@ -118,15 +118,26 @@ (rename-file (string-append #$output "/share/man/man3") (string-append #$output:doc "/share/man/man3")))) (replace 'check - (lambda* (#:key tests? #:allow-other-keys) + (lambda* (#:key tests? parallel-tests? make-flags #:allow-other-keys) (substitute* "tests/runtests.pl" (("/bin/sh") (which "sh"))) - (when tests? - ;; The top-level "make check" does "make -C tests quiet-test", which - ;; is too quiet. Use the "test" target instead, which is more - ;; verbose. - (invoke "make" "-C" "tests" "test")))) + (let* ((job-count (string-append + "-j" + (if parallel-tests? + (number->string (parallel-job-count)) + "1"))) + (arguments `("-C" "tests" "test" + ,@make-flags + ,(if #$(system-hurd?) + ;; protocol FAIL + (string-append "TFLAGS=\"~1474 " + job-count "\"") + (string-append "TFLAGS=" job-count))))) + ;; The top-level "make check" does "make -C tests quiet-test", which + ;; is too quiet. Use the "test" target instead, which is more + ;; verbose. + (apply invoke "make" arguments))))) #$@(if (system-hurd?) #~((add-after 'unpack 'skip-tests (lambda _ @@ -155,39 +166,6 @@ tunneling, and so on.") "See COPYING in the distribution.")) (home-page "https://curl.haxx.se/"))) -(define curl/fixed - (let ((%version "8.4.0")) - (package - (inherit curl) - (version "8.4.0a") ; add lowercase 'a' for grafting - (source (origin - (method url-fetch) - (uri (string-append "https://curl.se/download/curl-" - %version ".tar.xz")) - (sha256 - (base32 - "0bd8y8v66biyqvg70ka1sdd0aixs6yzpnvfsig907xzh9af2mihn")) - (patches (search-patches "curl-use-ssl-cert-env.patch")))) - (arguments - (if (system-hurd?) - (substitute-keyword-arguments (package-arguments curl) - ((#:phases phases '%standard-phases) - #~(modify-phases #$phases - ;; We cannot simply set #:make-flags because they are - ;; ignored by curl's custom check phase. - (replace 'check - (lambda* (#:key tests? make-flags #:allow-other-keys) - (substitute* "tests/runtests.pl" - (("/bin/sh") (which "sh"))) - ;; See comment in curl about check/test. - (let ((arguments `("-C" "tests" "test" - ,@make-flags - ;; protocol FAIL - "TFLAGS=~1474"))) - (when tests? - (apply invoke "make" arguments)))))))) - (package-arguments curl)))))) - (define-public curl-ssh (package/inherit curl (arguments diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm index 1d9abd9705..671c7839ac 100644 --- a/gnu/packages/game-development.scm +++ b/gnu/packages/game-development.scm @@ -2055,7 +2055,7 @@ scripted in a Python-like language.") (define-public godot (package (name "godot") - (version "4.1.2") + (version "4.1.3") (source (origin (method git-fetch) (uri (git-reference @@ -2064,7 +2064,7 @@ scripted in a Python-like language.") (file-name (git-file-name name version)) (sha256 (base32 - "1zm07rknpjkvyxpiscqsx5hi4gc5wi647jlhillxdf85b36s6q9j")) + "1mwwzf77ixkalciqakn6q42g9sl2570didfll406sfs42wz534ng")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 6472158abc..c02a6f0a84 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -267,7 +267,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "23.1.4") + (version "23.2.1") (source (origin (method url-fetch) @@ -277,7 +277,7 @@ also known as DXTn or DXTC) for Mesa.") "mesa-" version ".tar.xz"))) (sha256 (base32 - "0n89l7lvawh85hq2a7g5pp5v017s03qs3n4hbbff6rs8p5zs2qbj")))) + "1k61pgw0vcjrlb4299q98cy7iqmk2r7jmb5ika91z01dzhb0dpk4")))) (build-system meson-build-system) (propagated-inputs ;; The following are in the Requires.private field of gl.pc. @@ -754,10 +754,14 @@ OpenGL graphics API.") #~(modify-phases %standard-phases (add-before 'configure 'patch-paths (lambda* (#:key inputs #:allow-other-keys) - (let ((mesa (dirname (search-input-file inputs "lib/libGL.so")))) + (let ((mesa-lib + (lambda (file) + (search-input-file inputs (string-append "lib/" file))))) (substitute* (find-files "." "\\.[ch]$") - (("libGL.so.1") (string-append mesa "/libGL.so.1")) - (("libEGL.so.1") (string-append mesa "/libEGL.so.1"))))))))) + (("libGL.so.1") (mesa-lib "libGL.so.1")) + (("libEGL.so.1") (mesa-lib "libEGL.so.1")) + (("libGLESv1_CM.so.1") (mesa-lib "libGLESv1_CM.so.1")) + (("libGLESv2.so.2") (mesa-lib "libGLESv2.so.2"))))))))) (build-system meson-build-system) (native-inputs (list pkg-config python)) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 00e273b853..9e2efaa7fb 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -2204,6 +2204,10 @@ Cflags: -I${includedir}~%" #$output #$version))))) "_" "_" "_" "Codec_partialAnim" "_" "_" "_" "Codec_InvalidImages" "_" "_" "_" "Codec_GifInterlacedTruncated" + ;; This test started failing possibly after mesa + ;; being updated to 23.2.1 and possibly only on some + ;; hardware. + "_" "_" "_" "SkRuntimeBlender_GPU" "_" "_" "_" "SkText_UnicodeText_Flags" "_" "_" "_" "SkParagraph_FontStyle" "_" "_" "_" "flight_animated_image" diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 12785c811f..7ec4526492 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -406,7 +406,10 @@ system, and the core design of Django is reused in Grantlee.") libxfixes libxi libxinerama - libxkbcommon + ;; Use libxkbcommon-1.5 as 1.6.0 removed keysyms referenced in the + ;; qtbase source. + ;; TODO: Check if libxkbcommon can be used on next update. + libxkbcommon-1.5 libxml2 libxrandr libxrender diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index a4ee654097..3a4aafcaa7 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2023 Evgeny Pisemsky <evgeny@pisemsky.com> +;;; Copyright © 2023 dan <i@dan.games> ;;; ;;; This file is part of GNU Guix. ;;; @@ -60,6 +61,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages gl) + #:use-module (gnu packages vulkan) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xiph) #:use-module (gnu packages xorg) @@ -116,7 +118,7 @@ joystick, and graphics hardware.") (package (inherit sdl) (name "sdl2") - (version "2.26.2") + (version "2.28.5") (source (origin (method url-fetch) (uri @@ -124,7 +126,7 @@ joystick, and graphics hardware.") version ".tar.gz")) (sha256 (base32 - "1q4r1camsr17mnpv00d6h3qy93b481rp68r6fbxbszq3vv1rplwm")))) + "1r36cspzv6h8abiqbbkrgm17g975p9wiziir2xabj3721dyv6b1k")))) (arguments (substitute-keyword-arguments (package-arguments sdl) ((#:configure-flags flags) @@ -133,11 +135,13 @@ joystick, and graphics hardware.") #$flags)) ((#:make-flags flags ''()) #~(cons* - ;; SDL dlopens libudev, so make sure it is in rpath. This overrides - ;; the LDFLAG set in sdl’s configure-flags, which isn’t necessary - ;; as sdl2 includes Mesa by default. + ;; SDL dlopens libudev and libvulkan, so make sure they are in + ;; rpath. This overrides the LDFLAG set in sdl’s configure-flags, + ;; which isn’t necessary as sdl2 includes Mesa by default. (string-append "LDFLAGS=-Wl,-rpath," - #$(this-package-input "eudev") "/lib") + #$(this-package-input "eudev") "/lib" + ",-rpath," + #$(this-package-input "vulkan-loader") "/lib") #$flags)))) (inputs ;; SDL2 needs to be built with ibus support otherwise some systems @@ -151,6 +155,7 @@ joystick, and graphics hardware.") ibus-minimal libxkbcommon libxcursor ;enables X11 cursor support + vulkan-loader wayland wayland-protocols))) (license license:bsd-3))) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 6a0aaf7f14..75e6370c72 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -991,7 +991,7 @@ number generator") (name "mbedtls-apache") ;; XXX Check whether ‘-Wformat-signedness’ still breaks mbedtls-for-hiawatha ;; when updating. - (version "2.28.0") + (version "2.28.5") (source (origin (method git-fetch) @@ -1000,7 +1000,7 @@ number generator") (commit (string-append "mbedtls-" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0s37dsi29v7146fi9k4frvx5rz2snxdm6c3rwq2fvnca2r80hfjl")))) + (base32 "1jlkvvyigpjvv404b8vmx68f1v6g1h2zr6rd78dhc0xgqi018phs")))) (build-system cmake-build-system) (arguments `(#:configure-flags diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index cd165bbae7..7363925aac 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -7958,8 +7958,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") (define-public nghttp2 (package (name "nghttp2") - (version "1.49.0") - (replacement nghttp2-1.57) + (version "1.58.0") (source (origin (method url-fetch) @@ -7968,7 +7967,7 @@ derivation by David Revoy from the original MonsterID by Andreas Gohr.") "nghttp2-" version ".tar.xz")) (sha256 (base32 - "0vm692c7q2wc4xxz8c41nr8jps2fkwf51xp8fb233cghpf9d9kxh")))) + "1q4ps8acr7nyia7mf2z11m0yh3fn1imhyv855j3xjbx91l2a6s2a")))) (build-system gnu-build-system) (outputs (list "out" "lib")) ; only libnghttp2 @@ -8070,19 +8069,6 @@ compressed JSON header blocks. (("print \\(ver >= '3\\.8'\\)") "print (tuple(map(int, ver.split('.'))) >= (3,8))"))))))))))) -(define-public nghttp2-1.57 - (package - (inherit nghttp2) - (version "1.57.0") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/nghttp2/nghttp2/" - "releases/download/v" version "/" - "nghttp2-" version ".tar.xz")) - (sha256 - (base32 - "0n598w7w8rqdqiay2fad3a11253hibakan5c4vjkpx09648v044j")))))) - (define-public hpcguix-web (package (name "hpcguix-web") diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm index 553b733a6b..9de5cd24d2 100644 --- a/gnu/packages/xdisorg.scm +++ b/gnu/packages/xdisorg.scm @@ -510,14 +510,14 @@ avoiding password prompts when X11 forwarding has already been setup.") (define-public libxkbcommon (package (name "libxkbcommon") - (version "1.4.1") + (version "1.6.0") (source (origin (method url-fetch) (uri (string-append "https://xkbcommon.org/download/libxkbcommon-" version ".tar.xz")) (sha256 (base32 - "0fbb2dyjvf71p42y2jmwdcylsvj03w52f5rb23c2d00rwahhfg4l")))) + "0awwz5pg9x5bj0d7dpg4a7bd4gl6k55mlpxwb12534fkrpn19p0f")))) (build-system meson-build-system) (inputs (list libx11 @@ -554,6 +554,19 @@ X11 (yet).") "See 'COPYING' in the distribution.")) (properties '((cpe-name . "xkbcommon"))))) +(define-public libxkbcommon-1.5 + (package + (inherit libxkbcommon) + (version "1.5.0") + (source (origin + (inherit (package-source libxkbcommon)) + (method url-fetch) + (uri (string-append "https://xkbcommon.org/download/libxkbcommon-" + version ".tar.xz")) + (sha256 + (base32 + "05z08rpa464x8myjxddhix7jp9jcmakd7xrybx4hz8dwpg2123sn")))))) + (define-public libfakekey (package (name "libfakekey") @@ -688,7 +701,7 @@ following the mouse.") (define-public pixman (package (name "pixman") - (version "0.40.0") + (version "0.42.2") (source (origin (method url-fetch) @@ -697,7 +710,7 @@ following the mouse.") "https://www.cairographics.org/releases/pixman-" version ".tar.gz")) (sha256 - (base32 "1z13n96m7x91j25qq9wlkxsbq04wfwjhw66ir17frna06zn0s83d")) + (base32 "0pk298iqxqr64vk3z6nhjwr6vjg1971zfrjkqy5r9zd2mppq057a")) (patches (search-patches "pixman-CVE-2016-5296.patch")))) @@ -722,7 +735,7 @@ rasterisation.") (define-public libdrm (package (name "libdrm") - (version "2.4.114") + (version "2.4.117") (source (origin (method url-fetch) (uri (string-append @@ -730,7 +743,7 @@ rasterisation.") version ".tar.xz")) (sha256 (base32 - "09nhk3jx3qzggl5vyii3yh4zm0npjqsbxhzvxrg2xla77a2cyj9h")))) + "0ar4c4ikcbm1s4sg09ld406izq5s1yk7b2n0mmvql77bwdlqv252")))) (build-system meson-build-system) (arguments (list #:configure-flags @@ -744,6 +757,16 @@ rasterisation.") (_ ''())) #:phases #~(modify-phases %standard-phases + ;; A typo in a previous upstream commit disabled building + ;; libdrm_intel by default on supported platforms. This was + ;; fixed by the following change in upstream commit + ;; 8a933c778a0eb36526bf3fc8a289e25add9ff8b0. + ;; TODO: Remove on next update of libdrm. + (add-after 'unpack 'build-intel-by-default + (lambda _ + (substitute* "meson.build" + (("system\\(\\)\\.startswith") + "cpu_family().startswith")))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index f65ffa7476..8f359c3e2f 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -1432,18 +1432,17 @@ treat it as part of their software base when porting.") (define-public libxpm (package (name "libxpm") - (version "3.5.13") - (replacement libxpm/fixed) + (version "3.5.17") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/lib/libXpm-" version - ".tar.bz2")) + ".tar.xz")) (sha256 (base32 - "09dc6nwlb2122h02vl64k9x56mxnyqz2gwpga0abfv4bb1bxmlcw")))) + "0hvf49qy55gwldpwpw7ihcmn5i2iinpjh2rbha63hzcy060izcv4")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--disable-static"))) @@ -1457,21 +1456,6 @@ treat it as part of their software base when porting.") (description "XPM (X Pixmap) image file format library.") (license license:x11))) -(define-public libxpm/fixed - (package - (inherit libxpm) - (version "3.5.17") - (source - (origin - (method url-fetch) - (uri (string-append - "mirror://xorg/individual/lib/libXpm-" - version - ".tar.xz")) - (sha256 - (base32 - "0hvf49qy55gwldpwpw7ihcmn5i2iinpjh2rbha63hzcy060izcv4")))))) - (define-public libxres (package (name "libxres") @@ -5332,16 +5316,15 @@ Wayland.") (define-public libx11 (package (name "libx11") - (version "1.8.1") - (replacement libx11-fixed) ;security fixes + (version "1.8.7") (source (origin (method url-fetch) - (uri (string-append "https://xorg.freedesktop.org/archive/" - "/individual/lib/libX11-" version ".tar.xz")) + (uri (string-append "mirror://xorg/individual/lib/libX11-" + version ".tar.xz")) (sha256 (base32 - "1xyry8i7zqmlkvpbyyqwi18rrdw6ycczlvfp63rh2570pfhimi0v")))) + "1vlrgrdibp4lr84wgmsdy1ihzaai8bvvqc68npi1m19wir36gwh5")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;8 MiB of man pages + XML @@ -5363,19 +5346,6 @@ Wayland.") (description "Xorg Core X11 protocol client library.") (license license:x11))) -(define-public libx11-fixed - (package - (inherit libx11) - (version "1.8.7") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://xorg/individual/lib/libX11-" - version ".tar.xz")) - (sha256 - (base32 - "1vlrgrdibp4lr84wgmsdy1ihzaai8bvvqc68npi1m19wir36gwh5")))))) - ;; packages of height 5 in the propagated-inputs tree (define-public libxcursor |