From d8c9d27ffbc600aa04ecf933aad84c90b9869f1a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 7 Mar 2024 20:21:57 -0500 Subject: [PATCH 001/186] gnu: Add man2html. * gnu/packages/man.scm (man2html): New variable. Change-Id: Ia9d290b52af29867f6b3e0fff1aa0af8c788a9cc --- gnu/packages/man.scm | 47 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm index 71fcf2f4bc..780f6bf6d8 100644 --- a/gnu/packages/man.scm +++ b/gnu/packages/man.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2021 Jan (janneke) Nieuwenhuizen -;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2022, 2024 Maxim Cournoyer ;;; Copyright © 2022 Imran Iqbal ;;; ;;; This file is part of GNU Guix. @@ -219,6 +219,51 @@ accessed using the man command. It uses a Berkeley DB database in place of the traditional flat-text whatis databases.") (license license:gpl2+))) +(define-public man2html + (package + (name "man2html") + (version "1.6g-16") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://salsa.debian.org/debian/man2html") + (commit (string-append "debian/" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1cxm8b2x4cjmyidi4gfz9q29zrhaxhbnsiqcmlnyr1bdhjsmk786")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ;no test suite + ;; The source include a man page viewer as well as the man2html + ;; converter. We're only interested in the converter, so we specify the + ;; explicit 'manhtml' target. + #:make-flags #~(list (string-append "bindir=" #$output "/bin") + "manhtml") + #:phases #~(modify-phases %standard-phases + (replace 'configure + (lambda _ + (setenv "CC" #$(cc-for-target)) + (invoke "./configure" + (string-append "-prefix=" #$output)))) + (add-before 'install 'chdir + (lambda _ + (chdir "man2html"))) + (replace 'install + ;; This is needed because the 'manhtml' top level target + ;; doesn't exist in man2html/Makefile. + (lambda* (#:key make-flags #:allow-other-keys + #:rest args) + (apply (assoc-ref %standard-phases 'install) + `(,@args #:make-flags + ,(delete "manhtml" make-flags)))))))) + (home-page "https://salsa.debian.org/debian/man2html") + (synopsis "Man pages to HTML format converter") + (description "@command{man2html} is a command-line tool for converting man +pages into HTML format.") + (license license:gpl2+))) + (define-public mandoc (package (name "mandoc") From 59ff9d008816a7d04cdd50d0db371ae1223e3329 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 9 Mar 2024 16:49:55 -0500 Subject: [PATCH 002/186] gnu: qttools-5: Patch path to qmake for the lprodump command. This previously would lead to this cryptic error: "WARNING: Could not find qmake spec 'default'", which turned out to be caused by lprodump erroneously attempting to run 'qmake' from its own prefix (qmake is from the qtbase package, not qttools). * gnu/packages/qt.scm (qttools-5) [phases] : New phase. Change-Id: I6e9a2d35fec987451fd1e30b84a82023dbfd3316 --- gnu/packages/qt.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 761d12e31f..72c36513e9 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -2171,7 +2171,18 @@ plugin for Adobe After Effects.") "1bkx2sc5hyldarc7w76ymv7dlcna3ib9r2kp67jdqcf856bnrx36")))) (arguments (substitute-keyword-arguments (package-arguments qtsvg-5) - ((#:tests? _ #f) #f))) ; TODO: Enable the tests + ((#:tests? _ #f) #f) ; TODO: Enable the tests + ((#:phases phases '%standard-phases) + #~(modify-phases #$phases + (add-after 'unpack 'patch-qmake + (lambda* (#:key inputs #:allow-other-keys) + ;; Adjust the default location of the 'qmake' command known to + ;; the 'lprodump' command, which would otherwise look for it + ;; in its own bindir. + (substitute* "src/linguist/lprodump/main.cpp" + (("app.applicationDirPath\\() \\+ QLatin1String\\(\"/qmake\")") + (format #f "QLatin1String(~s)" + (search-input-file inputs "bin/qmake")))))))))) (native-inputs (list perl qtdeclarative-5 vulkan-headers)) (inputs (list mesa qtbase-5)) (synopsis "Qt Tools and Designer modules") From 05b19cd0715a3b5fa6e94f45a15264750feeafe0 Mon Sep 17 00:00:00 2001 From: nicodebo Date: Thu, 22 Feb 2024 22:08:19 +0000 Subject: [PATCH 003/186] gnu: Add nx-libs. * gnu/packages/nx.scm: New file. Reviewed-by: Steve George Change-Id: I13e088521d5e5577fed5d6a4b10867ca10f4293f Co-authored-by: Maxim Cournoyer --- gnu/local.mk | 1 + gnu/packages/nx.scm | 156 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 157 insertions(+) create mode 100644 gnu/packages/nx.scm diff --git a/gnu/local.mk b/gnu/local.mk index fb8c4afe1d..174c4c30e2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -487,6 +487,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/ntp.scm \ %D%/packages/nutrition.scm \ %D%/packages/nvi.scm \ + %D%/packages/nx.scm \ %D%/packages/ocaml.scm \ %D%/packages/ocr.scm \ %D%/packages/openkinect.scm \ diff --git a/gnu/packages/nx.scm b/gnu/packages/nx.scm new file mode 100644 index 0000000000..ab378d0847 --- /dev/null +++ b/gnu/packages/nx.scm @@ -0,0 +1,156 @@ +;;; This file is part of GNU Guix. +;;; Copyright © 2024 Nicolas Debonnaire +;;; Copyright © 2024 Maxim Cournoyer +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages nx) + #:use-module (guix build-system gnu) + #:use-module (guix download) + #:use-module (guix gexp) + #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix packages) + #:use-module (gnu packages autotools) + #:use-module (gnu packages base) + #:use-module (gnu packages bash) + #:use-module (gnu packages commencement) + #:use-module (gnu packages glib) + #:use-module (gnu packages gtk) + #:use-module (gnu packages image) + #:use-module (gnu packages onc-rpc) + #:use-module (gnu packages patchutils) + #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config) + #:use-module (gnu packages python) + #:use-module (gnu packages xdisorg) + #:use-module (gnu packages xml) + #:use-module (gnu packages xorg)) + +(define-public nx-libs + (package + (name "nx-libs") + (version "3.5.99.27") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ArcticaProject/nx-libs") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0ykbza39ksycpyydaiwwbp7hkmdk96v7b36pn989k39lhfwnn8kz")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ;no test suite + ;; The build randomly fails when run in parallel (see: + ;; https://github.com/ArcticaProject/nx-libs/issues/1072). + #:parallel-build? #f + #:make-flags #~(let ((sh (search-input-file %build-inputs "bin/sh"))) + (list (string-append "PREFIX=" #$output) + (string-append "ETCDIR_NX=" #$output "/etc") + (string-append "LOCAL_LDFLAGS=-Wl," + "-rpath=" #$output "/lib," + "-rpath=" #$output "/lib/nx/X11") + (string-append "IMAKE_DEFINES=-DUseTIRPC=1" + " -DBourneShell=" sh + " -DProjectRoot=" #$output + " -DDefaultUserPath=" + #$output "/bin") + (string-append "CONFIG_SHELL=" sh) + (string-append "SHELL=" sh) + ;; Autoreconf being run by Make, the generated + ;; configure script shebangs thus haven't been + ;; patched; workaround this by running explicitly + ;; via the shell. + (string-append "CONFIGURE=" sh " ./configure " + "--prefix=" #$output) + "VERBOSE=1")) + #:phases #~(modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'adjust-Makefile + (lambda _ + ;; It's best to source a script via its absolute path, + ;; otherwise it's looked from PATH and fails for POSIX + ;; shells, such as our Bash-provided 'sh' (see: + ;; https://github.com/ArcticaProject/nx-libs/issues/1071). + (substitute* "Makefile" + (("\\. replace.sh") + ". ./replace.sh")))) + (add-after 'install 'wrap-nxdialog + (lambda* (#:key inputs #:allow-other-keys) + (wrap-program (string-append #$output "/bin/nxdialog") + `("GUIX_PYTHONPATH" = + (,(getenv "GUIX_PYTHONPATH"))) + ;; Ensure GObject Introspection typelibs are found. + `("GI_TYPELIB_PATH" ":" = + (,(getenv "GI_TYPELIB_PATH"))))))))) + (native-inputs + (list autoconf + automake + bash-minimal ;for wrap-program + font-util + gccmakedep + imake + libtool + perl + pkg-config + quilt + which)) + (inputs + (list gtk+ + libjpeg-turbo + libtirpc + libxcomposite + libxdamage + libxext + libxfont + libxinerama + libxml2 + libxpm + libxrandr + libxtst + pixman + python-pygobject + python-wrapper + xkbcomp)) + (propagated-inputs + (list libpng)) ;in Requires of nxcomp.pc + (synopsis "NX X11 protocol compression libraries") + (description "NX is a software suite which implements very efficient +compression of the X11 protocol. This increases performance when using X +applications over a network, especially a slow one. This package provides the +following libraries: +@table @code +@item NX_X11 +NX's modified X Window System (X11) library +@item Xcomp +NX differential compression library for X11 +@item Xcompshad +Session shadowing library +@end table + +The following commands are also provided: + +@table @command +@item nxagent +Agent providing NX transport of X sessions +@item nxproxy +The NX proxy (client) binary +@item nxdialog +Helper script +@end table") + (home-page "https://github.com/ArcticaProject/nx-libs") + (license license:gpl2))) From 1f89e15207694af210b23672a6e1b1c217c6af33 Mon Sep 17 00:00:00 2001 From: nicodebo Date: Thu, 22 Feb 2024 22:08:20 +0000 Subject: [PATCH 004/186] gnu: Add x2goclient. * gnu/packages/nx.scm (x2goclient): New variable. Reviewed-by: Steve George Co-authored-by: Maxim Cournoyer Change-Id: Ib0ff6328ede3fb4a0b48462ac1a003438c53c862 --- gnu/packages/nx.scm | 90 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/gnu/packages/nx.scm b/gnu/packages/nx.scm index ab378d0847..189cf7de29 100644 --- a/gnu/packages/nx.scm +++ b/gnu/packages/nx.scm @@ -26,14 +26,20 @@ #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages commencement) + #:use-module (gnu packages cups) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages image) + #:use-module (gnu packages man) #:use-module (gnu packages onc-rpc) + #:use-module (gnu packages openldap) #:use-module (gnu packages patchutils) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages qt) + #:use-module (gnu packages ssh) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) #:use-module (gnu packages xorg)) @@ -154,3 +160,87 @@ Helper script @end table") (home-page "https://github.com/ArcticaProject/nx-libs") (license license:gpl2))) + +(define-public x2goclient + (package + (name "x2goclient") + (version "4.1.2.3") + (source + (origin + (method url-fetch) + (uri (string-append + "https://code.x2go.org/releases/source/x2goclient/x2goclient-" + version ".tar.gz")) + (sha256 + (base32 "0g6aba8kpsixq4486a8mga945lp31y0mzwa2krs5qqiiip3v72xb")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ;no test suite + #:make-flags + #~(list (string-append "SHELL=" + (search-input-file %build-inputs "bin/bash")) + "QT_VERSION=5" + "INSTALL_DIR=install -d -m 755" + "INSTALL_FILE=install -m 644" + "INSTALL_PROGRAM=install -m 755" + (string-append "PREFIX=" #$output) + (string-append "ETCDIR=" #$output "/etc")) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/onmainwindow.cpp" + (("/usr/sbin/sshd") + (search-input-file inputs "sbin/sshd")))))))) + (native-inputs + (list man2html + pkg-config + qtbase-5 + qttools-5)) + (inputs + (list cups + libssh + libxpm + nx-libs + openldap + openssh + pulseaudio + qtbase-5 + qtx11extras + qtsvg-5)) + (synopsis "Remote desktop and application solution") + (description + "X2Go enables you to access a graphical desktop of a computer via +SSH (Secure Shell). This package provides the X2Go Client, which can connect +to the X2Go Server. Basic features of X2Go include: +@itemize +@item +Graphical remote desktop that works well over both low bandwidth and high +bandwidth connections +@item +The ability to disconnect and reconnect to a session, even from another +client +@item +Support for sound +@item +Support for as many simultaneous users as the computer's resources will +allow +@item +Traffic is securely tunneled over SSH +@item +File sharing from client to server +@item +Printer sharing from client to server +@item +Easily select from multiple desktop environments (e.g., MATE, GNOME, KDE) +@item +Remote support possible via desktop sharing +@item +The ability to access single applications by specifying the name of the +desired executable in the client configuration or selecting one of the +pre-defined common applications. +@end itemize") + (home-page "https://wiki.x2go.org/doku.php") + (license license:gpl2))) From 7f1cd8847fb3c7a1c75df0a06e1fa4d298a66cbb Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Mon, 4 Mar 2024 21:46:13 -0800 Subject: [PATCH 005/186] gnu: xpra: Update to 5.0.7. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/xorg.scm (xpra): Update to 5.0.7. Change-Id: I5a1f3e6d39fb0bf7a8a1858574e34c49d57630f5 Signed-off-by: 宋文武 --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 17a35d964d..ddbbdb74ba 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -6157,14 +6157,14 @@ basic eye-candy effects.") (define-public xpra (package (name "xpra") - (version "5.0.4") + (version "5.0.7") (source (origin (method url-fetch) (uri (string-append "https://www.xpra.org/src/xpra-" version ".tar.xz")) (sha256 - (base32 "0zb49adrjrdsmf0k9xdc6j2idqy5lgzsjjrb4awjh5i4r3wc58m0")) + (base32 "0rkcsv0b55xbvkqi38nm01yxc09f7l9nj7xnp8v23rn6bp86m8mr")) (patches (search-patches "xpra-5.0-systemd-run.patch" "xpra-5.0-install_libs.patch")))) (build-system python-build-system) From b05bb6608c7f25ddce6b563194ba5a3007009282 Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Sat, 9 Mar 2024 16:27:57 +0800 Subject: [PATCH 006/186] gnu: gperftools: Fix build on riscv64-linux. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/cpp.scm(gperftools)[arguments]: When building for riscv64-linux always link with libatomic. Change-Id: I067087fffd8c142759b6d113f993c3e2ab1aef9b Signed-off-by: 宋文武 --- gnu/packages/cpp.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 3b65ce9f4a..d451eea2fd 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -30,7 +30,7 @@ ;;; Copyright © 2022 Attila Lendvai ;;; Copyright © 2022 Arun Isaac ;;; Copyright © 2022, 2023, 2024 David Elsing -;;; Copyright © 2022, 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2022-2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2022, 2023, 2024 Maxim Cournoyer ;;; Copyright © 2022 Antero Mejr ;;; Copyright © 2023 Sughosha @@ -907,9 +907,12 @@ lock-free fixed size queue written in C++11.") (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - ;; The tests are flaky when run in parallel. For more info: - ;; https://bugs.gnu.org/46562 - '(#:parallel-tests? #f)) + ;; The tests are flaky when run in parallel. For more info: + ;; https://bugs.gnu.org/46562 + `(#:parallel-tests? #f + ,@(if (target-riscv64?) + `(#:make-flags (list "LDFLAGS=-latomic")) + '()))) (native-inputs (list autoconf automake libtool ;; For tests. From c9ce94b5e1e43d5660b64ad5c66ef722babb708f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sat, 9 Mar 2024 14:48:44 +0800 Subject: [PATCH 007/186] gnu: qt5ct: Update to 1.8. * gnu/packages/qt.scm (qt5ct): Update to 1.8. Change-Id: Ic8637433e18f4913bf77b1ef8003daafddcae5cd --- gnu/packages/qt.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 72c36513e9..9df49d7fb3 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -218,14 +218,14 @@ of C++20 coroutines in connection with certain asynchronous Qt actions.") (define-public qt5ct (package (name "qt5ct") - (version "1.5") + (version "1.8") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/qt5ct/qt5ct-" version ".tar.bz2")) (sha256 - (base32 "14742vs32m98nbfb5mad0i8ciff5f45gfcb5v03p4hh2dvhhqgfn")))) + (base32 "1s88v3x5vxrz981jiqb9cnwak0shz6kgjbkp511i592y85a41dr3")))) (build-system qt-build-system) (arguments (list From 5b507280d7f38dfbfc8c29392f399a952524d16c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Fri, 8 Mar 2024 11:50:53 +0900 Subject: [PATCH 008/186] gnu: qbe: Update to 1.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/c.scm (qbe): Update to 1.2. Change-Id: I0fc2039b416026dc0563b9ead967713e594446bc Signed-off-by: 宋文武 --- gnu/packages/c.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/c.scm b/gnu/packages/c.scm index b558145ea0..c004aade73 100644 --- a/gnu/packages/c.scm +++ b/gnu/packages/c.scm @@ -326,7 +326,7 @@ compiler while still keeping it small, simple, fast and understandable.") (define-public qbe (package (name "qbe") - (version "1.1") + (version "1.2") (source (origin (method git-fetch) (uri (git-reference @@ -335,7 +335,7 @@ compiler while still keeping it small, simple, fast and understandable.") (file-name (git-file-name name version)) (sha256 (base32 - "07nl1kdgpz7hwfkng0yy4xihk0fmv1a2hq9bxzgvhy3vk9r7fmn8")))) + "1sxz5dn788n5c4v6mxa2kg3hf0a4qryg8wp0w3wx0qkzj6flj2sj")))) (build-system gnu-build-system) (arguments (list #:make-flags From b4e60b836224291ab17c470a845c057e6ecd5970 Mon Sep 17 00:00:00 2001 From: Parnikkapore Date: Sun, 3 Mar 2024 21:16:14 +0700 Subject: [PATCH 009/186] gnu: lite-xl: Update to 2.1.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/text-editors.scm (lite-xl): Update to 2.1.3. [arguments]: Pass '-Duse_system_lua=true' to configure. [source]: Remove snippet. [inputs]: Remove agg and reproc. Change-Id: If3a57587ce2049f94e4ac7791c680d29a4e7d222 Signed-off-by: 宋文武 --- gnu/packages/text-editors.scm | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index d17b370b6d..c6bf83ae10 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -1473,7 +1473,7 @@ commands.") (define-public lite-xl (package (name "lite-xl") - (version "2.1.1") + (version "2.1.3") (source (origin (method git-fetch) (uri (git-reference @@ -1482,18 +1482,10 @@ commands.") (file-name (git-file-name name version)) (sha256 (base32 - "1pnmax68hvk1ry4bjsxwq4qimfn55pai8jlljw6jiqzcmh4mp7xm")) - (modules '((guix build utils))) - (snippet '(substitute* "meson.build" - (("dependency\\('lua5\\.4',") - "dependency('lua-5.4',"))))) + "19wdq8w6ickyynx6r2wg2vf5isl2577zjizgwbzql9vhqdsi8ag3")))) (build-system meson-build-system) - (inputs (list agg - freetype - lua-5.4 - pcre2 - reproc - sdl2)) + (arguments (list #:configure-flags #~'("-Duse_system_lua=true"))) + (inputs (list lua-5.4 pcre2 freetype sdl2)) (native-inputs (list pkg-config)) (home-page "https://lite-xl.com") (synopsis "Lightweight text editor written in Lua") From e03886d6f693c5012ea9bf36bc8dac9fa7809636 Mon Sep 17 00:00:00 2001 From: antlers Date: Fri, 12 Jan 2024 07:35:51 +0000 Subject: [PATCH 010/186] gnu: texinfo-7: Update to 7.1.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/texinfo.scm (texinfo-7): Update to 7.1.0. Change-Id: Ie430edae45c4a3605f8408effd7528d86664ab61 Signed-off-by: 宋文武 --- gnu/packages/texinfo.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index f45ae06810..a5ddc95859 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -104,14 +104,14 @@ is on expressing the content semantically, avoiding physical markup commands.") (define-public texinfo-7 (package (inherit texinfo) - (version "7.0.3") + (version "7.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/texinfo/texinfo-" version ".tar.xz")) (sha256 (base32 - "1gq7i01iblgfcwby1977adh8mab9vpq318vsz628wlkzkp821d3l")))) + "0lq9nf1as11mfqf2ydyc6b1xl1hqk0qj5llavxph97hmkzqwkvny")))) (inputs (modify-inputs (package-inputs texinfo) (append perl-archive-zip))) ;needed for 'tex2any --epub3' (arguments From b22e1ff117e2e3002bc3227de66f485e643137e9 Mon Sep 17 00:00:00 2001 From: Felix Gruber Date: Wed, 27 Dec 2023 15:53:14 +0000 Subject: [PATCH 011/186] gnu: exempi: Update to 2.6.5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/freedesktop.scm (exempi): Update to 2.6.5. [arguments]: Remove trailing #t from 'remove-static-library phase. Change-Id: I99878003dd6fc696b66543400502a1ef40c73cc1 Signed-off-by: 宋文武 --- gnu/packages/freedesktop.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 7b5d2dbbf2..06fa644b7b 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1474,7 +1474,7 @@ move and resize windows, etc.") (define-public exempi (package (name "exempi") - (version "2.5.2") + (version "2.6.5") (source (origin (method url-fetch) (uri (string-append @@ -1482,7 +1482,7 @@ move and resize windows, etc.") name "-" version ".tar.bz2")) (sha256 (base32 - "1mdfxb36p8251n5m7l55gx3fcqpk46yz9v568xfr8igxmqa47xaj")))) + "1zhzwkfna14sy78llhfc94cy5hv3076j5v3p1zmvawzz5gaa7yg9")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list (string-append "--with-boost=" @@ -1496,8 +1496,7 @@ move and resize windows, etc.") ;; . ;; Simply delete the static library instead to save ~4.3 MiB. (delete-file (string-append (assoc-ref outputs "out") - "/lib/libexempi.a")) - #t))))) + "/lib/libexempi.a"))))))) (native-inputs (list boost)) ; tests (inputs From 9b1cab90471af555c865136bfa676d72d2f9e32f Mon Sep 17 00:00:00 2001 From: Benjamin Slade Date: Tue, 19 Dec 2023 12:38:27 -0600 Subject: [PATCH 012/186] gnu: pdfpc: Update to 4.6.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/pdf.scm (pdfpc): Update to 4.6.0. [arguments]: Remove 'fix-vala-API-conflict phase. [inputs]: Add qrencode. Signed-off-by: 宋文武 Change-Id: I9dfed5b8ff4ef0dd905034ba599f9875578df232 --- gnu/packages/pdf.scm | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index f32403b954..0a87346d8d 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -26,6 +26,7 @@ ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2023 Felix Gruber ;;; Copyright © 2024 dan +;;; Copyright © 2023 Benjamin Slade ;;; ;;; This file is part of GNU Guix. ;;; @@ -56,6 +57,7 @@ #:use-module (guix build-system python) #:use-module (guix build-system qt) #:use-module (gnu packages) + #:use-module (gnu packages aidc) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) #:use-module (gnu packages backup) @@ -1527,7 +1529,7 @@ multiple files.") (define-public pdfpc (package (name "pdfpc") - (version "4.5.0") + (version "4.6.0") (source (origin (method git-fetch) @@ -1536,22 +1538,13 @@ multiple files.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0bmy51w6ypz927hxwp5g7wapqvzqmsi3w32rch6i3f94kg1152ck")))) + (base32 "0kj84sf5hgr2v2ra6dxmxqcr173h17cpnhg9lcq36shdbdnncwg4")))) (build-system cmake-build-system) - (arguments - '(#:tests? #f ; no test target - #:phases - (modify-phases %standard-phases - ;; This is really a bug in Vala. - ;; https://github.com/pdfpc/pdfpc/issues/594 - (add-after 'unpack 'fix-vala-API-conflict - (lambda _ - (substitute* "src/classes/action/movie.vala" - (("info.from_caps\\(caps\\)") - "Gst.Video.info_from_caps(out info, caps)"))))))) + (arguments '(#:tests? #f)) ; no test target (inputs `(("cairo" ,cairo) ("discount" ,discount) ; libmarkdown + ("qrencode" ,qrencode) ("gtk+" ,gtk+) ("gstreamer" ,gstreamer) ("gst-plugins-base" ,gst-plugins-base) From 7758e63f7a89f53fbb7c7a265ae472af0a8dfab0 Mon Sep 17 00:00:00 2001 From: Parnikkapore Date: Sun, 3 Mar 2024 17:59:08 +0700 Subject: [PATCH 013/186] gnu: uchardet: Update to 0.0.8. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/freedesktop.scm (uchardet): Update to 0.0.8. Change-Id: I8a601ec7ef9b92b0efe4bc9b23affa6dc4bde24e Signed-off-by: 宋文武 --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 06fa644b7b..20cf2510d2 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -2426,14 +2426,14 @@ their MIME type. (define-public uchardet (package (name "uchardet") - (version "0.0.7") + (version "0.0.8") (source (origin (method url-fetch) (uri (string-append "https://www.freedesktop.org/software/" name "/releases/" name "-" version ".tar.xz")) (sha256 - (base32 "1ca51sryhryqz82v4d0graaiqqq5w2f33a9gj83b910xmq499irz")))) + (base32 "1w659aiphbnczpry771diakrzg9a8aqpn2abcxx1870aq37n0yp9")))) (build-system cmake-build-system) (home-page "https://www.freedesktop.org/wiki/Software/uchardet/") (synopsis "Encoding detector library") From a01f2d814b2621a8d3dcdd22b0e9dca6d98aa9f8 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 9 Mar 2024 10:50:21 +0100 Subject: [PATCH 014/186] gnu: bitcoin-unlimited: Update to 2.0.0.1. * gnu/packages/finance.scm (bitcoin-unlimited): Update to 2.0.0.1. Change-Id: I631b497695ba1933a52ca6ae6944f1fd590d3b26 --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 206d606933..2fb502bc71 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1750,7 +1750,7 @@ following three utilities are included with the library: (define-public bitcoin-unlimited (package (name "bitcoin-unlimited") - (version "2.0.0.0") + (version "2.0.0.1") (source (origin (method git-fetch) @@ -1759,7 +1759,7 @@ following three utilities are included with the library: (commit (string-append "BCHunlimited" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0s4iyjfhjx21xa3z7433m4skfr115565k0ckza87ha2d4nl8kz5h")))) + (base32 "1kkmg0gp86qz3ya8y5a00yic1mals138b9fv2cjlm7683sfjjljx")))) (build-system gnu-build-system) (native-inputs (list autoconf From 0d6a2eb0b0ae842ae45b8d1771cb5a9e0119cae3 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sat, 9 Mar 2024 15:11:50 +0100 Subject: [PATCH 015/186] gnu: monero: Update to 0.18.3.2. * gnu/packages/finance.scm (monero): Update to 0.18.3.2. Change-Id: Ia3e940e52065786bcae89e046883ad0ff5742752 --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 2fb502bc71..289a8ba3d9 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -684,7 +684,7 @@ blockchain.") ;; the system's dynamically linked library. (package (name "monero") - (version "0.18.3.1") + (version "0.18.3.2") (source (origin (method git-fetch) @@ -702,7 +702,7 @@ blockchain.") delete-file-recursively '("external/miniupnp" "external/rapidjson")))) (sha256 - (base32 "1k6mrgsvmqsfk95w8kjmp9v2fghjmmpj40667zndrw9jx1h85mwx")))) + (base32 "0ri3ss5vgsjk5pzmaaw8yi7sg4lasx58d8kz3m6z5vg7p69gdzxv")))) (build-system cmake-build-system) (native-inputs (list doxygen From 3b38cbe8c2cff60fde2dcd751908be144c6913ae Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sun, 10 Mar 2024 10:38:36 +0100 Subject: [PATCH 016/186] gnu: monero-gui: Update to 0.18.3.2. * gnu/packages/finance.scm (monero-gui): Update to 0.18.3.2. Change-Id: I42fdfe59ef9db2ac2dc87bb0783a917e858e025a --- gnu/packages/finance.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 289a8ba3d9..8c30bd1a30 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -789,7 +789,7 @@ the Monero command line client and daemon.") (define-public monero-gui (package (name "monero-gui") - (version "0.18.3.1") + (version "0.18.3.2") (source (origin (method git-fetch) @@ -805,7 +805,7 @@ the Monero command line client and daemon.") ;; See the 'extract-monero-sources' phase. (delete-file-recursively "monero"))) (sha256 - (base32 "1fjx8gdzc1pmfsi14r09gfmkglvh560pnxk70p0k82a4gbs1vyz2")))) + (base32 "0jic43b7jzc1i7x2mqqpbbb2992687nm12kk642yr10dm4maklzb")))) (build-system qt-build-system) (native-inputs `(,@(package-native-inputs monero) From bcf3f55be94d49ac23785343e934449fdcf1af3c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 10 Mar 2024 09:54:08 +0200 Subject: [PATCH 017/186] gnu: check-0.14: Fix build on powerpc-linux. * gnu/packages/check.scm (check-0.14)[source]: Include patch from check. Change-Id: I490b3d4cbe09381d091a398614d6b55687ac758f --- gnu/packages/check.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index 49a026bd20..bd1f2d1b65 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -250,6 +250,7 @@ source code editors and IDEs.") (inherit check) (version "0.14.0") (source (origin + (inherit (package-source check)) (method url-fetch) (uri (string-append "https://github.com/libcheck/check/releases" "/download/" version "/check-" version ".tar.gz")) From a3d2dde5b0dd40cf98acb6120fa048135c2e2be0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 10 Mar 2024 10:27:02 +0200 Subject: [PATCH 018/186] gnu: clang: Move compiler-cpu-architectures to llvm-meta.scm. * gnu/packages/llvm.scm (clang-properties): Extract compiler-cpu-architectures and move ... * gnu/packages/llvm-meta.scm: ... to here. * gnu/packages/zig.scm (zig-0.9, zig-0.10)[properties]: Use clang-compiler-cpu-architectures. * gnu/local.mk (GNU_SYSTEM_MODULES): Register new file. Change-Id: Ie0bedbd6e2927eaa05024685cc66375ea278e4c2 --- gnu/local.mk | 1 + gnu/packages/llvm-meta.scm | 94 ++++++++++++++++++++++++++++++++++++++ gnu/packages/llvm.scm | 74 ++---------------------------- gnu/packages/zig.scm | 7 +-- 4 files changed, 103 insertions(+), 73 deletions(-) create mode 100644 gnu/packages/llvm-meta.scm diff --git a/gnu/local.mk b/gnu/local.mk index 174c4c30e2..1aa413ebbe 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -425,6 +425,7 @@ GNU_SYSTEM_MODULES = \ %D%/packages/lisp-check.scm \ %D%/packages/lisp-xyz.scm \ %D%/packages/llvm.scm \ + %D%/packages/llvm-meta.scm \ %D%/packages/lout.scm \ %D%/packages/logging.scm \ %D%/packages/logo.scm \ diff --git a/gnu/packages/llvm-meta.scm b/gnu/packages/llvm-meta.scm new file mode 100644 index 0000000000..ea184806e5 --- /dev/null +++ b/gnu/packages/llvm-meta.scm @@ -0,0 +1,94 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2021 Ludovic Courtès +;;; Copyright © 2024 Efraim Flashner +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages llvm-meta) + #:use-module (guix utils) + #:export (clang-compiler-cpu-architectures)) + +(define (clang-compiler-cpu-architectures version) + "Return package properties for Clang VERSION." + `((compiler-cpu-architectures + ;; These lists were obtained by running: + ;; + ;; guix shell clang -- llc -march=x86-64 -mattr=help + ;; + ;; and then filtering against clang/test/Misc/target-invalid-cpu-note.c + ("powerpc64le" + ,@(if (version>=? version "11.0") + '("power8" "power9" "power10" "powerpc64le"))) + ("x86_64" + ,@(cond + ((version>=? version "17.0") + '("nocona" "core2" "penryn" "bonnell" "atom" "silvermont" "slm" + "goldmont" "goldmont-plus" "tremont" "nehalem" "corei7" "westmere" + "sandybridge" "corei7-avx" "ivybridge" "core-avx-i" "haswell" + "core-avx2" "broadwell" "skylake" "skylake-avx512" "skx" + "cascadelake" "cooperlake" "cannonlake" "icelake-client" + "rocketlake" "icelake-server" "tigerlake" "sapphirerapids" + "alderlake" "raptorlake" "meteorlake" "sierraforest" "grandridge" + "graniterapids" "graniterapids-d" "emeraldrapids" "knl" "knm" "k8" + "athlon64" "athlon-fx" "opteron" "k8-sse3" "athlon64-sse3" + "opteron-sse3" "amdfam10" "barcelona" "btver1" "btver2" "bdver1" + "bdver2" "bdver3" "bdver4" "znver1" "znver2" "znver3" "znver4" + "x86-64" "x86-64-v2" "x86-64-v3" "x86-64-v4")) + ((version>=? version "16.0") + '("nocona" "core2" "penryn" "bonnell" "atom" "silvermont" "slm" + "goldmont" "goldmont-plus" "tremont" "nehalem" "corei7" "westmere" + "sandybridge" "corei7-avx" "ivybridge" "core-avx-i" "haswell" + "core-avx2" "broadwell" "skylake" "skylake-avx512" "skx" + "cascadelake" "cooperlake" "cannonlake" "icelake-client" + "rocketlake" "icelake-server" "tigerlake" "sapphirerapids" + "alderlake" "raptorlake" "meteorlake" "sierraforest" "grandridge" + "graniterapids" "emeraldrapids" "knl" "knm" "k8" "athlon64" + "athlon-fx" "opteron" "k8-sse3" "athlon64-sse3" "opteron-sse3" + "amdfam10" "barcelona" "btver1" "btver2" "bdver1" "bdver2" + "bdver3" "bdver4" "znver1" "znver2" "znver3" "znver4" "x86-64" + "x86-64-v2" "x86-64-v3" "x86-64-v4")) + ((version>=? version "15.0") + '("nocona" "core2" "penryn" "bonnell" "atom" "silvermont" "slm" + "goldmont" "goldmont-plus" "tremont" "nehalem" "corei7" "westmere" + "sandybridge" "corei7-avx" "ivybridge" "core-avx-i" "haswell" + "core-avx2" "broadwell" "skylake" "skylake-avx512" "skx" + "cascadelake" "cooperlake" "cannonlake" "icelake-client" + "rocketlake" "icelake-server" "tigerlake" "sapphirerapids" + "alderlake" "knl" "knm" "k8" "athlon64" "athlon-fx" "opteron" + "k8-sse3" "athlon64-sse3" "opteron-sse3" "amdfam10" "barcelona" + "btver1" "btver2" "bdver1" "bdver2" "bdver3" "bdver4" "znver1" + "znver2" "znver3" "x86-64" "x86-64-v2" "x86-64-v3" "x86-64-v4")) + ((version>=? version "13.0") + '("nocona" "core2" "penryn" "bonnell" "atom" "silvermont" "slm" + "goldmont" "goldmont-plus" "tremont" "nehalem" "corei7" "westmere" + "sandybridge" "corei7-avx" "ivybridge" "core-avx-i" "haswell" + "core-avx2" "broadwell" "skylake" "skylake-avx512" "skx" + "cascadelake" "cooperlake" "cannonlake" "icelake-client" + "rocketlake" "icelake-server" "tigerlake" "sapphirerapids" + "alderlake" "knl" "knm" "k8" "athlon64" "athlon-fx" "opteron" + "k8-sse3" "athlon64-sse3" "opteron-sse3" "amdfam10" "barcelona" + "btver1" "btver2" "bdver1" "bdver2" "bdver3" "bdver4" "znver1" + "znver2" "znver3" "x86-64" "x86-64-v2" "x86-64-v3" "x86-64-v4")) + ((version>=? version "9.0") + '("atom" "silvermont" "slm" "goldmont" "goldmont-plus" "tremont" + "nehalem" "corei7" "westmere" "sandybridge" "corei7-avx" + "ivybridge" "core-avx-i" "haswell" "core-avx2" "broadwell" + "skylake" "skylake-avx512" "skx" "cascadelake" "cooperlake" + "cannonlake" "icelake-client" "icelake-server" "knl" "knm" "k8" + "athlon64" "athlon-fx" "opteron" "k8-sse3" "athlon64-sse3" + "opteron-sse3" "amdfam10" "barcelona" "btver1" "btver2" "bdver1" + "bdver2" "bdver3" "bdver4" "znver1" "znver2" "x86-64")) + (else '())))))) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index c002f62cac..ab30675d5c 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2018–2022 Marius Bakke ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice -;;; Copyright © 2018, 2021-2024 Efraim Flashner +;;; Copyright © 2018, 2021-2023 Efraim Flashner ;;; Copyright © 2018 Tim Gesthuizen ;;; Copyright © 2018 Pierre Neidhardt ;;; Copyright © 2019 Rutger Helling @@ -65,6 +65,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages libedit) #:use-module (gnu packages libffi) + #:use-module (gnu packages llvm-meta) #:use-module (gnu packages lua) #:use-module (gnu packages mpi) #:use-module (gnu packages ncurses) @@ -79,8 +80,7 @@ #:use-module (srfi srfi-1) #:use-module (ice-9 match) #:export (make-lld-wrapper - system->llvm-target - clang-properties)) + system->llvm-target)) (define* (system->llvm-target #:optional (system (or (and=> (%current-target-system) @@ -481,73 +481,7 @@ code analysis tools.") (define (clang-properties version) "Return package properties for Clang VERSION." - `((compiler-cpu-architectures - ("powerpc64le" - ;; This list was obtained from clang/test/Misc/target-invalid-cpu-note.c - ;; and then trimmed down. - ,@(if (version>=? version "11.0") - '("power8" "power9" "power10" "powerpc64le"))) - ("x86_64" - ;; This list was obtained from clang/test/Misc/target-invalid-cpu-note.c - ,@(cond - ((version>=? version "17.0") - '("nocona" "core2" "penryn" "bonnell" "atom" "silvermont" "slm" - "goldmont" "goldmont-plus" "tremont" "nehalem" "corei7" "westmere" - "sandybridge" "corei7-avx" "ivybridge" "core-avx-i" "haswell" - "core-avx2" "broadwell" "skylake" "skylake-avx512" "skx" - "cascadelake" "cooperlake" "cannonlake" "icelake-client" - "rocketlake" "icelake-server" "tigerlake" "sapphirerapids" - "alderlake" "raptorlake" "meteorlake" "sierraforest" "grandridge" - "graniterapids" "graniterapids-d" "emeraldrapids" "knl" "knm" "k8" - "athlon64" "athlon-fx" "opteron" "k8-sse3" "athlon64-sse3" - "opteron-sse3" "amdfam10" "barcelona" "btver1" "btver2" "bdver1" - "bdver2" "bdver3" "bdver4" "znver1" "znver2" "znver3" "znver4" - "x86-64" "x86-64-v2" "x86-64-v3" "x86-64-v4")) - ((version>=? version "16.0") - '("nocona" "core2" "penryn" "bonnell" "atom" "silvermont" "slm" - "goldmont" "goldmont-plus" "tremont" "nehalem" "corei7" "westmere" - "sandybridge" "corei7-avx" "ivybridge" "core-avx-i" "haswell" - "core-avx2" "broadwell" "skylake" "skylake-avx512" "skx" - "cascadelake" "cooperlake" "cannonlake" "icelake-client" - "rocketlake" "icelake-server" "tigerlake" "sapphirerapids" - "alderlake" "raptorlake" "meteorlake" "sierraforest" "grandridge" - "graniterapids" "emeraldrapids" "knl" "knm" "k8" "athlon64" - "athlon-fx" "opteron" "k8-sse3" "athlon64-sse3" "opteron-sse3" - "amdfam10" "barcelona" "btver1" "btver2" "bdver1" "bdver2" - "bdver3" "bdver4" "znver1" "znver2" "znver3" "znver4" "x86-64" - "x86-64-v2" "x86-64-v3" "x86-64-v4")) - ((version>=? version "15.0") - '("nocona" "core2" "penryn" "bonnell" "atom" "silvermont" "slm" - "goldmont" "goldmont-plus" "tremont" "nehalem" "corei7" "westmere" - "sandybridge" "corei7-avx" "ivybridge" "core-avx-i" "haswell" - "core-avx2" "broadwell" "skylake" "skylake-avx512" "skx" - "cascadelake" "cooperlake" "cannonlake" "icelake-client" - "rocketlake" "icelake-server" "tigerlake" "sapphirerapids" - "alderlake" "knl" "knm" "k8" "athlon64" "athlon-fx" "opteron" - "k8-sse3" "athlon64-sse3" "opteron-sse3" "amdfam10" "barcelona" - "btver1" "btver2" "bdver1" "bdver2" "bdver3" "bdver4" "znver1" - "znver2" "znver3" "x86-64" "x86-64-v2" "x86-64-v3" "x86-64-v4")) - ((version>=? version "13.0") - '("nocona" "core2" "penryn" "bonnell" "atom" "silvermont" "slm" - "goldmont" "goldmont-plus" "tremont" "nehalem" "corei7" "westmere" - "sandybridge" "corei7-avx" "ivybridge" "core-avx-i" "haswell" - "core-avx2" "broadwell" "skylake" "skylake-avx512" "skx" - "cascadelake" "cooperlake" "cannonlake" "icelake-client" - "rocketlake" "icelake-server" "tigerlake" "sapphirerapids" - "alderlake" "knl" "knm" "k8" "athlon64" "athlon-fx" "opteron" - "k8-sse3" "athlon64-sse3" "opteron-sse3" "amdfam10" "barcelona" - "btver1" "btver2" "bdver1" "bdver2" "bdver3" "bdver4" "znver1" - "znver2" "znver3" "x86-64" "x86-64-v2" "x86-64-v3" "x86-64-v4")) - ((version>=? version "9.0") - '("atom" "silvermont" "slm" "goldmont" "goldmont-plus" "tremont" - "nehalem" "corei7" "westmere" "sandybridge" "corei7-avx" - "ivybridge" "core-avx-i" "haswell" "core-avx2" "broadwell" - "skylake" "skylake-avx512" "skx" "cascadelake" "cooperlake" - "cannonlake" "icelake-client" "icelake-server" "knl" "knm" "k8" - "athlon64" "athlon-fx" "opteron" "k8-sse3" "athlon64-sse3" - "opteron-sse3" "amdfam10" "barcelona" "btver1" "btver2" "bdver1" - "bdver2" "bdver3" "bdver4" "znver1" "znver2" "x86-64")) - (else '())))))) + `((clang-compiler-cpu-architectures version))) (define-public (make-clang-toolchain clang libomp) (package diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm index c9c3ddca62..6e399dfce3 100644 --- a/gnu/packages/zig.scm +++ b/gnu/packages/zig.scm @@ -28,7 +28,8 @@ #:use-module (guix build-system cmake) #:use-module (gnu packages) #:use-module (gnu packages compression) - #:use-module (gnu packages llvm)) + #:use-module (gnu packages llvm) + #:use-module (gnu packages llvm-meta)) (define-public zig-0.9 (package @@ -130,7 +131,7 @@ toolchain. Among other features it provides (supported-systems %64bit-supported-systems) ;; Stage3 can take a lot of time and isn't verbose. (properties `((max-silent-time . 9600) - ,@(clang-properties "13"))) + ,@(clang-compiler-cpu-architectures "13"))) (license license:expat))) (define-public zig-0.10 @@ -195,6 +196,6 @@ toolchain. Among other features it provides (modify-inputs (package-native-inputs zig-0.9) (replace "llvm" llvm-15))) (properties `((max-silent-time . 9600) - ,@(clang-properties "15"))))) + ,@(clang-compiler-cpu-architectures "15"))))) (define-public zig zig-0.10) From b1c7f6e1f555758e00ddf43a2bcdc065be8292f9 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 10 Mar 2024 10:42:10 +0200 Subject: [PATCH 019/186] cpu: Remove duplicate clang-compiler-cpu-architecture entry. * gnu/packages/llvm-meta.scm (clang-compiler-cpu-architectures): Remove x86_64 version 15 entry since it is unchanged from the version 13 entry. Change-Id: Ifb845993e2deec842dfbe8f9b72944457aa7e98e --- gnu/packages/llvm-meta.scm | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/gnu/packages/llvm-meta.scm b/gnu/packages/llvm-meta.scm index ea184806e5..822cb5aade 100644 --- a/gnu/packages/llvm-meta.scm +++ b/gnu/packages/llvm-meta.scm @@ -60,17 +60,6 @@ "amdfam10" "barcelona" "btver1" "btver2" "bdver1" "bdver2" "bdver3" "bdver4" "znver1" "znver2" "znver3" "znver4" "x86-64" "x86-64-v2" "x86-64-v3" "x86-64-v4")) - ((version>=? version "15.0") - '("nocona" "core2" "penryn" "bonnell" "atom" "silvermont" "slm" - "goldmont" "goldmont-plus" "tremont" "nehalem" "corei7" "westmere" - "sandybridge" "corei7-avx" "ivybridge" "core-avx-i" "haswell" - "core-avx2" "broadwell" "skylake" "skylake-avx512" "skx" - "cascadelake" "cooperlake" "cannonlake" "icelake-client" - "rocketlake" "icelake-server" "tigerlake" "sapphirerapids" - "alderlake" "knl" "knm" "k8" "athlon64" "athlon-fx" "opteron" - "k8-sse3" "athlon64-sse3" "opteron-sse3" "amdfam10" "barcelona" - "btver1" "btver2" "bdver1" "bdver2" "bdver3" "bdver4" "znver1" - "znver2" "znver3" "x86-64" "x86-64-v2" "x86-64-v3" "x86-64-v4")) ((version>=? version "13.0") '("nocona" "core2" "penryn" "bonnell" "atom" "silvermont" "slm" "goldmont" "goldmont-plus" "tremont" "nehalem" "corei7" "westmere" From 2f5d2c406eb927cf0c6113f5c690ad73eafce521 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 6 Mar 2024 13:06:08 +0200 Subject: [PATCH 020/186] gnu: rust: Add tuning information. * gnu/packages/rust.scm (rust)[properties]: Add clang-properties matching the input llvm package. Change-Id: Ie2ef2387fff8aa639dcd73752bcaf3c26bbb376d --- gnu/packages/rust.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 1f129a93bd..3e3bb4dd00 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -49,6 +49,7 @@ #:use-module (gnu packages libffi) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) + #:use-module (gnu packages llvm-meta) #:use-module (gnu packages mingw) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -964,7 +965,9 @@ safety and thread safety guarantees.") (let ((base-rust rust-1.75)) (package (inherit base-rust) - (properties (alist-delete 'hidden? (package-properties base-rust))) + (properties (append + (alist-delete 'hidden? (package-properties base-rust)) + (clang-compiler-cpu-architectures "15"))) (outputs (cons* "rust-src" "tools" (package-outputs base-rust))) (source (origin From 92bd81a96f4cac9d0fe628b82ffb1d127ad3e42f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 6 Mar 2024 13:06:09 +0200 Subject: [PATCH 021/186] transformations: Add support for rust. * guix/transformations.scm (tuning-compiler): Add support for rustc. Change-Id: I6db596a586eda648666550cdcadaa5e1704cb79c --- guix/transformations.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/guix/transformations.scm b/guix/transformations.scm index 132ccd957a..f02b9f94d6 100644 --- a/guix/transformations.scm +++ b/guix/transformations.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016-2023 Ludovic Courtès ;;; Copyright © 2021 Marius Bakke ;;; Copyright © 2023 Sarthak Shah -;;; Copyright © 2023 Efraim Flashner +;;; Copyright © 2023, 2024 Efraim Flashner ;;; Copyright © 2023 Ekaitz Zarraga ;;; ;;; This file is part of GNU Guix. @@ -499,6 +499,10 @@ actual compiler." "-Dcpu=" (string-replace-substring #$micro-architecture "-" "_")))) + ((and (search-next "rustc") + (string=? next (search-next "rustc"))) + (list "-C" (string-append "target_cpu=" + #$micro-architecture))) (else (list (string-append "-march=" #$micro-architecture)))))))))))) @@ -519,7 +523,7 @@ actual compiler." (symlink #$program (string-append bin "/" program))) '("cc" "gcc" "clang" "g++" "c++" "clang++" - "go" "zig"))))))) + "go" "rustc" "zig"))))))) (define (build-system-with-tuning-compiler bs micro-architecture) "Return a variant of BS, a build system, that ensures that the compiler that From 8e7ed3b71536bb0c0452d1bdc6345055c3585f7d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 6 Mar 2024 13:06:10 +0200 Subject: [PATCH 022/186] gnu: rav1e: Mark as tunable. * gnu/packages/video.scm (rav1e)[properties]: Mark package as tunable. Change-Id: Icaf3615ce6f1e76416543a1285af5f1fdaec3589 --- gnu/packages/video.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index c4660c8998..94334e0c97 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -6021,6 +6021,8 @@ result in several formats: (description "@code{rav1e} is an AV1 video encoder. It is designed to eventually cover all use cases, though in its current form it is most suitable for cases where libaom (the reference encoder) is too slow.") + ;; This package shows a large speed boost when tuned for newer architectures. + (properties `((tunable? . #t))) (license license:bsd-2))) (define-public peek From 2a8018e42c0d9b81de56cf322043c797e443c267 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 10 Mar 2024 12:49:29 +0200 Subject: [PATCH 023/186] gnu: python-next: Skip another test. * gnu/packages/python.scm (python-next)[arguments]: Skip another test which fails on slow machines. Change-Id: I777aa346c674604a22dc0be0b319f5df02e0ab3b --- gnu/packages/python.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 0ae3709b99..12a5148cb1 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -663,7 +663,12 @@ data types.") #:make-flags (list (string-append (format #f "TESTOPTS=-j~d" (parallel-job-count)) ;; those tests fail on low-memory systems - " --exclude test_mmap test_socket test_threading test_asyncio" + " --exclude" + " test_mmap" + " test_socket" + " test_threading" + " test_asyncio" + " test_shutdown" ,@(if (system-hurd?) '(" test_posix" ;multiple errors " test_time" From c7836393be4d134861d652b2fcf09cf4e68275ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 10 Mar 2024 15:51:12 +0100 Subject: [PATCH 024/186] time-travel-manifest: Uncomment all the past releases. This reverts a4c35c607cfd7d6b0bad90cfcc46188d489e1754. * etc/time-travel-manifest.scm (%release-commits): Uncomment all the revisions. Change-Id: I6abdb760cbcf06597d843cabc5fd973ee916dc77 --- etc/time-travel-manifest.scm | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/etc/time-travel-manifest.scm b/etc/time-travel-manifest.scm index 80c4c7c346..039ca89889 100644 --- a/etc/time-travel-manifest.scm +++ b/etc/time-travel-manifest.scm @@ -66,21 +66,19 @@ (define %release-commits ;; Release commits: the list of version/commit pairs. + ;; + ;; Note: To merely compute the derivation of these revisions, we need to be + ;; able to build their dependencies. Some of them no longer build from + ;; source due to time traps like ; those + ;; need to be built beforehand in a virtual build machine running "in the + ;; past". '(("1.4.0" . "8e2f32cee982d42a79e53fc1e9aa7b8ff0514714") ("1.3.0" . "a0178d34f582b50e9bdbb0403943129ae5b560ff") - - ;; FIXME: To merely compute the derivation of these revisions, we need to - ;; be able to build their dependencies. However, pre-built binaries are - ;; currently missing and some of these no longer build from source due to - ;; time bombs like . Thus, comment - ;; them output until we have substitutes for these old things. - - ;; ("1.2.0" . "a099685659b4bfa6b3218f84953cbb7ff9e88063") - ;; ("1.1.0" . "d62c9b2671be55ae0305bebfda17b595f33797f2") - ;; ("1.0.1" . "d68de958b60426798ed62797ff7c96c327a672ac") - ;; ("1.0.0" . "6298c3ffd9654d3231a6f25390b056483e8f407c") - ;; ("0.16.0" . "4a0b87f0ec5b6c2dcf82b372dd20ca7ea6acdd9c") - )) + ("1.2.0" . "a099685659b4bfa6b3218f84953cbb7ff9e88063") + ("1.1.0" . "d62c9b2671be55ae0305bebfda17b595f33797f2") + ("1.0.1" . "d68de958b60426798ed62797ff7c96c327a672ac") + ("1.0.0" . "6298c3ffd9654d3231a6f25390b056483e8f407c") + ("0.16.0" . "4a0b87f0ec5b6c2dcf82b372dd20ca7ea6acdd9c"))) (manifest (map (match-lambda From e85fbe109719253b54f4de3ab54b688f3865de07 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 26 Feb 2024 18:39:48 +0000 Subject: [PATCH 025/186] gnu: python-extruct: Update to 0.16.0. * gnu/packages/python-web.scm (python-extruct): Update to 0.16.0. [propagated-inputs]: Remove python-rdflib-jsonld. Change-Id: I83608101a9ad3d223c7874c4fb5b34c37073ace5 Signed-off-by: Arun Isaac --- gnu/packages/python-web.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 8d0c5c278b..6b61ba10b3 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -44,7 +44,7 @@ ;;; Copyright © 2021 Greg Hogan ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 Pradana Aumars -;;; Copyright © 2021, 2022 Arun Isaac +;;; Copyright © 2021, 2022, 2024 Arun Isaac ;;; Copyright © 2021, 2022 jgart ;;; Copyright © 2021 Alice Brenon ;;; Copyright © 2022 John Kehayias @@ -8409,7 +8409,7 @@ compatibility with Microformats1 (mf1).") (define-public python-extruct (package (name "python-extruct") - (version "0.13.0") + (version "0.16.0") (source (origin (method git-fetch) ;for tests (uri (git-reference @@ -8418,7 +8418,7 @@ compatibility with Microformats1 (mf1).") (file-name (git-file-name name version)) (sha256 (base32 - "075zldf3dqcc429z1vk2ngbmv034bnlyk6arh3rh30jbsvz9pzl5")))) + "1s05sz6nghrap1gjkg3vsqz6djld6lczd6w3r1542ir8n7binl7a")))) (build-system python-build-system) (arguments (list @@ -8436,7 +8436,6 @@ compatibility with Microformats1 (mf1).") python-mf2py python-pyrdfa3 python-rdflib - python-rdflib-jsonld python-w3lib)) (home-page "https://github.com/scrapinghub/extruct") (synopsis "Extract embedded metadata from HTML markup") From b7ecce89bd60e591f0bfab6e2845aaf91f2fe309 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 26 Feb 2024 18:31:16 +0000 Subject: [PATCH 026/186] gnu: python-prov: Use python-rdflib@6. * gnu/packages/python-xyz.scm (python-prov)[arguments]: Add fix-rdflib-6-compatibility phase. [propagated-inputs]: Replace python-rdflib-5 with python-rdflib. Change-Id: I07de032e1b5e9b6e045904e3f6880b1acc6a9075 Signed-off-by: Arun Isaac --- gnu/packages/python-xyz.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 07ca8a9723..c1e7343310 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23984,8 +23984,18 @@ manipulation, or @code{stdout}.") (base32 "1vi2fj31vygfcqrkimdmk52q2ldw08g9fn4v4zlgdfgcjlhqyhxn")))) (build-system python-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-rdflib-6-compatibility + (lambda _ + ;; See https://github.com/trungdong/prov/issues/151 + (substitute* "src/prov/tests/test_rdf.py" + (("\\.serialize\\(format=\"nt\"\\)") + ".serialize(format=\"nt\", encoding=\"utf-8\")"))))))) (propagated-inputs - (list python-dateutil python-lxml python-networkx python-rdflib-5)) + (list python-dateutil python-lxml python-networkx python-rdflib)) (native-inputs (list graphviz python-pydot)) (home-page "https://github.com/trungdong/prov") From 4e046516a10580df4b0bf524cd3b8ee23f2862af Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 26 Feb 2024 18:35:01 +0000 Subject: [PATCH 027/186] gnu: Remove python-rdflib-5. * gnu/packages/rdf.scm (python-rdflib-5): Delete variable. Change-Id: I3a2dfe42805ccc5eedc5b71d900dfae2aa91d7a1 --- gnu/packages/rdf.scm | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index 3063ff5887..869fd9c112 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -367,21 +367,6 @@ powerful language for representing information.") (license (license:non-copyleft "file://LICENSE" "See LICENSE in the distribution.")))) -(define-public python-rdflib-5 - (package - (inherit python-rdflib) - (version "5.0.0") - (source - (origin - (method url-fetch) - (uri (pypi-uri "rdflib" version)) - (sha256 - (base32 - "0mdi7xh4zcr3ngqwlgqdqf0i5bxghwfddyxdng1zwpiqkpa9s53q")))) - ;; XXX: Lazily disable tests because they require a lot of work - ;; and this package is only transitional. - (arguments '(#:tests? #f)))) - ;; Note: This package is only needed for rdflib < 6.0; supersede when ;; the above are removed. (define-public python-rdflib-jsonld From 5cf8904acf3215831933c7a614343d29ac8cd6dd Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 26 Feb 2024 18:41:18 +0000 Subject: [PATCH 028/186] gnu: Remove python-rdflib-jsonld. * gnu/packages/rdf.scm (python-rdflib-jsonld): Delete variable. Change-Id: I4756396d70eb64ae01b4f6f6c416d9a34a124942 --- gnu/packages/rdf.scm | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index 869fd9c112..cc6b009f14 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -367,30 +367,6 @@ powerful language for representing information.") (license (license:non-copyleft "file://LICENSE" "See LICENSE in the distribution.")))) -;; Note: This package is only needed for rdflib < 6.0; supersede when -;; the above are removed. -(define-public python-rdflib-jsonld - (package - (name "python-rdflib-jsonld") - (version "0.6.2") - (source - (origin - (method url-fetch) - (uri (pypi-uri "rdflib-jsonld" version)) - (sha256 - (base32 - "0qrshlqzv5g5bign7kjja3xf7hyk7xgayr3yd0qlqda1kl0x6z0h")))) - (build-system python-build-system) - (native-inputs - (list python-nose)) - (propagated-inputs - (list python-rdflib)) - (home-page "https://github.com/RDFLib/rdflib-jsonld") - (synopsis "rdflib extension adding JSON-LD parser and serializer") - (description "This package provides an rdflib extension adding JSON-LD -parser and serializer.") - (license license:bsd-3))) - (define-public python-cfgraph (package (name "python-cfgraph") From d084fb4b04a1cebb59959633660013fff495cd0d Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 26 Feb 2024 19:27:10 +0000 Subject: [PATCH 029/186] gnu: python-docker: Update to 7.0.0. * gnu/packages/docker.scm (python-docker): Update to 7.0.0. [native-inputs]: Add python-setuptools-scm. [propagated-inputs]: Add python-packaging. Change-Id: I1c23575836689e9bcdbcea22ea9d84520b0353a0 --- gnu/packages/docker.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/docker.scm b/gnu/packages/docker.scm index 0fe1f2c1c7..0820f685b7 100644 --- a/gnu/packages/docker.scm +++ b/gnu/packages/docker.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2020 Jesse Dowell ;;; Copyright © 2021, 2022 Oleg Pykhalov ;;; Copyright © 2022 Pierre Langlois +;;; Copyright © 2024 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -47,6 +48,7 @@ #:use-module (gnu packages networking) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) @@ -60,22 +62,24 @@ (define-public python-docker (package (name "python-docker") - (version "5.0.3") + (version "7.0.0") (source (origin (method url-fetch) (uri (pypi-uri "docker" version)) (sha256 (base32 - "1yr7w8vmdis01myx26pqx7wcyz2cy1mfs421alppq3lpc9ms45nr")))) + "18z5wzqm7dbxaa5q4gs8yh2dma8i7savqcvibvy1i56djbxkcdrj")))) (build-system python-build-system) ;; TODO: Tests require a running Docker daemon. (arguments '(#:tests? #f)) (inputs (list python-requests python-six python-urllib3)) + (native-inputs + (list python-setuptools-scm)) (propagated-inputs (list python-docker-pycreds python-paramiko ;adds SSH support - python-websocket-client)) + python-packaging python-websocket-client)) (home-page "https://github.com/docker/docker-py/") (synopsis "Python client for Docker") (description "Docker-Py is a Python client for the Docker container From b0b988c41c9e0e591274495a1b2d6f27fcdae15a Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Fri, 16 Feb 2024 00:35:04 +0000 Subject: [PATCH 030/186] gnu: python-configargparse: Update to 1.7. * gnu/packages/python-xyz.scm (python-configargparse): Update to 1.7. [propagated-inputs]: Add python-pyyaml. Change-Id: Iac1e01fbbf5cefde15facadc176ea26fee9031ee --- gnu/packages/python-xyz.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index c1e7343310..0c72caeca0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -17249,16 +17249,18 @@ consistent API regardless of how the configuration was created.") (define-public python-configargparse (package (name "python-configargparse") - (version "1.5.3") + (version "1.7") (source (origin (method url-fetch) (uri (pypi-uri "ConfigArgParse" version)) (sha256 (base32 - "17vky4ihicbf7nggg30xs7h3g5rxzwgch8vilnnrvdaacszkq2qv")))) + "1l866g1dcf2ljf8fl7ggpxk1rggry0lya4d5b264gradi1qp81p7")))) (build-system pyproject-build-system) (native-inputs (list python-mock python-pytest)) + (propagated-inputs + (list python-pyyaml)) (synopsis "Replacement for argparse") (description "A drop-in replacement for argparse that allows options to also be set via config files and/or environment variables.") From eae73b8b83b31f83cc73f40b1cd7dedf19c0e237 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 11 Mar 2024 10:21:24 +0200 Subject: [PATCH 031/186] gnu: Add rust-cargo. This package is currently a mirror of rust-cargo-0.76. * gnu/packages/rust-apps.scm (rust-cargo): New variable. Change-Id: I47c80566fe916b0b7ebff653cce625dd4d1f4ba6 --- gnu/packages/crates-io.scm | 1 + gnu/packages/rust-apps.scm | 100 ++++++++++++++++++++++++++++++++++++- 2 files changed, 100 insertions(+), 1 deletion(-) diff --git a/gnu/packages/crates-io.scm b/gnu/packages/crates-io.scm index 1a08748392..a67d3d74bb 100644 --- a/gnu/packages/crates-io.scm +++ b/gnu/packages/crates-io.scm @@ -9664,6 +9664,7 @@ capabilities.") (description "This package provides spec generation for clap-rs/clap.") (license license:expat))) +;; TODO: Remove this package in favor of rust-cargo in rust-apps.scm. (define-public rust-cargo-0.76 (package (name "rust-cargo") diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 7313cdef77..2a815afb76 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -2361,7 +2361,105 @@ work. This allows the client to be used in a much simpler way, with the background agent taking care of maintaining the necessary state.") (license license:expat))) -;;; Note: keep in sync with our current Rust/Cargo version. +;; Note: Keep rust-cargo and rust-cargo-c in sync with our current +;; rust:cargo version. +(define-public rust-cargo + (package + (name "rust-cargo") + (version "0.76.0") + (source + (origin + (method url-fetch) + (uri (crate-uri "cargo" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "14yjyvj9bl6mlzx6bbi3igflgdrx1hil9ifnf1dl9xnm4mb2gjw6")))) + (build-system cargo-build-system) + (arguments + `(#:tests? #f ; unresolved import `cargo_test_support` + #:cargo-inputs + (("rust-anstream" ,rust-anstream-0.6) + ("rust-anstyle" ,rust-anstyle-1) + ("rust-anyhow" ,rust-anyhow-1) + ("rust-base64" ,rust-base64-0.21) + ("rust-bytesize" ,rust-bytesize-1) + ("rust-cargo-credential" ,rust-cargo-credential-0.4) + ("rust-cargo-credential-libsecret" ,rust-cargo-credential-libsecret-0.4) + ("rust-cargo-credential-macos-keychain" ,rust-cargo-credential-macos-keychain-0.4) + ("rust-cargo-credential-wincred" ,rust-cargo-credential-wincred-0.4) + ("rust-cargo-platform" ,rust-cargo-platform-0.1) + ("rust-cargo-util" ,rust-cargo-util-0.2) + ("rust-clap" ,rust-clap-4) + ("rust-color-print" ,rust-color-print-0.3) + ("rust-crates-io" ,rust-crates-io-0.39) + ("rust-curl" ,rust-curl-0.4) + ("rust-curl-sys" ,rust-curl-sys-0.4) + ("rust-filetime" ,rust-filetime-0.2) + ("rust-flate2" ,rust-flate2-1) + ("rust-flate2" ,rust-flate2-1) + ("rust-git2" ,rust-git2-0.18) + ("rust-git2-curl" ,rust-git2-curl-0.19) + ("rust-gix" ,rust-gix-0.55) + ("rust-gix-features" ,rust-gix-features-0.35) + ("rust-glob" ,rust-glob-0.3) + ("rust-hex" ,rust-hex-0.4) + ("rust-hmac" ,rust-hmac-0.12) + ("rust-home" ,rust-home-0.5) + ("rust-http-auth" ,rust-http-auth-0.1) + ("rust-humantime" ,rust-humantime-2) + ("rust-ignore" ,rust-ignore-0.4) + ("rust-im-rc" ,rust-im-rc-15) + ("rust-indexmap" ,rust-indexmap-2) + ("rust-itertools" ,rust-itertools-0.11) + ("rust-jobserver" ,rust-jobserver-0.1) + ("rust-lazycell" ,rust-lazycell-1) + ("rust-libc" ,rust-libc-0.2) + ("rust-libgit2-sys" ,rust-libgit2-sys-0.16) + ("rust-memchr" ,rust-memchr-2) + ("rust-opener" ,rust-opener-0.6) + ("rust-openssl" ,rust-openssl-0.10) + ("rust-os-info" ,rust-os-info-3) + ("rust-pasetors" ,rust-pasetors-0.6) + ("rust-pathdiff" ,rust-pathdiff-0.2) + ("rust-pulldown-cmark" ,rust-pulldown-cmark-0.9) + ("rust-rand" ,rust-rand-0.8) + ("rust-rustfix" ,rust-rustfix-0.6) + ("rust-semver" ,rust-semver-1) + ("rust-serde" ,rust-serde-1) + ("rust-serde-untagged" ,rust-serde-untagged-0.1) + ("rust-serde-value" ,rust-serde-value-0.7) + ("rust-serde-ignored" ,rust-serde-ignored-0.1) + ("rust-serde-json" ,rust-serde-json-1) + ("rust-sha1" ,rust-sha1-0.10) + ("rust-shell-escape" ,rust-shell-escape-0.1) + ("rust-supports-hyperlinks" ,rust-supports-hyperlinks-2) + ("rust-syn" ,rust-syn-2) + ("rust-tar" ,rust-tar-0.4) + ("rust-tar" ,rust-tar-0.4) + ("rust-tempfile" ,rust-tempfile-3) + ("rust-time" ,rust-time-0.3) + ("rust-toml" ,rust-toml-0.8) + ("rust-toml-edit" ,rust-toml-edit-0.20) + ("rust-tracing" ,rust-tracing-0.1) + ("rust-tracing-subscriber" ,rust-tracing-subscriber-0.3) + ("rust-unicase" ,rust-unicase-2) + ("rust-unicode-width" ,rust-unicode-width-0.1) + ("rust-unicode-xid" ,rust-unicode-xid-0.2) + ("rust-url" ,rust-url-2) + ("rust-walkdir" ,rust-walkdir-2) + ("rust-windows-sys" ,rust-windows-sys-0.48)) + #:cargo-development-inputs (("rust-same-file" ,rust-same-file-1) + ("rust-snapbox" ,rust-snapbox-0.4)))) + (native-inputs + (list pkg-config)) + (inputs + (list curl libssh2 libgit2-1.7 openssl zlib)) + (home-page "https://crates.io") + (synopsis "Package manager for Rust") + (description "Cargo, a package manager for Rust. This package provides +the library crate of Cargo.") + (license (list license:expat license:asl2.0)))) + (define-public rust-cargo-c (package (name "rust-cargo-c") From f51760bd2a76e6efe6fa454f1d9f9ba650bc1c31 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 11 Mar 2024 10:28:40 +0200 Subject: [PATCH 032/186] gnu: Add rust-bindgen. * gnu/packages/rust-apps.scm (rust-bindgen): New variable. Change-Id: I8b4a8e1d2c6a796143625b3de603cdec25723309 --- gnu/packages/rust-apps.scm | 39 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 2a815afb76..c6104d5ebd 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -84,6 +84,7 @@ #:use-module (gnu packages jemalloc) #:use-module (gnu packages kde) #:use-module (gnu packages linux) + #:use-module (gnu packages llvm) #:use-module (gnu packages networking) #:use-module (gnu packages shells) #:use-module (gnu packages ssh) @@ -1865,6 +1866,44 @@ rebase.") (base32 "006rn3fn4njayjxr2vd24g1awssr9i3894nbmfzkybx07j728vav")))))) +;; This is the unversioned package of the latest version of bindgen. +(define-public rust-bindgen + (package + (name "rust-bindgen") + (version "0.69.4") + (source + (origin + (method url-fetch) + (uri (crate-uri "bindgen" version)) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "18194611hn3k1dkxlha7a52sr8vmfhl9blc54xhj08cahd8wh3d0")))) + (build-system cargo-build-system) + (arguments + `(#:install-source? #f + #:cargo-inputs (("rust-annotate-snippets" ,rust-annotate-snippets-0.9) + ("rust-bitflags" ,rust-bitflags-2) + ("rust-cexpr" ,rust-cexpr-0.6) + ("rust-clang-sys" ,rust-clang-sys-1) + ("rust-itertools" ,rust-itertools-0.10) + ("rust-lazy-static" ,rust-lazy-static-1) + ("rust-lazycell" ,rust-lazycell-1) + ("rust-log" ,rust-log-0.4) + ("rust-prettyplease" ,rust-prettyplease-0.2) + ("rust-proc-macro2" ,rust-proc-macro2-1) + ("rust-quote" ,rust-quote-1) + ("rust-regex" ,rust-regex-1) + ("rust-rustc-hash" ,rust-rustc-hash-1) + ("rust-shlex" ,rust-shlex-1) + ("rust-syn" ,rust-syn-2) + ("rust-which" ,rust-which-4)))) + (inputs (list clang)) + (home-page "https://rust-lang.github.io/rust-bindgen/") + (synopsis "Generate Rust FFI bindings to C and C++ libraries") + (description "This package can be used to automatically generate Rust FFI +bindings to C and C++ libraries.") + (license license:bsd-3))) + (define-public sniffglue (package (name "sniffglue") From 27b762f78c58d853d86379ec58090c84e6de986d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 11 Mar 2024 10:31:54 +0200 Subject: [PATCH 033/186] gnu: rust-cbindgen: Redefine as rust-cbindgen-0.26. * gnu/packages/rust-apps.scm (rust-cbindgen): Update to 0.26.0. Change-Id: I54e031b53162730551f525c1445f98eaac552315 --- gnu/packages/rust-apps.scm | 41 +++++++++----------------------------- 1 file changed, 9 insertions(+), 32 deletions(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index c6104d5ebd..7d09633c5d 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -1783,39 +1783,8 @@ by modifying your @file{Cargo.toml} file from the command line.") rebase.") (license license:gpl3+))) -(define-public rust-cbindgen - (package - (name "rust-cbindgen") - (version "0.13.2") - (source - (origin - (method url-fetch) - (uri (crate-uri "cbindgen" version)) - (file-name (string-append name "-" version ".tar.xz")) - (sha256 - (base32 - "0673pq96hs7waavkv58v2pakpxpsfyjvbraa5kyl2b44phgdzcid")))) - (build-system cargo-build-system) - (arguments - `(#:cargo-inputs - (("clap" ,rust-clap-2) - ("log" ,rust-log-0.4) - ("proc-macro2" ,rust-proc-macro2-1) - ("quote" ,rust-quote-1) - ("serde" ,rust-serde-1) - ("serde-json" ,rust-serde-json-1) - ("syn" ,rust-syn-1) - ("tempfile" ,rust-tempfile-3) - ("toml" ,rust-toml-0.5)))) - (home-page "https://github.com/eqrion/cbindgen/") - (synopsis "Tool for generating C bindings to Rust code") - (description - "This package provides a tool for generating C/C++ bindings to Rust code.") - (license license:mpl2.0))) - (define-public rust-cbindgen-0.26 (package - (inherit rust-cbindgen) (name "rust-cbindgen") (version "0.26.0") (source @@ -1825,6 +1794,7 @@ rebase.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 "0jdbxmn5h5nlr4bifx85gny309djv5djs9q78fa1d7sj0wdw2sys")))) + (build-system cargo-build-system) (arguments `(#:cargo-inputs (("rust-clap" ,rust-clap-3) ("rust-heck" ,rust-heck-0.4) @@ -1838,7 +1808,12 @@ rebase.") ("rust-tempfile" ,rust-tempfile-3) ("rust-toml" ,rust-toml-0.5)) #:cargo-development-inputs (("rust-serial-test" ,rust-serial-test-0.5)))) - (native-inputs (list python-cython)))) + (native-inputs (list python-cython)) + (home-page "https://github.com/eqrion/cbindgen/") + (synopsis "Tool for generating C bindings to Rust code") + (description + "This package provides a tool for generating C/C++ bindings to Rust code.") + (license license:mpl2.0))) (define-public rust-cbindgen-0.24 (package @@ -1866,6 +1841,8 @@ rebase.") (base32 "006rn3fn4njayjxr2vd24g1awssr9i3894nbmfzkybx07j728vav")))))) +(define-public rust-cbindgen rust-cbindgen-0.26) + ;; This is the unversioned package of the latest version of bindgen. (define-public rust-bindgen (package From c72d8feb1fca60164be980bbc66f48c9360d94a6 Mon Sep 17 00:00:00 2001 From: "Andre A. Gomes" Date: Mon, 4 Mar 2024 12:34:23 +0200 Subject: [PATCH 034/186] gnu: nyxt: Update to 3.11.4. * gnu/packages/web-browsers.scm (nyxt): Update to 3.11.4. Signed-off-by: Guillaume Le Vaillant --- gnu/packages/web-browsers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index 84f5c9f0eb..ae875551c1 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -590,7 +590,7 @@ driven and does not detract you from your daily work.") (define-public nyxt (package (name "nyxt") - (version "3.11.3") + (version "3.11.4") (source (origin (method git-fetch) @@ -599,7 +599,7 @@ driven and does not detract you from your daily work.") (commit version))) (sha256 (base32 - "0vp3w9a3zzn9kbq48a4b1nylrn1i4ibwxpl377yq04ggqkd6fi9a")) + "1c1kiwa7chm491gpzihpqv33ysmxfp83gw6wcsbq72hkwir6kf74")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments From ddaf7e8a3e7d2d02bad85df89f68cda4f9c2360c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 11 Mar 2024 12:58:31 +0100 Subject: [PATCH 035/186] gnu: r-rgl: Update to 1.3.1. * gnu/packages/cran.scm (r-rgl): Update to 1.3.1. [inputs]: Remove pandoc. Change-Id: I71d6afc246dc4df92592b60d1ece742a61075dbc --- gnu/packages/cran.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index dbbf30c551..328f83dc41 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -18529,14 +18529,14 @@ Bioconductor packages.") (define-public r-rgl (package (name "r-rgl") - (version "1.2.8") + (version "1.3.1") (source (origin (method url-fetch) (uri (cran-uri "rgl" version)) (sha256 (base32 - "1x0p2yldg2mjf64xd5dd0bidzgy7b39w7zn18ghan2rdf0wffdg5")) + "0jbda1b4lrkcpdld369687pm7isy69l5sx1wg2yrpvvzvmcppslz")) (snippet '(delete-file "inst/htmlwidgets/lib/CanvasMatrix/CanvasMatrix.min.js")))) ;; For OpenGL and X11 support @@ -18561,10 +18561,10 @@ Bioconductor packages.") r-rmarkdown)) ;for vignettes (inputs (list freetype - libpng glu + libpng libx11 - pandoc + zlib zlib)) (propagated-inputs (list r-base64enc From b671958e14e4f023dd30647043aace361ddfbca5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 11 Mar 2024 13:05:14 +0100 Subject: [PATCH 036/186] gnu: r-qs: Update to 0.26.1. * gnu/packages/cran.scm (r-qs): Update to 0.26.1. [arguments]: Remove 'use-older-zstd phase. [propagated-inputs]: Remove r-bh. Change-Id: I1b47155a2a0102631d905c19c15ff70f75229e8a --- gnu/packages/cran.scm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 328f83dc41..c9d45e4b59 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -39592,28 +39592,19 @@ package.") (define-public r-qs (package (name "r-qs") - (version "0.25.7") + (version "0.26.1") (source (origin (method url-fetch) (uri (cran-uri "qs" version)) (sha256 (base32 - "0a0jay9p2k0ahf08s94dr1w66qhbgzs87vkaanwkd4j6lvijncz7")))) + "0qmgnc4igy8mjzarm30cgi4z75hh8f01kvcs6n6s63cy4qk30vs6")))) (properties `((upstream-name . "qs"))) (build-system r-build-system) - (arguments - (list - #:phases - '(modify-phases %standard-phases - ;; Our zstd is at 1.5.0, but this package bundles 1.5.2. - (add-after 'unpack 'use-older-zstd - (lambda _ - (substitute* "configure" - (("100502") "100500"))))))) (inputs (list lz4 (list zstd "lib"))) (propagated-inputs - (list r-rapiserialize r-rcpp r-stringfish)) + (list r-bh r-rapiserialize r-rcpp r-stringfish)) (native-inputs (list pkg-config r-knitr)) (home-page "https://github.com/traversc/qs") From ceedcde3489bba469532d57fca1231a77c2ea17d Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 11 Mar 2024 13:29:33 +0100 Subject: [PATCH 037/186] gnu: r-rmarkdown: Update to 2.26. * gnu/packages/statistics.scm (r-rmarkdown): Update to 2.26. [propagated-inputs]: Remove r-stringr. Change-Id: If4120aca18f6fb5b1fbeccbc9848be52079baa14 --- gnu/packages/statistics.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index 0d9f593614..ef2d154a07 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -3271,30 +3271,29 @@ certain criterion, e.g., it contains a certain regular file.") (define-public r-rmarkdown (package (name "r-rmarkdown") - (version "2.25") + (version "2.26") (source (origin (method url-fetch) (uri (cran-uri "rmarkdown" version)) (sha256 - (base32 "0m814598vc67sjwk83xh9g17n72618l32dgg7fz8y0gycqk6dr06")))) + (base32 "1q6z2j1y6pjdz4nzw44srv9j62irnxqhkvrsi46ma7xrzq6ig34g")))) (properties `((upstream-name . "rmarkdown") (updater-extra-propagated-inputs . ("pandoc")))) (build-system r-build-system) (propagated-inputs - (list r-bslib + (list pandoc + r-bslib r-evaluate r-fontawesome r-htmltools r-jquerylib r-jsonlite r-knitr - r-stringr r-tinytex r-xfun - r-yaml - pandoc)) + r-yaml)) (native-inputs (list esbuild r-knitr)) (home-page "https://rmarkdown.rstudio.com") From a54892bc7f9ba51edfa8dfb716b3267790b9eeed Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 11 Mar 2024 13:30:17 +0100 Subject: [PATCH 038/186] gnu: r-zcompositions: Update to 1.5.0-2. * gnu/packages/cran.scm (r-zcompositions): Update to 1.5.0-2. Change-Id: I429845c3d6d2629b720484585e3c29b4552aef1e --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index c9d45e4b59..636ac65201 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -2318,13 +2318,13 @@ known as Dynamic Linear Models.") (define-public r-zcompositions (package (name "r-zcompositions") - (version "1.5.0-1") + (version "1.5.0-2") (source (origin (method url-fetch) (uri (cran-uri "zCompositions" version)) (sha256 (base32 - "0sx6i03iyg4jxmjiyzkssz3i6c8nv29wwhbl7yd0wxapwpakmlj8")))) + "08kcl870x7kai7zdhqgm4cbfhbrf673rjxghbwpn08l7pwkhix60")))) (properties `((upstream-name . "zCompositions"))) (build-system r-build-system) (propagated-inputs From f28e3c281ade7f3883589dcf15986ccea0cf899c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 11 Mar 2024 13:30:17 +0100 Subject: [PATCH 039/186] gnu: r-nodbi: Update to 0.10.4. * gnu/packages/cran.scm (r-nodbi): Update to 0.10.4. Change-Id: I9ef02e2897b0321c1a7347bc64a44358d4999167 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 636ac65201..68a7a36ef3 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14572,13 +14572,13 @@ tidyverse workflow.") (define-public r-nodbi (package (name "r-nodbi") - (version "0.10.3") + (version "0.10.4") (source (origin (method url-fetch) (uri (cran-uri "nodbi" version)) (sha256 (base32 - "17ghgp6sabj4dlmx3cdn9rrhci7050a73cd17fymjksgvy1jbwf6")))) + "0q4nsxic1jlraipdc6zi711c3316n9wgq1cgbywhjlxb52qhkmd7")))) (properties `((upstream-name . "nodbi"))) (build-system r-build-system) (propagated-inputs From 81a991b2f545ec1c9f49d7fb4544f24b4cc72cb3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 11 Mar 2024 13:30:17 +0100 Subject: [PATCH 040/186] gnu: r-flextable: Update to 0.9.5. * gnu/packages/cran.scm (r-flextable): Update to 0.9.5. Change-Id: I0355bf1ee1231d57f389d6cecd1f7dc01beca7a0 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 68a7a36ef3..7ba4cdb20d 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -14652,14 +14652,14 @@ functions.") (define-public r-flextable (package (name "r-flextable") - (version "0.9.4") + (version "0.9.5") (source (origin (method url-fetch) (uri (cran-uri "flextable" version)) (sha256 (base32 - "1dlsag1y3s7d5lp1dh2kxf1qax4r9xvxycpmxl64gkr50dk13bam")))) + "14mq27k7998405qwpdpxa1csbf5pdgzj9s892xm95bd4chnshdvw")))) (build-system r-build-system) (propagated-inputs (list r-data-table From 5afa48b47ac1556ea7c48b7e02aff996b49ec8fc Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 11 Mar 2024 13:30:17 +0100 Subject: [PATCH 041/186] gnu: r-survey: Update to 4.4-1. * gnu/packages/cran.scm (r-survey): Update to 4.4-1. [propagated-inputs]: Add r-rcpp and r-rcpparmadillo. [native-inputs]: Add r-r-rsp. Change-Id: I0974a97525a0f475988c8c2860d8a6129a7859ce --- gnu/packages/cran.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 7ba4cdb20d..ff5f080bbe 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -16525,14 +16525,14 @@ console, resulting in an interactive editing environment.") (define-public r-survey (package (name "r-survey") - (version "4.2-1") + (version "4.4-1") (source (origin (method url-fetch) (uri (cran-uri "survey" version)) (sha256 (base32 - "0l7iml53k2blmcgvbvplln08fn2s6da856m5izcvw87v6bhn2g6c")))) + "1649srmdr8i9j8grqikkm8nbfav31s7iygx6pv96jvr3wh80yh46")))) (build-system r-build-system) (propagated-inputs (list r-lattice @@ -16540,7 +16540,10 @@ console, resulting in an interactive editing environment.") r-minqa r-mitools r-numderiv + r-rcpp + r-rcpparmadillo r-survival)) + (native-inputs (list r-r-rsp)) (home-page "https://r-survey.r-forge.r-project.org/survey/") (synopsis "Analysis of complex survey samples") (description From 5ae2cc7f5007a48b6682ff1cde507086bca2d7a8 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 11 Mar 2024 13:30:17 +0100 Subject: [PATCH 042/186] gnu: r-multcompview: Update to 0.1-10. * gnu/packages/cran.scm (r-multcompview): Update to 0.1-10. Change-Id: I87369df94b804ee2b51a194bb1f7a6f8a20eae63 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index ff5f080bbe..1917b27a57 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -17068,13 +17068,13 @@ Hothorn, Westfall, 2010, CRC Press).") (define-public r-multcompview (package (name "r-multcompview") - (version "0.1-9") + (version "0.1-10") (source (origin (method url-fetch) (uri (cran-uri "multcompView" version)) (sha256 - (base32 "15vki166n2k4ng72hy62c2mzz18s10h6l6w839qplg0zsplr6f8z")))) + (base32 "12mdk12xciq1d3zn94rixahhcah2qq41lvb5n4kzgjaq4yr4kwiq")))) (properties `((upstream-name . "multcompView"))) (build-system r-build-system) (home-page "https://cran.r-project.org/package=multcompView") From dd29651d4edabcda14915815001423d1628da2b7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 11 Mar 2024 13:30:17 +0100 Subject: [PATCH 043/186] gnu: r-admisc: Update to 0.35. * gnu/packages/cran.scm (r-admisc): Update to 0.35. Change-Id: I1cc5bc8124782c06e2b2fe1a41c397548bf3dba5 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 1917b27a57..aeb30bb984 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -18981,13 +18981,13 @@ Tabelow (2007) .") (define-public r-admisc (package (name "r-admisc") - (version "0.34") + (version "0.35") (source (origin (method url-fetch) (uri (cran-uri "admisc" version)) (sha256 - (base32 "1psvi8hb7j65abw8g4ya9r43r5kd9mcv478pg2d09za0cig8gkzx")))) + (base32 "0gzdb9dm34qfkjqgfrd3wm96dzhcps4xayyrhp80mzgh14zmnjyg")))) (properties `((upstream-name . "admisc"))) (build-system r-build-system) (home-page "https://github.com/dusadrian/admisc") From ce332fda91b0b36ead7f545e511d6222421bff93 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 11 Mar 2024 13:30:18 +0100 Subject: [PATCH 044/186] gnu: r-colorramps: Update to 2.3.4. * gnu/packages/cran.scm (r-colorramps): Update to 2.3.4. Change-Id: I0b8667b643666a68fda52376e19a56bbb3862134 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index aeb30bb984..b2db79fc00 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19330,14 +19330,14 @@ over-plotting in scatter plots with text.") (define-public r-colorramps (package (name "r-colorramps") - (version "2.3.2") + (version "2.3.4") (source (origin (method url-fetch) (uri (cran-uri "colorRamps" version)) (sha256 (base32 - "0cq8l6ybhff2q2dj2i73b4cnw6v2c6ql24jbrkh0xrpc9wjsarxj")))) + "1y4gn6v8wmwq3wcfgdnx1ah2qa53gayvbfa62kp286ga4c8k3prw")))) (properties `((upstream-name . "colorRamps"))) (build-system r-build-system) (home-page "https://cran.r-project.org/web/packages/colorRamps") From 3ee5a7efa0f0d5f713d6c7d327e74491349b8b51 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 11 Mar 2024 13:30:18 +0100 Subject: [PATCH 045/186] gnu: r-rnifti: Update to 1.6.1. * gnu/packages/cran.scm (r-rnifti): Update to 1.6.1. Change-Id: I7ef3a2b3a85c4c67b1ea23b23eabef67944aa284 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index b2db79fc00..f84e08d761 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -19934,14 +19934,14 @@ and compatibility with @code{ape} objects.") (define-public r-rnifti (package (name "r-rnifti") - (version "1.6.0") + (version "1.6.1") (source (origin (method url-fetch) (uri (cran-uri "RNifti" version)) (sha256 (base32 - "0spsdkqvlkk7xn6wz6778gc6cc7dnfcwpz91q8wdzxgcbgxdy0yv")))) + "0wn06fnq5c7f0vwakryb75vzkjh03dqz2z57lgmn68hwgssnpalc")))) (properties `((upstream-name . "RNifti"))) (build-system r-build-system) (inputs (list zlib)) From 5fd8c5a81e7efd1c87a89b1fdef2c1cb740a689f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 11 Mar 2024 13:30:18 +0100 Subject: [PATCH 046/186] gnu: r-globals: Update to 0.16.3. * gnu/packages/cran.scm (r-globals): Update to 0.16.3. Change-Id: I655b63182fa9cda436f5b7be7de5730682ff5af1 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index f84e08d761..d22ca85106 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -21645,14 +21645,14 @@ subsetting.") (define-public r-globals (package (name "r-globals") - (version "0.16.2") + (version "0.16.3") (source (origin (method url-fetch) (uri (cran-uri "globals" version)) (sha256 (base32 - "02kpdlrx1bannaixz03c0f7bii9g36iy2nw779mfgi56byljcb38")))) + "0nwcl40sbmmf812di9c3lryls9wn2k2dyjvpkp9832wd4jafsg6p")))) (build-system r-build-system) (propagated-inputs (list r-codetools)) From 14e32ae473a3eb043ba106f50c437b36413a9e38 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 11 Mar 2024 13:30:18 +0100 Subject: [PATCH 047/186] gnu: r-cobs: Update to 1.3-8. * gnu/packages/cran.scm (r-cobs): Update to 1.3-8. Change-Id: Ia654a9e3431f92566df1e7f8b0d8ec6e79920c78 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index d22ca85106..da4aea8d61 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -22211,14 +22211,14 @@ numbers (e.g. concentrations).") (define-public r-cobs (package (name "r-cobs") - (version "1.3-7") + (version "1.3-8") (source (origin (method url-fetch) (uri (cran-uri "cobs" version)) (sha256 (base32 - "0gz6i8scvfkmg0z7rcqc422dm360xv5ygcxnj6yyvpcpdv7sdp9k")))) + "08cqpiylbfy5j5xxajpngqaycmmciwhyf3sk3972x2l6rg3lj81c")))) (build-system r-build-system) (propagated-inputs (list r-quantreg r-sparsem)) From fa0be5a49be429d38a6e7b3488577505caf149c2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 11 Mar 2024 13:30:18 +0100 Subject: [PATCH 048/186] gnu: r-gmodels: Update to 2.19.1. * gnu/packages/cran.scm (r-gmodels): Update to 2.19.1. Change-Id: Ifdb09883a7093c4b3521dce0da6136f278f6ab9d --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index da4aea8d61..cb50a0799c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -22801,14 +22801,14 @@ network.") (define-public r-gmodels (package (name "r-gmodels") - (version "2.18.1.1") + (version "2.19.1") (source (origin (method url-fetch) (uri (cran-uri "gmodels" version)) (sha256 (base32 - "158y7yh4maawn9vki8cq4sil48xib2bbpl6qgj5gvlkw3c14hzfs")))) + "13c8x7iwyz36qir3ikbvjb5dl6gdh4fh82qdxcpcdinwfhrbhmxv")))) (build-system r-build-system) (propagated-inputs (list r-gdata r-mass)) From 48de8d86df4ba0a03615eec8db09c6b1701953c7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 11 Mar 2024 13:30:18 +0100 Subject: [PATCH 049/186] gnu: r-ggraph: Update to 2.2.1. * gnu/packages/cran.scm (r-ggraph): Update to 2.2.1. Change-Id: I16a96877df3fa37c5065862a6768389e11299a8a --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index cb50a0799c..9f833919fc 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -24832,14 +24832,14 @@ databases, including ENA, PDB or ChEMBL are also accessible.") (define-public r-ggraph (package (name "r-ggraph") - (version "2.2.0") + (version "2.2.1") (source (origin (method url-fetch) (uri (cran-uri "ggraph" version)) (sha256 (base32 - "0zs02xyzvimk8hj1z465zxp1hlca3gfirdcwb3gqriwsmnfhg661")))) + "1w9snb43wpa2rv16fx5vmh7nqpgkr05iz6flnmlfx3xd0ylzh1a4")))) (build-system r-build-system) (propagated-inputs (list r-cli From 63b649a2f7c261d5b5074530d0fd8b514a9c1700 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 11 Mar 2024 13:30:19 +0100 Subject: [PATCH 050/186] gnu: r-systemfonts: Update to 1.0.6. * gnu/packages/cran.scm (r-systemfonts): Update to 1.0.6. Change-Id: I88b6bca71843e034780cc897506a5ca73d6288a8 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 9f833919fc..0ff2f402d7 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27265,14 +27265,14 @@ both R code and compiled C/C++/FORTRAN code.") (define-public r-systemfonts (package (name "r-systemfonts") - (version "1.0.5") + (version "1.0.6") (source (origin (method url-fetch) (uri (cran-uri "systemfonts" version)) (sha256 (base32 - "08sqw5izpwhawcjkcyscvslz914skwfi0s68rdwrqwwkh8fzn3w4")))) + "1mqxb2njfnk5rfwkqc940xbpwd3dh25zac4sapv5mjyddrxnwn6i")))) (properties `((upstream-name . "systemfonts"))) (build-system r-build-system) (propagated-inputs From d14a9951ecf817fdddd6f85848f08b30f1be38a6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 11 Mar 2024 13:30:19 +0100 Subject: [PATCH 051/186] gnu: r-graphlayouts: Update to 1.1.1. * gnu/packages/cran.scm (r-graphlayouts): Update to 1.1.1. Change-Id: I20a604015e7b16b0ac6fb83169f2fbd3002b2cb7 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 0ff2f402d7..a8711b6db9 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -27294,14 +27294,14 @@ be used further by e.g. graphic devices.") (define-public r-graphlayouts (package (name "r-graphlayouts") - (version "1.1.0") + (version "1.1.1") (source (origin (method url-fetch) (uri (cran-uri "graphlayouts" version)) (sha256 (base32 - "14ib4yjcxb6zgci5h89p9swqabab57bzywwp96d3nhn620chap22")))) + "009q5y46lbizdabbb6a61xlfa3g5lf3nd9w42709lcxi0ad4bhkv")))) (properties `((upstream-name . "graphlayouts"))) (build-system r-build-system) (propagated-inputs From 4bec8df853db5f0d959f26ff1ff094e860fb5b6a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 11 Mar 2024 13:30:19 +0100 Subject: [PATCH 052/186] gnu: r-accsda: Update to 1.1.3. * gnu/packages/cran.scm (r-accsda): Update to 1.1.3. [propagated-inputs]: Remove r-ggthemes. Change-Id: I00d749030f50d5837a5572c0642551e212e97a1a --- gnu/packages/cran.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a8711b6db9..109d8d3c97 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -28553,21 +28553,18 @@ and mixture of Gaussian models.") (define-public r-accsda (package (name "r-accsda") - (version "1.1.2") + (version "1.1.3") (source (origin (method url-fetch) (uri (cran-uri "accSDA" version)) (sha256 (base32 - "0jf4x5j9y7a3mvf2ghjp6bxdq1s5jh2sx3x3ar6f3lyzzvrnls4v")))) + "1s0c4wy4bzrc2fkka7kl519z1yckp6s4ggzy1ik992ygyprdcs1q")))) (properties `((upstream-name . "accSDA"))) (build-system r-build-system) (propagated-inputs - (list r-ggplot2 - r-ggthemes - r-gridextra - r-mass)) + (list r-ggplot2 r-gridextra r-mass)) (home-page "https://github.com/gumeo/accSDA/wiki") (synopsis "Accelerated sparse discriminant analysis") (description From 0afc70e8f0672ff239da54dd2c393761bf8a8deb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 11 Mar 2024 13:30:19 +0100 Subject: [PATCH 053/186] gnu: r-fda: Update to 6.1.8. * gnu/packages/cran.scm (r-fda): Update to 6.1.8. Change-Id: Iba11aa8b4b31b9bd95b4b819e759aa6d2d97e37a --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 109d8d3c97..336255b8ab 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -29856,14 +29856,14 @@ variable observed over time.") (define-public r-fda (package (name "r-fda") - (version "6.1.7") + (version "6.1.8") (source (origin (method url-fetch) (uri (cran-uri "fda" version)) (sha256 (base32 - "00hiz15v31zs5l0bqdkim1fpfd3bjvssv77iczq0si724s4fqxiq")))) + "01y488zviaj9z8h88vnia9wg4as62jx73la1qji1ljbr5258b3gg")))) (properties `((upstream-name . "fda"))) (build-system r-build-system) (propagated-inputs From b4065ef93d69c04a38e7e53f58ff8683ecba03bb Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 11 Mar 2024 13:30:19 +0100 Subject: [PATCH 054/186] gnu: r-rstan: Update to 2.32.6. * gnu/packages/cran.scm (r-rstan): Update to 2.32.6. [inputs]: Add pandoc. Change-Id: Iddad21c83ce3f5af01c57027edc7157948092990 --- gnu/packages/cran.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 336255b8ab..78072d734b 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -32714,14 +32714,14 @@ techniques to average Bayesian predictive distributions.") (define-public r-rstan (package (name "r-rstan") - (version "2.32.5") + (version "2.32.6") (source (origin (method url-fetch) (uri (cran-uri "rstan" version)) (sha256 (base32 - "0m655pf0lrhqh2mzylximd2vch9wy252k4zwyfqn1sfwmx642dva")))) + "0w0si8sd26c4nivqh85y0imil14sp4vy97yikmrv1lxvj40x141k")))) (properties '((upstream-name . "rstan") (updater-extra-native-inputs . ("tzdata-for-tests")))) @@ -32750,6 +32750,7 @@ techniques to average Bayesian predictive distributions.") r-rcppeigen r-rcppparallel r-stanheaders)) + (inputs (list pandoc)) (home-page "https://discourse.mc-stan.org/") (synopsis "R interface to Stan") (description From 776e4d083a6d76f5d6459aeb0479bfe2ef7d9693 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 11 Mar 2024 13:30:20 +0100 Subject: [PATCH 055/186] gnu: r-paws-common: Update to 0.7.1. * gnu/packages/cran.scm (r-paws-common): Update to 0.7.1. Change-Id: I114662deb79dcc063dcb74e4ab72739c185fb0f0 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index 78072d734b..a84d799329 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -40031,14 +40031,14 @@ fully reproducible.") (define-public r-paws-common (package (name "r-paws-common") - (version "0.7.0") + (version "0.7.1") (source (origin (method url-fetch) (uri (cran-uri "paws.common" version)) (sha256 (base32 - "05rld34brjc32p9f9cbqyyh208rh9idnyih33cpw7bz7bfyicnqm")))) + "1mjbyykav3f5yv59hnaihqsqhinvrlhphp93ks9xp756w6abciqf")))) (properties `((upstream-name . "paws.common"))) (build-system r-build-system) (propagated-inputs From 1e5e3d8e24e8ed0b071fcd4b95d2a0a05c80c546 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 11 Mar 2024 13:30:20 +0100 Subject: [PATCH 056/186] gnu: r-logger: Update to 0.3.0. * gnu/packages/cran.scm (r-logger): Update to 0.3.0. Change-Id: Id090ba50fe10b71785acf359f880ec030c9eb235 --- gnu/packages/cran.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/cran.scm b/gnu/packages/cran.scm index a84d799329..97518abc4c 100644 --- a/gnu/packages/cran.scm +++ b/gnu/packages/cran.scm @@ -41074,13 +41074,13 @@ Monte Carlo approach implemented in JAGS.") (define-public r-logger (package (name "r-logger") - (version "0.2.2") + (version "0.3.0") (source (origin (method url-fetch) (uri (cran-uri "logger" version)) (sha256 - (base32 "08kym5i5fvbf5xhh9qdszp4jdgyc7j7zpnwzy68wabqz73aff6sg")))) + (base32 "0ivhrmq408pb7gx7yhmrn6mjkx15dvkb4bpk4z5y642l3j2vv9vd")))) (properties `((upstream-name . "logger"))) (build-system r-build-system) (native-inputs (list r-knitr)) From 8bba5dd26a97e764ace5d6a9b88e9b4d34f1b2b7 Mon Sep 17 00:00:00 2001 From: Wilko Meyer Date: Fri, 1 Mar 2024 18:50:41 +0100 Subject: [PATCH 057/186] gnu: linux-libre 6.7: Update to 6.7.7. * gnu/packages/linux.scm (linux-libre-6.7-version): Update to 6.7.7. (linux-libre-6.7-pristine-source, deblob-scripts-6.7): Update hashes. Change-Id: Ibf045f6eccaa36acd373ca03dc6239174edbae20 Signed-off-by: Leo Famulari --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9660273efe..09d424ce78 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -497,17 +497,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "mainline" kernel. -(define-public linux-libre-6.7-version "6.7.6") +(define-public linux-libre-6.7-version "6.7.7") (define-public linux-libre-6.7-gnu-revision "gnu") (define deblob-scripts-6.7 (linux-libre-deblob-scripts linux-libre-6.7-version linux-libre-6.7-gnu-revision (base32 "1ddngihfmwffgvxxv8xsppi76r6grvdxr6zzfzvgl9qw07a6c9fd") - (base32 "1vb2pd0wdfl9p5qi8hj1i5xg1p4pyrp01iqhap9xbb2yai4l80j5"))) + (base32 "1lhsy2qnmz47r8m926k1kng912m64j7pnpcvd1ddgdqpq5byp88j"))) (define-public linux-libre-6.7-pristine-source (let ((version linux-libre-6.7-version) - (hash (base32 "1lrp7pwnxnqyy8c2l4n4nz997039gbnssrfm8ss8kl3h2c7fr2g4"))) + (hash (base32 "1n8lgf814mfslca51pm3nh4icvv1lb5w5l1sxdkf5nqdax28nsr5"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.7))) From 7b99730b5df6ab4aefad95f3996cdb5a4209557c Mon Sep 17 00:00:00 2001 From: Wilko Meyer Date: Fri, 1 Mar 2024 18:50:42 +0100 Subject: [PATCH 058/186] gnu: linux-libre 6.6: Update to 6.6.19. * gnu/packages/linux.scm (linux-libre-6.6-version): Update to 6.6.19. (linux-libre-6.6-pristine-source, deblob-scripts-6.6): Update hashes. Change-Id: I675043d5a7d7a58046c5c4883baf602997ab894c Signed-off-by: Leo Famulari --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 09d424ce78..d2b51f15e8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -515,17 +515,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-6.6-version "6.6.18") +(define-public linux-libre-6.6-version "6.6.19") (define-public linux-libre-6.6-gnu-revision "gnu") (define deblob-scripts-6.6 (linux-libre-deblob-scripts linux-libre-6.6-version linux-libre-6.6-gnu-revision (base32 "1qm8f3fq4yx59f7b6yky5ryyf229ypxnry922sr8cy0s7mp62cmv") - (base32 "0kavbby960k7wg355p3hjb9v1c4gnk8dv3lkfhpz44ayhv7kihg5"))) + (base32 "014w19b9igdy3rpwrqn21why151zlc9hdx2b1qvdkjsbz6smx3lp"))) (define-public linux-libre-6.6-pristine-source (let ((version linux-libre-6.6-version) - (hash (base32 "07cv97l5jiakmmv35n0ganvqfr0590b02f3qb617qkx1zg2xhhsf"))) + (hash (base32 "16hk8y3pw40hahhpnpxjwhprq6hlblavr45pglpb3d62f9mpwqxm"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.6))) From 7ea225f3719845d8218369fed209abb063f2f90f Mon Sep 17 00:00:00 2001 From: Wilko Meyer Date: Fri, 1 Mar 2024 18:50:43 +0100 Subject: [PATCH 059/186] gnu: linux-libre 6.1: Update to 6.1.80. * gnu/packages/linux.scm (linux-libre-6.1-version): Update to 6.1.80. (linux-libre-6.1-pristine-source, deblob-scripts-6.1): Update hashes. Change-Id: Ieeb2db5249ef534a2cd00b66f1064673245c4b91 Signed-off-by: Leo Famulari --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d2b51f15e8..b6c377c7e5 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -533,17 +533,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-6.1-version "6.1.79") +(define-public linux-libre-6.1-version "6.1.80") (define-public linux-libre-6.1-gnu-revision "gnu") (define deblob-scripts-6.1 (linux-libre-deblob-scripts linux-libre-6.1-version linux-libre-6.1-gnu-revision (base32 "1sf80f2i4vf888xjcn84ymn4w5ynn30ib9033zwmv7f09yvfhapy") - (base32 "0vghx43lf7madaihsm279qnw8fsmgwq6p7r39r2m645mvap8mjxw"))) + (base32 "06djvq3q6n8m7gmqap05jwslmpy0fmgfc9z8ny6kfh9lwgz8kx3r"))) (define-public linux-libre-6.1-pristine-source (let ((version linux-libre-6.1-version) - (hash (base32 "16xkd0hcslqlcf55d4ivzhf1fkhfs5yy0m9arbax8pmm5yi9r97s"))) + (hash (base32 "0wdnyy7m9kfkl98id0gm6jzp4aa0hfy6gfkb4k4cg1wbpfpcm3jn"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.1))) From 858435290eff53eb5ee56b2ec65a2a7da6f821c2 Mon Sep 17 00:00:00 2001 From: Wilko Meyer Date: Fri, 1 Mar 2024 18:50:44 +0100 Subject: [PATCH 060/186] gnu: linux-libre 5.15: Update to 5.15.150. * gnu/packages/linux.scm (linux-libre-5.15-version): Update to 5.15.150. (linux-libre-5.15-pristine-source, deblob-scripts-5.15): Update hashes. Change-Id: I22b170d3af24151e22cc4f3c830ce91be1b00d0c Signed-off-by: Leo Famulari --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index b6c377c7e5..9f95eb6ef1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -548,17 +548,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-6.1))) -(define-public linux-libre-5.15-version "5.15.149") +(define-public linux-libre-5.15-version "5.15.150") (define-public linux-libre-5.15-gnu-revision "gnu") (define deblob-scripts-5.15 (linux-libre-deblob-scripts linux-libre-5.15-version linux-libre-5.15-gnu-revision (base32 "18ac30kxg2mf2f6gk3p935hzhz2qs110jy4xwk21kblnnkskbxj8") - (base32 "14pw0yl0yxdgcdp01rpi91ylil9irwzxfq04kfvn3gg2abaq37bn"))) + (base32 "1a4la9nfdl5qiyfbzhgbqhl638wy1crkgpfnfaj0qf3hg4jsg0g4"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "1c01fnaghj55mkgsgddznq1zq4mswsa05rz00kmh1d3y6sd8115x"))) + (hash (base32 "1m74cwsbjwlamxh8vdg2y9jjzk0h7a40adml2p2wszwf8lmmj1gf"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) From 471b77355adc753abea3406546a053c2be2e1059 Mon Sep 17 00:00:00 2001 From: Wilko Meyer Date: Fri, 1 Mar 2024 18:50:45 +0100 Subject: [PATCH 061/186] gnu: linux-libre 5.10: Update to 5.10.211. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.211. (linux-libre-5.10-pristine-source): Update hash. Change-Id: I9171f5c2aa6b1184dbbcd12a8546c39ac775d0ce Signed-off-by: Leo Famulari --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 9f95eb6ef1..8e3ac72f13 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -563,7 +563,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.15))) -(define-public linux-libre-5.10-version "5.10.210") +(define-public linux-libre-5.10-version "5.10.211") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts @@ -573,7 +573,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "12csh2zyjrqzgqcv799gv8h4xaw1irxh2zqddn4jqp5p7psx4j5k"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "0vggj3a71awc1w803cdzrnkn88rxr7l1xh9mmdcw9hzxj1d3r9jf"))) + (hash (base32 "1cir36s369fl6s46x16xnjg0wdlnkipsp2zhz11m9d3z205hly1s"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) From 86833f7791f6de5fa7a501fcfffdbc168023662b Mon Sep 17 00:00:00 2001 From: Wilko Meyer Date: Fri, 1 Mar 2024 18:50:46 +0100 Subject: [PATCH 062/186] gnu: linux-libre 5.4: Update to 5.4.270. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.270. (linux-libre-5.4-pristine-source): Update hash. Change-Id: I1b5c3f1cb770c7d29cf4a9c678ea8786f89c31e3 Signed-off-by: Leo Famulari --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8e3ac72f13..f7ff75fbaa 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -578,7 +578,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.269") +(define-public linux-libre-5.4-version "5.4.270") (define-public linux-libre-5.4-gnu-revision "gnu1") (define deblob-scripts-5.4 (linux-libre-deblob-scripts @@ -588,7 +588,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0x0xg0fcykpd117x3q0gim8jilhx922ashhckjvafxv2gk2zzjhj"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "1kqqm4hpif3jy2ycnb0dfjgzyn18vqhm1i5q7d7rkisks33bwm7z"))) + (hash (base32 "0svnkpivv5w9b2yyg0z607b84f591d401gxvr8s7kmzdxadhcjqs"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) From 29a3a25f8b4d812d3fb7cc13e18409e7482eb7b8 Mon Sep 17 00:00:00 2001 From: Wilko Meyer Date: Fri, 1 Mar 2024 18:50:47 +0100 Subject: [PATCH 063/186] gnu: linux-libre 4.19: Update to 4.19.308. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.308. (linux-libre-4.19-pristine-source): Update hash. Change-Id: Ifa9d16737ca5961672654822de3e5dd70cb3be1b Signed-off-by: Leo Famulari --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f7ff75fbaa..c7b95636f1 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -593,7 +593,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.307") +(define-public linux-libre-4.19-version "4.19.308") (define-public linux-libre-4.19-gnu-revision "gnu1") (define deblob-scripts-4.19 (linux-libre-deblob-scripts @@ -603,7 +603,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0fgkp3v7qgqpn7l1987xcwwlrmwsbscqnxfv06p8nkavrhymrv3c"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "0lp3fc7sqy48vpcl2g0n1bz7i1hp9k0nlz3i1xfh9l056ihzzvl3"))) + (hash (base32 "1j81zdx75m48rvqacw4xlcb13vkvlx0pfq4kdfxrsdfl7wfcwl9a"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) From 001dfb89579856b8695b33b59f484f36e313347f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sat, 2 Mar 2024 13:41:23 -0500 Subject: [PATCH 064/186] gnu: Update the default linux-libre package to the 6.7 series. * gnu/packages/linux.scm (linux-libre-version, linux-libre-gnu-revision, linux-libre-pristine-source, linux-libre-source, linux-libre): Use linux-libre-6.7. Change-Id: I889a36129417363328d7509446dcedb31f816569 --- gnu/packages/linux.scm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c7b95636f1..aea5f9a432 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -1100,20 +1100,6 @@ Linux kernel. It has been modified to remove all non-free binary blobs.") ;;; Generic kernel packages. ;;; -(define-public linux-libre-6.6 - (make-linux-libre* linux-libre-6.6-version - linux-libre-6.6-gnu-revision - linux-libre-6.6-source - '("x86_64-linux" "i686-linux" "armhf-linux" - "aarch64-linux" "powerpc64le-linux" "riscv64-linux") - #:configuration-file kernel-config)) - -(define-public linux-libre-version linux-libre-6.6-version) -(define-public linux-libre-gnu-revision linux-libre-6.6-gnu-revision) -(define-public linux-libre-pristine-source linux-libre-6.6-pristine-source) -(define-public linux-libre-source linux-libre-6.6-source) -(define-public linux-libre linux-libre-6.6) - (define-public linux-libre-6.7 (make-linux-libre* linux-libre-6.7-version linux-libre-6.7-gnu-revision @@ -1122,6 +1108,20 @@ Linux kernel. It has been modified to remove all non-free binary blobs.") "aarch64-linux" "powerpc64le-linux" "riscv64-linux") #:configuration-file kernel-config)) +(define-public linux-libre-version linux-libre-6.7-version) +(define-public linux-libre-gnu-revision linux-libre-6.7-gnu-revision) +(define-public linux-libre-pristine-source linux-libre-6.7-pristine-source) +(define-public linux-libre-source linux-libre-6.7-source) +(define-public linux-libre linux-libre-6.7) + +(define-public linux-libre-6.6 + (make-linux-libre* linux-libre-6.6-version + linux-libre-6.6-gnu-revision + linux-libre-6.6-source + '("x86_64-linux" "i686-linux" "armhf-linux" + "aarch64-linux" "powerpc64le-linux" "riscv64-linux") + #:configuration-file kernel-config)) + (define-public linux-libre-6.1 (make-linux-libre* linux-libre-6.1-version linux-libre-6.1-gnu-revision From a26bce55e60aa3444c4378d3996f3aa41b9661e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 11 Mar 2024 22:07:43 +0100 Subject: [PATCH 065/186] time-machine: Allow time travels to v0.16.0. * guix/scripts/time-machine.scm (%oldest-possible-commit): Change to v0.16.0. * tests/guix-time-machine.sh: Adjust comment. Change-Id: I9ad82bd45fee0d172b5348a8ae16e990338a3a97 --- guix/scripts/time-machine.scm | 4 ++-- tests/guix-time-machine.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/guix/scripts/time-machine.scm b/guix/scripts/time-machine.scm index 2c30fe7cfd..d9ce85df84 100644 --- a/guix/scripts/time-machine.scm +++ b/guix/scripts/time-machine.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Konrad Hinsen -;;; Copyright © 2019, 2020, 2021, 2023 Ludovic Courtès +;;; Copyright © 2019-2021, 2023-2024 Ludovic Courtès ;;; Copyright © 2021 Simon Tournier ;;; Copyright © 2023 Maxim Cournoyer ;;; @@ -147,7 +147,7 @@ Execute COMMAND ARGS... in an older version of Guix.\n")) ;;; firmed up in v1.0.0; it is the oldest, safest commit that can be travelled ;;; to. (define %oldest-possible-commit - "6298c3ffd9654d3231a6f25390b056483e8f407c") ;v1.0.0 + "4a0b87f0ec5b6c2dcf82b372dd20ca7ea6acdd9c") ;v0.16.0 (define %reference-channels (list (channel (inherit %default-guix-channel) diff --git a/tests/guix-time-machine.sh b/tests/guix-time-machine.sh index 983f796225..df75c681da 100644 --- a/tests/guix-time-machine.sh +++ b/tests/guix-time-machine.sh @@ -1,6 +1,6 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2023 Maxim Cournoyer -# Copyright © 2023 Ludovic Courtès +# Copyright © 2023-2024 Ludovic Courtès # # This file is part of GNU Guix. # @@ -39,7 +39,7 @@ else EXTRA_OPTIONS="" fi -# Visiting a commit older than v1.0.0 must fail (this test is expensive +# Visiting a commit older than v0.16.0 must fail (this test is expensive # because it clones the whole repository). guix time-machine -q --commit=v0.15.0 $EXTRA_OPTIONS -- describe && false From 8f4ffb3fae133bb21d7991e97c2f19a7108b1143 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 11 Mar 2024 10:59:42 +0100 Subject: [PATCH 066/186] daemon: Protect against FD escape when building fixed-output derivations (CVE-2024-27297). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes a security issue (CVE-2024-27297) whereby a fixed-output derivation build process could open a writable file descriptor to its output, send it to some outside process for instance over an abstract AF_UNIX socket, which would then allow said process to modify the file in the store after it has been marked as “valid”. Vulnerability discovered by puck . Nix security advisory: https://github.com/NixOS/nix/security/advisories/GHSA-2ffj-w4mj-pg37 Nix fix: https://github.com/NixOS/nix/commit/244f3eee0bbc7f11e9b383a15ed7368e2c4becc9 * nix/libutil/util.cc (readDirectory): Add variants that take a DIR* and a file descriptor. Rewrite the ‘Path’ variant accordingly. (copyFile, copyFileRecursively): New functions. * nix/libutil/util.hh (copyFileRecursively): New declaration. * nix/libstore/build.cc (DerivationGoal::buildDone): When ‘fixedOutput’ is true, call ‘copyFileRecursively’ followed by ‘rename’ on each output. Change-Id: I7952d41093eed26e123e38c14a4c1424be1ce1c4 Reported-by: Picnoir , Théophane Hufschmitt Change-Id: Idb5f2757f35af86b032a9851cecb19b70227bd88 --- nix/libstore/build.cc | 16 ++++++ nix/libutil/util.cc | 112 ++++++++++++++++++++++++++++++++++++++++-- nix/libutil/util.hh | 6 +++ 3 files changed, 129 insertions(+), 5 deletions(-) diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc index 461fcbc584..e2adee118b 100644 --- a/nix/libstore/build.cc +++ b/nix/libstore/build.cc @@ -1382,6 +1382,22 @@ void DerivationGoal::buildDone() % drvPath % statusToString(status)); } + if (fixedOutput) { + /* Replace the output, if it exists, by a fresh copy of itself to + make sure that there's no stale file descriptor pointing to it + (CVE-2024-27297). */ + foreach (DerivationOutputs::iterator, i, drv.outputs) { + if (pathExists(i->second.path)) { + Path pivot = i->second.path + ".tmp"; + copyFileRecursively(i->second.path, pivot, true); + int err = rename(pivot.c_str(), i->second.path.c_str()); + if (err != 0) + throw SysError(format("renaming `%1%' to `%2%'") + % pivot % i->second.path); + } + } + } + /* Compute the FS closure of the outputs and register them as being valid. */ registerOutputs(); diff --git a/nix/libutil/util.cc b/nix/libutil/util.cc index 82eac72120..493f06f357 100644 --- a/nix/libutil/util.cc +++ b/nix/libutil/util.cc @@ -215,14 +215,11 @@ bool isLink(const Path & path) } -DirEntries readDirectory(const Path & path) +static DirEntries readDirectory(DIR *dir) { DirEntries entries; entries.reserve(64); - AutoCloseDir dir = opendir(path.c_str()); - if (!dir) throw SysError(format("opening directory `%1%'") % path); - struct dirent * dirent; while (errno = 0, dirent = readdir(dir)) { /* sic */ checkInterrupt(); @@ -230,11 +227,29 @@ DirEntries readDirectory(const Path & path) if (name == "." || name == "..") continue; entries.emplace_back(name, dirent->d_ino, dirent->d_type); } - if (errno) throw SysError(format("reading directory `%1%'") % path); + if (errno) throw SysError(format("reading directory")); return entries; } +DirEntries readDirectory(const Path & path) +{ + AutoCloseDir dir = opendir(path.c_str()); + if (!dir) throw SysError(format("opening directory `%1%'") % path); + return readDirectory(dir); +} + +static DirEntries readDirectory(int fd) +{ + /* Since 'closedir' closes the underlying file descriptor, duplicate FD + beforehand. */ + int fdcopy = dup(fd); + if (fdcopy < 0) throw SysError("dup"); + + AutoCloseDir dir = fdopendir(fdcopy); + if (!dir) throw SysError(format("opening directory from file descriptor `%1%'") % fd); + return readDirectory(dir); +} unsigned char getFileType(const Path & path) { @@ -364,6 +379,93 @@ void deletePath(const Path & path, unsigned long long & bytesFreed, size_t linkT _deletePath(path, bytesFreed, linkThreshold); } +static void copyFile(int sourceFd, int destinationFd) +{ + struct stat st; + if (fstat(sourceFd, &st) == -1) throw SysError("statting file"); + + ssize_t result = copy_file_range(sourceFd, NULL, destinationFd, NULL, st.st_size, 0); + if (result < 0 && errno == ENOSYS) { + for (size_t remaining = st.st_size; remaining > 0; ) { + unsigned char buf[8192]; + size_t count = std::min(remaining, sizeof buf); + + readFull(sourceFd, buf, count); + writeFull(destinationFd, buf, count); + remaining -= count; + } + } else { + if (result < 0) + throw SysError(format("copy_file_range `%1%' to `%2%'") % sourceFd % destinationFd); + if (result < st.st_size) + throw SysError(format("short write in copy_file_range `%1%' to `%2%'") + % sourceFd % destinationFd); + } +} + +static void copyFileRecursively(int sourceroot, const Path &source, + int destinationroot, const Path &destination, + bool deleteSource) +{ + struct stat st; + if (fstatat(sourceroot, source.c_str(), &st, AT_SYMLINK_NOFOLLOW) == -1) + throw SysError(format("statting file `%1%'") % source); + + if (S_ISREG(st.st_mode)) { + AutoCloseFD sourceFd = openat(sourceroot, source.c_str(), + O_CLOEXEC | O_NOFOLLOW | O_RDONLY); + if (sourceFd == -1) throw SysError(format("opening `%1%'") % source); + + AutoCloseFD destinationFd = openat(destinationroot, destination.c_str(), + O_CLOEXEC | O_CREAT | O_WRONLY | O_TRUNC, + st.st_mode); + if (destinationFd == -1) throw SysError(format("opening `%1%'") % source); + + copyFile(sourceFd, destinationFd); + } else if (S_ISLNK(st.st_mode)) { + char target[st.st_size + 1]; + ssize_t result = readlinkat(sourceroot, source.c_str(), target, st.st_size); + if (result != st.st_size) throw SysError("reading symlink target"); + target[st.st_size] = '\0'; + int err = symlinkat(target, destinationroot, destination.c_str()); + if (err != 0) + throw SysError(format("creating symlink `%1%'") % destination); + } else if (S_ISDIR(st.st_mode)) { + int err = mkdirat(destinationroot, destination.c_str(), 0755); + if (err != 0) + throw SysError(format("creating directory `%1%'") % destination); + + AutoCloseFD destinationFd = openat(destinationroot, destination.c_str(), + O_CLOEXEC | O_RDONLY | O_DIRECTORY); + if (err != 0) + throw SysError(format("opening directory `%1%'") % destination); + + AutoCloseFD sourceFd = openat(sourceroot, source.c_str(), + O_CLOEXEC | O_NOFOLLOW | O_RDONLY); + if (sourceFd == -1) + throw SysError(format("opening `%1%'") % source); + + if (deleteSource && !(st.st_mode & S_IWUSR)) { + /* Ensure the directory writable so files within it can be + deleted. */ + if (fchmod(sourceFd, st.st_mode | S_IWUSR) == -1) + throw SysError(format("making `%1%' directory writable") % source); + } + + for (auto & i : readDirectory(sourceFd)) + copyFileRecursively((int)sourceFd, i.name, (int)destinationFd, i.name, + deleteSource); + } else throw Error(format("refusing to copy irregular file `%1%'") % source); + + if (deleteSource) + unlinkat(sourceroot, source.c_str(), + S_ISDIR(st.st_mode) ? AT_REMOVEDIR : 0); +} + +void copyFileRecursively(const Path &source, const Path &destination, bool deleteSource) +{ + copyFileRecursively(AT_FDCWD, source, AT_FDCWD, destination, deleteSource); +} static Path tempName(Path tmpRoot, const Path & prefix, bool includePid, int & counter) diff --git a/nix/libutil/util.hh b/nix/libutil/util.hh index 880b0e93b2..058f5f8446 100644 --- a/nix/libutil/util.hh +++ b/nix/libutil/util.hh @@ -102,6 +102,12 @@ void deletePath(const Path & path); void deletePath(const Path & path, unsigned long long & bytesFreed, size_t linkThreshold = 1); +/* Copy SOURCE to DESTINATION, recursively. Throw if SOURCE contains a file + that is not a regular file, symlink, or directory. When DELETESOURCE is + true, delete source files once they have been copied. */ +void copyFileRecursively(const Path &source, const Path &destination, + bool deleteSource = false); + /* Create a temporary directory. */ Path createTempDir(const Path & tmpRoot = "", const Path & prefix = "nix", bool includePid = true, bool useGlobalCounter = true, mode_t mode = 0755); From 5f100c68a4a8ef9ed5599bb99c910018869bc6f3 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Thu, 20 Jul 2023 12:13:55 -0700 Subject: [PATCH 067/186] etc: systemd services: switch to "journal" for output and error logging. The "syslog" method has been deprecated for years, and issues a warning: Standard output type syslog is obsolete, automatically updating to journal. Please update your unit file, and consider removing the setting altogether. Fixes: #48323 * etc/guix-daemon.service.in (StandardOutput): Use "journal" (StandardError): Likewise. * etc/guix-publish.service.in (StandardOutput): Likewise. (StandardError): Likewise. --- etc/guix-daemon.service.in | 4 ++-- etc/guix-publish.service.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/guix-daemon.service.in b/etc/guix-daemon.service.in index 9dbc3b5678..5e75379b5e 100644 --- a/etc/guix-daemon.service.in +++ b/etc/guix-daemon.service.in @@ -9,8 +9,8 @@ Description=Build daemon for GNU Guix ExecStart=@localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix-daemon \ --build-users-group=guixbuild --discover=no Environment='GUIX_LOCPATH=@localstatedir@/guix/profiles/per-user/root/guix-profile/lib/locale' LC_ALL=en_US.utf8 -StandardOutput=syslog -StandardError=syslog +StandardOutput=journal +StandardError=journal # Work around a nasty systemd ‘feature’ that kills the entire process tree # (including the daemon!) if any child, such as cc1plus, runs out of memory. diff --git a/etc/guix-publish.service.in b/etc/guix-publish.service.in index b8fd3b4c03..0d82e73d94 100644 --- a/etc/guix-publish.service.in +++ b/etc/guix-publish.service.in @@ -11,8 +11,8 @@ After=guix-daemon.service [Service] ExecStart=@localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix publish --user=nobody --port=8181 Environment='GUIX_LOCPATH=@localstatedir@/guix/profiles/per-user/root/guix-profile/lib/locale' LC_ALL=en_US.utf8 -StandardOutput=syslog -StandardError=syslog +StandardOutput=journal +StandardError=journal # Despite the name, this is rate-limited: a broken daemon will eventually fail. Restart=always From b8954a7faeccae11c32add7cd0f408d139af3a43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 11 Mar 2024 23:13:21 +0100 Subject: [PATCH 068/186] gnu: guix: Update to 8f4ffb3. * gnu/packages/package-management.scm (guix): Update to 8f4ffb3. Change-Id: I4574442c529f49881df03501d000e2da68618417 --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index f155edaca0..19e5969ddf 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -176,8 +176,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.4.0") - (commit "aeb494322ca9dec4a4d66a7d063239c8536bd538") - (revision 16)) + (commit "8f4ffb3fae133bb21d7991e97c2f19a7108b1143") + (revision 17)) (package (name "guix") @@ -193,7 +193,7 @@ (commit commit))) (sha256 (base32 - "1xl769lkpvkjpvq4vwkxm4dp77sr9finvr6izvf4kvyi6s3hbsys")) + "1s4rfhida9gm454yj61vxs35a71i281cz0zyyq1l6fxc6ic775dd")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments From 4003c60abf7a6e59e47cc2deb9eef2f104ebb994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 11 Mar 2024 23:13:40 +0100 Subject: [PATCH 069/186] news: Add entry for the daemon fixed-output derivation vulnerability. * etc/news.scm: Add entry. Change-Id: Ib3f9c22eda1e8b9075620ec01b4edf2f24cfcf93 --- etc/news.scm | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/etc/news.scm b/etc/news.scm index 3e8c88499f..b54eb47221 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -1,6 +1,6 @@ ;; GNU Guix news, for use by 'guix pull'. ;; -;; Copyright © 2019-2023 Ludovic Courtès +;; Copyright © 2019-2024 Ludovic Courtès ;; Copyright © 2019–2021 Tobias Geerinckx-Rice ;; Copyright © 2019, 2020 Miguel Ángel Arruga Vivas ;; Copyright © 2019, 2020 Konrad Hinsen @@ -28,6 +28,44 @@ (channel-news (version 0) + (entry (commit "8f4ffb3fae133bb21d7991e97c2f19a7108b1143") + (title + (en "Daemon vulnerability allowing store corruption has been fixed") + (fr "Une faille du démon permettant de corrompre le dépôt a été corrigée")) + (body + (en "A vulnerability in the build daemon, @command{guix-daemon}, was +identified and fixed. The vulnerability would allow unprivileged users to +corrupt the result of @dfn{fixed-output derivations} such as source code +tarballs and Git checkouts, which in turn could lead to local privilege +escalation. + +This bug is fixed and Guix System users are advised to upgrade their system, +with a command along the lines of: + +@example +sudo guix system reconfigure /run/current-system/configuration.scm +sudo herd restart guix-daemon +@end example + +See @uref{https://issues.guix.gnu.org/69728} for more information on this +issue.") + (fr "Une faille de sécurité du démon de compilation, +@command{guix-daemon}, a été identifiée et corrigée. La faille permettait à +un·e utilisateur·rice sans privilège de corrompre le résultat d'une +@dfn{dérivation à sortie fixe} telle qu'une archive ou un @i{checkout} Git, ce +qui peut ensuite permettre une élévation locale de privilèges. + +Ce problème est corrigé et les utilisateur·rices de Guix System sont invité·es +à mettre à jour leur système avec une commande telle que : + +@example +sudo guix system reconfigure /run/current-system/configuration.scm +sudo herd restart guix-daemon +@end example + +Voir @uref{https://issues.guix.gnu.org/69728} pour plus d'informations sur +cette anomalie."))) + (entry (commit "10a193596368443f441077525ebbddf787d91e4b") (title (en "Linux-libre 4.14 removed due to end of upstream support") From 79163d2c3c50fb1a7fd3fb3e64a34e9a1d0e3083 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 11 Mar 2024 20:31:16 +0200 Subject: [PATCH 070/186] gnu: tor-browser: Build with newest rust-cbindgen. * gnu/packages/tor-browsers.scm (make-torbrowser)[inputs]: Replace rust-cbindgen-0.24 with rust-cbindgen. Change-Id: I6263a11342cb506c6c271e0360b7273c35be585d --- gnu/packages/tor-browsers.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm index 6c8113c461..1e59d07544 100644 --- a/gnu/packages/tor-browsers.scm +++ b/gnu/packages/tor-browsers.scm @@ -291,7 +291,7 @@ Browser.") (list rust `(,rust "cargo") - rust-cbindgen-0.24 + rust-cbindgen llvm-15 clang-15 perl From bacc391ebac750bdd3d3941aecab8bd059a50210 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 11 Mar 2024 20:32:29 +0200 Subject: [PATCH 071/186] gnu: icecat: Build with latest rust-cbindgen. * gnu/packages/gnuzilla.scm (icecat-minimal)[inputs]: Replace rust-cbindgen-0.24 with rust-cbindgen. Change-Id: I147c6facf297f19f24c12b908a8a43793fa6c153 --- gnu/packages/gnuzilla.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 12b9f2d121..aafe059177 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -3,7 +3,7 @@ ;;; Copyright © 2013-2022 Ludovic Courtès ;;; Copyright © 2014-2024 Mark H Weaver ;;; Copyright © 2015 Sou Bunnbu -;;; Copyright © 2016, 2017, 2018, 2019, 2021 Efraim Flashner +;;; Copyright © 2016-2019, 2021, 2024 Efraim Flashner ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2017, 2023 Clément Lassieur ;;; Copyright © 2017, 2018 Nikita @@ -763,7 +763,7 @@ variable defined below. It requires guile-json to be installed." ;; ,(search-patch "icecat-use-system-media-libs.patch")) rust `(,rust "cargo") - rust-cbindgen-0.24 + rust-cbindgen llvm-15 clang-15 perl From 7f1145d11a92b98ca1874e59c7761a63aec0454c Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 11 Mar 2024 20:33:09 +0200 Subject: [PATCH 072/186] gnu: icedove-minimal: Build with newest rust-cbindgen. * gnu/packages/gnuzilla.scm (icedove-minimal)[inputs]: Replace rust-cbindgen-0.23 with rust-cbindgen. Change-Id: I7e8f1edca86a5faf5a148e34a1ff20b85f16e039 --- gnu/packages/gnuzilla.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index aafe059177..1910a6d64c 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -1850,7 +1850,7 @@ ca495991b7852b855")) pkg-config python-wrapper rust - rust-cbindgen-0.23 + rust-cbindgen which yasm)) (home-page "https://www.thunderbird.net") From 7fa8bf85208353b7847450313e98e647325b6545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 12 Mar 2024 09:52:50 +0100 Subject: [PATCH 073/186] news: Give upgrade instructions for foreign distros. * etc/news.scm: Update entry. Change-Id: Ia7c326bc97042d92a8d499ee27dd41d15f1f0d29 --- etc/news.scm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/etc/news.scm b/etc/news.scm index b54eb47221..a19fed9a7d 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -47,6 +47,11 @@ sudo guix system reconfigure /run/current-system/configuration.scm sudo herd restart guix-daemon @end example +If you are using Guix on another distro, run @command{info \"(guix) Upgrading +Guix\"} or visit +@uref{https://guix.gnu.org/manual/devel/en/html_node/Upgrading-Guix.html} to +learn how to upgrade Guix. + See @uref{https://issues.guix.gnu.org/69728} for more information on this issue.") (fr "Une faille de sécurité du démon de compilation, @@ -63,6 +68,10 @@ sudo guix system reconfigure /run/current-system/configuration.scm sudo herd restart guix-daemon @end example +Pour voir comment mettre à jour Guix sur une autre distribution, lancer +@command{info \"(guix.fr) Mettre à niveau Guix\"} ou visiter +@uref{https://guix.gnu.org/manual/devel/fr/html_node/Mettre-a-niveau-Guix.html}. + Voir @uref{https://issues.guix.gnu.org/69728} pour plus d'informations sur cette anomalie."))) From 0547fe862cfdb53d408e777e6137d9222100cb50 Mon Sep 17 00:00:00 2001 From: Florian Pelz Date: Tue, 12 Mar 2024 09:33:13 +0100 Subject: [PATCH 074/186] news: Add 'de' translation. * etc/news.scm: Add German translation. Change-Id: Ia2a11f71cdee5ccbf2a7fbe176e713418771599e --- etc/news.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/etc/news.scm b/etc/news.scm index a19fed9a7d..d288b6efe1 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -31,6 +31,7 @@ (entry (commit "8f4ffb3fae133bb21d7991e97c2f19a7108b1143") (title (en "Daemon vulnerability allowing store corruption has been fixed") + (de "Schwachstelle im Daemon behoben, durch die der Store verfälscht werden konnte") (fr "Une faille du démon permettant de corrompre le dépôt a été corrigée")) (body (en "A vulnerability in the build daemon, @command{guix-daemon}, was @@ -54,6 +55,27 @@ learn how to upgrade Guix. See @uref{https://issues.guix.gnu.org/69728} for more information on this issue.") + (de "Eine Sicherheitslücke im Erstellungs-Daemon, +@command{guix-daemon}, wurde gefunden und geschlossen. Sie hatte es +unprivilegierten Nutzern ermöglicht, das Ergebnis einer @dfn{Ableitung mit +fester Ausgabe}, wie Quellcode-Tarballs und Git-Checkouts, zu manipulieren. +So war eine lokale Rechteausweitung möglich. + +Der Fehler ist behoben und wir raten Nutzern von Guix System, ihr System zu +aktualisieren mit einem Befehl wie: + +@example +sudo guix system reconfigure /run/current-system/configuration.scm +sudo herd restart guix-daemon +@end example + +Wenn Sie Guix auf einer anderen Distribution verwenden, erfahren Sie mit dem +Befehl @command{info \"(guix.de) Aktualisieren von Guix\"} oder auf +@uref{https://guix.gnu.org/manual/devel/de/html_node/Aktualisieren-von-Guix.html}, +wie Sie Guix aktualisieren. + +Siehe @uref{https://issues.guix.gnu.org/69728} für mehr Informationen zu dem +Fehler.") (fr "Une faille de sécurité du démon de compilation, @command{guix-daemon}, a été identifiée et corrigée. La faille permettait à un·e utilisateur·rice sans privilège de corrompre le résultat d'une From 351303a94463fe9c468d5d5ec80d54608bc6d683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sat, 9 Mar 2024 12:42:05 +0800 Subject: [PATCH 075/186] gnu: xfconf: Update to 4.18.3. * gnu/packages/xfce.scm (xfconf): Update to 4.18.3. Change-Id: I938fa3a1d8770c62a1456a814144b24ed1b4a025 --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index a44a871ba2..4c089360a6 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -134,7 +134,7 @@ Xfce Desktop Environment.") (define-public xfconf (package (name "xfconf") - (version "4.18.1") + (version "4.18.3") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -142,7 +142,7 @@ Xfce Desktop Environment.") "xfconf-" version ".tar.bz2")) (sha256 (base32 - "0mr20250mp4pgy82v5kvb0hp5060vy6yz9hd6icmmp6gpd8lfwfr")))) + "165xbr6y5z4zr235znkqlwkcy2ib9hgfqrdic0n7p57nas8ccv65")))) (build-system gnu-build-system) (arguments '(#:phases From 64794c145a12b9ddfcede00d660f8d6954be3e31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sat, 9 Mar 2024 12:42:05 +0800 Subject: [PATCH 076/186] gnu: garcon: Update to 4.18.2. * gnu/packages/xfce.scm (garcon): Update to 4.18.2. Change-Id: I45cfb8bca3556849cc08c00053696b077553f4f6 --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 4c089360a6..9f2e17f532 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -332,7 +332,7 @@ development.") (define-public garcon (package (name "garcon") - (version "4.18.1") + (version "4.18.2") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -340,7 +340,7 @@ development.") "garcon-" version ".tar.bz2")) (sha256 (base32 - "02y2nkxwx5mp1w6x2ydi3hpgymk7159zvyzk70afp5dcdlm96ypy")))) + "0ka35nxqhl4cbmyf9x2ysinihixsqmibqywqr2zqz5iiw699530v")))) (build-system gnu-build-system) (native-inputs (list `(,glib "bin") gobject-introspection intltool pkg-config)) From 359cef96d36843f6384d1bc975c10337f542abb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sat, 9 Mar 2024 12:42:05 +0800 Subject: [PATCH 077/186] gnu: tumbler: Update to 4.18.2. * gnu/packages/xfce.scm (tumbler): Update to 4.18.2. Change-Id: I99c65a09b5fe4b02e4d678f64721a713cde09b87 --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 9f2e17f532..6e162ef71a 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -359,7 +359,7 @@ merging features essential for loading menus modified with menu editors.") (define-public tumbler (package (name "tumbler") - (version "4.18.1") + (version "4.18.2") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -367,7 +367,7 @@ merging features essential for loading menus modified with menu editors.") "tumbler-" version ".tar.bz2")) (sha256 (base32 - "1833qnfw2c9wv7iw5cad5x5scj1rsqmmbwfld33zxx8akhd9hqgz")))) + "0ymy6a0hbv5iainphgpd7dfi8snpg7zs7lyqq2cgiiza6p3fwc5m")))) (build-system gnu-build-system) (native-inputs (list pkg-config intltool From 43fb294937a2f990c707aa7fb4ae30039c20fc92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sat, 9 Mar 2024 12:42:05 +0800 Subject: [PATCH 078/186] gnu: xfce4-panel: Update to 4.18.6. * gnu/packages/xfce.scm (xfce4-panel): Update to 4.18.6. Change-Id: I29a0372692fc9896cdfa083e07c0e4a0255108c5 --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 6e162ef71a..e4d4058209 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -398,7 +398,7 @@ management D-Bus specification.") (define-public xfce4-panel (package (name "xfce4-panel") - (version "4.18.4") + (version "4.18.6") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -406,7 +406,7 @@ management D-Bus specification.") name "-" version ".tar.bz2")) (sha256 (base32 - "0m7vmk7rc2sjfqba0flgnw77kn1j222xqs7r86bpg8sf1614yc1j")) + "0qkw1msrvq7hc4mjg9iai0kymgkrpj1nijv04zjbdfcbymhp2cr1")) (patches (search-patches "xfce4-panel-plugins.patch")))) (build-system gnu-build-system) (arguments From b6701d3a84328b95cb6abaaf652d028a85179425 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sat, 9 Mar 2024 12:42:05 +0800 Subject: [PATCH 079/186] gnu: xfce4-appfinder: Update to 4.18.1. * gnu/packages/xfce.scm (xfce4-appfinder): Update to 4.18.1. Change-Id: Ice902179d6991d9e887aeb2d9dfe144530c5dcf7 --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index e4d4058209..44ab0c748d 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -605,7 +605,7 @@ per window.") (define-public xfce4-appfinder (package (name "xfce4-appfinder") - (version "4.18.0") + (version "4.18.1") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -614,7 +614,7 @@ per window.") "/" name "-" version ".tar.bz2")) (sha256 (base32 - "136137w2xc78jq0xcbymjwdxapllwyy7h3ydshz0gli7ngbrhaln")))) + "1yck11y86d45yxsppd1yqk894k3cf5vh91a5sm559gl175jylm4q")))) (build-system gnu-build-system) (native-inputs (list pkg-config intltool)) From 80679b5c0551c8f4189c4e2285e1ef4fea415d73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sat, 9 Mar 2024 12:42:05 +0800 Subject: [PATCH 080/186] gnu: xfce4-settings: Update to 4.18.4. * gnu/packages/xfce.scm (xfce4-settings): Update to 4.18.4. Change-Id: If945317a90a0e0325bac352024c98920b8c6c86c --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 44ab0c748d..b993496149 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -682,7 +682,7 @@ allows you to shut down the computer from Xfce.") (define-public xfce4-settings (package (name "xfce4-settings") - (version "4.18.3") + (version "4.18.4") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -690,7 +690,7 @@ allows you to shut down the computer from Xfce.") name "-" version ".tar.bz2")) (sha256 (base32 - "18giyc190i7b3nc3l745p6fqpnqivwxm0yc7l0whfa03wndykf9d")) + "1p513i8zwc3glv2cf3x2abwm4hvdb7clamj19yadj2036v85a37i")) (patches (search-patches "xfce4-settings-defaults.patch")))) (build-system gnu-build-system) (arguments From ad5faf27750182acb8c66c02f359163bbf93c5ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sat, 9 Mar 2024 12:42:05 +0800 Subject: [PATCH 081/186] gnu: thunar: Update to 4.18.10. * gnu/packages/xfce.scm (thunar): Update to 4.18.10. Change-Id: I170cfa24d0086d6c1d2707d4c5693f28678adf3e --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index b993496149..8ccf3a8fbe 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -727,7 +727,7 @@ like appearance, display, keyboard and mouse settings.") (define-public thunar (package (name "thunar") - (version "4.18.7") ;stable version = even minor + (version "4.18.10") ;stable version = even minor (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -735,7 +735,7 @@ like appearance, display, keyboard and mouse settings.") "thunar-" version ".tar.bz2")) (sha256 (base32 - "0shbbih2l6h3sda2221h7gsskv2lnchnmypk76cdgf51iafafxi2")))) + "020xrwzdnk5b7cli8vmv3yn7sfq6pg7bz57m4p0xh0ln2cgqlc78")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--with-custom-thunarx-dirs-enabled"))) From 30e6d0a19201607ec6518fb59b096bf8804f4999 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sat, 9 Mar 2024 12:42:05 +0800 Subject: [PATCH 082/186] gnu: xfce4-terminal: Update to 1.1.3. * gnu/packages/xfce.scm (xfce4-terminal): Update to 1.1.3. Change-Id: Ic6589ee48f8e406f4d6b7b12ead165119b904e7f --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 8ccf3a8fbe..beee0cb452 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1082,7 +1082,7 @@ features playback of local media files, DVD/CD and live streams.") (define-public xfce4-terminal (package (name "xfce4-terminal") - (version "1.1.0") + (version "1.1.3") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/apps/" name "/" @@ -1090,7 +1090,7 @@ features playback of local media files, DVD/CD and live streams.") name "-" version ".tar.bz2")) (sha256 (base32 - "18yl792x617qa90g6caw4cy1arfl847majjxkxs0k6rb4ivk70j0")))) + "0i9xgd0rgw0j59hlp9kyxndw2b35nhxjls09c20rzdj1sj4dak91")))) (build-system gnu-build-system) (arguments (list From 0888676854825a955934c02c532e8279b2ead24b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sat, 9 Mar 2024 12:42:06 +0800 Subject: [PATCH 083/186] gnu: xfce4-power-manager: Update to 4.18.3. * gnu/packages/xfce.scm (xfce4-power-manager): Update to 4.18.3. Change-Id: I64cb289730b4fea2af5e3cbffef5500e1bfe1382 --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index beee0cb452..39190a19f0 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1250,7 +1250,7 @@ system resources, while still being visually appealing and user friendly.") (define-public xfce4-power-manager (package (name "xfce4-power-manager") - (version "4.18.2") + (version "4.18.3") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -1258,7 +1258,7 @@ system resources, while still being visually appealing and user friendly.") "xfce4-power-manager-" version ".tar.bz2")) (sha256 (base32 - "0kfzvhb1hnr16fcplm7bdpp4fcxr3irzq3w4q0lpbc5n6kaqyq71")))) + "1w445v3911cf7l6w5c0f84aphv8s579f8srnhjrhf3drd07xsy8d")))) (build-system gnu-build-system) (native-inputs (list pkg-config intltool)) From ff055e80e41f47a0ab5e0b89bff3595d4705d0c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sat, 9 Mar 2024 12:42:06 +0800 Subject: [PATCH 084/186] gnu: xfce4-dev-tools: Update to 4.18.1. * gnu/packages/xfce.scm (xfce4-dev-tools): Update to 4.18.1. Change-Id: I4e5b30d2dc70ba50b560d777a8b10ecb421dcbd9 --- gnu/packages/xfce.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 39190a19f0..c5d61ba0d5 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -2200,7 +2200,7 @@ local weather in the panel, using forecast data provided by the (define-public xfce4-dev-tools (package (name "xfce4-dev-tools") - (version "4.18.0") + (version "4.18.1") (source (origin (method url-fetch) (uri (string-append "https://archive.xfce.org/src/xfce/" @@ -2208,7 +2208,7 @@ local weather in the panel, using forecast data provided by the "xfce4-dev-tools-" version ".tar.bz2")) (sha256 (base32 - "0dxyfsx70nddkkv0ygkl02wv4p99g62zjkw68sf4bqzhap4lznzf")))) + "10bnb8q7sj60ahzfwrb3av4ngr17wk1p6jsnfv0yn8l90kksnb41")))) (build-system gnu-build-system) (native-inputs (list pkg-config)) From 671acb67abc3805a2968f4af8327c63cf2bd442c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sat, 9 Mar 2024 12:51:44 +0800 Subject: [PATCH 085/186] gnu: Add xfwm4-themes. * gnu/packages/xfce.scm (xfwm4-themes): New package. Change-Id: I01f7c7e095234c408c40cf344f6332753289d55f --- gnu/packages/xfce.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index c5d61ba0d5..351ec24217 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015 Sou Bunnbu +;;; Copyright © 2014, 2015, 2024 宋文武 ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2016 Andreas Enge ;;; Copyright © 2016 Florian Paul Schmidt @@ -949,6 +949,26 @@ menu.") on the screen.") (license gpl2+))) +(define-public xfwm4-themes + (package + (name "xfwm4-themes") + (version "4.10.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://archive.xfce.org/src/art/xfwm4-themes/" + (version-major+minor version) "/" + "xfwm4-themes-" version ".tar.bz2")) + (sha256 + (base32 + "0xfmdykav4rf6gdxbd6fhmrfrvbdc1yjihz7r7lba0wp1vqda51j")))) + (build-system gnu-build-system) + (home-page "https://www.xfce.org/") + (synopsis "Themes for the Xfce window manager") + (description "This package provides a set of additional themes for the Xfce +window manager.") + (license gpl3+))) + (define-public xfdesktop (package (name "xfdesktop") From e0ada527e52881cf0c2a8733cc9429083e67fa9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sat, 9 Mar 2024 12:52:56 +0800 Subject: [PATCH 086/186] gnu: xfce: Add xfwm4-themes. * gnu/packages/xfce.scm (xfce)[inputs]: Add xfwm4-themes. Change-Id: If68db115691bdb0dc324ca502f1853d51e9d52b8 --- gnu/packages/xfce.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm index 351ec24217..593226a740 100644 --- a/gnu/packages/xfce.scm +++ b/gnu/packages/xfce.scm @@ -1246,6 +1246,7 @@ for and start applications.") xfconf xfdesktop xfwm4 + xfwm4-themes xkill ;; Panel plugins. xfce4-battery-plugin From 91efdc55f6ea807eb8b2a7a637bc3000c0033917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sun, 10 Mar 2024 15:15:21 +0800 Subject: [PATCH 087/186] gnu: ltris: Update to 1.3. * gnu/packages/games.scm (ltris): Update to 1.3. Change-Id: I52e61633449100d945f52160c689d5a9d27da66a --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 9ff08e5e74..801e051166 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -2130,14 +2130,14 @@ It is similar to standard chess but this variant is far more complicated.") (define-public ltris (package (name "ltris") - (version "1.2.6") + (version "1.3") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/lgames/ltris/" "ltris-" version ".tar.gz")) (sha256 - (base32 "1xj65kn815x2hq1ynzjyc90dj178xwa2xvx7jx99qf60ahaf4g62")))) + (base32 "144zvnnky79z5ychyyb2wsp7h2pcbl50fbzd9w9dvxkw6adz4yip")))) (build-system gnu-build-system) (arguments '(#:phases From 2a739c4d210d704c9c1f2a57773f0b0b6198a60a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sun, 10 Mar 2024 15:52:45 +0800 Subject: [PATCH 088/186] gnu: manaplus: Update to 2.1.3.17. * gnu/packages/games.scm (manaplus): Update to 2.1.3.17. [arguments]: Pass "--with-sdl2" as configure-flags. [inputs]: Replace sdl-union with sdl2, sdl2-image, sdl2-mixer, sdl2-net and sdl2-ttf. Change-Id: I223150d559bce21e055b44262c7c97b3ccfa8dc2 --- gnu/packages/games.scm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 801e051166..db8d8da0a9 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -4676,7 +4676,7 @@ on the screen and keyboard to display letters.") (define-public manaplus (package (name "manaplus") - (version "1.9.3.23") + (version "2.1.3.17") (source (origin (method url-fetch) (uri (string-append @@ -4684,18 +4684,15 @@ on the screen and keyboard to display letters.") version "/manaplus-" version ".tar.xz")) (sha256 (base32 - "1ky182p4svwdqm6cf7jbns85hidkhkhq4s17cs2p381f0klapfjz")))) + "0ggswsa3xq7lss3j4k7fyzn56sw7hlrwk744i3d9w0n4932nmlg8")))) (build-system gnu-build-system) (arguments - '(#:configure-flags - (list (string-append "CPPFLAGS=-I" - (assoc-ref %build-inputs "sdl-union") - "/include/SDL")))) + (list #:configure-flags #~'("--with-sdl2"))) (native-inputs (list pkg-config)) (inputs (list glu curl libxml2 mesa - (sdl-union))) + sdl2 sdl2-image sdl2-mixer sdl2-net sdl2-ttf)) (home-page "https://manaplus.org") (synopsis "Client for 'The Mana World' and similar games") (description From a52701a4d3c90327f6b88267173a5a98ef3db8e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Sun, 10 Mar 2024 11:28:01 +0800 Subject: [PATCH 089/186] gnu: cagebreak: Update to 2.3.1. * gnu/packages/wm.scm (cagebreak): Update to 2.3.1. [inputs]: Replace wlroots-0.16 with wlroots. Change-Id: I1e14c45790aa633c200f604243bcd61b269bc231 --- gnu/packages/wm.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index edbb3096b8..a6f1ecd5c9 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -3054,7 +3054,7 @@ shows a notification for the user on the screen.") (define-public cagebreak (package (name "cagebreak") - (version "2.2.0") + (version "2.3.1") (source (origin (method git-fetch) (uri (git-reference @@ -3063,7 +3063,7 @@ shows a notification for the user on the screen.") (file-name (git-file-name name version)) (sha256 (base32 - "0yhn77hdy7c80hd6r8nmvs206pmp76bx4zr94imfvgs8fh5gb8cy")))) + "0firjpp7qw4kb2h1zh5pv5k0xf0jvx6x0r0s7j6y7dhlh5j0s00q")))) (build-system meson-build-system) (arguments (list @@ -3079,7 +3079,7 @@ shows a notification for the user on the screen.") (("/etc/") (string-append #$output "/etc/")) (("/usr/share/") (string-append #$output "/usr/share/")))))))) (native-inputs (list pkg-config scdoc)) - (inputs (list libevdev pango wlroots-0.16)) + (inputs (list libevdev pango wlroots)) (home-page "https://github.com/project-repo/cagebreak") (synopsis "Tiling wayland compositor inspired by ratpoison") (description From 4ef63d7ed0ae1ae29c97cb16f63c537c70473dcf Mon Sep 17 00:00:00 2001 From: aurtzy Date: Fri, 8 Mar 2024 15:27:15 -0500 Subject: [PATCH 090/186] gnu: Add rust-bindgen-cli-0.69. * gnu/packages/rust-apps.scm (rust-bindgen-cli): New variable. (rust-bindgen): Remove this package. Change-Id: I0841f34d73acf4e161c9f0ba0c6543d7f0d03092 Signed-off-by: Efraim Flashner --- gnu/packages/rust-apps.scm | 45 +++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 7d09633c5d..8785659777 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -1843,42 +1843,43 @@ rebase.") (define-public rust-cbindgen rust-cbindgen-0.26) -;; This is the unversioned package of the latest version of bindgen. -(define-public rust-bindgen +(define-public rust-bindgen-cli (package - (name "rust-bindgen") + (name "rust-bindgen-cli") (version "0.69.4") (source (origin (method url-fetch) - (uri (crate-uri "bindgen" version)) + (uri (crate-uri "bindgen-cli" version)) (file-name (string-append name "-" version ".tar.gz")) (sha256 - (base32 "18194611hn3k1dkxlha7a52sr8vmfhl9blc54xhj08cahd8wh3d0")))) + (base32 "00dfny07m4xfnqbfn7yr7cqwilj6935lbyg5d39yxjfj8jglfcax")))) (build-system cargo-build-system) (arguments `(#:install-source? #f - #:cargo-inputs (("rust-annotate-snippets" ,rust-annotate-snippets-0.9) - ("rust-bitflags" ,rust-bitflags-2) - ("rust-cexpr" ,rust-cexpr-0.6) - ("rust-clang-sys" ,rust-clang-sys-1) - ("rust-itertools" ,rust-itertools-0.10) - ("rust-lazy-static" ,rust-lazy-static-1) - ("rust-lazycell" ,rust-lazycell-1) + #:cargo-inputs (("rust-bindgen" ,rust-bindgen-0.69) + ("rust-clap" ,rust-clap-4) + ("rust-clap-complete" ,rust-clap-complete-4) + ("rust-env-logger" ,rust-env-logger-0.10) ("rust-log" ,rust-log-0.4) - ("rust-prettyplease" ,rust-prettyplease-0.2) - ("rust-proc-macro2" ,rust-proc-macro2-1) - ("rust-quote" ,rust-quote-1) - ("rust-regex" ,rust-regex-1) - ("rust-rustc-hash" ,rust-rustc-hash-1) - ("rust-shlex" ,rust-shlex-1) - ("rust-syn" ,rust-syn-2) - ("rust-which" ,rust-which-4)))) - (inputs (list clang)) + ("rust-shlex" ,rust-shlex-1)) + #:phases + (modify-phases %standard-phases + (replace 'install + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((bin (string-append (assoc-ref outputs "out") "/bin")) + (bindgen (string-append bin "/bindgen")) + (llvm-dir (string-append + (assoc-ref inputs "clang") "/lib"))) + (install-file "target/release/bindgen" bin) + (wrap-program bindgen + `("LIBCLANG_PATH" = (,llvm-dir))))))))) + (inputs (list bash-minimal clang)) (home-page "https://rust-lang.github.io/rust-bindgen/") (synopsis "Generate Rust FFI bindings to C and C++ libraries") (description "This package can be used to automatically generate Rust FFI -bindings to C and C++ libraries.") +bindings to C and C++ libraries. This package provides the @command{bindgen} +command.") (license license:bsd-3))) (define-public sniffglue From 62d8b14e325880bb68fbc7dd69452c6cace1149f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 12 Mar 2024 10:01:46 +0200 Subject: [PATCH 091/186] gnu: rust-bindgen-cli: Add shell completions. * gnu/packages/rust-apps.scm (rust-bindgen-cli)[arguments]: Add a phase to install shell completions. Change-Id: Ia476d02a7c2d75518da2624b09b7091fafb70d8d --- gnu/packages/rust-apps.scm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 8785659777..d73bd1a030 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm @@ -1873,7 +1873,29 @@ rebase.") (assoc-ref inputs "clang") "/lib"))) (install-file "target/release/bindgen" bin) (wrap-program bindgen - `("LIBCLANG_PATH" = (,llvm-dir))))))))) + `("LIBCLANG_PATH" = (,llvm-dir)))))) + (add-after 'install 'install-completions + (lambda* (#:key native-inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (share (string-append out "/share")) + (bindgen (string-append out "/bin/bindgen"))) + (mkdir-p (string-append share "/bash-completion/completions")) + (with-output-to-file + (string-append share "/bash-completion/completions/bindgen") + (lambda _ (invoke bindgen "--generate-shell-completions" "bash"))) + (mkdir-p (string-append share "/fish/vendor_completions.d")) + (with-output-to-file + (string-append share "/fish/vendor_completions.d/bindgen.fish") + (lambda _ (invoke bindgen "--generate-shell-completions" "fish"))) + (mkdir-p (string-append share "/zsh/site-functions")) + (with-output-to-file + (string-append share "/zsh/site-functions/_bindgen") + (lambda _ (invoke bindgen "--generate-shell-completions" "zsh"))) + (mkdir-p (string-append share "/elvish/lib")) + (with-output-to-file + (string-append share "/elvish/lib/bindgen") + (lambda _ + (invoke bindgen "--generate-shell-completions" "elvish"))))))))) (inputs (list bash-minimal clang)) (home-page "https://rust-lang.github.io/rust-bindgen/") (synopsis "Generate Rust FFI bindings to C and C++ libraries") From ac74586ff355df5e14242a5ad0bad23ede23a36e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 6 Mar 2024 09:22:29 +0200 Subject: [PATCH 092/186] gnu: syncthing: Mark as tunable. * gnu/packages/syncthing.scm (syncthing)[properties]: Mark package as tunable. Change-Id: Ia885bbd32f043e83b231359cca438ea9caf4e8dc --- gnu/packages/syncthing.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index d09b03bcdb..744b857070 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -129,7 +129,9 @@ Protocol.") (home-page "https://github.com/syncthing/syncthing") (properties '((release-monitoring-url . "https://syncthing.net/downloads/") - (upstream-name . "syncthing-source"))) + (upstream-name . "syncthing-source") + ;; The hashing code greatly benefits from newer architecture support. + (tunable? . #t))) (license mpl2.0))) (define-public syncthing-gtk From 6cff29fb6e273e4a746dd518a07776d7c4c71b42 Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Fri, 8 Mar 2024 10:49:20 +0100 Subject: [PATCH 093/186] gnu: petsc: Add tunable property. Tested with some real-world simulations on multpiple HPC systems. * gnu/packages/maths.scm (petsc)[properties]: Add tunable? flag. Change-Id: I81588d0556c4176f29d7ab760322cd7aec271f12 Signed-off-by: Efraim Flashner --- gnu/packages/maths.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ea42341c41..bb2d7a3504 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3515,7 +3515,8 @@ September 2004}") data structures and routines for the scalable (parallel) solution of scientific applications modeled by partial differential equations.") (license (license:non-copyleft - "https://www.mcs.anl.gov/petsc/documentation/copyright.html")))) + "https://www.mcs.anl.gov/petsc/documentation/copyright.html")) + (properties '((tunable? . #t))))) (define-public petsc-complex (package From f7e6a84e989295d86e8c776988f65c36df117095 Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Fri, 8 Mar 2024 12:08:11 +0100 Subject: [PATCH 094/186] gnu: hypre: Honor the #:tests? flag. * gnu/packages/maths.scm (hypre)[arguments]: Adjust 'check phase to honor the #:tests? flag. Change-Id: I475fabd7d9f73ed320b97a4767830d82190c2b15 Signed-off-by: Efraim Flashner --- gnu/packages/maths.scm | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index bb2d7a3504..52ab4d66a0 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -7136,16 +7136,21 @@ set.") (lambda _ (invoke "make" "-C" "docs"))) (replace 'check - (lambda _ - (setenv "LD_LIBRARY_PATH" (string-append (getcwd) "/hypre/lib")) - (setenv "PATH" (string-append "." ":" (getenv "PATH"))) - (invoke "make" "check" "CHECKRUN=") - (for-each (lambda (filename) - (let ((size (stat:size (stat filename)))) - (when (positive? size) - (error (format #f "~a size ~d; error indication~%" - filename size))))) - (find-files "test" ".*\\.err$")))) + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "LD_LIBRARY_PATH" + (string-append (getcwd) "/hypre/lib")) + (setenv "PATH" + (string-append "." ":" + (getenv "PATH"))) + (invoke "make" "check" "CHECKRUN=") + (for-each (lambda (filename) + (let ((size (stat:size (stat filename)))) + (when (positive? size) + (error (format #f + "~a size ~d; error indication~%" + filename size))))) + (find-files "test" ".*\\.err$"))))) (add-after 'install 'install-docs (lambda* (#:key outputs #:allow-other-keys) ;; Custom install because docs/Makefile doesn't honor ${docdir}. From a42ce77f1bf2c7ef3810bfe4e60170cf8cbf9517 Mon Sep 17 00:00:00 2001 From: Giacomo Leidi Date: Sat, 9 Mar 2024 11:33:07 +0100 Subject: [PATCH 095/186] gnu: ssh-to-age: Update to 1.1.7. * gnu/packages/password-utils.scm (ssh-to-age): Update to 1.1.7. [synopsis]: Remove period at the end of the sentence. Change-Id: Ide1bab2490b52459c31191d578619f9ea1edcbaf Signed-off-by: Efraim Flashner --- gnu/packages/password-utils.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm index 13174656cb..fa079a9b09 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -425,7 +425,7 @@ applications, there is xclip integration." ) (define-public ssh-to-age (package (name "ssh-to-age") - (version "1.1.2") + (version "1.1.7") (source (origin (method git-fetch) @@ -434,7 +434,7 @@ applications, there is xclip integration." ) (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "09rhga9iqmyyq8pkprydy8y15qhzqvbpgzvs681rcyllf8szrj73")))) + (base32 "134gpbalyll238wvj9ci0rascgm4csayz863ci99cy5qq8266wrl")))) (build-system go-build-system) (arguments '(#:import-path "github.com/Mic92/ssh-to-age/cmd/ssh-to-age" @@ -443,7 +443,7 @@ applications, there is xclip integration." ) go-filippo-io-edwards25519 go-filippo-io-age)) (home-page "https://github.com/Mic92/ssh-to-age") - (synopsis "Convert SSH @code{ed25519} keys to @code{age} keys.") + (synopsis "Convert SSH @code{ed25519} keys to @code{age} keys") (description "This package provides a simple command-line tool to convert SSH @code{ed25519} keys to @code{age} keys.") (license license:expat))) From fc1762fe38b4e0bf63c9efe4bed1435f0ef522bd Mon Sep 17 00:00:00 2001 From: Zheng Junjie Date: Sat, 9 Mar 2024 16:21:07 +0800 Subject: [PATCH 096/186] gnu: ruby-x25519: Fix build on non x86_64. * gnu/packages/patches/ruby-x25519-automatic-fallback-non-x86_64.patch: New patch. * gnu/packages/ruby.scm (ruby-x25519)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Register it. Change-Id: If9c3b8dd8d818094f4cc5392bd5717f1430c369a Signed-off-by: Efraim Flashner --- gnu/local.mk | 1 + ...x25519-automatic-fallback-non-x86_64.patch | 45 +++++++++++++++++++ gnu/packages/ruby.scm | 7 ++- 3 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/ruby-x25519-automatic-fallback-non-x86_64.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1aa413ebbe..e8b0a0e7be 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1999,6 +1999,7 @@ dist_patch_DATA = \ %D%/packages/patches/ruby-latex-decode-fix-test.patch \ %D%/packages/patches/ruby-mustache-1.1.1-fix-race-condition-tests.patch \ %D%/packages/patches/ruby-nokogiri.patch \ + %D%/packages/patches/ruby-x25519-automatic-fallback-non-x86_64.patch \ %D%/packages/patches/rustc-1.54.0-src.patch \ %D%/packages/patches/rust-1.64-fix-riscv64-bootstrap.patch \ %D%/packages/patches/rust-1.70-fix-rustix-build.patch \ diff --git a/gnu/packages/patches/ruby-x25519-automatic-fallback-non-x86_64.patch b/gnu/packages/patches/ruby-x25519-automatic-fallback-non-x86_64.patch new file mode 100644 index 0000000000..cd501bb343 --- /dev/null +++ b/gnu/packages/patches/ruby-x25519-automatic-fallback-non-x86_64.patch @@ -0,0 +1,45 @@ +from https://patch-diff.githubusercontent.com/raw/RubyCrypto/x25519/pull/36.patch + +From 5886507e08488c0ed116b1979a073b78b9495683 Mon Sep 17 00:00:00 2001 +From: Eric Long +Date: Sat, 15 Apr 2023 02:58:26 +0800 +Subject: [PATCH] Add automatic fallback for non-x86_64 targets + +--- + Rakefile | 2 +- + ext/x25519_precomputed/extconf.rb | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Rakefile b/Rakefile +index 535697c..6e4f4d3 100644 +--- a/Rakefile ++++ b/Rakefile +@@ -7,7 +7,7 @@ CLEAN.include("**/*.o", "**/*.so", "**/*.bundle", "pkg", "tmp") + + require "rake/extensiontask" + %w[precomputed ref10].each do |provider| +- next if provider == "precomputed" && RUBY_PLATFORM =~ /arm64-darwin/ ++ next if provider == "precomputed" && RUBY_PLATFORM !~ /x86_64|x64/ + + Rake::ExtensionTask.new("x25519_#{provider}") do |ext| + ext.ext_dir = "ext/x25519_#{provider}" +diff --git a/ext/x25519_precomputed/extconf.rb b/ext/x25519_precomputed/extconf.rb +index 7f2ba4d..b049f98 100644 +--- a/ext/x25519_precomputed/extconf.rb ++++ b/ext/x25519_precomputed/extconf.rb +@@ -4,12 +4,12 @@ + + require "mkmf" + +-if RUBY_PLATFORM =~ /arm64-darwin|aarch64-linux/ +- File.write("Makefile", "install clean: ;") +-else ++if RUBY_PLATFORM =~ /x86_64|x64/ + $CFLAGS << " -Wall -O3 -pedantic -std=c99 -mbmi -mbmi2 -march=haswell" + + create_makefile "x25519_precomputed" ++else ++ File.write("Makefile", "install clean: ;") + end + + # rubocop:enable Style/GlobalVars diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index e6d51b94e2..9a28ecf9f5 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -34,7 +34,7 @@ ;;; Copyright © 2023 Yovan Naumovski ;;; Copyright © 2023 gemmaro ;;; Copyright © 2023 Janneke Nieuwenhuizen -;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023, 2024 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. @@ -3258,7 +3258,10 @@ error streams.") (file-name (git-file-name name version)) (sha256 (base32 - "1g0311ly32f6hfn4q5fvkbjbl2bhv1l9fx6s0kglxfsrwq51926y")))) + "1g0311ly32f6hfn4q5fvkbjbl2bhv1l9fx6s0kglxfsrwq51926y")) + (patches + (search-patches + "ruby-x25519-automatic-fallback-non-x86_64.patch")))) (build-system ruby-build-system) (arguments (list #:test-target "spec" From ff1251de0bc327ec478fc66a562430fbf35aef42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 12 Mar 2024 11:53:35 +0100 Subject: [PATCH 097/186] daemon: Address shortcoming in previous security fix for CVE-2024-27297. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a followup to 8f4ffb3fae133bb21d7991e97c2f19a7108b1143. Commit 8f4ffb3fae133bb21d7991e97c2f19a7108b1143 fell short in two ways: (1) it didn’t have any effet for fixed-output derivations performed in a chroot, which is the case for all of them except those using “builtin:download” and “builtin:git-download”, and (2) it did not preserve ownership when copying, leading to “suspicious ownership or permission […] rejecting this build output” errors. * nix/libstore/build.cc (DerivationGoal::buildDone): Account for ‘chrootRootDir’ when copying ‘drv.outputs’. * nix/libutil/util.cc (copyFileRecursively): Add ‘fchown’ and ‘fchownat’ calls to preserve file ownership; this is necessary for chrooted fixed-output derivation builds. * nix/libutil/util.hh: Update comment. Change-Id: Ib59f040e98fed59d1af81d724b874b592cbef156 --- nix/libstore/build.cc | 11 ++++++----- nix/libutil/util.cc | 4 ++++ nix/libutil/util.hh | 7 ++++--- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc index e2adee118b..d23c0944a4 100644 --- a/nix/libstore/build.cc +++ b/nix/libstore/build.cc @@ -1387,13 +1387,14 @@ void DerivationGoal::buildDone() make sure that there's no stale file descriptor pointing to it (CVE-2024-27297). */ foreach (DerivationOutputs::iterator, i, drv.outputs) { - if (pathExists(i->second.path)) { - Path pivot = i->second.path + ".tmp"; - copyFileRecursively(i->second.path, pivot, true); - int err = rename(pivot.c_str(), i->second.path.c_str()); + Path output = chrootRootDir + i->second.path; + if (pathExists(output)) { + Path pivot = output + ".tmp"; + copyFileRecursively(output, pivot, true); + int err = rename(pivot.c_str(), output.c_str()); if (err != 0) throw SysError(format("renaming `%1%' to `%2%'") - % pivot % i->second.path); + % pivot % output); } } } diff --git a/nix/libutil/util.cc b/nix/libutil/util.cc index 493f06f357..578d657293 100644 --- a/nix/libutil/util.cc +++ b/nix/libutil/util.cc @@ -422,6 +422,7 @@ static void copyFileRecursively(int sourceroot, const Path &source, if (destinationFd == -1) throw SysError(format("opening `%1%'") % source); copyFile(sourceFd, destinationFd); + fchown(destinationFd, st.st_uid, st.st_gid); } else if (S_ISLNK(st.st_mode)) { char target[st.st_size + 1]; ssize_t result = readlinkat(sourceroot, source.c_str(), target, st.st_size); @@ -430,6 +431,8 @@ static void copyFileRecursively(int sourceroot, const Path &source, int err = symlinkat(target, destinationroot, destination.c_str()); if (err != 0) throw SysError(format("creating symlink `%1%'") % destination); + fchownat(destinationroot, destination.c_str(), + st.st_uid, st.st_gid, AT_SYMLINK_NOFOLLOW); } else if (S_ISDIR(st.st_mode)) { int err = mkdirat(destinationroot, destination.c_str(), 0755); if (err != 0) @@ -455,6 +458,7 @@ static void copyFileRecursively(int sourceroot, const Path &source, for (auto & i : readDirectory(sourceFd)) copyFileRecursively((int)sourceFd, i.name, (int)destinationFd, i.name, deleteSource); + fchown(destinationFd, st.st_uid, st.st_gid); } else throw Error(format("refusing to copy irregular file `%1%'") % source); if (deleteSource) diff --git a/nix/libutil/util.hh b/nix/libutil/util.hh index 058f5f8446..377aac0684 100644 --- a/nix/libutil/util.hh +++ b/nix/libutil/util.hh @@ -102,9 +102,10 @@ void deletePath(const Path & path); void deletePath(const Path & path, unsigned long long & bytesFreed, size_t linkThreshold = 1); -/* Copy SOURCE to DESTINATION, recursively. Throw if SOURCE contains a file - that is not a regular file, symlink, or directory. When DELETESOURCE is - true, delete source files once they have been copied. */ +/* Copy SOURCE to DESTINATION, recursively, preserving ownership. Throw if + SOURCE contains a file that is not a regular file, symlink, or directory. + When DELETESOURCE is true, delete source files once they have been + copied. */ void copyFileRecursively(const Path &source, const Path &destination, bool deleteSource = false); From 4c94b9e983bc51d9504655f1e7727c4f6d14b6b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 12 Mar 2024 14:24:18 +0100 Subject: [PATCH 098/186] news: Update commit for fixed-output derivation vulnerability. * etc/news.scm: Update. Change-Id: Ia34408882f8928a0fd05acc12d4edc66b3dcb3b7 --- etc/news.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/news.scm b/etc/news.scm index d288b6efe1..ab7fa4c0d5 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -28,7 +28,7 @@ (channel-news (version 0) - (entry (commit "8f4ffb3fae133bb21d7991e97c2f19a7108b1143") + (entry (commit "ff1251de0bc327ec478fc66a562430fbf35aef42") (title (en "Daemon vulnerability allowing store corruption has been fixed") (de "Schwachstelle im Daemon behoben, durch die der Store verfälscht werden konnte") From 30a8de0bcdadfb55cbcaa34760527c1b767808c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 12 Mar 2024 14:27:01 +0100 Subject: [PATCH 099/186] gnu: guix: Update to 4c94b9e. * gnu/packages/package-management.scm (guix): Update to 4c94b9e. Change-Id: I73678ae87acbc2ef0185daf844486f7394a46fd7 --- gnu/packages/package-management.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 19e5969ddf..0b4d5ac3ea 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -176,8 +176,8 @@ ;; Note: the 'update-guix-package.scm' script expects this definition to ;; start precisely like this. (let ((version "1.4.0") - (commit "8f4ffb3fae133bb21d7991e97c2f19a7108b1143") - (revision 17)) + (commit "4c94b9e983bc51d9504655f1e7727c4f6d14b6b7") + (revision 18)) (package (name "guix") @@ -193,7 +193,7 @@ (commit commit))) (sha256 (base32 - "1s4rfhida9gm454yj61vxs35a71i281cz0zyyq1l6fxc6ic775dd")) + "19lqlfafs5mrnciw4jz4iccx5zzhj4pyb20bz6cdqcqbf9nmkfp1")) (file-name (string-append "guix-" version "-checkout")))) (build-system gnu-build-system) (arguments From d7e092719a4e0e168df56c03076a87c0e32692e5 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 12 Mar 2024 14:37:03 +0200 Subject: [PATCH 100/186] gnu: ruby-stackprof: Skip test known to fail. * gnu/packages/ruby.scm (ruby-stackprof)[arguments]: Skip another test which is known to fail. Change-Id: Ie261864cc19eba881377b88c07b6402c60a22423 --- gnu/packages/ruby.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 9a28ecf9f5..1020412847 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2015, 2016, 2017 Ben Woodcroft ;;; Copyright © 2017 Nikita ;;; Copyright © 2017, 2019-2022 Marius Bakke -;;; Copyright © 2017-2023 Efraim Flashner +;;; Copyright © 2017-2024 Efraim Flashner ;;; Copyright © 2017, 2018, 2020, 2021 Tobias Geerinckx-Rice ;;; Copyright © 2017 Clément Lassieur ;;; Copyright © 2017, 2018, 2019 Christopher Baines @@ -9875,7 +9875,10 @@ navigation capabilities to @code{pry}, using @code{byebug}.") (("def test_(cputime)" _ name) (string-append "def skip_" name)) ;; This test often fails - (("def test_gc") "def skip_test_gc")))) + (("def test_gc") "def skip_test_gc") + ;; This test is known to fail on 32-bit systems. + ;; /gnu/store/w8y8wm82by1cnp33n5vy976wbrns9jys-stackprof-0.2.26.gem + (("def test_raw") "def skip_test_raw")))) (add-before 'check 'build-tests (lambda _ (invoke "rake" "compile"))) From 447e9c96259e8fa15a828de9b2dd3400e2ffafe6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 12 Mar 2024 14:37:33 +0200 Subject: [PATCH 101/186] gnu: ruby-stackprof: Update to 0.2.26. * gnu/packages/ruby.scm (ruby-stackprof): Update to 0.2.26. Change-Id: I6f15da677e630708c702eb00e83c960de8e3d639 --- gnu/packages/ruby.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 1020412847..5fd89712e0 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -9849,13 +9849,13 @@ navigation capabilities to @code{pry}, using @code{byebug}.") (define-public ruby-stackprof (package (name "ruby-stackprof") - (version "0.2.25") + (version "0.2.26") (source (origin (method url-fetch) (uri (rubygems-uri "stackprof" version)) (sha256 - (base32 "0bhdgfb0pmw9mav1kw9fn0ka012sa0i3h5ppvqssw5xq48nhxnr8")))) + (base32 "1gdqqwnampxmc54nf6zfy9apkmkpdavzipvfssmjlhnrrjy8qh7f")))) (build-system ruby-build-system) (arguments (list From a2bf7bda4cade6e6b035ab7ad06acdfbf377c7a2 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 9 Mar 2024 20:36:20 -0500 Subject: [PATCH 102/186] gnu: libextractor: Update to 1.13. * gnu/packages/gnunet.scm (libextractor): Update to 1.13. [inputs]: Remove ffmpeg-4, no longer supported. Replace gtk+ with gdk-pixbuf. [argumens]: Reinstate parallel tests. Remove fix-exiv2-tests phase. Change-Id: Ic299c31a2d40512116c9876e0fbb4f9ded0ccc3b --- gnu/packages/gnunet.scm | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index fd101a8acf..a28419213b 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -84,14 +84,14 @@ (define-public libextractor (package (name "libextractor") - (version "1.11") + (version "1.13") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/libextractor/libextractor-" version ".tar.gz")) (sha256 (base32 - "13xxv11mif3m0mpk7i43mljhhaqrj52kznm1qi3qb8s6hymk7xhn")))) + "0mgprmwdhdwq9xhfxfhcncd304425nvcc4zi8ci5f0nja4n333xv")))) (build-system gnu-build-system) ;; WARNING: Checks require /dev/shm to be in the build chroot, especially ;; not to be a symbolic link to /run/shm. @@ -104,13 +104,12 @@ `(("exiv2" ,exiv2) ("bzip2" ,bzip2) ("flac" ,flac) - ("ffmpeg" ,ffmpeg-4) ("file" ,file) ;libmagic, for the MIME plug-in ("glib" ,glib) ("giflib" ,giflib) ("gstreamer" ,gstreamer) ("gst-plugins-base" ,gst-plugins-base) - ("gtk+" ,gtk+) + ("gdk-pixbuf" ,gdk-pixbuf) ("libarchive" ,libarchive) ("libgsf" ,libgsf) ("libjpeg" ,libjpeg-turbo) @@ -130,17 +129,8 @@ `(#:configure-flags (list (string-append "--with-ltdl=" (assoc-ref %build-inputs "libltdl"))) - #:parallel-tests? #f #:phases (modify-phases %standard-phases - (add-after 'configure 'fix-exiv2-tests - ;; exiv2>=0.27.3 rounds geolocation - ;; https://github.com/Exiv2/exiv2/pull/1107/commits/db1be4ae8e1077949fcb6a960e93069d6a41b395#diff-f3f55183ccbe956c720c86e61f708d9f - (lambda _ - (substitute* "src/plugins/test_exiv2.c" - (("17.585\\\\\" ") "18\\\"") - (("21.713\\\\\" ") "22\\\"")) - #t)) (add-after 'install 'move-static-libraries (lambda* (#:key outputs #:allow-other-keys) ;; Move static libraries to the "static" output. From dc24ee62eec9406e32e5c2fa88b9a5762ae096fc Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 9 Mar 2024 21:01:20 -0500 Subject: [PATCH 103/186] gnu: libextractor: Modernize. * gnu/packages/gnunet.scm (libextractor): Move inputs, native-inputs after arguments. [arguments]: Use gexps. Remove trailing #t. [inputs]: Remove labels and sort. Change-Id: Ia3950630bd0985e106fb92cce3f92732e93970df --- gnu/packages/gnunet.scm | 132 ++++++++++++++++++++-------------------- 1 file changed, 65 insertions(+), 67 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index a28419213b..59b41edf6f 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2022 Maxime Devos ;;; Copyright © 2023 Adam Faiz -;;; Copyright © 2023 Maxim Cournoyer +;;; Copyright © 2023, 2024 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -83,76 +83,74 @@ (define-public libextractor (package - (name "libextractor") - (version "1.13") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnu/libextractor/libextractor-" - version ".tar.gz")) - (sha256 - (base32 - "0mgprmwdhdwq9xhfxfhcncd304425nvcc4zi8ci5f0nja4n333xv")))) - (build-system gnu-build-system) - ;; WARNING: Checks require /dev/shm to be in the build chroot, especially - ;; not to be a symbolic link to /run/shm. - ;; FIXME: - ;; The following dependencies are all optional, but should be - ;; available for maximum coverage: - ;; * librpm (rpm) ; investigate failure - ;; * libtidy-html (tidy-html) ; investigate failure - (inputs - `(("exiv2" ,exiv2) - ("bzip2" ,bzip2) - ("flac" ,flac) - ("file" ,file) ;libmagic, for the MIME plug-in - ("glib" ,glib) - ("giflib" ,giflib) - ("gstreamer" ,gstreamer) - ("gst-plugins-base" ,gst-plugins-base) - ("gdk-pixbuf" ,gdk-pixbuf) - ("libarchive" ,libarchive) - ("libgsf" ,libgsf) - ("libjpeg" ,libjpeg-turbo) - ("libltdl" ,libltdl) - ("libmpeg2" ,libmpeg2) - ("libmp4v2" ,libmp4v2) - ("libsmf" ,libsmf) - ("libogg" ,libogg) - ("libtiff" ,libtiff) - ("libvorbis" ,libvorbis) - ("zlib" ,zlib))) - (native-inputs - (list pkg-config)) - (outputs '("out" - "static")) ; 420 KiB .a files - (arguments - `(#:configure-flags - (list (string-append "--with-ltdl=" - (assoc-ref %build-inputs "libltdl"))) - #:phases - (modify-phases %standard-phases - (add-after 'install 'move-static-libraries - (lambda* (#:key outputs #:allow-other-keys) - ;; Move static libraries to the "static" output. - (let* ((out (assoc-ref outputs "out")) - (lib (string-append out "/lib")) - (static (assoc-ref outputs "static")) - (slib (string-append static "/lib"))) - (mkdir-p slib) - (for-each (lambda (file) - (install-file file slib) - (delete-file file)) - (find-files lib "\\.a$")) - #t)))))) - (synopsis "Library to extract meta-data from media files") - (description - "GNU libextractor is a library for extracting metadata from files. It + (name "libextractor") + (version "1.13") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnu/libextractor/libextractor-" + version ".tar.gz")) + (sha256 + (base32 + "0mgprmwdhdwq9xhfxfhcncd304425nvcc4zi8ci5f0nja4n333xv")))) + (build-system gnu-build-system) + (outputs '("out" + "static")) ; 420 KiB .a files + (arguments + (list #:configure-flags + #~(list (string-append "--with-ltdl=" + #$(this-package-input "libltdl"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'move-static-libraries + (lambda* (#:key outputs #:allow-other-keys) + ;; Move static libraries to the "static" output. + (let* ((out #$output) + (lib (string-append out "/lib")) + (slib (string-append #$output:static "/lib"))) + (mkdir-p slib) + (for-each (lambda (file) + (install-file file slib) + (delete-file file)) + (find-files lib "\\.a$")))))))) + ;; WARNING: Checks require /dev/shm to be in the build chroot, especially + ;; not to be a symbolic link to /run/shm. + ;; FIXME: + ;; The following dependencies are all optional, but should be + ;; available for maximum coverage: + ;; * librpm (rpm) ; investigate failure + ;; * libtidy-html (tidy-html) ; investigate failure + (native-inputs + (list pkg-config)) + (inputs + (list bzip2 + exiv2 + file ;libmagic, for the MIME plug-in + flac + gdk-pixbuf + giflib + glib + gst-plugins-base + gstreamer + libarchive + libgsf + libjpeg-turbo + libltdl + libmp4v2 + libmpeg2 + libogg + libsmf + libtiff + libvorbis + zlib)) + (synopsis "Library to extract meta-data from media files") + (description + "GNU libextractor is a library for extracting metadata from files. It supports a very large number of file formats, including audio files, document files, and archive files. Each file format is implemented as a plugin, so new formats can be added easily. The package also contains a command-line tool to extract metadata from a file and print the results.") - (license license:gpl3+) - (home-page "https://www.gnu.org/software/libextractor/"))) + (license license:gpl3+) + (home-page "https://www.gnu.org/software/libextractor/"))) (define-public libmicrohttpd (package From 0d44ac48bbb3b5391a27b9cea1881bdb487dc3b4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 11 Mar 2024 11:32:03 -0400 Subject: [PATCH 104/186] gnu: libextractor: Add autotools inputs. These are needed when building from git. * gnu/packages/gnunet.scm (libextractor) [native-inputs]: Add autoconf-2.71, automake, gettext-minimal, libtool and texinfo. Change-Id: Ia35932b56c74354fc7cffc104e4ae5efa9ad8c85 --- gnu/packages/gnunet.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 59b41edf6f..cdd09f5de9 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -65,6 +65,7 @@ #:use-module (gnu packages python) #:use-module (gnu packages sphinx) #:use-module (gnu packages sqlite) + #:use-module (gnu packages texinfo) #:use-module (gnu packages text-editors) #:use-module (gnu packages tls) #:use-module (gnu packages upnp) @@ -120,7 +121,12 @@ ;; * librpm (rpm) ; investigate failure ;; * libtidy-html (tidy-html) ; investigate failure (native-inputs - (list pkg-config)) + (list autoconf-2.71 + automake + gettext-minimal + libtool + pkg-config + texinfo)) (inputs (list bzip2 exiv2 From 28012e9fe1bbe4c4a29c1842ba2a5d309f802fe9 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 11 Mar 2024 14:25:11 -0400 Subject: [PATCH 105/186] gnu: libextractor: Enable apparmor support. * gnu/packages/gnunet.scm (libextractor) [inputs]: Add libapparmor. Change-Id: I6ec8b7fce5db0179f2b65d9a4509ab9bcecb12ef --- gnu/packages/gnunet.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index cdd09f5de9..5db5907d65 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -32,6 +32,7 @@ (define-module (gnu packages gnunet) #:use-module (gnu packages) + #:use-module (gnu packages apparmor) #:use-module (gnu packages base) #:use-module (gnu packages file) #:use-module (gnu packages aidc) @@ -137,6 +138,7 @@ glib gst-plugins-base gstreamer + libapparmor libarchive libgsf libjpeg-turbo From e1e3536ecea9cba7d4be109af438a45caf8d5eae Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 12 Mar 2024 21:49:51 -0400 Subject: [PATCH 106/186] gnu: libextractor: Enable RPM support. * gnu/packages/gnunet.scm (libextractor) [inputs]: Add rpm. Change-Id: I618330e038d4793bc61cf62320dc33fa16ab9c7f --- gnu/packages/gnunet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 5db5907d65..828ddb99af 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -117,9 +117,8 @@ ;; WARNING: Checks require /dev/shm to be in the build chroot, especially ;; not to be a symbolic link to /run/shm. ;; FIXME: - ;; The following dependencies are all optional, but should be + ;; The following dependency is optional, but should be ;; available for maximum coverage: - ;; * librpm (rpm) ; investigate failure ;; * libtidy-html (tidy-html) ; investigate failure (native-inputs (list autoconf-2.71 @@ -149,6 +148,7 @@ libsmf libtiff libvorbis + rpm zlib)) (synopsis "Library to extract meta-data from media files") (description From 43d6d5e6461d930dda4846279b3d56c97467bc06 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 12 Mar 2024 21:56:17 -0400 Subject: [PATCH 107/186] gnu: libextractor: Enable tidy-html support. * gnu/packages/gnunet.scm (libextractor) [source]: Apply patch. [phases] : New phase. [inputs]: Add tidy-html. Remove associated comment. * gnu/packages/patches/libextractor-tidy-support.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Change-Id: Ic812e09504d522ec87410bbbb03ccd3d6e48dd71 --- gnu/local.mk | 1 + gnu/packages/gnunet.scm | 14 ++-- .../patches/libextractor-tidy-support.patch | 81 +++++++++++++++++++ 3 files changed, 89 insertions(+), 7 deletions(-) create mode 100644 gnu/packages/patches/libextractor-tidy-support.patch diff --git a/gnu/local.mk b/gnu/local.mk index e8b0a0e7be..574a67b49c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1514,6 +1514,7 @@ dist_patch_DATA = \ %D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \ %D%/packages/patches/julia-Use-MPFR-4.2.patch \ %D%/packages/patches/libcss-check-format.patch \ + %D%/packages/patches/libextractor-tidy-support.patch \ %D%/packages/patches/libftdi-fix-paths-when-FTDIPP-set.patch \ %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.1.1.patch \ %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.3.0.patch \ diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 828ddb99af..e23755302d 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -93,7 +93,9 @@ version ".tar.gz")) (sha256 (base32 - "0mgprmwdhdwq9xhfxfhcncd304425nvcc4zi8ci5f0nja4n333xv")))) + "0mgprmwdhdwq9xhfxfhcncd304425nvcc4zi8ci5f0nja4n333xv")) + (patches + (search-patches "libextractor-tidy-support.patch")))) (build-system gnu-build-system) (outputs '("out" "static")) ; 420 KiB .a files @@ -103,6 +105,9 @@ #$(this-package-input "libltdl"))) #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'force-reconfigure + (lambda _ + (delete-file "configure"))) (add-after 'install 'move-static-libraries (lambda* (#:key outputs #:allow-other-keys) ;; Move static libraries to the "static" output. @@ -114,12 +119,6 @@ (install-file file slib) (delete-file file)) (find-files lib "\\.a$")))))))) - ;; WARNING: Checks require /dev/shm to be in the build chroot, especially - ;; not to be a symbolic link to /run/shm. - ;; FIXME: - ;; The following dependency is optional, but should be - ;; available for maximum coverage: - ;; * libtidy-html (tidy-html) ; investigate failure (native-inputs (list autoconf-2.71 automake @@ -149,6 +148,7 @@ libtiff libvorbis rpm + tidy-html zlib)) (synopsis "Library to extract meta-data from media files") (description diff --git a/gnu/packages/patches/libextractor-tidy-support.patch b/gnu/packages/patches/libextractor-tidy-support.patch new file mode 100644 index 0000000000..8fe2f21b2b --- /dev/null +++ b/gnu/packages/patches/libextractor-tidy-support.patch @@ -0,0 +1,81 @@ +Upstream status: submitted to bug-libextractor@gnu.org. + +From 1fc6daaeaf829fb941a176831c011888a73c43b9 Mon Sep 17 00:00:00 2001 +From: Maxim Cournoyer +Date: Mon, 11 Mar 2024 09:36:26 -0400 +Subject: [PATCH] html_extractor: Add support for modern tidy-html. + +* configure.ac: Use PKG_PROG_PKG_CONFIG to initialize pkg-config detection. +: Check for library via pkg-config. +* src/plugins/html_extractor.c: Standardize tidy include file names. +--- + configure.ac | 28 +++++++++------------------- + src/plugins/html_extractor.c | 4 ++-- + 2 files changed, 11 insertions(+), 21 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d17ff39..e89d70c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -176,6 +176,8 @@ AS_CASE(["$target_os"], + + AM_ICONV + ++PKG_PROG_PKG_CONFIG() ++ + # We define the paths here, because MinGW/GCC expands paths + # passed through the command line ("-DLOCALEDIR=..."). This would + # lead to hard-coded paths ("C:\mingw\mingw\bin...") that do +@@ -424,25 +426,13 @@ AC_CHECK_LIB(magic, magic_open, + AM_CONDITIONAL(HAVE_MAGIC, false))], + AM_CONDITIONAL(HAVE_MAGIC, false)) + +-AC_MSG_CHECKING(for tidyNodeGetValue -ltidy) +-AC_LANG_PUSH(C++) +-SAVED_LIBS=$LIBS +-LIBS="$LIBS -ltidy" +-AC_LINK_IFELSE( +- [AC_LANG_PROGRAM([[#include ]], +- [[ Bool b = tidyNodeGetValue (NULL, NULL, NULL); ]])], +- [AC_MSG_RESULT(yes) +- AM_CONDITIONAL(HAVE_TIDY, true) +- AC_DEFINE(HAVE_TIDY,1,[Have tidyNodeGetValue in libtidy])], +- [AC_MSG_RESULT(no) +- AM_CONDITIONAL(HAVE_TIDY, false)]) +-LIBS=$SAVED_LIBS +-AC_LANG_POP(C++) +- +-# restore LIBS +-LIBS=$LIBSOLD +- +- ++dnl tidyNodeGetValue was already available in 5.0.0, released in 2015. ++PKG_CHECK_MODULES([TIDY], [tidy >= 5.0.0], ++ [AC_DEFINE(HAVE_TIDY, 1, [Have tidy]) ++ AM_CONDITIONAL(HAVE_TIDY, true)], ++ [AM_CONDITIONAL(HAVE_TIDY, false)]) ++CFLAGS="$CFLAGS $TIDY_CFLAGS" ++LIBS="$LIBS $TIDY_LIBS" + + # should 'make check' run tests? + AC_MSG_CHECKING(whether to run tests) +diff --git a/src/plugins/html_extractor.c b/src/plugins/html_extractor.c +index 5ebf97b..88100d3 100644 +--- a/src/plugins/html_extractor.c ++++ b/src/plugins/html_extractor.c +@@ -26,8 +26,8 @@ + #include "platform.h" + #include "extractor.h" + #include +-#include +-#include ++#include ++#include + + /** + * Mapping of HTML META names to LE types. + +base-commit: a75f40b64b5868967c95ea214e8eaac4f7088b23 +-- +2.41.0 + From dfe177bd4336cedfa1eae8cc38be86a5afe69ebd Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 4 Mar 2024 16:02:43 +0100 Subject: [PATCH 108/186] gnu: xournalpp: Update to 1.2.3. * gnu/packages/pdf.scm (xournalpp): Update to 1.2.3. Change-Id: If7ec00c3bcdb208132d595c152c3099258f738f4 --- gnu/packages/pdf.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 0a87346d8d..22f6c8651f 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2019 Alex Griffin ;;; Copyright © 2019 Ben Sturmfels ;;; Copyright © 2019,2020 Hartmut Goebel -;;; Copyright © 2020-2023 Nicolas Goaziou +;;; Copyright © 2020-2024 Nicolas Goaziou ;;; Copyright © 2020, 2022 Michael Rohleder ;;; Copyright © 2020, 2024 Timotej Lazar ;;; Copyright © 2020, 2022, 2023 Maxim Cournoyer @@ -1052,7 +1052,7 @@ using a stylus.") (define-public xournalpp (package (name "xournalpp") - (version "1.2.2") + (version "1.2.3") (source (origin (method git-fetch) @@ -1061,7 +1061,7 @@ using a stylus.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1svmdj43z1shm3wnkrdrq1h6rba843mp4x4d8jmxsx7kwiiz9l78")))) + (base32 "1rj9kz21r59cswfpczp5dcmvchbbmybv661iyycaiii2z5gh0h7i")))) (build-system cmake-build-system) (arguments (list From 8529e7358a3c318311037bf77c7e21e95cf65c2a Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Mon, 4 Mar 2024 15:49:37 +0100 Subject: [PATCH 109/186] gnu: asymptote: Update to 2.87. * gnu/packages/plotutils.scm (asymptote): Update to 2.87. Change-Id: I25d91094e56b9e6b9d1a7313d6697f82ab1c2785 --- gnu/packages/plotutils.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm index 114cde6f1f..0d7e894d60 100644 --- a/gnu/packages/plotutils.scm +++ b/gnu/packages/plotutils.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2015 Eric Bavier -;;; Copyright © 2016-2023 Nicolas Goaziou +;;; Copyright © 2016-2024 Nicolas Goaziou ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2020 Maxim Cournoyer ;;; Copyright © 2023 gemmaro @@ -276,14 +276,14 @@ colors, styles, options and details.") (define-public asymptote (package (name "asymptote") - (version "2.86") + (version "2.87") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/asymptote/" version "/asymptote-" version ".src.tgz")) (sha256 - (base32 "07y9yg7kdkgmz024qzny8xhjw3c367kxfpwzv19cxcy7qcgsvsy4")) + (base32 "06sr0fpc3zci7ncj9gwp3h8zhbvxs37rwwzqirnxa86zyfar4shf")) (modules '((guix build utils))) (snippet ;; Remove bundled RapidJSON. From f0d5d50c2c6f16b98c4f1acce1ff71f142d595ee Mon Sep 17 00:00:00 2001 From: Cayetano Santos Date: Mon, 4 Mar 2024 20:47:55 +0100 Subject: [PATCH 110/186] gnu: emacs-crux: Update to 0.5.0. * gnu/packages/emacs-xyz.scm (emacs-crux): Update to 0.5.0. Signed-off-by: Nicolas Goaziou Change-Id: I539c77ff756b692f9f0b0b4c62f18db373a05f16 --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7fa5df9202..5810455d0b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -24405,7 +24405,7 @@ mode.") (define-public emacs-crux (package (name "emacs-crux") - (version "0.4.0") + (version "0.5.0") (source (origin (method git-fetch) @@ -24415,7 +24415,7 @@ mode.") (file-name (git-file-name name version)) (sha256 (base32 - "1h28chpyq61k72qh749r5kqq1y70wx3xw9c3zyfzmy750wlw6nyj")))) + "00n4k09x3slchs81xw1q0rcb78ncb5k2lvsigb9j7s3kxbj6bvvy")))) (build-system emacs-build-system) (home-page "https://github.com/bbatsov/crux") (synopsis "Collection of useful functions for Emacs") From 8bd8484e6da4f3665432615b09eef5459d381ed9 Mon Sep 17 00:00:00 2001 From: Cayetano Santos Date: Sat, 9 Mar 2024 12:02:58 +0100 Subject: [PATCH 111/186] gnu: emacs-org-pandoc-import: Update to 1.0-0.db308f1. * gnu/packages/emacs-xyz.scm (emacs-org-pandoc-import): Update to 1.0-0.db308f1. Last stable 1.0 version dates back from 3 years ago. Signed-off-by: Nicolas Goaziou Change-Id: Ic0da2b7956695f75274aab14a13dbfca919a4999 --- gnu/packages/emacs-xyz.scm | 63 ++++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 5810455d0b..eb3e21968c 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11287,41 +11287,44 @@ Features degrade gracefully when viewed from terminal.") (license license:gpl3+))) (define-public emacs-org-pandoc-import - (package - (name "emacs-org-pandoc-import") - (version "1.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/tecosaur/org-pandoc-import/") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "00z9bpm975mlyqlxbyib3j547br6kvcam04b70qkmq22vh8yf341")))) - (build-system emacs-build-system) - (arguments - `(#:include - (cons* "^filters\\/" "^preprocessors" %default-include) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-exec-paths - (lambda* (#:key inputs #:allow-other-keys) - (let ((pandoc (assoc-ref inputs "pandoc"))) - (substitute* "org-pandoc-import.el" - (("\"pandoc\"") (string-append "\"" pandoc "/bin/pandoc\""))))))))) - (inputs - (list pandoc)) - (home-page "https://github.com/tecosaur/org-pandoc-import/") - (synopsis "Read and edit non-Org file types in Org") - (description - "This package uses Pandoc to convert selected file types to Org. It can + (let ((commit "db308f1a05be26ce5b287633637ce554599b1377") + (revision "0")) + (package + (name "emacs-org-pandoc-import") + (version (git-version "1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tecosaur/org-pandoc-import/") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "19z1qaairhpj8kyyqwx8yf53j3f03a9a1z1jfa348qmncnra5jmh")))) + (build-system emacs-build-system) + (arguments + `(#:include + (cons* "^filters\\/" "^preprocessors" %default-include) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-exec-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((pandoc (assoc-ref inputs "pandoc"))) + (substitute* "org-pandoc-import.el" + (("\"pandoc\"") + (string-append "\"" pandoc "/bin/pandoc\""))))))))) + (inputs + (list pandoc)) + (home-page "https://github.com/tecosaur/org-pandoc-import/") + (synopsis "Read and edit non-Org file types in Org") + (description + "This package uses Pandoc to convert selected file types to Org. It can convert supported non-Org files to an Org file with Pandoc. It can also intercept requests for non-Org files it knows it can convert, convert the file to a temporary Org file, and open this file instead. On save, it exports back to the original non-Org file.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-org-pomodoro ;; Last release version was from 2016. From 35e4561843df3edad2f85100456276f662a60394 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Tue, 20 Feb 2024 00:32:32 +0100 Subject: [PATCH 112/186] gnu: emacs-sway: Update to 0.7-0.84eae5e. * gnu/packages/emacs-xyz.scm (emacs-sway): Update to 0.7-0.84eae5e. Change-Id: I37549f7e66d9fa1df455af3bc972e49cb79d50ef Signed-off-by: Nicolas Goaziou --- gnu/packages/emacs-xyz.scm | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index eb3e21968c..164ab4e716 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13091,27 +13091,29 @@ The following completions are currently available: (license license:gpl3+))) (define-public emacs-sway - (package - (name "emacs-sway") - (version "0.7") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/thblt/sway.el") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1w29dkl7s835zgwnc4jx1cp84s6mmwbvlil8z2c31psy0rlajc6i")))) - (build-system emacs-build-system) - (home-page "https://github.com/thblt/sway.el") - (synopsis "Communication with the Sway window manager") - (description - "This is a basic library to control the Sway window manager from Emacs. + (let ((commit "84eae5e16a643eb00b0a422ded751cceb17cc8f0") + (revision "0")) + (package + (name "emacs-sway") + (version (git-version "0.7" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/thblt/sway.el") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "194plzc6rg7a5j3f68say0znix34yp8421cdlkwnw345czh52mjn")))) + (build-system emacs-build-system) + (home-page "https://github.com/thblt/sway.el") + (synopsis "Communication with the Sway window manager") + (description + "This is a basic library to control the Sway window manager from Emacs. Its main use case is in combination with popup managers like Shackle, to use frames instead of windows while still giving focus to existing frames instead of duplicating them.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-sweet-theme (let ((commit "78f741806ecebe01224bf54d09ad80e306652508") From bcc5ba635813ca1a580fa550dc208beed13969d8 Mon Sep 17 00:00:00 2001 From: Adriel Dumas--Jondeau Date: Wed, 13 Mar 2024 09:53:52 +0100 Subject: [PATCH 113/186] gnu: Add kalamine. * gnu/packages/python-xyz.scm (kalamine): New variable. Change-Id: If13f258440bb35973b3d79a87fea68e4708845bf Reviewed-by: Sharlatan Hellseher Signed-off-by: Nicolas Goaziou --- gnu/packages/python-xyz.scm | 41 +++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 0c72caeca0..232b5d6999 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -148,6 +148,7 @@ ;;; Copyright © 2023, 2024 Troy Figiel ;;; Copyright © 2024 Timothee Mathieu ;;; Copyright © 2024 Ian Eure +;;; Copyright © 2024 Adriel Dumas--Jondeau ;;; ;;; This file is part of GNU Guix. ;;; @@ -6376,6 +6377,46 @@ accessible for novices, as well as a scripting interface offering the full flexibility and power of the Python language.") (license license:gpl3+))) +(define-public kalamine + (package + (name "kalamine") + (version "0.36") + (source + (origin + (method url-fetch) + (uri (pypi-uri "kalamine" version)) + (sha256 + (base32 "1xxncavq5a0dydhzpfjdxmqsddl77275d9k9giw1032bdyb9d5is")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'make-test-layouts + (lambda _ + (apply invoke + (cons* "python" "-m" "kalamine.cli" "build" + (find-files "layouts" "\\.toml"))) + (invoke "python" "-m" "kalamine.cli" "new" "test.toml")))))) + (propagated-inputs + (list python-click + python-livereload + python-lxml + python-progress + python-pyyaml + python-tomli)) + ;; TODO: Add python-pytest-ruff to native-inputs once it has been + ;; packaged. + (native-inputs + (list python-hatchling python-mypy python-pytest)) + (home-page "https://github.com/OneDeadKey/kalamine") + (synopsis "Keyboard layout maker") + (description + "Kalamine provides a CLI to create advanced keyboard layout from a +textual portable description. It also supports layout emulation via web +browser.") + (license license:expat))) + (define-public python-dm-tree (package (name "python-dm-tree") From b6dd1271044d1830b4f8ff605c1011ef44f58cd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Tue, 12 Mar 2024 13:48:28 +0000 Subject: [PATCH 114/186] gnu: fcgiwrap: Update to 1.1.0-1.2870d27, change source. * gnu/packages/web.scm (fcgiwrap): Update to 1.1.0-1.2870d27. [source]: Switch to https://github.com/flu0r1ne/fcgiwrap. Reviewed-by: Dale Mellor Signed-off-by: Christopher Baines Change-Id: Ia9e7b911a0c8bde50924e3398f915f945cf955a6 --- gnu/packages/web.scm | 68 +++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 32 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index ddc673896b..f163802a60 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1109,40 +1109,44 @@ APIs.") (license (license:non-copyleft "file://LICENSE.TERMS")))) (define-public fcgiwrap - (package - (name "fcgiwrap") - (version "1.1.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/gnosek/fcgiwrap") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1ryw66h9aazi83amk8l7ha8k5g0c7qvk5g6jv376a1ws9xk2qw6f")))) - (build-system gnu-build-system) - (arguments - `(#:tests? #f ; no tests included - #:make-flags (list "CC=gcc") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-CFLAGS - ;; Remove broken options unconditionally added to CFLAGS. - (lambda _ - (substitute* "configure.ac" - ((" -Werror") "")) - #t))))) - (native-inputs - (list autoconf automake pkg-config)) - (inputs - (list fcgi)) - (home-page "https://nginx.localdomain.pl/wiki/FcgiWrap") - (synopsis "Simple server for running CGI applications over FastCGI") - (description "Fcgiwrap is a simple server for running CGI applications + (let ((commit "2870d2729a3930988f0041e2d78fec672e69afac") + (revision "1")) + (package + (name "fcgiwrap") + (version (git-version "1.1.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + ;; Upstream last updated in 2015, this forked version has better + ;; socket cleanup. + (url "https://github.com/flu0r1ne/fcgiwrap") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0rkpp4apfhdcrmym3pcpqlncd0r4fyr3pa45i8g6x4p38b4azmmm")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no tests included + #:make-flags (list "CC=gcc") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-CFLAGS + ;; Remove broken options unconditionally added to CFLAGS. + (lambda _ + (substitute* "configure.ac" + ((" -Werror") "")) + #t))))) + (native-inputs + (list autoconf automake pkg-config)) + (inputs + (list fcgi)) + (home-page "https://nginx.localdomain.pl/wiki/FcgiWrap") + (synopsis "Simple server for running CGI applications over FastCGI") + (description "Fcgiwrap is a simple server for running CGI applications over FastCGI. It hopes to provide clean CGI support to Nginx (and other web servers that may need it).") - (license license:expat))) + (license license:expat)))) (define-public starman (package From 39d852d88aa77fb095c3a20df442fbafdc4d1605 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 8 Mar 2024 14:19:55 -0800 Subject: [PATCH 115/186] gnu: vcmi: Update to 1.4.5. * gnu/packages/games.scm (vcmi): Update to 1.4.5. Signed-off-by: Christopher Baines Change-Id: Icd72038c03d1f37f42527ccd824993165413d0f7 --- gnu/packages/games.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index db8d8da0a9..e619c2f10e 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -11376,7 +11376,7 @@ play; it will look for them at @file{~/.local/share/fheroes2} folder.") (define-public vcmi (package (name "vcmi") - (version "1.4.2") + (version "1.4.5") (source (origin (method git-fetch) (uri (git-reference @@ -11385,7 +11385,7 @@ play; it will look for them at @file{~/.local/share/fheroes2} folder.") (file-name (git-file-name name version)) (sha256 (base32 - "039d9dvb2i4y1fj6q5py34r17fwb5jqxkjcg7j57asjk4w9b7i8b")) + "1z4vy3drj6dra8rb243pyryr61jnlw3l7yxsxwl9rddv8cdk69lz")) (patches (search-patches "vcmi-disable-privacy-breach.patch")))) (build-system cmake-build-system) (arguments From 0762c240dc8e6004f2e766c88a765649ab777cb4 Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Mon, 4 Mar 2024 21:54:40 -0800 Subject: [PATCH 116/186] gnu: swig-next: Update to 4.2.1. * gnu/packages/swig.scm (swig-next): Update to 4.2.1. Change-Id: I8119b79ebf7d7d404f1161473ab16a04017c1bb7 Signed-off-by: Christopher Baines --- gnu/packages/swig.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/swig.scm b/gnu/packages/swig.scm index 7025d05038..03cddcf28e 100644 --- a/gnu/packages/swig.scm +++ b/gnu/packages/swig.scm @@ -79,7 +79,7 @@ you tailor the wrapping process to suit your application.") (package (inherit swig) (name "swig") - (version "4.2.0") + (version "4.2.1") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/" name "/" name "/" @@ -87,5 +87,5 @@ you tailor the wrapping process to suit your application.") name "-" version ".tar.gz")) (sha256 (base32 - "15wwh9215rdkflpr85r7zxr2nmrib03jr4bvh5i0f9lyb3bs4716")))) + "1n5pb77hwadjpbqgqn28i5v4cp94ar19wmv9vk6v4j6hw9a5617s")))) (inputs (list pcre2)))) From e3072b457b84db4fbfda599c38d1b65ff1b11e81 Mon Sep 17 00:00:00 2001 From: Aaron Covrig Date: Fri, 8 Mar 2024 11:33:23 -0500 Subject: [PATCH 117/186] gnu: rpi-imager: Update to version 1.8.5. * gnu/packages/raspberry-pi.scm (rpi-imager): Update to 1.8.5. Signed-off-by: Christopher Baines Change-Id: I456f412a9e965a22f690c3d672826791e52f57c3 --- gnu/packages/raspberry-pi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/raspberry-pi.scm b/gnu/packages/raspberry-pi.scm index 5c25ed96da..fb6434f57d 100644 --- a/gnu/packages/raspberry-pi.scm +++ b/gnu/packages/raspberry-pi.scm @@ -466,7 +466,7 @@ secondary LCD display connected to the Raspberry Pi board.") (define-public rpi-imager (package (name "rpi-imager") - (version "1.7.5") + (version "1.8.5") (source (origin (method git-fetch) (uri (git-reference @@ -489,7 +489,7 @@ secondary LCD display connected to the Raspberry Pi board.") (cut member <> keep))))))) (sha256 (base32 - "0c5qsqh7drvf76hc75m2cp7bf44w7gwbmhgaqjrl5qwb6pbqf7y8")))) + "1jr4w9h0bvqpy4r1g22n7b07zpplmc318v4lcfvh70c0rhl2vfi6")))) (build-system qt-build-system) (arguments (list From 199e7760f563fed3103337ce695c48f5fc889201 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 8 Mar 2024 11:44:15 -0800 Subject: [PATCH 118/186] gnu: diffoscope: Update to 260. * gnu/packages/diffoscope.scm (diffoscope): Update to 260. [native-inputs]: Add p7zip. Signed-off-by: Christopher Baines Change-Id: I2fcf6209a09dd1ba75e2b373f6f13aa69f7daaa6 --- gnu/packages/diffoscope.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/diffoscope.scm b/gnu/packages/diffoscope.scm index f5a3bbc5b9..52f615f2cf 100644 --- a/gnu/packages/diffoscope.scm +++ b/gnu/packages/diffoscope.scm @@ -74,7 +74,7 @@ (define-public diffoscope (package (name "diffoscope") - (version "258") + (version "260") (source (origin (method git-fetch) @@ -83,7 +83,7 @@ (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1wppshi18lyrgxxi8j06ij0qi31zdgqwjj6bycsyvipkc1cj6xhp")))) + (base32 "1yp32g2769mn91k6wx6fs7lhcfi1cdy54apkgfaf7ib6l0ji5hwv")))) (build-system python-build-system) (arguments (list @@ -198,6 +198,7 @@ odt2txt openssh openssl + p7zip pgpdump poppler python-jsbeautifier From a00341c9e64c28dc05773b84179bedde103a001b Mon Sep 17 00:00:00 2001 From: terramorpha Date: Mon, 11 Mar 2024 01:17:47 -0400 Subject: [PATCH 119/186] gnu: zig-zls: Update to 0.10.0. * gnu/packages/zig-xyz.scm (zig-zls): Update to 0.10.0. [build-system]: Switch to the zig-build-system. [inputs]: Switch to zig-0.10. [arguments]: Remove #:phases and skip tests. Change-Id: Ie062067854ba1087b0394128c66e060df3ef5abf Signed-off-by: Christopher Baines --- gnu/packages/zig-xyz.scm | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/gnu/packages/zig-xyz.scm b/gnu/packages/zig-xyz.scm index fd194a6a4f..0cd08b6ac6 100644 --- a/gnu/packages/zig-xyz.scm +++ b/gnu/packages/zig-xyz.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2022 Maya Tomasek ;;; Copyright © 2023 Ekaitz Zarraga ;;; Copyright © 2023 Felix Lechner +;;; Copyright © 2024 Justin Veilleux ;;; ;;; This file is part of GNU Guix. ;;; @@ -107,7 +108,7 @@ mission-critical safety and performance for financial services.") (define-public zig-zls (package (name "zig-zls") - (version "0.9.0") + (version "0.10.0") (source (origin (method git-fetch) (uri (git-reference @@ -117,24 +118,12 @@ mission-critical safety and performance for financial services.") (file-name (git-file-name name version)) (sha256 (base32 - "1hhs7dz9rpshfd1a7x5swmix2rmh53vsqskh3mzqlrj2lgb3cnii")))) - (build-system gnu-build-system) - (inputs (list zig-0.9 python)) + "1lsks7h3z2m4psyn9mwdylv1d6a9i3z54ssadiz76w0clbh8ch9k")))) + (build-system zig-build-system) + (inputs (list zig-0.10 python)) (arguments - (list #:phases #~(modify-phases %standard-phases - (delete 'configure) - (replace 'build - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (setenv "ZIG_GLOBAL_CACHE_DIR" - (string-append (getcwd) "/zig-cache")) - (invoke "zig" "build" "install" - "-Drelease-safe" "--prefix" out)))) - (delete 'install) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "zig" "build" "test"))))))) + ;; The tests fail with memory leaks. + (list #:tests? #f)) (synopsis "Zig language server") (description "Zig Language Server is a language server implementing the @acronym{LSP, From a68288c7d02b7984e4c453f24afca8534de563ef Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Mon, 4 Mar 2024 21:36:50 -0800 Subject: [PATCH 120/186] gnu: slib: Update to 3c1. * gnu/packages/scheme.scm (slib): Update to 3c1. Change-Id: Ic887b7600173f96bd2ca74c9adadf42780a18ce6 Signed-off-by: Christopher Baines --- gnu/packages/scheme.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index ad06d7db06..5ca1a0d2f8 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -701,14 +701,14 @@ regular-expression notation.") (define-public slib (package (name "slib") - (version "3b6") + (version "3c1") (source (origin (method url-fetch) (uri (string-append "http://groups.csail.mit.edu/mac/ftpdir/scm/slib-" version ".zip")) (sha256 (base32 - "137dn2wwwwg0qbifgxfckjhzj4m4820crpg9kziv402l7f2b931f")))) + "10f7l0fmd0xzs6kc2cwqjrx7msdn0fsd918r459xyc05wscfpy62")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; There is no check target. From ca66f636001d46385a1918436929dc8f7a367d71 Mon Sep 17 00:00:00 2001 From: Tomas Volf <~@wolfsden.cz> Date: Tue, 12 Mar 2024 20:27:19 +0100 Subject: [PATCH 121/186] gnu: cni-plugins: Update to 1.4.1. * gnu/packages/containers.scm (cni-plugins): Update to 1.4.1. Change-Id: I770504d4f3cf2c74cb14ce8ea37055742529db94 Signed-off-by: Christopher Baines --- gnu/packages/containers.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/containers.scm b/gnu/packages/containers.scm index aa270a25f3..6d4877460d 100644 --- a/gnu/packages/containers.scm +++ b/gnu/packages/containers.scm @@ -291,7 +291,7 @@ Layer-4 sockets.") (define-public cni-plugins (package (name "cni-plugins") - (version "1.0.1") + (version "1.4.1") (source (origin (method git-fetch) @@ -299,7 +299,7 @@ Layer-4 sockets.") (url "https://github.com/containernetworking/plugins") (commit (string-append "v" version)))) (sha256 - (base32 "1j91in0mg4nblpdccyq63ncbnn2pc2zzjp1fh3jy0bsndllgv0nc")) + (base32 "0l6f4z762n8blak41wcxdmdhm92gqw2qcxcqd3s4wiql3d7273kj")) (file-name (git-file-name name version)))) (build-system go-build-system) (arguments From 7b5c030684020282a690322b558f86718eb148a7 Mon Sep 17 00:00:00 2001 From: cage Date: Tue, 12 Mar 2024 20:33:31 +0100 Subject: [PATCH 122/186] gnu: cl-nodgui: Update to 0.6.0.2. * gnu/packages/lisp-xyz.scm (sbcl-nodgui): Update to 0.6.0.2. [inputs]: Add sbcl-cl-opengl, sbcl-sdl2 and sbcl-zpng. Change-Id: I6fc569d4a32b1f8fc256ae17de186145caa2ac30 Signed-off-by: Christopher Baines --- gnu/packages/lisp-xyz.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 435f588ab3..ea13b467dd 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -12426,11 +12426,11 @@ Scalable Vector Graphics files.") (sbcl-package->cl-source-package sbcl-cl-svg)) (define-public sbcl-nodgui - (let ((commit "6baccf45371afd4dcc8cd3f38332b300614783b6") + (let ((commit "35fd379e11162995ed48c2f8ebe6a5bf0a6f48cb") (revision "1")) (package (name "sbcl-nodgui") - (version (git-version "0.4.8.6" revision commit)) + (version (git-version "0.6.0.2" revision commit)) (source (origin (method git-fetch) @@ -12439,7 +12439,7 @@ Scalable Vector Graphics files.") (commit commit))) (file-name (git-file-name "cl-nodgui" version)) (sha256 - (base32 "0fjz8362qmvkbzj9ylyllkdxg7vvj38l3y5qn4xi2gim92x4lx67")))) + (base32 "01l1hyzf8ryc35ydrjhqjn4az8asdwn46knl5gx8v02z2jcv7j24")))) (build-system asdf-build-system/sbcl) (inputs (list sbcl-alexandria @@ -12451,8 +12451,11 @@ Scalable Vector Graphics files.") sbcl-esrap sbcl-jpeg-turbo sbcl-named-readtables + sbcl-cl-opengl sbcl-parse-number sbcl-pngload + sbcl-sdl2 + sbcl-zpng tk tklib)) (arguments From 4e26331a5ee87928a16888c36d51e270f0f10f90 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 13 Mar 2024 17:30:56 +0200 Subject: [PATCH 123/186] gnu: llvm-17: Fix building on riscv64-linux. * gnu/packages/llvm.scm (%llvm-patches): Add a patch for 17.0.6. * gnu/packages/patches/clang-17.0-link-dsymutil-latomic.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Change-Id: I9dfd23d2f0fb10620c4aa73a6480151d6e6daa9a --- gnu/local.mk | 1 + gnu/packages/llvm.scm | 3 ++- .../patches/clang-17.0-link-dsymutil-latomic.patch | 14 ++++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/clang-17.0-link-dsymutil-latomic.patch diff --git a/gnu/local.mk b/gnu/local.mk index 574a67b49c..4750cb290c 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1042,6 +1042,7 @@ dist_patch_DATA = \ %D%/packages/patches/clang-15.0-libc-search-path.patch \ %D%/packages/patches/clang-16.0-libc-search-path.patch \ %D%/packages/patches/clang-17.0-libc-search-path.patch \ + %D%/packages/patches/clang-17.0-link-dsymutil-latomic.patch \ %D%/packages/patches/clang-runtime-asan-build-fixes.patch \ %D%/packages/patches/clang-runtime-esan-build-fixes.patch \ %D%/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch \ diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index ab30675d5c..2b8e8d6215 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -550,7 +550,8 @@ output), and Binutils.") '(("14.0.6" . ("clang-14.0-libc-search-path.patch")) ("15.0.7" . ("clang-15.0-libc-search-path.patch")) ("16.0.6" . ("clang-16.0-libc-search-path.patch")) - ("17.0.6" . ("clang-17.0-libc-search-path.patch")))) + ("17.0.6" . ("clang-17.0-libc-search-path.patch" + "clang-17.0-link-dsymutil-latomic.patch")))) (define (llvm-monorepo version) (origin diff --git a/gnu/packages/patches/clang-17.0-link-dsymutil-latomic.patch b/gnu/packages/patches/clang-17.0-link-dsymutil-latomic.patch new file mode 100644 index 0000000000..f94840527e --- /dev/null +++ b/gnu/packages/patches/clang-17.0-link-dsymutil-latomic.patch @@ -0,0 +1,14 @@ +This was mistakenly added to llvm-17 while a patch was being rebased. + +--- + +diff --git a/llvm/tools/dsymutil/CMakeLists.txt b/llvm/tools/dsymutil/CMakeLists.txt +index 3cb88a50ce25..8699d0bb1d6b 100644 +--- a/llvm/tools/dsymutil/CMakeLists.txt ++++ b/llvm/tools/dsymutil/CMakeLists.txt +@@ -42,4 +42,4 @@ if(APPLE) + target_link_libraries(dsymutil PRIVATE "-framework CoreFoundation") + endif(APPLE) + +-# target_link_libraries(dsymutil PRIVATE ${LLVM_ATOMIC_LIB}) ++target_link_libraries(dsymutil PRIVATE ${LLVM_ATOMIC_LIB}) From cee74f37251ff10a2bceb59be7651fb980151a8b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 11 Mar 2024 11:31:18 +0200 Subject: [PATCH 124/186] gnu: rust: Make all intermediate packages public. * gnu/packages/rust.scm (rust-1.74, rust-1.75): Make package public. Change-Id: Id45d6e8c6e6c42811d4cbc3ab50c61045a7c9090 --- gnu/packages/rust.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/rust.scm b/gnu/packages/rust.scm index 3e3bb4dd00..60aa9b1ea0 100644 --- a/gnu/packages/rust.scm +++ b/gnu/packages/rust.scm @@ -906,7 +906,7 @@ safety and thread safety guarantees.") (("features = \\[\"fs\"" all) (string-append all ", \"use-libc\"")))))))))) -(define rust-1.74 +(define-public rust-1.74 (let ((base-rust (rust-bootstrapped-package rust-1.73 "1.74.1" "07930r17dkj3dnsrmilywb6p9i2g2jx56ndfpa2wh8crzhi3xnv7"))) (package @@ -938,7 +938,7 @@ safety and thread safety guarantees.") (delete 'revert-riscv-pause-instruction)))) (package-arguments base-rust)))))) -(define rust-1.75 +(define-public rust-1.75 (let ((base-rust (rust-bootstrapped-package rust-1.74 "1.75.0" "1260mf3066ki6y55pvr35lnf54am6z96a3ap3hniwd4xpi2rywsv"))) (package From 76a3414a1bc500626a9feca013673f994eb51a34 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Wed, 13 Mar 2024 21:47:22 +0100 Subject: [PATCH 125/186] gnu: emacs-hyperbole: Update to 9.0.1. Fixes . * gnu/packages/emacs-xyz.scm (emacs-hyperbole): Update to 9.0.1. [arguments]<#:include>: Add HY-NEWS. Change-Id: I9d8c4be3d1a1af30f69ac87cf5d0f1db29d5d935 --- gnu/packages/emacs-xyz.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 164ab4e716..4308e08499 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1065,19 +1065,20 @@ uploading PlatformIO projects.") (define-public emacs-hyperbole (package (name "emacs-hyperbole") - (version "9.0.0") + (version "9.0.1") (source (origin (method url-fetch) (uri (string-append "https://elpa.gnu.org/packages/" "hyperbole-" version ".tar")) (sha256 - (base32 "07kpyp3ggf4knakn18niy819l184apx4d9vbcwv57j8zyqgn4c3l")))) + (base32 "0a7py2dvszh0rf2smbmm8msjrc8vbbvlqnsqw0m2l12v8vllmxnb")))) (build-system emacs-build-system) (arguments (list #:include #~(cons* "DEMO" "DEMO-ROLO.otl" "HY-ABOUT" + "HY-NEWS" "man/hkey-help.txt" "man/hyberbole.info" "kotl/.*" From bed706f1ff68ce6492eaaf756bca59c5fbdac4e3 Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Thu, 14 Mar 2024 11:21:37 +0300 Subject: [PATCH 126/186] gnu: guile-ares-rs: Update to 0.9.3. * gnu/packages/guile-xyz.scm (guile-ares-rs): Update to 0.9.3. Change-Id: Iabe57fcb4f1947eb0908109333e4432b8e554cfe --- gnu/packages/guile-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 9d683199ac..008f9ae2a5 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1117,7 +1117,7 @@ for calling methods on remote servers by exchanging JSON objects.") (define-public guile-ares-rs (package (name "guile-ares-rs") - (version "0.9.1") + (version "0.9.3") (source (origin (method git-fetch) @@ -1127,7 +1127,7 @@ for calling methods on remote servers by exchanging JSON objects.") (file-name (git-file-name name version)) (sha256 (base32 - "173jg8z0cwq5r67lzxsmyir5f6cxd9i5gzb3qryq71cqq4h1c77n")))) + "021lg06c5lrp2j1qv8hl4jh4yq07k158h824kjv6b87bxqk7vq54")))) (build-system guile-build-system) (arguments (list From 507315643e32d03329a566ce2803e8249d5fc76d Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Thu, 14 Mar 2024 11:21:17 +0300 Subject: [PATCH 127/186] gnu: emacs-arei: Update to 0.9.3. * gnu/packages/emacs-xyz.scm (emacs-arei): Update to 0.9.3. Change-Id: I4cbdc4d5b65038c34912575a4f106993972c2a6f --- gnu/packages/emacs-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 4308e08499..8c3fc5e022 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -448,7 +448,7 @@ input via a small child-frame spawned at the position of the cursor.") (define-public emacs-arei (package (name "emacs-arei") - (version "0.9.2") + (version "0.9.3") (source (origin (method git-fetch) @@ -458,7 +458,7 @@ input via a small child-frame spawned at the position of the cursor.") (file-name (git-file-name name version)) (sha256 (base32 - "0qpri3ygb1fffi9mlipa7qmb6434aispbz1z3j14i7zrqassigm4")))) + "0nf101zdrz8yqscpvvmaw0dgb334h9v2ychyjlq95vksvx9r1zid")))) (build-system emacs-build-system) (propagated-inputs (list emacs-eros emacs-sesman emacs-queue)) (home-page "https://git.sr.ht/~abcdw/emacs-arei") From 6e4b1b450cf3b8ab431b5923d411bb3de85ecada Mon Sep 17 00:00:00 2001 From: cage Date: Tue, 12 Mar 2024 20:42:21 +0100 Subject: [PATCH 128/186] gnu: cl-croatoan: Update to 0.2-1.282145f. * gnu/packages/lisp-xyz.scm (sbcl-croatoan): Update to 0.2-1.282145f. Change-Id: I8a7e93e9f0dabfa42e35845e610dd5bd2b63cec9 Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 62 ++++++++++++++++++++------------------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index ea13b467dd..ec9bf3a9ca 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -19108,37 +19108,39 @@ protocol for Mastodon.") (sbcl-package->cl-source-package sbcl-tooter)) (define-public sbcl-croatoan - (package - (name "sbcl-croatoan") - (version "0.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/McParen/croatoan") - (commit (string-append "v" version)))) - (file-name (git-file-name "cl-croatoan" version)) - (sha256 - (base32 "0x2rlckyn8kn5mqy0fib8piggz694g3naarz2dvha1hsy4jhb1wg")))) - (build-system asdf-build-system/sbcl) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "ncurses/ncurses.lisp" - (("libncursesw.so") - (search-input-file inputs "/lib/libncursesw.so")))))))) - (inputs - (list ncurses - sbcl-cffi - sbcl-trivial-gray-streams - sbcl-bordeaux-threads)) - (synopsis "Common Lisp bindings for the ncurses terminal library") - (description "Croatoan provides high-level Common Lisp CLOS bindings for + (let ((commit "282145ff9e9005fddc4241bc6827b3ab09c5bd25") + (revision "1")) + (package + (name "sbcl-croatoan") + (version (git-version "2.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/McParen/croatoan") + (commit commit))) + (file-name (git-file-name "cl-croatoan" version)) + (sha256 + (base32 "021h2f2yj4j9gynr3k7qi36x94jm5b95p3vaddbaih96wyzgbmq5")))) + (build-system asdf-build-system/sbcl) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "ncurses/ncurses.lisp" + (("libncursesw.so") + (search-input-file inputs "/lib/libncursesw.so")))))))) + (inputs + (list ncurses + sbcl-cffi + sbcl-trivial-gray-streams + sbcl-bordeaux-threads)) + (synopsis "Common Lisp bindings for the ncurses terminal library") + (description "Croatoan provides high-level Common Lisp CLOS bindings for the ncurses terminal library.") - (home-page "https://github.com/McParen/croatoan") - (license license:expat))) + (home-page "https://github.com/McParen/croatoan") + (license license:expat)))) (define-public ecl-croatoan (sbcl-package->ecl-package sbcl-croatoan)) From dc4842797bfdc5f9f3f5f725bf189c2b68bd6b5a Mon Sep 17 00:00:00 2001 From: cage Date: Tue, 12 Mar 2024 20:59:43 +0100 Subject: [PATCH 129/186] gnu: tinmop: Update to 0.9.9.141421356. * gnu/packages/web-browsers.scm (tinmop): Update to 0.9.9.141421356. Change-Id: Ibf43c33b2581a78d5a4050493049db73f77c896b Signed-off-by: Guillaume Le Vaillant --- gnu/packages/web-browsers.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index ae875551c1..9234c0d7f6 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -848,7 +848,7 @@ http, and https via third-party applications.") (define-public tinmop (package (name "tinmop") - (version "0.9.9.1414213") + (version "0.9.9.141421356") (source (origin (method git-fetch) @@ -857,7 +857,7 @@ http, and https via third-party applications.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0rlgnqld6ls46452xvcr8k4ji4lwmlsrxib5ii9l9clkm0s477wv")))) + (base32 "0cw8scjxci98jx5cmm98x0frjrbs3q7w3dwz60xpy67aqmwq7kqx")))) (build-system gnu-build-system) (native-inputs (list autoconf @@ -919,15 +919,15 @@ http, and https via third-party applications.") #t)) (add-after 'unpack 'fix-configure.ac (lambda _ - (delete-file "configure") - (substitute* "configure.ac" - (("AC_PATH_PROG.+CURL") - "dnl") - (("AC_PATH_PROGS.+GIT") - "dnl") - (("AC_PATH_PROG.+GPG") - "dnl")) - #t)) + (delete-file "configure") + (substitute* "configure.ac" + (("AC_PATH_PROG.+CURL") + "dnl") + (("AC_PATH_PROGS.+GIT") + "dnl") + (("AC_PATH_PROG.+GPG") + "dnl")) + #t)) (add-after 'configure 'fix-asdf (lambda* (#:key inputs #:allow-other-keys) (substitute* "Makefile.in" From 59bd15a7c66508ba6818ae71922ce322472c0f5f Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 12 Mar 2024 16:34:33 +0000 Subject: [PATCH 130/186] gnu: openjdk11: Update to 11.0.22. * gnu/packages/java.scm (openjdk11): Update to 11.0.22. Signed-off-by: Christopher Baines --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 151fc8aa89..a115c134ba 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1217,7 +1217,7 @@ new Date();")) (define-public openjdk11 (package (name "openjdk") - (version "11.0.17") + (version "11.0.22") (source (origin (method url-fetch) (uri (string-append "https://openjdk-sources.osci.io/openjdk11/openjdk-" @@ -1225,7 +1225,7 @@ new Date();")) (file-name (string-append name "-" version ".tar.xz")) (sha256 (base32 - "1prvqy0ysz0999wrhsrbz6vrknpqfihl9l74l16ph93g89dqi5ia")) + "18ca4syp9xlrqjgyjkb1sp9835riy6aym5xs81r8byrz6jlb2473")) (modules '((guix build utils))) (snippet '(for-each delete-file (find-files "." "\\.(bin|exe|jar)$"))) From d200159b8e36faf2b051809a15b87c7ab2cc08cb Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 12 Mar 2024 16:34:34 +0000 Subject: [PATCH 131/186] gnu: openjdk12: Update source hash. * gnu/packages/java.scm (openjdk12): Update source hash. Signed-off-by: Christopher Baines Change-Id: I03cbaf3fc21c045c67cd89bb37e232716b03bb30 --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a115c134ba..e6eb21d866 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1534,7 +1534,7 @@ new Date();")) (define-public openjdk12 (make-openjdk - openjdk11 "12.33" "0mbhdrk12b6878kby0flnbak7444dlpm0ihlmf92vk59y1c02bc2" + openjdk11 "12.33" "0pi2gwib3j2imi4l623iaywrmvfh9rqzh82lj2gxqbrmg55swvjf" (source (origin (method url-fetch) @@ -1542,7 +1542,7 @@ new Date();")) (file-name (string-append name "-" version ".tar.bz2")) (sha256 (base32 - "0mbhdrk12b6878kby0flnbak7444dlpm0ihlmf92vk59y1c02bc2")) + "0pi2gwib3j2imi4l623iaywrmvfh9rqzh82lj2gxqbrmg55swvjf")) (modules '((guix build utils))) (snippet '(for-each delete-file (find-files "." "\\.(bin|exe|jar)$"))) From 6d96d7c4e7f9a1fd27876778323c98a7b2372c63 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 12 Mar 2024 16:34:35 +0000 Subject: [PATCH 132/186] gnu: openjdk13: Update to 13.0.14. * gnu/packages/java.scm (openjdk13): Update to 13.0.14. Signed-off-by: Christopher Baines --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index e6eb21d866..f629fe7800 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1573,8 +1573,8 @@ blacklisted.certs.pem" "#! java BlacklistedCertsConverter SHA-256\n")))))))))) (define-public openjdk13 - (make-openjdk openjdk12 "13.0.13" - "0pxf4dlig61k0pg7amg4mi919hzam7nzwckry01avgq1wj8ambji" + (make-openjdk openjdk12 "13.0.14" + "1v92i5rhahqkjw8mz09c9qasnxqc67ygy0y266kdmm534z0da755" (source (origin (inherit (package-source base)) (patches '()))))) From 62c7f9947e6ee1d1a58925ecc5bc970b2d05c775 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 12 Mar 2024 16:34:36 +0000 Subject: [PATCH 133/186] gnu: openjdk15: Update to 15.0.10. * gnu/packages/java.scm (openjdk15): Update to 15.0.10. Signed-off-by: Christopher Baines --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index f629fe7800..66c103fd15 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1596,8 +1596,8 @@ blacklisted.certs.pem" (define-public openjdk15 (make-openjdk - openjdk14 "15.0.9" - "1k3x06fv89l84ysjsyw8s89q8blghq85m6xjzv373x6297ln8n7a" + openjdk14 "15.0.10" + "0hdllv348bws6m992bh73jik18x0sv0k2m9l817b3zb7q802sp7x" (source (origin (inherit (package-source base)) (modules '()) From b844b81dcea4e020b0f4cd52ad6796f2954531ca Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 12 Mar 2024 16:34:37 +0000 Subject: [PATCH 134/186] gnu: openjdk17: Update to 17.0.10. * gnu/packages/java.scm (openjdk17): Update to 17.0.10. Signed-off-by: Christopher Baines --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 66c103fd15..7c47c88829 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1623,8 +1623,8 @@ blacklisted.certs.pem" (define-public openjdk17 (make-openjdk - openjdk16 "17.0.5" - "1asnysg6kxdkrmb88y6qihdr12ljsyxv0mg6hlcs7cwxgsdlqkfs" + openjdk16 "17.0.10" + "1bq1rqnipz6wdr05s20gm8nlpb3328ljxckzvc5ag0gf7fzlhn5f" (source (origin (inherit (package-source base)) (patches (search-patches "openjdk-15-xcursor-no-dynamic.patch")))) From 289666a09c5d7f831bb607cd2bac6bc1d9b71fa0 Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 12 Mar 2024 16:34:38 +0000 Subject: [PATCH 135/186] gnu: openjdk18: Update to 18.0.2.1. * gnu/packages/java.scm (openjdk18): Update to 18.0.2.1. Signed-off-by: Christopher Baines --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 7c47c88829..528288a300 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1639,8 +1639,8 @@ blacklisted.certs.pem" (("^#!.*") "#! java BlockedCertsConverter SHA-256\n")))))))))) (define-public openjdk18 - (make-openjdk openjdk17 "18.0.2" - "1yimfdkwpinhg5cf1mcrzk9xvjwnray3cx762kypb9jcwbranjwx")) + (make-openjdk openjdk17 "18.0.2.1" + "0zxanjzz4p3psqahlidh55vx1ldanq70c2ygk3gcfn9a94vnr9rg")) (define-public openjdk19 (make-openjdk openjdk18 "19.0.2" From 37073f9dd2985f1f07d4a1e25c104f65870cff3b Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 12 Mar 2024 16:34:39 +0000 Subject: [PATCH 136/186] gnu: openjdk20: Update to 20.0.2. * gnu/packages/java.scm (openjdk20): Update to 20.0.2. Signed-off-by: Christopher Baines --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 528288a300..c94612bdc6 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1660,8 +1660,8 @@ blacklisted.certs.pem" (setenv "SOURCE_DATE_EPOCH" "1234567890"))))))))) (define-public openjdk20 - (make-openjdk openjdk19 "20" - "0pk5lpwijfv9qv7vwpsq2xfklbnqdfs6xbdhc5aamrpar4xi4ykx")) + (make-openjdk openjdk19 "20.0.2" + "1af1v2c3d8x4c6shzl6cv9qwq7a4hn5map5pjh9vjcky0hkzd489")) (define-public openjdk21 (make-openjdk openjdk20 "21" From b5bd0d3a7ea932710bc7a39733b00fb644f3425a Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 12 Mar 2024 16:34:40 +0000 Subject: [PATCH 137/186] gnu: openjdk21: Update to 21.0.2. * gnu/packages/java.scm (openjdk21): Update to 21.0.2. Signed-off-by: Christopher Baines --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index c94612bdc6..613742007a 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1664,8 +1664,8 @@ blacklisted.certs.pem" "1af1v2c3d8x4c6shzl6cv9qwq7a4hn5map5pjh9vjcky0hkzd489")) (define-public openjdk21 - (make-openjdk openjdk20 "21" - "06wjfwrkqykjdkis2s1nh91cy8vwincnmc699cxvyk3fc12jf3vw" + (make-openjdk openjdk20 "21.0.2" + "0d1g3wnzr5whjpq8gvxq0h7kd7lxd3xgc6bh3kg8vzz096asn0kj" (source (origin (inherit (package-source base)) (patches (search-patches "openjdk-21-fix-rpath.patch" From 3bd795bc5736a81adc586da80c67107dd8f64384 Mon Sep 17 00:00:00 2001 From: Fabio Natali Date: Sat, 2 Mar 2024 10:25:52 +0000 Subject: [PATCH 138/186] doc: Fix section on LUKS support. Only LUKS1 is supported in Guix at the time of this commit. Contrarily to what reported in previous versions of this section, LUKS2 is not supported. * doc/guix.texi (Keyboard Layout, Networking, and Partitioning)[Disk Partitioning]: Fix section on LUKS support. Signed-off-by: Christopher Baines Change-Id: Ia670963178810174d3ea4585c537defbaaeb0f25 --- doc/guix.texi | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 858d5751bf..796ac0028f 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -2728,20 +2728,20 @@ the Cryptsetup/LUKS utilities to do that (see @inlinefmtifelse{html, @code{man cryptsetup}} for more information). @quotation Warning -Note that GRUB can unlock LUKS2 devices since version 2.06, but only -supports the PBKDF2 key derivation function, which is not the default -for @command{cryptsetup luksFormat}. You can check which key derivation -function is being used by a device by running @command{cryptsetup -luksDump @var{device}}, and looking for the PBKDF field of your -keyslots. +While efforts are in progress to extend support to LUKS2, please note +that Guix only supports devices of type LUKS1 at the moment. You can +verify that your existing LUKS device is of the right type by running +@command{cryptsetup luksDump @var{device}}. Alternatively, you can +create a new LUKS1 device with @command{cryptsetup luksFormat --type +luks1 @var{device}}. @end quotation Assuming you want to store the root partition on @file{/dev/sda2}, the -command sequence to format it as a LUKS2 partition would be along these +command sequence to format it as a LUKS1 partition would be along these lines: @example -cryptsetup luksFormat --type luks2 --pbkdf pbkdf2 /dev/sda2 +cryptsetup luksFormat --type luks1 /dev/sda2 cryptsetup open /dev/sda2 my-partition mkfs.ext4 -L my-root /dev/mapper/my-partition @end example From 0e00d2ced1c266fa706192e6bb7db2c8005dbead Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 14 Mar 2024 13:40:31 +0000 Subject: [PATCH 139/186] gnu: combinatorial-blas: Update source hash. Diffoscope shows there are changes, but they don't look significant. * gnu/packages/maths.scm (combinatorial-blas): Update source hash. Change-Id: I32db6df0ef7c652572b1e874fe22175a4b66af6e --- gnu/packages/maths.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 52ab4d66a0..d551b751e6 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -8075,7 +8075,7 @@ easily be incorporated into existing simulation codes.") ".tgz")) (sha256 (base32 - "1a9wbgdqyy1whhfc0yl0yqkax3amnqa6iihhq48d063gc0jwfd9a")) + "0gzxgd2ybnh49h57rh47vrqnsyk11jn206j5kf9y7p5vksc79ffz")) (patches (search-patches "combinatorial-blas-awpm.patch" "combinatorial-blas-io-fix.patch")))) (build-system cmake-build-system) From 8166d5b81ed6ca32434fb4e66fa8306a28e4949b Mon Sep 17 00:00:00 2001 From: Jean-Pierre De Jesus DIAZ Date: Tue, 5 Mar 2024 18:17:13 +0100 Subject: [PATCH 140/186] gnu: raspi-gpio: Make public. As it's unclear why it's not. * gnu/packages/raspberry-pi.scm (raspi-gpio): Make variable public. Change-Id: Iaf2789120a726d702d97c3a30a32e3b2cf5da3f1 Signed-off-by: Christopher Baines --- gnu/packages/raspberry-pi.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/raspberry-pi.scm b/gnu/packages/raspberry-pi.scm index fb6434f57d..c4f03c3ed9 100644 --- a/gnu/packages/raspberry-pi.scm +++ b/gnu/packages/raspberry-pi.scm @@ -85,7 +85,7 @@ used in the Raspberry Pi") (supported-systems '("armhf-linux" "aarch64-linux")) (license license:gpl3))) -(define raspi-gpio +(define-public raspi-gpio (let ((commit "6d0769ac04760b6e9f33b4aa1f11c682237bf368") (revision "1")) (package From 7319b4d5286d31a9c6a889e81af72308efdaab41 Mon Sep 17 00:00:00 2001 From: Tanguy Le Carrour Date: Fri, 23 Feb 2024 19:11:43 +0100 Subject: [PATCH 141/186] teams: Add Tanguy Le Carrour. * etc/teams.scm.in ("Tanguy Le Carrour"): New member. Change-Id: Ic1b1588a5a8bc67ee8e135c3069966f139374529 Signed-off-by: Christopher Baines --- etc/teams.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/etc/teams.scm b/etc/teams.scm index ac2886a6eb..570793b539 100755 --- a/etc/teams.scm +++ b/etc/teams.scm @@ -587,6 +587,10 @@ GLib/GIO, GTK, GStreamer and Webkit." "andreas@enge.fr") lxqt science tex) +(define-member (person "Tanguy Le Carrour" + "tanguy@bioneland.org") + python home) + (define-member (person "Tobias Geerinckx-Rice" "me@tobias.gr") core kernel mentors) From efe62c5ed38a09d7467a6c1c3d5f509d284ad290 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 14 Mar 2024 21:01:00 +0100 Subject: [PATCH 142/186] gnu: Add morpheus. * gnu/packages/bioinformatics.scm (morpheus): New variable. Co-authored-by: Navid Afkhami Change-Id: I4bf14414f497ff17690b1d26420d442d236fd6b5 --- gnu/packages/bioinformatics.scm | 63 +++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index b8ecea013c..dd51f73d5b 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9308,6 +9308,69 @@ viewer.") (delete 'patch-tests) (delete 'configure)))))))) +(define-public morpheus + (package + (name "morpheus") + (version "2.3.6") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/morpheus.lab/morpheus") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1jyzbkz8d39kjicrk3ihcx7yvq5wsynvnlcw922bqqsw8nwnn12c")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "3rdparty/eigen") + (substitute* '("morpheus/core/cpm_shape_tracker.cpp" + "morpheus/core/membranemapper.h" + "morpheus/testing/components/motility/directed_motion_test.cpp" + "morpheus/testing/components/interaction/generator_cell_sorting.cpp" + "morpheus/testing/components/interaction/test_cell_sorting.cpp" + "morpheus/testing/core/cpm/generator_csm_plane.cpp" + "morpheus/testing/test_operators.h") + (("#include \"eigen/") "#include \"eigen3/")))))) + ;; This is for a different Morpheus. + (properties '((lint-hidden-cve "CVE-2022-31261"))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags + '(list "-DMORPHEUS_GUI=OFF" + "-DBUILD_TESTING=ON" + "-DDOWNLOAD_XTENSOR=OFF") + #:phases + '(modify-phases %standard-phases + (add-after 'unpack 'disable-gtest-download + (lambda _ + (substitute* "3rdparty/CMakeLists.txt" + (("add_subdirectory\\(GTest\\)") "")))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "ctest" "--output-junit" "test_results.xml"))))))) + (inputs (list boost + eigen + file + gnuplot + libtiff + libxslt + xsimd + xtensor + xtl + zlib)) + (native-inputs + (list doxygen googletest xxd)) + (home-page "https://gitlab.com/morpheus.lab/morpheus") + (synopsis "Multicellular simulation") + (description + "Morpheus is a modeling and simulation environment for the study of +multi-scale and multicellular systems.") + (license license:bsd-3))) + (define-public mosaik (let ((commit "5c25216d3522d6a33e53875cd76a6d65001e4e67")) (package From fb377b4af7c1088451d1351a5a2d3b6a613955cd Mon Sep 17 00:00:00 2001 From: Troy Figiel Date: Sun, 21 Jan 2024 22:12:22 +0100 Subject: [PATCH 143/186] gnu: Add python-zconfig. * gnu/packages/python-web.scm (python-zconfig): New variable. Signed-off-by: Sharlatan Hellseher --- gnu/packages/python-web.scm | 38 +++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 6b61ba10b3..790164b1ab 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2722,6 +2722,44 @@ object to help create WSGI responses.") files. These locks can also be used to mediate access to other files.") (license license:zpl2.1))) +(define-public python-zconfig + (package + (name "python-zconfig") + (version "4.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ZConfig" version)) + (sha256 + (base32 "0mh13p38vq7ip4zkvaplzr8w0mqrmmqiyb5y663d165slvxl5mpq")))) + (build-system python-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (begin + ;; This test assumes we still have setup.py in the + ;; directory from which we import zconfig, which + ;; does not work after installing the package. + (delete-file-recursively + "src/ZConfig/tests/test_readme.py") + (invoke "zope-testrunner" "-vv" "--test-path=src" + "--all")) + (format #t "test suite not run~%"))))))) + (native-inputs (list python-docutils python-manuel python-zope-exceptions + python-zope-testrunner)) + (home-page "https://github.com/zopefoundation/ZConfig/") + (synopsis "Structured configuration library intended for general use") + (description + "@code{zconfig} is a configuration library intended for general +use. It supports a hierarchical schema-driven configuration model that allows +a schema to specify data conversion routines written in Python. Its model is +very different from the model supported by the @code{configparser} module +found in Python's standard library, and is more suitable to +configuration-intensive applications.") + (license license:zpl2.1))) + (define-public python-zope-event (package (name "python-zope-event") From 36da1ad73dabdb05bba4a95d47f2b1a49627b38f Mon Sep 17 00:00:00 2001 From: Troy Figiel Date: Sun, 21 Jan 2024 22:12:47 +0100 Subject: [PATCH 144/186] gnu: Add python-zodbpickle. * gnu/packages/python-web.scm (python-zodbpickle): New variable. Signed-off-by: Sharlatan Hellseher --- gnu/packages/python-web.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 790164b1ab..18caeb63bb 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2760,6 +2760,34 @@ found in Python's standard library, and is more suitable to configuration-intensive applications.") (license license:zpl2.1))) +(define-public python-zodbpickle + (package + (name "python-zodbpickle") + (version "3.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "zodbpickle" version)) + (sha256 + (base32 "035bjrksl4h92mvjkx6id4gjcpc1k4mbci8ryjl6l9mki7ihx77b")))) + (build-system pyproject-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (invoke "zope-testrunner" "-vv" "--test-path=src" + "--all") + (format #t "test suite not run~%"))))))) + (native-inputs (list python-zope-testrunner)) + (home-page "https://github.com/zopefoundation/zodbpickle") + (synopsis "Uniform pickling interface for @code{zodb}") + (description + "This package is a fork of the @code{pickle} module (and the +supporting C extension) from both Python 3.2 and Python 3.3. The fork adds +support for the @code{noload} operations used by @code{zodb}.") + (license (list license:psfl license:zpl2.1)))) + (define-public python-zope-event (package (name "python-zope-event") From e22175655d446592d9ad142f2898465eb5b95db6 Mon Sep 17 00:00:00 2001 From: Troy Figiel Date: Sun, 21 Jan 2024 22:13:52 +0100 Subject: [PATCH 145/186] gnu: Add python-zodb. * gnu/packages/python-web.scm (python-zodb): New variable. Signed-off-by: Sharlatan Hellseher --- gnu/packages/python-web.scm | 51 +++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 18caeb63bb..07f92136f0 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -2760,6 +2760,57 @@ found in Python's standard library, and is more suitable to configuration-intensive applications.") (license license:zpl2.1))) +(define-public python-zodb + (package + (name "python-zodb") + (version "5.8.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ZODB" version)) + (sha256 + (base32 "1pv4w8mnx6j4xvkcjbkh99pv8ljby7g9f7zjq7zhdmk06sykmiy6")))) + (build-system pyproject-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (begin + ;; This test does not work after installing the + ;; package, since it expects the ZODB source code + ;; to reside in the src/ directory. + (delete-file-recursively + "src/ZODB/tests/testdocumentation.py") + (invoke "zope-testrunner" "-vv" "--test-path=src" + "--all")) + (format #t "test suite not run~%"))))))) + (propagated-inputs (list python-btrees + python-persistent + python-zconfig + python-six + python-transaction + python-zc-lockfile + python-zodbpickle + python-zope-interface)) + (native-inputs (list python-manuel python-zope-testing + python-zope-testrunner)) + (home-page "http://zodb-docs.readthedocs.io") + (synopsis "Object-oriented database for Python") + (description + "@code{ZODB} provides an object-oriented and @acronym{ACID, +Atomicity Consistency Isolation Durability} compliant database for Python with +a high degree of transparency. @code{ZODB} is an object-oriented database, +not an object-relational mapping. This comes with several advantaged: + +@itemize +@item no separate language for database operations +@item very little impact on your code to make objects persistent +@item no database mapper that partially hides the database. +@item almost no seam between code and database. +@end itemize") + (license license:zpl2.1))) + (define-public python-zodbpickle (package (name "python-zodbpickle") From 2187ac84d03f4c7ed1432e5ec88b37247d870f3b Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 14 Mar 2024 22:34:19 +0000 Subject: [PATCH 146/186] gnu: packages: python-web: Sort use-modules alphabetically. * gnu/packages/python-web.scm: Sort #:use-module alphabetically to ease maintenance. Change-Id: Id01b66ff7eaf610895c1275c2abfd9de2e537d8e --- gnu/packages/python-web.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 07f92136f0..7a40b8402b 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -78,15 +78,15 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages python-web) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix git-download) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system copy) #:use-module (guix build-system pyproject) #:use-module (guix build-system python) + #:use-module (guix download) #:use-module (guix gexp) + #:use-module (guix git-download) + #:use-module (guix packages) #:use-module (guix utils) - #:use-module (gnu packages) #:use-module (gnu packages admin) #:use-module (gnu packages base) #:use-module (gnu packages bash) @@ -106,8 +106,8 @@ #:use-module (gnu packages node) #:use-module (gnu packages openstack) #:use-module (gnu packages pcre) - #:use-module (gnu packages protobuf) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages protobuf) #:use-module (gnu packages python) #:use-module (gnu packages python-build) #:use-module (gnu packages python-check) @@ -121,12 +121,12 @@ #:use-module (gnu packages serialization) #:use-module (gnu packages sphinx) #:use-module (gnu packages texinfo) - #:use-module (gnu packages tls) #:use-module (gnu packages time) + #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (gnu packages web) #:use-module (gnu packages xml) - #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages) #:use-module (srfi srfi-1)) (define-public python-huggingface-hub From a862a99bb38b31178fcf53093973583e6d67d860 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 14 Mar 2024 23:09:10 +0000 Subject: [PATCH 147/186] gnu: python-pycurl: Enable tests. * gnu/packages/python-web.scm (python-pycurl): Enable most of the tests. [build-system]: Swap to pyproject-build-system. [arguments] <#:tests?>: Enable them. <#:test-arguments>: Disable some failing and hanging tests. [native-inputs]: Add python-flaky, python-pytest, and python-pytest-xdist. Change-Id: Ie222aa1111720f2e39b950b79d9e707401be7e8f --- gnu/packages/python-web.scm | 48 +++++++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 7a40b8402b..856f36ca0b 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -61,6 +61,7 @@ ;;; Copyright © 2023 John Kehayias ;;; Copyright © 2023 Ivan Vilata-i-Balaguer ;;; Copyright © 2024 Troy Figiel +;;; Copyright © 2024 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -1917,21 +1918,44 @@ Amazon S3 compatible object storage server.") (uri (pypi-uri "pycurl" version)) (sha256 (base32 "1ji46b924caa4saxvjxs9h673yy0kif297nxpnjn84r7w05mjc2p")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - ;; The tests attempt to access external web servers, so we cannot run - ;; them. Furthermore, they are skipped altogether when using Python 2. - '(#:tests? #f + '(#:test-flags + (list "-n" "auto" + "-k" (string-append + ;; Disable hanginging tests + "not test_multi_socket_select" + ;; E assert None is not None + ;; E+ where None = + ;; .socket_result + " and not test_easy_pause_unpause" + " and not test_multi_socket_action" + ;; E pycurl.error: (1, '') + " and not test_http_version_3" + ;; OSError: tests/fake-curl/libcurl/with_gnutls.so: cannot + ;; open shared object file: No such file or directory + " and not test_libcurl_ssl_gnutls" + ;; OSError: tests/fake-curl/libcurl/with_nss.so: cannot + ;; open shared object file: No such file or directory + " and not test_libcurl_ssl_nss" + ;; OSError: tests/fake-curl/libcurl/with_openssl.so: cannot + ;; open shared object file: No such file or directory + " and not test_libcurl_ssl_openssl")) #:phases (modify-phases %standard-phases - (add-before 'build 'configure-tls-backend - (lambda _ - ;; XXX: PycURL fails to automatically determine which TLS - ;; backend to use when cURL is built with --disable-static. - ;; See setup.py and . - (setenv "PYCURL_SSL_LIBRARY" "gnutls") - #t))))) + (add-before 'build 'configure-tls-backend + (lambda _ + ;; XXX: PycURL fails to automatically determine which + ;; TLS backend to use when cURL is built with + ;; --disable-static. See setup.py and + ;; . + (setenv "PYCURL_SSL_LIBRARY" "gnutls")))))) (native-inputs - (list python-nose python-bottle)) + (list python-bottle + python-flaky + python-nose + python-pytest + python-pytest-xdist)) (inputs (list curl gnutls)) (home-page "http://pycurl.io/") From 019fb14b1e5ddce11b71f25663a2d7953b4700ac Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Mar 2024 13:17:02 -0400 Subject: [PATCH 148/186] gnu: linux-libre: Update to 6.7.9. * gnu/packages/linux.scm (linux-libre-6.7-version): Update to 6.7.9. (linux-libre-6.7-pristine-source): Update hash. Change-Id: I9d3e3907623b17f1a47b78ea00e9b7a5cf428ff6 --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index aea5f9a432..a3a857167c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -497,7 +497,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "mainline" kernel. -(define-public linux-libre-6.7-version "6.7.7") +(define-public linux-libre-6.7-version "6.7.9") (define-public linux-libre-6.7-gnu-revision "gnu") (define deblob-scripts-6.7 (linux-libre-deblob-scripts @@ -507,7 +507,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1lhsy2qnmz47r8m926k1kng912m64j7pnpcvd1ddgdqpq5byp88j"))) (define-public linux-libre-6.7-pristine-source (let ((version linux-libre-6.7-version) - (hash (base32 "1n8lgf814mfslca51pm3nh4icvv1lb5w5l1sxdkf5nqdax28nsr5"))) + (hash (base32 "0inkvyrvq60j9lxgivkivq3qh94lsfc1dpv6vwgxmy3q0zy37mqg"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.7))) From 1e568b2ed3e10d156cb26f4d66942fc6b54d9b9c Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Mar 2024 13:17:30 -0400 Subject: [PATCH 149/186] gnu: linux-libre 6.6: Update to 6.6.21. * gnu/packages/linux.scm (linux-libre-6.6-version): Update to 6.6.21. (linux-libre-6.6-pristine-source): Update hash. Change-Id: Ic2f197add55f89196010c32957e10d3683cb8c01 --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a3a857167c..7dd7ab746c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -515,7 +515,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The current "stable" kernels. That is, the most recently released major ;; versions that are still supported upstream. -(define-public linux-libre-6.6-version "6.6.19") +(define-public linux-libre-6.6-version "6.6.21") (define-public linux-libre-6.6-gnu-revision "gnu") (define deblob-scripts-6.6 (linux-libre-deblob-scripts @@ -525,7 +525,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "014w19b9igdy3rpwrqn21why151zlc9hdx2b1qvdkjsbz6smx3lp"))) (define-public linux-libre-6.6-pristine-source (let ((version linux-libre-6.6-version) - (hash (base32 "16hk8y3pw40hahhpnpxjwhprq6hlblavr45pglpb3d62f9mpwqxm"))) + (hash (base32 "0mz420w99agr7jv1jgqfr4fjhzbv005xif086sqx556s900l62zf"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.6))) From c6d2fa1139982cb84922c8e439c6777e9ab52806 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Mar 2024 13:18:02 -0400 Subject: [PATCH 150/186] gnu: linux-libre 6.1: Update to 6.1.81. * gnu/packages/linux.scm (linux-libre-6.1-version): Update to 6.1.81. (linux-libre-6.1-pristine-source, deblob-scripts-6.1): Update hashes. Change-Id: Iaec9f01a190d67bcab490c318456241ea8eabf22 --- gnu/packages/linux.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 7dd7ab746c..025afa5a32 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -533,17 +533,17 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." ;; The "longterm" kernels — the older releases with long-term upstream support. ;; Here are the support timelines: ;; -(define-public linux-libre-6.1-version "6.1.80") +(define-public linux-libre-6.1-version "6.1.81") (define-public linux-libre-6.1-gnu-revision "gnu") (define deblob-scripts-6.1 (linux-libre-deblob-scripts linux-libre-6.1-version linux-libre-6.1-gnu-revision (base32 "1sf80f2i4vf888xjcn84ymn4w5ynn30ib9033zwmv7f09yvfhapy") - (base32 "06djvq3q6n8m7gmqap05jwslmpy0fmgfc9z8ny6kfh9lwgz8kx3r"))) + (base32 "08y5smwgbl2l74dlk850pbvn8d1y14cqvll2gbx80vmvfwlzp8c3"))) (define-public linux-libre-6.1-pristine-source (let ((version linux-libre-6.1-version) - (hash (base32 "0wdnyy7m9kfkl98id0gm6jzp4aa0hfy6gfkb4k4cg1wbpfpcm3jn"))) + (hash (base32 "0arl96yrqplbmp2gjyqcfma1lgc30kbn95m0sflv0yyldwf8dg8f"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-6.1))) From cc2b28975b9c21423e9cd56f266e99dfa37bd05a Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Mar 2024 13:18:39 -0400 Subject: [PATCH 151/186] gnu: linux-libre 5.15: Update to 5.15.151. * gnu/packages/linux.scm (linux-libre-5.15-version): Update to 5.15.151. (linux-libre-5.15-pristine-source): Update hash. Change-Id: I83ddffad4f1ce05723faa5d243e8345b21e39edb --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 025afa5a32..f6c466418c 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -548,7 +548,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-6.1))) -(define-public linux-libre-5.15-version "5.15.150") +(define-public linux-libre-5.15-version "5.15.151") (define-public linux-libre-5.15-gnu-revision "gnu") (define deblob-scripts-5.15 (linux-libre-deblob-scripts @@ -558,7 +558,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "1a4la9nfdl5qiyfbzhgbqhl638wy1crkgpfnfaj0qf3hg4jsg0g4"))) (define-public linux-libre-5.15-pristine-source (let ((version linux-libre-5.15-version) - (hash (base32 "1m74cwsbjwlamxh8vdg2y9jjzk0h7a40adml2p2wszwf8lmmj1gf"))) + (hash (base32 "0jby224ncdardjwmf8c59s5j71inpvdlzah984ilf2b6y85pc7la"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.15))) From 65d12a4a97b0d131027b666b39b58c2ec3d91a0f Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Mar 2024 13:18:58 -0400 Subject: [PATCH 152/186] gnu: linux-libre 5.10: Update to 5.10.212. * gnu/packages/linux.scm (linux-libre-5.10-version): Update to 5.10.212. (linux-libre-5.10-pristine-source): Update hash. Change-Id: I620729ec22cd67bbe22dc808ba6b4d74d2c0479d --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f6c466418c..248a2e34f6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -563,7 +563,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.15))) -(define-public linux-libre-5.10-version "5.10.211") +(define-public linux-libre-5.10-version "5.10.212") (define-public linux-libre-5.10-gnu-revision "gnu1") (define deblob-scripts-5.10 (linux-libre-deblob-scripts @@ -573,7 +573,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "12csh2zyjrqzgqcv799gv8h4xaw1irxh2zqddn4jqp5p7psx4j5k"))) (define-public linux-libre-5.10-pristine-source (let ((version linux-libre-5.10-version) - (hash (base32 "1cir36s369fl6s46x16xnjg0wdlnkipsp2zhz11m9d3z205hly1s"))) + (hash (base32 "14vll2bghd52wngjxy78hgglydcxka59yziji0w56dcdpmky9wqc"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.10))) From 557fc25caa3627da93b3cc8b1a80ca94942e35ec Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Mar 2024 13:19:14 -0400 Subject: [PATCH 153/186] gnu: linux-libre 5.4: Update to 5.4.271. * gnu/packages/linux.scm (linux-libre-5.4-version): Update to 5.4.271. (linux-libre-5.4-pristine-source): Update hash. Change-Id: Iaf7277f1f4ec3f106b8f0b82aef5a8be953972bd --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 248a2e34f6..2f28d93313 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -578,7 +578,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.10))) -(define-public linux-libre-5.4-version "5.4.270") +(define-public linux-libre-5.4-version "5.4.271") (define-public linux-libre-5.4-gnu-revision "gnu1") (define deblob-scripts-5.4 (linux-libre-deblob-scripts @@ -588,7 +588,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0x0xg0fcykpd117x3q0gim8jilhx922ashhckjvafxv2gk2zzjhj"))) (define-public linux-libre-5.4-pristine-source (let ((version linux-libre-5.4-version) - (hash (base32 "0svnkpivv5w9b2yyg0z607b84f591d401gxvr8s7kmzdxadhcjqs"))) + (hash (base32 "0l2qv4xlhnry9crs90rkihsxyny6jz8kxw08bfad7nys9hrn3g6d"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-5.4))) From f28802a8139e9a963d974da19db3c3bf9e3ef2c5 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Wed, 13 Mar 2024 13:19:39 -0400 Subject: [PATCH 154/186] gnu: linux-libre 4.19: Update to 4.19.309. * gnu/packages/linux.scm (linux-libre-4.19-version): Update to 4.19.309. (linux-libre-4.19-pristine-source): Update hash. Change-Id: If579a8179ded35cb4269e733bd96ee6f7c5d5360 --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 2f28d93313..d0f259e9a4 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -593,7 +593,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (%upstream-linux-source version hash) deblob-scripts-5.4))) -(define-public linux-libre-4.19-version "4.19.308") +(define-public linux-libre-4.19-version "4.19.309") (define-public linux-libre-4.19-gnu-revision "gnu1") (define deblob-scripts-4.19 (linux-libre-deblob-scripts @@ -603,7 +603,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given DEBLOB-SCRIPTS." (base32 "0fgkp3v7qgqpn7l1987xcwwlrmwsbscqnxfv06p8nkavrhymrv3c"))) (define-public linux-libre-4.19-pristine-source (let ((version linux-libre-4.19-version) - (hash (base32 "1j81zdx75m48rvqacw4xlcb13vkvlx0pfq4kdfxrsdfl7wfcwl9a"))) + (hash (base32 "1yc45kfiwdqsqa11sxafs82b0day6qvgjcll8rx9vipidsmagbcm"))) (make-linux-libre-source version (%upstream-linux-source version hash) deblob-scripts-4.19))) From e1e6116e05f00d8a9e70cb2c129858f72b87ffb8 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Thu, 14 Mar 2024 19:58:06 -0400 Subject: [PATCH 155/186] Revert "gnu: linux-libre-documentation: Fix compilation." This bug was fixed upstream in 6.7.6. This reverts commit b6f82b9ef1a3d51a39995598eab9f793656e9123. Change-Id: Ia756a62b29ad1f342b0e7430a0cb88cc140974eb --- gnu/packages/linux.scm | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index d0f259e9a4..343e8c1032 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2005,17 +2005,6 @@ GnuPG-based password manager like @code{pass}.") (package (inherit linux-libre) (name "linux-libre-documentation") - (source - (origin - (inherit linux-libre-source) - (patches - (list - (origin - (method url-fetch) - (uri "https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/Documentation/sphinx/kernel_feat.py?id=c23de7ceae59e4ca5894c3ecf4f785c50c0fa428") - (sha256 - (base32 - "0inw2pl7nh82sw8bhvvzqa61552bisl78yc1nyl2x6dmpyppzrld"))))))) (arguments (list #:tests? #f From 646810ab6a66f16b451b920ecd6b6dc4e4859482 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Fri, 15 Mar 2024 07:48:08 +0000 Subject: [PATCH 156/186] gnu: python-pycurl: Disable one failing test. * gnu/packages/python-web.com (python-pycurl) [arguments] <#:test-flags>: Disable one more failing test which occurs on CI with CPU thread count more than 16. Change-Id: Ie772a7f096357b541cc8baa2349a524f05500e52 --- gnu/packages/python-web.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 856f36ca0b..c2bdfc8da8 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -1941,7 +1941,10 @@ Amazon S3 compatible object storage server.") " and not test_libcurl_ssl_nss" ;; OSError: tests/fake-curl/libcurl/with_openssl.so: cannot ;; open shared object file: No such file or directory - " and not test_libcurl_ssl_openssl")) + " and not test_libcurl_ssl_openssl" + ;; pycurl.error: (56, 'Recv failure: Connection reset by + ;; peer') + " and not test_post_with_read_callback")) #:phases (modify-phases %standard-phases (add-before 'build 'configure-tls-backend (lambda _ From 93aefca7bab5f5b40164176e3224221d26d708f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= Date: Thu, 14 Mar 2024 14:55:29 +0100 Subject: [PATCH 157/186] gnu: alacritty: Fix loading of libxkbcommon-x11.so. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/terminals.scm (alacritty)[arguments]: Handle libxkbcommon-x11.so in the ‘add-absolute-library-references’ phase. This fixes this error: thread 'main' panicked at /tmp/guix-build-alacritty-0.13.1.drv-0/source/guix-vendor/rust-xkbcommon-dl-0.4.1.tar.gz/src/x11.rs:59:28: Library libxkbcommon-x11.so could not be loaded. note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace Change-Id: Ifbf19b4962bc3d9eeba6acdf32ca66b0c662f493 Signed-off-by: Efraim Flashner --- gnu/packages/terminals.scm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gnu/packages/terminals.scm b/gnu/packages/terminals.scm index 49c42c8fcb..f0ae4d4d4d 100644 --- a/gnu/packages/terminals.scm +++ b/gnu/packages/terminals.scm @@ -39,6 +39,7 @@ ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Jaeme Sifat ;;; Copyright © 2024 Suhail +;;; Copyright © 2024 Clément Lassieur ;;; ;;; This file is part of GNU Guix. ;;; @@ -1604,6 +1605,8 @@ basic input/output.") (search-input-file inputs (string-append "lib/" all))) (("libwayland-[[:alpha:]]*\\.so" all) (search-input-file inputs (string-append "lib/" all))) + (("libxkbcommon-x11\\.so") + (search-input-file inputs "lib/libxkbcommon-x11.so")) (("libxkbcommon\\.so") (search-input-file inputs "lib/libxkbcommon.so"))))) (replace 'install From 999bfa0d543c539e4554797deaf2f447dddf3796 Mon Sep 17 00:00:00 2001 From: Luis Felipe Date: Fri, 15 Mar 2024 14:34:22 -0500 Subject: [PATCH 158/186] doc: build: Update paths to style sheets. The Guix website style sheets are now organized in themes. This change makes the documentation builder use the resources provided by a theme called "initial" (See https://issues.guix.gnu.org/69783). * doc/build.scm (syntax-highlighted-html): Update path to CSS. (html-manual-indexes): Likewise. (stylized-html): Likewise, and update path to language picker image. Change-Id: Ib2d51fcfdec42ad827add1ead1cfee4c9c4e65b7 Signed-off-by: Florian Pelz --- doc/build.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/build.scm b/doc/build.scm index 2cd57b4a92..9ab2ca32d2 100644 --- a/doc/build.scm +++ b/doc/build.scm @@ -365,7 +365,7 @@ actual file name." #:languages languages)) (syntax-css-url - "/static/base/css/code.css")) + "/themes/initial/css/code.css")) "Return a derivation called NAME that processes all the HTML files in INPUT to (1) add them a link to SYNTAX-CSS-URL, and (2) highlight the syntax of all its 
 blocks (as produced by 'makeinfo --html')."
@@ -624,7 +624,7 @@ its 
 blocks (as produced by 'makeinfo --html')."
                         #:key
                         (languages %languages)
                         (manual %manual)
-                        (manual-css-url "/static/base/css/manual.css"))
+                        (manual-css-url "/themes/initial/css/manual.css"))
   "Process all the HTML files in INPUT; add them MANUAL-CSS-URL as a