From 3080abba40c819933d1857abe4abaaa3cf65baab Mon Sep 17 00:00:00 2001 From: Kaelyn Takata Date: Sat, 16 Dec 2023 01:00:51 +0000 Subject: gnu: xorgproto: Update to 2023.2. * gnu/packages/xorg.scm (xorgproto): Update to 2023.2. Change-Id: Ie0e4712e4ec3fe9620d160bedcfe74452fa6ae5d Signed-off-by: John Kehayias --- gnu/packages/xorg.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 382075237ab..723b3e0c4e9 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -245,14 +245,14 @@ which can be read by any architecture.") (define-public xorgproto (package (name "xorgproto") - (version "2022.2") + (version "2023.2") (source (origin (method url-fetch) (uri (string-append "mirror://xorg/individual/proto" "/xorgproto-" version ".tar.xz")) (sha256 (base32 - "17kbq1x68jl9mz69ays5c0w72lpkqi937raxk0im7y88pvrdn4sx")))) + "0b4c27aq25w1fccks49p020avf9jzh75kaq5qwnww51bp1yvq7xn")))) (build-system gnu-build-system) (propagated-inputs ;; To get util-macros in (almost?) all package inputs. -- cgit v1.3 From 158502e40d800407f1bd697dd5dd0437086730bf Mon Sep 17 00:00:00 2001 From: Kaelyn Takata Date: Sat, 16 Dec 2023 01:00:57 +0000 Subject: gnu: xorg-server-xwayland: Update to 23.2.3 [security fixes]. Fixes CVE-2023-5367 and CVE-2023-5380. See the X.Org security advisory for more information. Also fixes CVE-2023-6377 and CVE-2023-6478. See the X.Org security advisory for more information. * gnu/packages/xorg.scm (xorg-server-xwayland): Update to 23.2.3. [inputs]: Add libxcvt. [properties]: Set upstream-name. Change-Id: I05427b1d93d07a4210466f290621c1ca5effb4af Signed-off-by: John Kehayias --- gnu/packages/xorg.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 723b3e0c4e9..a761fb2fbd2 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -5250,7 +5250,7 @@ EGLStream families of extensions.") (define-public xorg-server-xwayland (package (name "xorg-server-xwayland") - (version "21.1.3") + (version "23.2.3") (source (origin (method url-fetch) @@ -5258,7 +5258,7 @@ EGLStream families of extensions.") "/xserver/xwayland-" version ".tar.xz")) (sha256 (base32 - "18pqvg76grbsyxa3mm3j06i1l8cwb28nbn2gcnqpsk7x75zpbhpb")))) + "00p30yyikh7h9xsqgir66xb06pspgjlibv1mi0n42irc4fkrm7gb")))) (inputs (list font-dejavu dbus egl-wayland @@ -5268,6 +5268,7 @@ EGLStream families of extensions.") libepoxy libgcrypt libtirpc + libxcvt libxfont2 libxkbfile pixman @@ -5283,6 +5284,7 @@ EGLStream families of extensions.") wayland wayland-protocols) '()))) + (properties '((upstream-name . "xwayland"))) (build-system meson-build-system) (arguments `(#:configure-flags -- cgit v1.3 From bc7713fa8878ab8a2158c8660d9b2bbb8fb2f77e Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Sun, 17 Dec 2023 01:11:32 -0500 Subject: gnu: curl: Update to 8.5.0 [security fixes]. Fixes CVE-2023-46218 and CVE-2023-46219. See and respectively. * gnu/packages/curl.scm (curl): Update to 8.5.0. * gnu/packages/patches/curl-use-ssl-cert-env.patch: Update patch. Change-Id: Iaa6aa5de0f45576dc06bf5eca1eec502e5c83332 --- gnu/packages/curl.scm | 11 +++++++--- gnu/packages/patches/curl-use-ssl-cert-env.patch | 26 ++++++++++++------------ 2 files changed, 21 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index b33f4d36d40..0bf6d996e6a 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -65,14 +65,14 @@ (define-public curl (package (name "curl") - (version "8.4.0") + (version "8.5.0") (source (origin (method url-fetch) (uri (string-append "https://curl.se/download/curl-" version ".tar.xz")) (sha256 (base32 - "0bd8y8v66biyqvg70ka1sdd0aixs6yzpnvfsig907xzh9af2mihn")) + "1sqfflilf7mcz1g03lazyr6v6pf1rsrzprrknsir10hdwawqvas2")) (patches (search-patches "curl-use-ssl-cert-env.patch")))) (build-system gnu-build-system) (outputs '("out" @@ -127,6 +127,9 @@ (if parallel-tests? (number->string (parallel-job-count)) "1"))) + ;; Ignore test 1477 due to a missing file in the 8.5.0 + ;; release. See + ;; . (arguments `("-C" "tests" "test" ,@make-flags ,(if #$(or (system-hurd?) @@ -134,8 +137,10 @@ (target-aarch64?)) ;; protocol FAIL (string-append "TFLAGS=\"~1474 " + "~1477 " job-count "\"") - (string-append "TFLAGS=" job-count))))) + (string-append "TFLAGS=\"~1477 " + job-count "\""))))) ;; The top-level "make check" does "make -C tests quiet-test", which ;; is too quiet. Use the "test" target instead, which is more ;; verbose. diff --git a/gnu/packages/patches/curl-use-ssl-cert-env.patch b/gnu/packages/patches/curl-use-ssl-cert-env.patch index 24be6e31d9b..c39c1f7e98b 100644 --- a/gnu/packages/patches/curl-use-ssl-cert-env.patch +++ b/gnu/packages/patches/curl-use-ssl-cert-env.patch @@ -5,37 +5,37 @@ must be called when no other threads exist). This fixes network functionality in rust:cargo, and probably removes the need for other future workarounds. =================================================================== ---- curl-7.66.0.orig/lib/easy.c 2020-01-02 15:43:11.883921171 +0100 -+++ curl-7.66.0/lib/easy.c 2020-01-02 16:18:54.691882797 +0100 -@@ -134,6 +134,9 @@ - # pragma warning(default:4232) /* MSVC extension, dllimport identity */ +--- curl-8.5.0.orig/lib/easy.c 2023-12-17 00:36:32.400468561 -0500 ++++ curl-8.5.0/lib/easy.c 2023-12-17 00:39:08.898612331 -0500 +@@ -137,6 +137,9 @@ + static char *leakpointer; #endif - + +char * Curl_ssl_cert_dir = NULL; +char * Curl_ssl_cert_file = NULL; + /** * curl_global_init() globally initializes curl given a bitwise set of the * different features of what to initialize. -@@ -155,6 +158,9 @@ - #endif +@@ -163,6 +166,9 @@ + goto fail; } - + + Curl_ssl_cert_dir = curl_getenv("SSL_CERT_DIR"); + Curl_ssl_cert_file = curl_getenv("SSL_CERT_FILE"); + if(!Curl_ssl_init()) { DEBUGF(fprintf(stderr, "Error: Curl_ssl_init failed\n")); - return CURLE_FAILED_INIT; -@@ -260,6 +266,9 @@ + goto fail; +@@ -287,6 +293,9 @@ Curl_ssl_cleanup(); Curl_resolver_global_cleanup(); - + + free(Curl_ssl_cert_dir); + free(Curl_ssl_cert_file); + - #ifdef WIN32 - Curl_win32_cleanup(init_flags); + #ifdef _WIN32 + Curl_win32_cleanup(easy_init_flags); #endif diff -ur curl-7.66.0.orig/lib/url.c curl-7.66.0/lib/url.c --- curl-7.66.0.orig/lib/url.c 2020-01-02 15:43:11.883921171 +0100 -- cgit v1.3 From 1b0e216ad68cf5a893d4007d1373cdc30c820df6 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Sun, 17 Dec 2023 01:12:45 -0500 Subject: gnu: mesa: Update to 23.3.1. * gnu/packages/gl.scm (mesa): Update to 23.3.1. Change-Id: Idf4393b4fa5b7df7a78bd88d7591385023460b5b --- gnu/packages/gl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index c02a6f0a842..b8827de85ee 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -267,7 +267,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "23.2.1") + (version "23.3.1") (source (origin (method url-fetch) @@ -277,7 +277,7 @@ also known as DXTn or DXTC) for Mesa.") "mesa-" version ".tar.xz"))) (sha256 (base32 - "1k61pgw0vcjrlb4299q98cy7iqmk2r7jmb5ika91z01dzhb0dpk4")))) + "1rhxnifvzf168lys0qq6by1xrzs15q6climjzq7z5czxf1ni4j3f")))) (build-system meson-build-system) (propagated-inputs ;; The following are in the Requires.private field of gl.pc. -- cgit v1.3 From d55a4431f3d2b2d61a5b505a8cbbb4cbbd7a8090 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Mon, 18 Dec 2023 18:37:11 -0500 Subject: gnu: gtk: Skip failing test. The 'gtk:tools / validate' test started failing for unknown reasons after updating mesa to 23.3.1 and xorgproto to 2023.2. Skip for now. * gnu/packages/gtk.scm (gtk)[arguments]{phases}: Skip the 'gtk:tools / validate' test using the 'patch' phase. Change-Id: I7d0a459c0cbbb979f4589f929eb637f00f642225 --- gnu/packages/gtk.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index cc33c9f6721..1a3bb56945b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1178,7 +1178,11 @@ application suites.") ;; The unaligned-offscreen test fails for unknown reasons, also ;; on different distributions (see: ;; https://gitlab.gnome.org/GNOME/gtk/-/issues/4889). - ((" 'unaligned-offscreen',") "")) + ((" 'unaligned-offscreen',") "") + ;; This test, 'gtk:tools / validate', started failing for + ;; unknown reasons after updating mesa to 23.3.1 and xorgproto + ;; to 2023.2. + ((" 'validate',") "")) (substitute* "testsuite/reftests/meson.build" (("[ \t]*'label-wrap-justify.ui',") "") ;; The inscription-markup.ui fails due to /etc/machine-id -- cgit v1.3 From ebd3b3e9020f978e65f7be7f4eb0ffff9bbca31f Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Mon, 18 Dec 2023 18:49:40 -0500 Subject: gnu: mesa: Enable zink support. * gnu/packages/gl.scm (mesa)[arguments]: Add zink to gallium-drivers in configure-flags. Change-Id: I1fc7e38a8307b589a7c48bc0b923fccd9ffcd8b8 --- gnu/packages/gl.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index b8827de85ee..8c5e61dfd25 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -324,16 +324,16 @@ also known as DXTn or DXTC) for Mesa.") ((target-aarch64?) ;; TODO: Fix svga driver for non-Intel architectures. '("-Dgallium-drivers=etnaviv,freedreno,kmsro,lima,nouveau,\ -panfrost,r300,r600,swrast,tegra,v3d,vc4,virgl")) +panfrost,r300,r600,swrast,tegra,v3d,vc4,virgl,zink")) ((target-arm32?) ;; Freedreno FTBFS when built on a 64-bit machine. '("-Dgallium-drivers=etnaviv,kmsro,lima,nouveau,panfrost,\ -r300,r600,swrast,tegra,v3d,vc4,virgl")) +r300,r600,swrast,tegra,v3d,vc4,virgl,zink")) ((or (target-ppc64le?) (target-ppc32?) (target-riscv64?)) - '("-Dgallium-drivers=nouveau,r300,r600,radeonsi,swrast,virgl")) + '("-Dgallium-drivers=nouveau,r300,r600,radeonsi,swrast,virgl,zink")) (else '("-Dgallium-drivers=crocus,iris,nouveau,r300,r600,radeonsi,\ -svga,swrast,virgl"))) +svga,swrast,virgl,zink"))) ;; Enable various optional features. TODO: opencl requires libclc, ;; omx requires libomxil-bellagio "-Dplatforms=x11,wayland" -- cgit v1.3 From bdab356332e391e09d0feafe0fcac9c52388a07d Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 25 Dec 2023 11:36:20 +0200 Subject: gnu: curl: Fix test suite on arm platforms. * gnu/packages/curl.scm (curl)[arguments]: Adjust the flags in the custom 'check phase to skip a test instead of ignoring the test result. Change-Id: Ib2098137b04766988507d2f86832871150cd0af7 --- gnu/packages/curl.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/curl.scm b/gnu/packages/curl.scm index 0bf6d996e6a..f73aed679d6 100644 --- a/gnu/packages/curl.scm +++ b/gnu/packages/curl.scm @@ -136,9 +136,9 @@ (target-arm32?) (target-aarch64?)) ;; protocol FAIL - (string-append "TFLAGS=\"~1474 " - "~1477 " - job-count "\"") + (string-append "TFLAGS=~1474 " + "!1477 " + job-count) (string-append "TFLAGS=\"~1477 " job-count "\""))))) ;; The top-level "make check" does "make -C tests quiet-test", which -- cgit v1.3 From 42c448ee6e13d165807d83e8c48941bead4847c1 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Thu, 28 Dec 2023 23:49:15 -0500 Subject: gnu: mesa: Update to 23.3.2. * gnu/packages/gl.scm (mesa): Update to 23.3.2. Change-Id: Ic348c48f4045e8766646a5fe62209619a0247059 --- gnu/packages/gl.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index ce99b334413..dfe9be73c00 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -294,7 +294,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "23.3.1") + (version "23.3.2") (source (origin (method url-fetch) @@ -304,7 +304,7 @@ also known as DXTn or DXTC) for Mesa.") "mesa-" version ".tar.xz"))) (sha256 (base32 - "1rhxnifvzf168lys0qq6by1xrzs15q6climjzq7z5czxf1ni4j3f")))) + "1p4swrbmz3kb1805kdj973hf8virgmix4m9qprmcb2bgl4gviz1w")))) (build-system meson-build-system) (propagated-inputs ;; The following are in the Requires.private field of gl.pc. -- cgit v1.3 From 4440ba3f6ee1f6936755b2eb1e9d60108d2f9c72 Mon Sep 17 00:00:00 2001 From: Benjamin Slade Date: Fri, 29 Dec 2023 01:08:35 -0600 Subject: sbcl: update to 2.4.0 * gnu/packages/lisp.scm (sbcl): Update to 2.4.0. Signed-off-by: Guillaume Le Vaillant Change-Id: I6087f3697b1c9501be09e1e983fb36d11ec35ba2 --- gnu/packages/lisp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 4a895984e70..20ec61dfe55 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -439,14 +439,14 @@ an interpreter, a compiler, a debugger, and much more.") (define-public sbcl (package (name "sbcl") - (version "2.3.7") + (version "2.4.0") (source (origin (method url-fetch) (uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-" version "-source.tar.bz2")) (sha256 - (base32 "1xwr1pnwd3xj375ainlad7mm479rk2mrks8dc6d92cash3xl90b9")) + (base32 "0xhpdnsg8idzxkn20iw8gd2rk470d7vc22vrp5clq9fj117vgn43")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.3 From 466975efea86727465f75a4e2c54e9eeb212f4a6 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Fri, 29 Dec 2023 12:28:52 +0000 Subject: gnu: cl-alexandria: Update to 1.4-0.009b7e5. * gnu/packages/lisp-xyz.scm (sbcl-alexandria): Update to 1.4-0.009b7e5. [file-name]: Rename to cl-alexandria. Move above sha256. Change-Id: I7122aff13715d24e99a58fa4b55b0ef012ae8c40 Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index aa3ea7c9ced..3023bf07db7 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -168,29 +168,30 @@ (sbcl-package->ecl-package sbcl-alexandria-plus)) (define-public sbcl-alexandria - (package - (name "sbcl-alexandria") - (version "1.4") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.common-lisp.net/alexandria/alexandria.git") - (commit (string-append "v" version)))) - (sha256 - (base32 - "0r1adhvf98h0104vq14q7y99h0hsa8wqwqw92h7ghrjxmsvz2z6l")) - (file-name (git-file-name name version)))) - (build-system asdf-build-system/sbcl) - (native-inputs - (list sbcl-rt)) - (synopsis "Collection of portable utilities for Common Lisp") - (description - "Alexandria is a collection of portable utilities. It does not contain + (let ((commit "009b7e532071d9777bdbd63b82d776555da95916") + (revision "0")) + (package + (name "sbcl-alexandria") + (version (git-version "1.4" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.common-lisp.net/alexandria/alexandria.git") + (commit commit))) + (file-name (git-file-name "cl-alexandria" version)) + (sha256 + (base32 "0pdj779j3nwzn8f1661vf00rrjrbks1xgiq0rvwjw6qyxsfqfnl9")))) + (build-system asdf-build-system/sbcl) + (native-inputs + (list sbcl-rt)) + (synopsis "Collection of portable utilities for Common Lisp") + (description + "Alexandria is a collection of portable utilities. It does not contain conceptual extensions to Common Lisp. It is conservative in scope, and portable between implementations.") - (home-page "https://common-lisp.net/project/alexandria/") - (license license:public-domain))) + (home-page "https://common-lisp.net/project/alexandria/") + (license license:public-domain)))) (define-public cl-alexandria (sbcl-package->cl-source-package sbcl-alexandria)) -- cgit v1.3 From 154bb7140f77d528253e6363db14524eadd26a67 Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Fri, 29 Dec 2023 12:58:52 +0000 Subject: gnu: cl-trivial-garbage: Update to 0.21-0.3474f64. * gnu/packages/lisp-xyz.scm (sbcl-trivial-garbage): Update to 0.21-0.3474f64. Change-Id: I2e6efb02756450fa5c59fe87ae661987cb86d023 Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 3023bf07db7..7b2025c7ecf 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -4844,27 +4844,29 @@ precisely controls the behavior of the parser via Common Lisp restarts.") (sbcl-package->ecl-package sbcl-unix-opts)) (define-public sbcl-trivial-garbage - (package - (name "sbcl-trivial-garbage") - (version "0.21") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/trivial-garbage/trivial-garbage") - (commit (string-append "v" version)))) - (file-name (git-file-name "trivial-garbage" version)) - (sha256 - (base32 "0122jicfg7pca1wxw8zak1n92h5friqy60988ns0ysksj3fphw9n")))) - (build-system asdf-build-system/sbcl) - (native-inputs - (list sbcl-rt)) - (home-page "https://common-lisp.net/project/trivial-garbage/") - (synopsis "Portable GC-related APIs for Common Lisp") - (description "@command{trivial-garbage} provides a portable API to + (let ((commit "3474f6414b73d4e3aa2d5c53080f4247a34f6380") + (revision "0")) + (package + (name "sbcl-trivial-garbage") + (version (git-version "0.21" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/trivial-garbage/trivial-garbage") + (commit commit))) + (file-name (git-file-name "cl-trivial-garbage" version)) + (sha256 + (base32 "0rfwxvwg0kpcaa0hsi035yrkfdfks4bq8d9azmrww2f0rmv9g6sd")))) + (build-system asdf-build-system/sbcl) + (native-inputs + (list sbcl-rt)) + (home-page "https://common-lisp.net/project/trivial-garbage/") + (synopsis "Portable GC-related APIs for Common Lisp") + (description "@command{trivial-garbage} provides a portable API to finalizers, weak hash-tables and weak pointers on all major implementations of the Common Lisp programming language.") - (license license:public-domain))) + (license license:public-domain)))) (define-public cl-trivial-garbage (sbcl-package->cl-source-package sbcl-trivial-garbage)) -- cgit v1.3 From 66d327a0499fdda31c375531080a5b0af8d644ef Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Fri, 29 Dec 2023 12:14:15 +0000 Subject: gnu: cl-flexi-streams: Update to 1.0.19-0.74a1027. * gnu/packages/lisp-xyz.scm (sbcl-flexi-streams): Update to 1.0.19-0.74a1027. Change-Id: Id2b82050423aba4f6aa4055c95a18768f110ed71 Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 52 ++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 25 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 7b2025c7ecf..41f3056c982 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -1361,35 +1361,37 @@ thin compatibility layer for gray streams.") (sbcl-package->ecl-package sbcl-trivial-gray-streams)) (define-public sbcl-flexi-streams - (package - (name "sbcl-flexi-streams") - (version "1.0.19") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/edicl/flexi-streams") - (commit (string-append "v" version)))) - (file-name (git-file-name "flexi-streams" version)) - (sha256 - (base32 "0v7lh4nrldzczd4mwylvmxfdxk7wfsli24iv1axd6mkb833llr70")))) - (build-system asdf-build-system/sbcl) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'make-git-checkout-writable - (lambda _ - (for-each make-file-writable (find-files ".")) - #t))))) - (inputs `(("trivial-gray-streams" ,sbcl-trivial-gray-streams))) - (synopsis "Implementation of virtual bivalent streams for Common Lisp") - (description "Flexi-streams is an implementation of \"virtual\" bivalent + (let ((commit "74a1027311371a57258eba1bc908e050f5702277") + (revision "0")) + (package + (name "sbcl-flexi-streams") + (version (git-version "1.0.19" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/edicl/flexi-streams") + (commit commit))) + (file-name (git-file-name "cl-flexi-streams" version)) + (sha256 + (base32 "04azqvz11s8dngy49bjl19hrfn0ip1b7m0szm4hlppq364msil7b")))) + (build-system asdf-build-system/sbcl) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'make-git-checkout-writable + (lambda _ + (for-each make-file-writable (find-files ".")) + #t))))) + (inputs `(("trivial-gray-streams" ,sbcl-trivial-gray-streams))) + (synopsis "Implementation of virtual bivalent streams for Common Lisp") + (description "Flexi-streams is an implementation of \"virtual\" bivalent streams that can be layered atop real binary or bivalent streams and that can be used to read and write character data in various single- or multi-octet encodings which can be changed on the fly. It also supplies in-memory binary streams which are similar to string streams.") - (home-page "http://weitz.de/flexi-streams/") - (license license:bsd-3))) + (home-page "http://weitz.de/flexi-streams/") + (license license:bsd-3)))) (define-public cl-flexi-streams (sbcl-package->cl-source-package sbcl-flexi-streams)) -- cgit v1.3 From 35a0bb9691e32f7e8027bcf9016ebbc64b74cbcd Mon Sep 17 00:00:00 2001 From: "Paul A. Patience" Date: Fri, 29 Dec 2023 12:17:57 +0000 Subject: gnu: cl-flexi-streams: Improve package style. * gnu/packages/lisp-xyz.scm (sbcl-flexi-streams)[arguments]: Use G-expressions. Drop trailing #t in phases. [inputs]: Remove labels. Change-Id: I4aae98985435203006384906a0b28c798e3b9740 Signed-off-by: Guillaume Le Vaillant --- gnu/packages/lisp-xyz.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 41f3056c982..9e16912988f 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -1377,13 +1377,13 @@ thin compatibility layer for gray streams.") (base32 "04azqvz11s8dngy49bjl19hrfn0ip1b7m0szm4hlppq364msil7b")))) (build-system asdf-build-system/sbcl) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'make-git-checkout-writable - (lambda _ - (for-each make-file-writable (find-files ".")) - #t))))) - (inputs `(("trivial-gray-streams" ,sbcl-trivial-gray-streams))) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'make-git-checkout-writable + (lambda _ + (for-each make-file-writable (find-files "."))))))) + (inputs + (list sbcl-trivial-gray-streams)) (synopsis "Implementation of virtual bivalent streams for Common Lisp") (description "Flexi-streams is an implementation of \"virtual\" bivalent streams that can be layered atop real binary or bivalent streams and that can -- cgit v1.3 From 67119aadac198423270bf4618a394ab4d1e1d75d Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 4 Jan 2024 16:56:15 +0100 Subject: gnu: cl-lparallel: Update to 2.8.4-1.80fc295. * gnu/packages/lisp-xyz.scm (sbcl-lparallel): Update to 2.8.4-1.80fc295. [source]: Update URI to maintained repository. [inputs]: Remove labels. Change-Id: I18ac84c0889a57c040ed9b443774ae16e716918d --- gnu/packages/lisp-xyz.scm | 69 ++++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 34 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 9e16912988f..36aa59a7929 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5113,39 +5113,40 @@ WebKit browsing engine.") (sbcl-package->ecl-package sbcl-cl-webkit)) (define-public sbcl-lparallel - (package - (name "sbcl-lparallel") - (version "2.8.4") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/lmj/lparallel/") - (commit (string-append "lparallel-" version)))) - (file-name (git-file-name "lparallel" version)) - (sha256 - (base32 - "0g0aylrbbrqsz0ahmwhvnk4cmc2931fllbpcfgzsprwnqqd7vwq9")))) - (build-system asdf-build-system/sbcl) - (inputs - `(("alexandria" ,sbcl-alexandria) - ("bordeaux-threads" ,sbcl-bordeaux-threads) - ("trivial-garbage" ,sbcl-trivial-garbage))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-dependency - ;; lparallel loads a SBCL specific system in its asd file. This is - ;; not carried over into the fasl which is generated. In order for - ;; it to be carried over, it needs to be listed as a dependency. - (lambda _ - (substitute* "lparallel.asd" - ((":depends-on \\(:alexandria" all) - (string-append all " #+sbcl :sb-cltl2")))))))) - (home-page "https://lparallel.org/") - (synopsis "Parallelism for Common Lisp") - (description - "@command{lparallel} is a library for parallel programming in Common + (let ((commit "80fc2952a074776abd343d6b5d3ab157f0e1df7a") + (revision "1")) + (package + (name "sbcl-lparallel") + (version (git-version "2.8.4" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sharplispers/lparallel/") + (commit commit))) + (file-name (git-file-name "cl-lparallel" version)) + (sha256 + (base32 "0nv2dx8cl25g68icqhw95yr5mygm86lcjzmzijql51na1p60g6y9")))) + (build-system asdf-build-system/sbcl) + (inputs + (list sbcl-alexandria + sbcl-bordeaux-threads + sbcl-trivial-garbage)) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-dependency + ;; lparallel loads a SBCL specific system in its asd file. This is + ;; not carried over into the fasl which is generated. In order for + ;; it to be carried over, it needs to be listed as a dependency. + (lambda _ + (substitute* "lparallel.asd" + ((":depends-on \\(:alexandria" all) + (string-append all " #+sbcl :sb-cltl2")))))))) + (home-page "https://lparallel.org/") + (synopsis "Parallelism for Common Lisp") + (description + "@command{lparallel} is a library for parallel programming in Common Lisp, featuring: @itemize @@ -5160,7 +5161,7 @@ Lisp, featuring: @item task killing by category, @item integrated timeouts. @end itemize\n") - (license license:expat))) + (license license:expat)))) (define-public cl-lparallel (sbcl-package->cl-source-package sbcl-lparallel)) -- cgit v1.3 From 386376029367943367734c522efce5649bb3fd5b Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 4 Jan 2024 17:01:51 +0100 Subject: gnu: cl-bordeaux-threads: Update to 0.9.3. * gnu/packages/lisp-xyz.scm (sbcl-bordeaux-threads): Update to 0.9.3. [arguments]: Remove 'silence-deprecation-warning' phase. Change-Id: I392d48fb2250bfcae66e3e60d3de89ad4edb99f1 --- gnu/packages/lisp-xyz.scm | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 36aa59a7929..580e21f04e7 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -1281,14 +1281,14 @@ timeouts.") (define-public sbcl-bordeaux-threads (package (name "sbcl-bordeaux-threads") - (version "0.9.2") + (version "0.9.3") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/sionescu/bordeaux-threads") (commit (string-append "v" version)))) (sha256 - (base32 "0d9sd7pm91yhln95z8nclhn6n4l5b2cp3pxpggpmpv7rsq84ssmh")) + (base32 "0pp3w5hsph47sqagr4j2pbg3ddb29jx93zg8kvxsp2c4flp0qz0f")) (file-name (git-file-name "cl-bordeaux-threads" version)))) (inputs (list sbcl-alexandria sbcl-global-vars @@ -1300,16 +1300,6 @@ timeouts.") (list #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'silence-deprecation-warning - (lambda _ - ;; The deprecation warning for APIv1 makes the build of some - ;; of the dependents of bordeaux-threads fail because they - ;; interpret it as an error instead of a simple indication. - ;; Let's silence this warning for now. - (substitute* (cons* "apiv1/default-implementations.lisp" - (find-files "apiv1" "impl-.*\\.lisp")) - (("\\(warn \"Bordeaux-Threads APIv1 is deprecated\\. Please migrate to APIv2\\.\"\\)") - "")))) (add-after 'unpack 'adjust-test-sleep (lambda _ ;; 0.001 is too short for some slower machines. -- cgit v1.3 From d1ce5a3597ed81f670900740338f6460ce71b653 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Thu, 4 Jan 2024 17:11:10 +0100 Subject: gnu: ecl-lparallel: Enable tests. * gnu/packages/lisp-xyz.scm (ecl-lparallel)[arguments]: Enable tests. Change-Id: I58c7ab8173db4bb87ac8f94526bfc912a3e479b9 --- gnu/packages/lisp-xyz.scm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 580e21f04e7..69e071096d9 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2018, 2019 Pierre Langlois ;;; Copyright © 2019, 2020 Katherine Cox-Buday ;;; Copyright © 2019 Jesse Gildersleve -;;; Copyright © 2019-2023 Guillaume Le Vaillant +;;; Copyright © 2019-2024 Guillaume Le Vaillant ;;; Copyright © 2019 Brett Gilio ;;; Copyright © 2020 Konrad Hinsen ;;; Copyright © 2020 Dimakis Dimakakos @@ -5157,11 +5157,7 @@ Lisp, featuring: (sbcl-package->cl-source-package sbcl-lparallel)) (define-public ecl-lparallel - (package - (inherit (sbcl-package->ecl-package sbcl-lparallel)) - (arguments - ;; TODO: Find why the tests get stuck forever; disable them for now. - `(#:tests? #f)))) + (sbcl-package->ecl-package sbcl-lparallel)) (define-public sbcl-cl-markup (let ((commit "e0eb7debf4bdff98d1f49d0f811321a6a637b390")) -- cgit v1.3 From 7f530f52c9c07b34c4df9c8fbeae0c3c9d0345e9 Mon Sep 17 00:00:00 2001 From: Guillaume Le Vaillant Date: Sun, 7 Jan 2024 11:27:02 +0100 Subject: gnu: cl-concurrent-hash-tables: Update to 0.0.0-1.6ad539b. * gnu/packages/lisp-xyz.scm (sbcl-concurrent-hash-tables): Update to 0.0.0-1.6ad539b. Change-Id: I6e44d4d17cf21162c099b0bb9e6d1ae60f869c33 --- gnu/packages/lisp-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 69e071096d9..38eb9bdfdd6 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -16328,8 +16328,8 @@ directly.") (sbcl-package->ecl-package sbcl-custom-hash-table)) (define-public sbcl-concurrent-hash-tables - (let ((commit "1b9f0b5da54fece4f42296e1bdacfcec0c370a5a") - (revision "0")) + (let ((commit "6ad539b8970ff94b1e1369b59065ed7d0660904c") + (revision "1")) (package (name "sbcl-concurrent-hash-tables") (version (git-version "0.0.0" revision commit)) @@ -16341,7 +16341,7 @@ directly.") (commit commit))) (file-name (git-file-name "cl-concurrent-hash-tables" version)) (sha256 - (base32 "03g24ycr1ngzg8bv10iwp1bmnldz5bxbfdqrzhfxhicpibh49r96")))) + (base32 "0wgbv3wl33rlfbywmjag0gk7igzfksmib30r8cbnd5n47ic09iip")))) (build-system asdf-build-system/sbcl) (inputs (list sbcl-atomics sbcl-bordeaux-threads)) -- cgit v1.3 From 6dc7307cfbe276aa540936199e9bf3c350b39b22 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 5 Jan 2024 10:12:17 +0100 Subject: gnu: shepherd: Update to 0.10.3. * gnu/packages/admin.scm (shepherd-0.10): Update to 0.10.3. Change-Id: I6b14a41c22a18bcf0c5bd380d7f118276d0f761c --- gnu/packages/admin.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 54427146654..3f1de1e6b66 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -373,14 +373,14 @@ interface and is based on GNU Guile.") (define-public shepherd-0.10 (package (inherit shepherd-0.9) - (version "0.10.2") + (version "0.10.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/shepherd/shepherd-" version ".tar.gz")) (sha256 (base32 - "0v9ld9gbqdp5ya380fbkdsxa0iqr90gi6yk004ccz3n792nq6wlj")))) + "1vxghlxnxajx2iciqmjia49c5hkir8li0gv29kl55frhn2zgxilf")))) (native-inputs (modify-inputs (package-native-inputs shepherd-0.9) (replace "guile-fibers" ;; Work around -- cgit v1.3 From 59a68a6c2a4765b0e9bb17d3a7e65d565dd799dd Mon Sep 17 00:00:00 2001 From: Greg Hogan Date: Tue, 5 Dec 2023 19:51:29 +0000 Subject: gnu: valgrind: Update to 3.22.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/valgrind.scm (valgrind): Update to 3.22.0. Change-Id: I336c4208d0a15e54ea8ae0238b898b8a909eea62 Signed-off-by: Ludovic Courtès --- gnu/packages/valgrind.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/valgrind.scm b/gnu/packages/valgrind.scm index 06622548a52..b50dabf9ca9 100644 --- a/gnu/packages/valgrind.scm +++ b/gnu/packages/valgrind.scm @@ -39,7 +39,7 @@ (define-public valgrind (package (name "valgrind") - (version "3.20.0") + (version "3.22.0") (source (origin (method url-fetch) (uri (list (string-append "https://sourceware.org/pub/valgrind" @@ -48,7 +48,7 @@ "/valgrind-" version ".tar.bz2"))) (sha256 (base32 - "1ipkp6yi202pml2r0qwflysmq86dkqd8iyi1y51d6y70vcqw0dl5")))) + "0k1ddnzxfpbng2sp5r31jjxsmp35g977rx6a8jcp4prcvmddn4f8")))) (build-system gnu-build-system) (outputs '("doc" ;16 MB "out")) -- cgit v1.3 From f896382594f96d6d41965bd5c6dba856b7991f12 Mon Sep 17 00:00:00 2001 From: "Artyom V. Poptsov" Date: Sat, 9 Dec 2023 11:09:26 +0300 Subject: gnu: go-golang-org-x-sys: Update to 0.8.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/golang.scm (go-golang-org-x-sys): Update to 0.8.0. (go-golang-org-x-sys-0.8): Remove. (go-github-com-quic-go-quic-go, go-github-com-quic-go-qtls-go1-20): Use the new version of "go-golang-org-x-sys". * gnu/packages/networking.scm (yggdrasil): Use the new version of "go-golang-org-x-sys". [propagated-inputs]: Don't rewrite inputs; add "go-golang-org-x-sys". Change-Id: I969dd402427e345550038918f6de607413c44a61 Signed-off-by: Ludovic Courtès --- gnu/packages/golang.scm | 52 +++++++++++++----------------------------- gnu/packages/networking.scm | 55 +++++++++++++++++++++------------------------ 2 files changed, 41 insertions(+), 66 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 36e2c4b23e3..58681af9583 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -3959,11 +3959,11 @@ packages.") (license license:bsd-3)))) (define-public go-golang-org-x-sys - (let ((commit "b60007cc4e6f966b1c542e343d026d06723e5653") + (let ((commit "ca59edaa5a761e1d0ea91d6c07b063f85ef24f78") (revision "0")) (package (name "go-golang-org-x-sys") - (version (git-version "0.4.0" revision commit)) + (version (git-version "0.8.0" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -3972,7 +3972,7 @@ packages.") (file-name (git-file-name name version)) (sha256 (base32 - "0fr2d6fnpbqx6n89sg9lsinqkdaw49y068kqj2g0cxlhbh69hzii")))) + "1p81niiin8dwyrjl2xsc95136w3vdw4kmj0w3mlh0vh5v134s4xq")))) (build-system go-build-system) (arguments (list @@ -3989,24 +3989,6 @@ support for low-level interaction with the operating system.") (home-page "https://go.googlesource.com/sys") (license license:bsd-3)))) -;; XXX: This version is required for "go-github-com-quic-go-qtls-go1-20". -(define-public go-golang-org-x-sys-0.8 - (let ((commit "ca59edaa5a761e1d0ea91d6c07b063f85ef24f78") - (revision "0")) - (package - (inherit go-golang-org-x-sys) - (name "go-golang-org-x-sys") - (version (git-version "0.8.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://go.googlesource.com/sys") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1p81niiin8dwyrjl2xsc95136w3vdw4kmj0w3mlh0vh5v134s4xq"))))))) - (define-public go-golang-org-x-text (package (name "go-golang-org-x-text") @@ -7269,7 +7251,7 @@ implementation of generics.") #:import-path "github.com/quic-go/qtls-go1-20" #:go go-1.20)) (propagated-inputs (list go-golang-org-x-crypto - go-golang-org-x-sys-0.8)) + go-golang-org-x-sys)) (synopsis "TLS 1.3 for QUIC") (description "Go standard library TLS 1.3 implementation, modified for QUIC. For @@ -7330,21 +7312,17 @@ the Go standard library}.") #:tests? #f #:go go-1.20)) (propagated-inputs - (let ((p (package-input-rewriting - `((,go-golang-org-x-sys . ,go-golang-org-x-sys-0.8)) - #:deep? #true))) - (cons go-golang-org-x-sys-0.8 - (map p - (list go-github-com-quic-go-qtls-go1-20 - go-github-com-quic-go-qpack - go-golang-org-x-crypto - go-github-com-cheekybits-genny - go-github-com-marten-seemann-chacha20 - go-github-com-golang-protobuf-proto - go-golang-org-x-crypto - go-golang-org-x-exp - go-golang-org-x-net - go-golang-org-x-sync))))) + (list go-github-com-quic-go-qtls-go1-20 + go-github-com-quic-go-qpack + go-golang-org-x-crypto + go-github-com-cheekybits-genny + go-github-com-marten-seemann-chacha20 + go-github-com-golang-protobuf-proto + go-golang-org-x-crypto + go-golang-org-x-exp + go-golang-org-x-net + go-golang-org-x-sys + go-golang-org-x-sync)) (synopsis "QUIC in Go") (description "This package provides a Go language implementation of the QUIC network protocol.") diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 98444306561..cc6f1a1e048 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -4445,35 +4445,32 @@ QUIC protocol.") "github.com/yggdrasil-network/yggdrasil-go/cmd/yggdrasilctl" "github.com/yggdrasil-network/yggdrasil-go/cmd/genkeys")))))))) (propagated-inputs - (let ((p (package-input-rewriting - `((,go-golang-org-x-sys . ,go-golang-org-x-sys-0.8)) - #:deep? #true))) - (cons go-golang-org-x-sys-0.8 - (map p - (list go-github-com-arceliar-ironwood - go-github-com-arceliar-phony - go-github-com-bits-and-blooms-bitset - go-github-com-bits-and-blooms-bloom - go-github-com-cheggaaa-pb-v3 - go-github-com-fatih-color - go-github-com-gologme-log - go-github-com-hashicorp-go-syslog - go-github-com-hjson-hjson-go - go-github-com-kardianos-minwinsvc - go-github-com-mattn-go-colorable - go-github-com-mattn-go-isatty - go-github-com-mattn-go-runewidth - go-github-com-mitchellh-mapstructure - go-github-com-olekukonko-tablewriter - go-github-com-quic-go-quic-go - go-github-com-vividcortex-ewma - go-golang-org-x-crypto - go-golang-org-x-net - go-golang-org-x-text - go-golang-org-x-tools - go-golang-zx2c4-com-wireguard - go-netlink - go-netns))))) + (list go-golang-zx2c4-com-wireguard + go-golang-org-x-text + go-golang-org-x-net + go-golang-org-x-crypto + go-golang-org-x-tools + go-golang-org-x-sys + go-netns + go-netlink + go-github-com-bits-and-blooms-bitset + go-github-com-bits-and-blooms-bloom + go-github-com-quic-go-quic-go + go-github-com-hjson-hjson-go + go-github-com-olekukonko-tablewriter + go-github-com-mitchellh-mapstructure + go-github-com-mattn-go-runewidth + go-github-com-mattn-go-isatty + go-github-com-mattn-go-colorable + go-github-com-kardianos-minwinsvc + go-github-com-hjson-hjson-go + go-github-com-hashicorp-go-syslog + go-github-com-gologme-log + go-github-com-fatih-color + go-github-com-cheggaaa-pb-v3 + go-github-com-vividcortex-ewma + go-github-com-arceliar-phony + go-github-com-arceliar-ironwood)) (home-page "https://yggdrasil-network.github.io/blog.html") (synopsis "Experiment in scalable routing as an encrypted IPv6 overlay network") -- cgit v1.3 From c784c0f43f496e134ef68dbcfbb78d95283796fa Mon Sep 17 00:00:00 2001 From: Rostislav Svoboda Date: Sun, 19 Nov 2023 10:30:59 +0100 Subject: gnu: Add emacs-color-identifiers-mode. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs-xyz.scm (emacs-color-identifiers-mode): New variable. Change-Id: I1243d468f0ebb39715438fb814d0691dac785515 Signed-off-by: Ludovic Courtès --- gnu/packages/emacs-xyz.scm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index f2953295c2e..64cc7e163df 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11395,6 +11395,30 @@ package provides a light and a dark variant.") Solarized color scheme.") (license license:expat)))) +(define-public emacs-color-identifiers-mode + (let ((commit "a26d00d898e0a3295cb7da9323046397223ea1fe") + (revision "0")) + (package + (name "emacs-color-identifiers-mode") + (version (git-version "1.1" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ankurdave/color-identifiers-mode") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1kky827f922ziiwasrfnv97vqdf62fp9yml36x1fjsm2h6qw0c8v")))) + (build-system emacs-build-system) + (propagated-inputs (list emacs-dash)) + (home-page "https://github.com/ankurdave/color-identifiers-mode") + (synopsis "Minor mode for coloring identifiers based on their names") + (description + "This package provides an Emacs minor mode to highlight each source +code identifier uniquely based on its name.") + (license license:gpl3+)))) + (define-public emacs-poet-theme (let ((commit "16eb694f0755c04c4db98614d0eca1199fddad70") (revision "1")) -- cgit v1.3 From 51d25c771cfb7e26f5bd0d675893f68a8cbb92dc Mon Sep 17 00:00:00 2001 From: Troy Figiel Date: Fri, 17 Nov 2023 21:48:02 +0100 Subject: gnu: python-uqbar: Update to 0.5.9. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/graphviz.scm (python-uqbar): Update to 0.5.9. [source]: Add patch for Python 3.10 compatibility. [arguments]: Remove outdated patch phase. Change-Id: I81d83efd69bd07fe12790981c48a6e82297908f0 Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/graphviz.scm | 12 +++-------- gnu/packages/patches/python-uqbar-python3.10.patch | 23 ++++++++++++++++++++++ 3 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 gnu/packages/patches/python-uqbar-python3.10.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index f804f4ef5bd..3548b5eb3d5 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1782,6 +1782,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-sphinx-prompt-docutils-0.19.patch \ %D%/packages/patches/python-telingo-fix-comparison.patch \ %D%/packages/patches/python-typeguard-python3.10.patch \ + %D%/packages/patches/python-uqbar-python3.10.patch \ %D%/packages/patches/python-wxwidgets-type-errors.patch \ %D%/packages/patches/qtdeclarative-5-disable-qmlcache.patch \ %D%/packages/patches/qtdeclarative-disable-qmlcache.patch \ diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index b91c365e3c5..c5507e036c1 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -195,7 +195,7 @@ structure and layout algorithms.") (define-public python-uqbar (package (name "python-uqbar") - (version "0.5.6") + (version "0.5.9") (source (origin (method git-fetch) @@ -205,18 +205,12 @@ structure and layout algorithms.") (file-name (git-file-name name version)) (sha256 (base32 - "1ml3x2mf7nlnvrh9lari5yk0sz2mmg39jwsbjxnpzhnw4kcwpdrs")))) + "0c573nzpm51qgz2g296f8pw8ys0i3r6daynxk06zagk5l5fgw9ar")) + (patches (search-patches "python-uqbar-python3.10.patch")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'patch - (lambda _ - (substitute* "setup.py" - ;; Latest versions of sphink-rtd-theme require npm to build. - (("sphinx-rtd-theme >= 0.5.0") "sphinx-rtd-theme >= 0.2.4") - (("black") "black >= 19.10b0")) - #t)) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? diff --git a/gnu/packages/patches/python-uqbar-python3.10.patch b/gnu/packages/patches/python-uqbar-python3.10.patch new file mode 100644 index 00000000000..164f0c0c64d --- /dev/null +++ b/gnu/packages/patches/python-uqbar-python3.10.patch @@ -0,0 +1,23 @@ +Since Python 3.10 the output of a CLI program created with argparse +uses "options" instead of "optional arguments". This behaviour breaks +the tests in python-uqbar. + +--- a/tests/test_cli.py ++++ b/tests/test_cli.py +@@ -84,7 +84,7 @@ def test_call_help(): + + speak like a cat + +- optional arguments: ++ options: + -h, --help show this help message and exit + --version show program's version number and exit + --loud be adamant +@@ -101,6 +101,6 @@ def test_help(): + """ + usage: vox-aggregator [-h] [--version] {help,list,birds,mammals} ... + +- optional arguments: ++ options: + -h, --help show this help message and exit + --version show program's version number and exit -- cgit v1.3 From b6106e8fff83c1fdf1d46527813b7b1f2fc90801 Mon Sep 17 00:00:00 2001 From: Tristan Cottam Date: Sat, 18 Nov 2023 12:31:13 +0100 Subject: gnu: Add emacs-adwaita-dark-theme MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs-xyz.scm (emacs-adwaita-dark-theme): New variable. Change-Id: Id6e6d0d6aa27e7c1cc6ec0fc11c3a5f09231d751 Signed-off-by: Ludovic Courtès --- gnu/packages/emacs-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 64cc7e163df..99c16f382d9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2017,6 +2017,27 @@ Apprentice and Sourcerer.") theme but now takes more inspiration from the Nano theme.") (license license:gpl3+))) +(define-public emacs-adwaita-dark-theme + ;; Version 1.1.1 isn't tagged upstream. + (package + (name "emacs-adwaita-dark-theme") + (version "1.1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/jessieh/adwaita-dark-theme") + (commit "057c39313341907b35c68d2179226886a0c276fd"))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1g7hyg2hfvn24gaw4lca4g8lw10q2wg9nfrgl7pfdggz202m027c")))) + (build-system emacs-build-system) + (home-page "https://gitlab.com/jessieh/adwaita-dark-theme") + (synopsis "Adwaita-inspired dark color scheme for Emacs") + (description + "This package provides an Adwaita-inspired dark color scheme for Emacs.") + (license license:gpl2+))) + (define-public emacs-treepy (package (name "emacs-treepy") -- cgit v1.3 From ce4fbea7bb3ec43a220ee3654c19fc52c00cc9d5 Mon Sep 17 00:00:00 2001 From: Antoine Côté Date: Mon, 20 Nov 2023 14:51:52 +0000 Subject: gnu: libmatroska: Update to 1.7.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/video.scm (libmatroska): Update to 1.7.1. Change-Id: Ia2c943743636f0a01b1446be871b6dcd663ad0d3 Signed-off-by: Ludovic Courtès --- gnu/packages/video.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index e70aa5352e7..f7d720f89dc 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1505,14 +1505,14 @@ SMPTE 314M.") (define-public libmatroska (package (name "libmatroska") - (version "1.6.3") + (version "1.7.1") (source (origin (method url-fetch) (uri (string-append "https://dl.matroska.org/downloads/" "libmatroska/libmatroska-" version ".tar.xz")) (sha256 - (base32 "06h81sxyz2riic0gpzik6ffcnq32wrqphi8c6k55glcdymiimyfs")))) + (base32 "1cqq61qgv6x3xjzjrw71dya7lbsbrsmi9raqm2k4hgfrp0rk0ajp")))) (build-system cmake-build-system) (inputs (list libebml)) -- cgit v1.3 From 5d97fdb608a89e8653f093bf34720e0822124805 Mon Sep 17 00:00:00 2001 From: Antoine Côté Date: Mon, 20 Nov 2023 14:51:53 +0000 Subject: gnu: mkvtoolnix: Update to 80.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/video.scm (mkvtoolnix): Update to 80.0. [inputs]: Add GMP and QTSVG. Replace QT*-5 by their non-suffixed variant. [native-inputs]: Likewise, and change to RUBY-3.2. Change-Id: If01ce578c9f9ac50e1c99e96c110687e8872177c Signed-off-by: Ludovic Courtès --- gnu/packages/video.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index f7d720f89dc..d1b163dc8b5 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1047,14 +1047,14 @@ H.264 (MPEG-4 AVC) video streams.") (define-public mkvtoolnix (package (name "mkvtoolnix") - (version "52.0.0") + (version "80.0") (source (origin (method url-fetch) (uri (string-append "https://mkvtoolnix.download/sources/" "mkvtoolnix-" version ".tar.xz")) (sha256 - (base32 "15y7ahlifsclnkl70wn5w34dil8nwcwcjnw3k2ydqc6dz4vb0j5s")) + (base32 "1x9k9pmw7mzm2amvm251a45dlj9p9iqfank5p4w2fizxkapws25v")) (modules '((guix build utils))) (snippet '(begin ;; Delete bundled libraries. @@ -1070,6 +1070,7 @@ H.264 (MPEG-4 AVC) video streams.") (outputs '("out" "gui")) ; "mkvtoolnix-gui" brings the closure size from ~300 MB to 1.5+ GB. (inputs (list boost + gmp bzip2 cmark libebml @@ -1083,8 +1084,9 @@ H.264 (MPEG-4 AVC) video streams.") lzo pcre2 pugixml - qtbase-5 - qtmultimedia-5 + qtbase + qtmultimedia + qtsvg utfcpp zlib)) (native-inputs @@ -1096,8 +1098,8 @@ H.264 (MPEG-4 AVC) video streams.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("po4a" ,po4a) - ("qttools-5" ,qttools-5) - ("ruby" ,ruby-2.7))) + ("qttools" ,qttools) + ("ruby" ,ruby-3.2))) (arguments `(#:configure-flags (list (string-append "--with-boost=" -- cgit v1.3 From 5f8a993aa85554ca09bd27139230d7664107e1b6 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 7 Jan 2024 16:27:09 +0100 Subject: gnu: mkvtoolnix: Remove input labels and use gexps. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/video.scm (mkvtoolnix)[native-inputs]: Remove labels. [arguments]: Use gexps and ‘this-package-input’ & co. Change-Id: I12b6638cd78c8c957ac9856c0e19025f4941847e --- gnu/packages/video.scm | 157 ++++++++++++++++++++++++++----------------------- 1 file changed, 83 insertions(+), 74 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index d1b163dc8b5..4181013b0d4 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1090,81 +1090,90 @@ H.264 (MPEG-4 AVC) video streams.") utfcpp zlib)) (native-inputs - `(("docbook-xsl" ,docbook-xsl) - ("gettext" ,gettext-minimal) - ("googletest" ,googletest) - ("libxslt" ,libxslt) - ("nlohmann-json" ,nlohmann-json) - ("perl" ,perl) - ("pkg-config" ,pkg-config) - ("po4a" ,po4a) - ("qttools" ,qttools) - ("ruby" ,ruby-3.2))) + (list docbook-xsl + gettext-minimal + googletest + libxslt + nlohmann-json + perl + pkg-config + po4a + qttools + ruby-3.2)) (arguments - `(#:configure-flags - (list (string-append "--with-boost=" - (assoc-ref %build-inputs "boost")) - (string-append "--with-docbook-xsl-root=" - (assoc-ref %build-inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl)) - "--enable-update-check=no" - "--enable-precompiled-headers=no") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-utfcpp-include - (lambda _ - (substitute* "src/common/strings/utf8.cpp" - (("") - "")))) - (add-after 'unpack 'patch-relative-file-names - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (substitute* "src/mkvtoolnix-gui/util/settings.cpp" - (("mkvmerge" match) - (string-append out "/bin/" match))) - #t))) - (add-before 'configure 'add-googletest - (lambda* (#:key inputs #:allow-other-keys) - (symlink (search-input-directory inputs "/include/gtest") - "lib/gtest"))) - (replace 'build - (lambda _ - (let ((-j (list "-j" (number->string (parallel-job-count))))) - (apply invoke "rake" -j)))) - (replace 'check - (lambda _ - (invoke "rake" "tests/unit"))) - (replace 'install - (lambda _ - (invoke "rake" "install"))) - (add-after 'install 'post-install - (lambda* (#:key outputs #:allow-other-keys) - ;; Move the Qt interface to "gui". - (let* ((out (assoc-ref outputs "out")) - (gui (assoc-ref outputs "gui")) - (strip-store-dir (lambda (path) - (substring path (string-prefix-length out path))))) - (for-each - (lambda (file) - (mkdir-p (string-append gui (dirname file))) - (rename-file (string-append out file) - (string-append gui file))) - (append '("/bin/mkvtoolnix-gui" - "/share/applications/org.bunkus.mkvtoolnix-gui.desktop" - "/share/metainfo/org.bunkus.mkvtoolnix-gui.appdata.xml" - "/share/mime/packages/org.bunkus.mkvtoolnix-gui.xml") - (map strip-store-dir (find-files out "\\.ogg$")) - (map strip-store-dir (find-files out "mkvtoolnix-gui\\.png$")) - (map strip-store-dir (find-files out "mkvtoolnix-gui\\.1")))) - (for-each - (lambda (file) - (delete-file-recursively (string-append out file))) - '("/share/applications" - "/share/metainfo" - "/share/mime" - "/share/mkvtoolnix"))) - #t))))) + (list + #:configure-flags + #~(list (string-append "--with-boost=" + #$(this-package-input "boost")) + (string-append "--with-docbook-xsl-root=" + #$(this-package-native-input "docbook-xsl") + "/xml/xsl/docbook-xsl-" + #$(package-version + (this-package-native-input "docbook-xsl"))) + "--enable-update-check=no" + "--enable-precompiled-headers=no") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-utfcpp-include + (lambda _ + (substitute* "src/common/strings/utf8.cpp" + (("") + "")))) + (add-after 'unpack 'patch-relative-file-names + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "src/mkvtoolnix-gui/util/settings.cpp" + (("mkvmerge" match) + (string-append out "/bin/" match))) #t))) + (add-before 'configure 'add-googletest + (lambda* (#:key inputs #:allow-other-keys) + (symlink (search-input-directory inputs + "/include/gtest") + "lib/gtest"))) + (replace 'build + (lambda _ + (let ((-j (list "-j" + (number->string (parallel-job-count))))) + (apply invoke "rake" -j)))) + (replace 'check + (lambda _ + (invoke "rake" "tests/unit"))) + (replace 'install + (lambda _ + (invoke "rake" "install"))) + (add-after 'install 'post-install + (lambda* (#:key outputs #:allow-other-keys) + ;; Move the Qt interface to "gui". + (let* ((out (assoc-ref outputs "out")) + (gui (assoc-ref outputs "gui")) + (strip-store-dir (lambda (path) + (substring path + (string-prefix-length + out path))))) + (for-each (lambda (file) + (mkdir-p (string-append gui + (dirname + file))) + (rename-file (string-append out file) + (string-append gui file))) + (append '("/bin/mkvtoolnix-gui" + "/share/applications/org.bunkus.mkvtoolnix-gui.desktop" + "/share/metainfo/org.bunkus.mkvtoolnix-gui.appdata.xml" + "/share/mime/packages/org.bunkus.mkvtoolnix-gui.xml") + (map strip-store-dir + (find-files out "\\.ogg$")) + (map strip-store-dir + (find-files out + "mkvtoolnix-gui\\.png$")) + (map strip-store-dir + (find-files out + "mkvtoolnix-gui\\.1")))) + (for-each (lambda (file) + (delete-file-recursively + (string-append out file))) + '("/share/applications" + "/share/metainfo" "/share/mime" + "/share/mkvtoolnix")))))))) (home-page "https://mkvtoolnix.download") (synopsis "Tools to create, alter and inspect Matroska files") (description -- cgit v1.3 From 0c75999d19e97fa30e246d0a698828f467dc1c5a Mon Sep 17 00:00:00 2001 From: Tomas Volf <~@wolfsden.cz> Date: Sat, 6 Jan 2024 14:59:54 +0100 Subject: gnu: cgit: Update to 1.2.3-793c420. * gnu/packages/version-control.scm (cgit): Update to 793c420897e18eb3474c751d54cf4e0983f85433. [inputs]: Update git to 2.43.0. Change-Id: I3441e9e2837d22ae208f5cccc53d815cc3e0f042 Signed-off-by: Mathieu Othacehe --- gnu/packages/version-control.scm | 219 ++++++++++++++++++++------------------- 1 file changed, 111 insertions(+), 108 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 40d7a00dae7..4d5d1a97204 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1072,115 +1072,118 @@ collaboration using typical untrusted file hosts or services.") (license license:gpl3+))) (define-public cgit - (package - (name "cgit") - ;; Update the ‘git-source’ input as well. - (version "1.2.3") - (source (origin - (method url-fetch) - (uri (string-append - "https://git.zx2c4.com/cgit/snapshot/cgit-" - version ".tar.xz")) - (sha256 - (base32 - "193d990ym10qlslk0p8mjwp2j6rhqa7fq0y1iff65lvbyv914pss")))) - (build-system gnu-build-system) - (arguments - (list - #:tests? #f ; XXX: fail to build the in-source git. - #:test-target "test" - #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) - "SHELL_PATH=sh") - #:phases - #~(modify-phases %standard-phases - (add-after 'unpack 'unpack-git - (lambda* (#:key inputs #:allow-other-keys) - ;; Unpack the source of git into the 'git' directory. - (invoke "tar" "--strip-components=1" "-C" "git" "-xf" - (assoc-ref inputs "git-source")))) - (add-after 'unpack 'patch-absolute-file-names - (lambda* (#:key inputs #:allow-other-keys) - (define (quoted-file-name input path) - (string-append "\"" input path "\"")) - (substitute* "ui-snapshot.c" - (("\"gzip\"") - (quoted-file-name (assoc-ref inputs "gzip") "/bin/gzip")) - (("\"bzip2\"") - (quoted-file-name (assoc-ref inputs "bzip2") "/bin/bzip2")) - (("\"xz\"") - (quoted-file-name (assoc-ref inputs "xz") "/bin/xz"))) - - (substitute* "filters/about-formatting.sh" - (("$\\(dirname $0\\)") (string-append (assoc-ref outputs "out") - "/lib/cgit/filters")) - (("\\| tr") (string-append "| " (which "tr")))) - - (substitute* "filters/html-converters/txt2html" - (("sed") (which "sed"))) - - (substitute* "filters/html-converters/man2html" - (("groff") (which "groff"))) - - (substitute* "filters/html-converters/rst2html" - (("rst2html\\.py") (which "rst2html.py"))))) - (delete 'configure) ; no configure script - (add-after 'build 'build-man - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "doc-man" make-flags))) - (replace 'install - (lambda* (#:key make-flags outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (apply invoke - "make" "install" "install-man" - (string-append "prefix=" out) - (string-append "CGIT_SCRIPT_PATH=" out "/share/cgit") - make-flags) - ;; Move the platform-dependent 'cgit.cgi' into lib to get it - ;; stripped. - (rename-file (string-append out "/share/cgit/cgit.cgi") - (string-append out "/lib/cgit/cgit.cgi"))))) - (add-after 'install 'wrap-python-scripts - (lambda* (#:key outputs #:allow-other-keys) - (for-each - (lambda (file) - (wrap-program (string-append (assoc-ref outputs "out") - "/lib/cgit/filters/" file) - `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))))) - '("syntax-highlighting.py" - "html-converters/md2html"))))))) - (native-inputs - ;; For building manpage. - (list asciidoc)) - (inputs - `(;; Building cgit requires a Git source tree. - ("git-source" - ,(origin - (method url-fetch) - ;; cgit is tightly bound to git. Use GIT_VER from the Makefile, - ;; which may not match the current (package-version git). - (uri "mirror://kernel.org/software/scm/git/git-2.25.4.tar.xz") - (sha256 - (base32 "11am6s46wmn1yll5614smjhzlghbqq6gysgcs64igjr9y5wzpdxq")))) - ("bash-minimal" ,bash-minimal) - ("openssl" ,openssl) - ("python" ,python) - ("python-docutils" ,python-docutils) - ("python-markdown" ,python-markdown) - ("python-pygments" ,python-pygments) - ("zlib" ,zlib) - ;; bzip2, groff, gzip and xz are inputs (not native inputs) - ;; since they are actually substituted into cgit source and - ;; referenced by the built package output. - ("bzip2" ,bzip2) - ("groff" ,groff) - ("gzip" ,gzip) - ("xz" ,xz))) - (home-page "https://git.zx2c4.com/cgit/") - (synopsis "Web frontend for git repositories") - (description - "CGit is an attempt to create a fast web interface for the Git SCM, using + (let ((commit "793c420897e18eb3474c751d54cf4e0983f85433") + (rev "1")) + (package + (name "cgit") + ;; Update the ‘git-source’ input as well. + (version (git-version "1.2.3" rev commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.zx2c4.com/cgit") + (commit commit))) + (sha256 + (base32 + "1mhrm14wpqvralf9j33ih5ai6naiq3g2jg2z91gnw9dhh8f9ilwz")) + (file-name (git-file-name name version)))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ; XXX: fail to build the in-source git. + #:test-target "test" + #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + "SHELL_PATH=sh") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'unpack-git + (lambda* (#:key inputs #:allow-other-keys) + ;; Unpack the source of git into the 'git' directory. + (invoke "tar" "--strip-components=1" "-C" "git" "-xf" + (assoc-ref inputs "git-source")))) + (add-after 'unpack 'patch-absolute-file-names + (lambda* (#:key inputs #:allow-other-keys) + (define (quoted-file-name input path) + (string-append "\"" input path "\"")) + (substitute* "ui-snapshot.c" + (("\"gzip\"") + (quoted-file-name (assoc-ref inputs "gzip") "/bin/gzip")) + (("\"bzip2\"") + (quoted-file-name (assoc-ref inputs "bzip2") "/bin/bzip2")) + (("\"xz\"") + (quoted-file-name (assoc-ref inputs "xz") "/bin/xz"))) + + (substitute* "filters/about-formatting.sh" + (("$\\(dirname $0\\)") (string-append (assoc-ref outputs "out") + "/lib/cgit/filters")) + (("\\| tr") (string-append "| " (which "tr")))) + + (substitute* "filters/html-converters/txt2html" + (("sed") (which "sed"))) + + (substitute* "filters/html-converters/man2html" + (("groff") (which "groff"))) + + (substitute* "filters/html-converters/rst2html" + (("rst2html\\.py") (which "rst2html.py"))))) + (delete 'configure) ; no configure script + (add-after 'build 'build-man + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "doc-man" make-flags))) + (replace 'install + (lambda* (#:key make-flags outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (apply invoke + "make" "install" "install-man" + (string-append "prefix=" out) + (string-append "CGIT_SCRIPT_PATH=" out "/share/cgit") + make-flags) + ;; Move the platform-dependent 'cgit.cgi' into lib to get it + ;; stripped. + (rename-file (string-append out "/share/cgit/cgit.cgi") + (string-append out "/lib/cgit/cgit.cgi"))))) + (add-after 'install 'wrap-python-scripts + (lambda* (#:key outputs #:allow-other-keys) + (for-each + (lambda (file) + (wrap-program (string-append (assoc-ref outputs "out") + "/lib/cgit/filters/" file) + `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))))) + '("syntax-highlighting.py" + "html-converters/md2html"))))))) + (native-inputs + ;; For building manpage. + (list asciidoc)) + (inputs + `( ;; Building cgit requires a Git source tree. + ("git-source" + ,(origin + (method url-fetch) + ;; cgit is tightly bound to git. Use GIT_VER from the Makefile, + ;; which may not match the current (package-version git). + (uri "mirror://kernel.org/software/scm/git/git-2.43.0.tar.xz") + (sha256 + (base32 "1v3nkfm3gw8wr7595qy86qla8xyjvi85fmly4lfph4frfcz60ijl")))) + ("bash-minimal" ,bash-minimal) + ("openssl" ,openssl) + ("python" ,python) + ("python-docutils" ,python-docutils) + ("python-markdown" ,python-markdown) + ("python-pygments" ,python-pygments) + ("zlib" ,zlib) + ;; bzip2, groff, gzip and xz are inputs (not native inputs) + ;; since they are actually substituted into cgit source and + ;; referenced by the built package output. + ("bzip2" ,bzip2) + ("groff" ,groff) + ("gzip" ,gzip) + ("xz" ,xz))) + (home-page "https://git.zx2c4.com/cgit/") + (synopsis "Web frontend for git repositories") + (description + "CGit is an attempt to create a fast web interface for the Git SCM, using a built-in cache to decrease server I/O pressure.") - (license license:gpl2))) + (license license:gpl2)))) (define-public cgit-pink (package -- cgit v1.3 From a5d5c5b357515ec9365ee0b678fa29ac1f86288d Mon Sep 17 00:00:00 2001 From: Tomas Volf <~@wolfsden.cz> Date: Sat, 6 Jan 2024 14:15:35 +0100 Subject: gnu: ovmf: Update to 202311. * gnu/packages/firmware.scm (ovmf): Update to 202311. Change-Id: I32b6d7587b37211b0de6a118024cb4f854ce112d Signed-off-by: Mathieu Othacehe --- gnu/packages/firmware.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 5cebf515bf3..e691bf33dae 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -875,7 +875,7 @@ Executables included are: (let ((toolchain-ver "GCC5")) (package (name "ovmf") - (version "202308") + (version "202311") (source (origin (method git-fetch) (uri (git-reference @@ -886,7 +886,7 @@ Executables included are: (file-name (git-file-name name version)) (sha256 (base32 - "04rnfnaqr2c7ayplj7ib730zp1snw157zx5rmykz5hz1zz2vb20j")))) + "136dl5cxpjpg37whzlqq7jrrjsgybmwrgkbbmks8xaixqmzwhbw0")))) (build-system gnu-build-system) (arguments (list -- cgit v1.3 From 224499f2d466b1a3f3a45e44a709a983185b69ca Mon Sep 17 00:00:00 2001 From: Mattia Bunel Date: Fri, 5 Jan 2024 14:50:53 +0100 Subject: gnu: Add laszip. * gnu/packages/geo.scm (laszip): New variable. Signed-off-by: Mathieu Othacehe Change-Id: I8baf25f1d51c9ac90bcea4a1e9a564e21e0a9ee6 --- gnu/packages/geo.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 31abb2cc361..73b7aa3d115 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -3228,3 +3228,31 @@ For maps, it can uses its own \"binfile\" map format, or Garmin map file format, and data from OpenStreetMap, Garmin maps, Marco Polo Grosser Reiseplaner, Routeplaner Europa 2007, Map + Route.") (license license:gpl2))) + +(define-public laszip + (package + (name "laszip") + (version "3.4.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/LASzip/LASzip") + (commit "3.4.3"))) + (file-name (git-file-name name version)) + (sha256 + (base32 "09lcsgxwv0jq50fhsgfhx0npbf1zcwn3hbnq6q78fshqksbxmz7m")))) + (build-system cmake-build-system) + (arguments + (list + #:configure-flags #~(list "-DLASZIP_BUILD_STATIC=NO") + #:build-type "Release" + ;; No tests. + #:tests? #f)) + (home-page "https://laszip.org/") + (synopsis "Compression library for LAS files") + (description + "LASzip is a library for compressing @code{LAS} files and uncompressing +@code{LAZ} files. The @code{LAS} format is a file format designed for the +interchange and archiving of lidar point cloud data.") + (license license:asl2.0))) -- cgit v1.3 From 9c634835e5d4418095257dee71eb0bfaaddffa05 Mon Sep 17 00:00:00 2001 From: Georgios Athanasiou Date: Sun, 7 Jan 2024 13:27:07 +0200 Subject: gnu: Add guile-yamlpp. * gnu/packages/guile-xyz.scm (guile-yamlpp): New variable. Change-Id: I54694eeea17e414df4d7778a2e119f3f995c20e4 Signed-off-by: Mathieu Othacehe --- gnu/packages/guile-xyz.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 75e3754046e..9dc1176797c 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1839,6 +1839,33 @@ written in pure Scheme by using Guile's foreign function interface.") library}.") (license license:gpl3+))) +(define-public guile-yamlpp + (package + (name "guile-yamlpp") + (version "0.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/yorgath/guile-yamlpp") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "14mlqi7hw7pi9scwk1g432issnqcn185pd8na2plijxq55cy0iq7")))) + (build-system gnu-build-system) + (native-inputs (list autoconf automake libtool pkg-config)) + (inputs (list guile-3.0 yaml-cpp)) + (native-search-paths + (list (search-path-specification + (variable "GUILE_EXTENSIONS_PATH") + (files (list "lib/guile/3.0"))))) + (home-page "https://gitlab.com/yorgath/guile-yamlpp") + (synopsis "Guile YAML reader/writer based on @code{yaml-cpp}") + (description + "A module for GNU Guile to read and write YAML files. It works using +bindings to the @code{yaml-cpp} C++ library.") + (license license:gpl3+))) + (define-public guile-dbi (package (name "guile-dbi") -- cgit v1.3 From 1fb02d45eb7c102f7ca0e9ccac1ccd767eccd23d Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Sat, 6 Jan 2024 18:32:06 -0800 Subject: gnu: s7: Update to 618de30. * gnu/packages/lisp.scm (s7): Update to commit 618de30. Change-Id: I34d92b77a4e8de84f18de0ce7af984928e338282 Signed-off-by: Mathieu Othacehe --- gnu/packages/lisp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm index 4a895984e70..e89e02e1e48 100644 --- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -1485,7 +1485,7 @@ includes a compiler as well as an interpreter.") (define-public s7-bootstrap ;; Need s7-bootstrap to build libc_s7.so (for the REPL) and run tests - (let ((commit "a5b4bb49f8bcd7c33ae2366065fc8c254b734460") ;no releases + (let ((commit "618de30e0f9851515724245e3ebbfa1be4de6906") ;no releases (revision "0")) (hidden-package (package @@ -1499,7 +1499,7 @@ includes a compiler as well as an interpreter.") (file-name (git-file-name name version)) (sha256 (base32 - "03n1axdlypzmbgzrhlwfqwa1xiw36hi25j2hwc7vw77mz90cd9f8")))) + "0kh1f49g24ppjpr16v1nc9lr7pvr5nzb82bpw8c6q8ll7pqalqaf")))) (build-system gnu-build-system) (arguments (list #:tests? #f ;no tests in bootstrap -- cgit v1.3 From 2b5fcd70d07e693b1677387573e8a5e810fe5fa4 Mon Sep 17 00:00:00 2001 From: kiasoc5 Date: Sat, 6 Jan 2024 14:28:30 -0500 Subject: gnu: txt2tags: Update to 3.9. * gnu/packages/textutils.scm (txt2tags): Update to 3.9. Change-Id: Ia825f5807c87941504feffdb317594f5b1fa62ef Signed-off-by: Mathieu Othacehe --- gnu/packages/textutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/textutils.scm b/gnu/packages/textutils.scm index ea182b1925c..494e6b5ef58 100644 --- a/gnu/packages/textutils.scm +++ b/gnu/packages/textutils.scm @@ -996,13 +996,13 @@ and Cython.") (define-public txt2tags (package (name "txt2tags") - (version "3.7") + (version "3.9") (source (origin (method url-fetch) (uri (pypi-uri "txt2tags" version)) (sha256 (base32 - "12hpnvdy7dgarq6ini9jp7dp2zcmvpax04zbl3jb84kd423r75i7")))) + "0ik7gpr3gymgxnj0p86k8768kyxncbncv93zq67sbak3dbdl8hky")))) (build-system python-build-system) (native-inputs (list python-tox)) (home-page "https://txt2tags.org") -- cgit v1.3 From b920ee31a6b8e3be38242da5d725def7816163d8 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sat, 6 Jan 2024 19:21:08 +0800 Subject: gnu: font-sarasa-gothic: Update to 1.0.3. * gnu/packages/fonts.scm (font-sarasa-gothic): Update to 1.0.3. [source]: Update the URI. Change-Id: I227632d725fb341199c738a5aa6ac17e7ea635cb Signed-off-by: Mathieu Othacehe --- gnu/packages/fonts.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 7516e1642b7..68c0770d78b 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -1952,15 +1952,15 @@ weights and five widths in both Roman and Italic, plus variable fonts.") (define-public font-sarasa-gothic (package (name "font-sarasa-gothic") - (version "0.42.6") + (version "1.0.3") (source (origin (method url-fetch) (uri (string-append "https://github.com/be5invis/Sarasa-Gothic" "/releases/download/v" version - "/sarasa-gothic-ttc-" version ".7z")) + "/Sarasa-TTC-" version ".7z")) (sha256 - (base32 "0czx10yph2lxg2k4w6qjnil73zb2pgg3g400apm9gay41m04990v")))) + (base32 "1cgqf15fhg567s2bwjpal3xfcdnbgyy0iav5181zkn6b4k56dgl4")))) (build-system font-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.3 From ccce23bd81b3386bdccddb8c65bd1718da13497f Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Sat, 6 Jan 2024 14:57:36 +0800 Subject: gnu: Add font-cardo. * gnu/packages/fonts.scm (font-cardo): New variable. Change-Id: I60edadc74c33690bb14dff209979a57f22dd5277 Signed-off-by: Mathieu Othacehe --- gnu/packages/fonts.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gnu') diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm index 68c0770d78b..e050f4fde9e 100644 --- a/gnu/packages/fonts.scm +++ b/gnu/packages/fonts.scm @@ -123,6 +123,29 @@ titling.") (license license:silofl1.1))) +(define-public font-cardo + (package + (name "font-cardo") + (version "1.04") + (source (origin + (method url-fetch) + (uri (string-append "https://scholarsfonts.net/cardo" + (string-delete #\. version) ".zip")) + (sha256 + (base32 + "0ps55zjva4fzmg47w2i8srrh8sqxz1wkcclihwgzlwfbaxixn0cl")))) + (build-system font-build-system) + (home-page "https://scholarsfonts.net/cardofnt.html") + (synopsis "Unicode font for classical scholarship") + (description + "Cardo is a large unicode font specifically designed for the needs of +classicists, biblical scholars, medievalists, and linguists. Since it may be +used to prepare materials for publication, it also contains features that are +required for high-quality typography, such as ligatures, text figures (also +known as old style numerals), true small capitals and a variety of punctuation +and space characters.") + (license license:silofl1.1))) + (define-public font-chivo (let ((commit "dc61c468d79781eb5183426e88e844af16cdc3e5") (revision "0")) -- cgit v1.3 From 51735eac1cc21356dc1cb59356ebe96a460b5b59 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 24 Dec 2023 16:59:57 +0100 Subject: gnu: dtc: Update to 1.7.0. Enable the python bindings and switch to the meson build system that handles the python bindings better than the Makefile build system here. * gnu/packages/patches/dtc-meson-cell-overflow.patch: New file * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/bootloaders.scm (dtc): Update to 1.7.0. [build-system]: Switch to the meson-build-system. [arguments]: Remove #:make-flags. Add a new 'preparations phase. Do not edit the Makefile in the 'patch-pkg-config phase. Remove the 'configure phase. Change-Id: Ie61c920829ab3a8c32f4924c694dba6bda807711 Signed-off-by: Mathieu Othacehe --- gnu/local.mk | 1 + gnu/packages/bootloaders.scm | 58 ++++++++++++++-------- gnu/packages/patches/dtc-meson-cell-overflow.patch | 32 ++++++++++++ 3 files changed, 71 insertions(+), 20 deletions(-) create mode 100644 gnu/packages/patches/dtc-meson-cell-overflow.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 3548b5eb3d5..46da9a8adcd 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1092,6 +1092,7 @@ dist_patch_DATA = \ %D%/packages/patches/doxygen-hurd.patch \ %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \ %D%/packages/patches/dstat-skip-devices-without-io.patch \ + %D%/packages/patches/dtc-meson-cell-overflow.patch \ %D%/packages/patches/dune-common-skip-failing-tests.patch \ %D%/packages/patches/dune-grid-add-missing-include-cassert.patch \ %D%/packages/patches/dune-istl-fix-solver-playground.patch \ diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index bd8b621e353..c73a0e665d8 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -55,9 +55,12 @@ #:use-module (gnu packages man) #:use-module (gnu packages mtools) #:use-module (gnu packages ncurses) + #:use-module (gnu packages ninja) + #:use-module (gnu packages package-management) #:use-module (gnu packages perl) #: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 texinfo) #:use-module (gnu packages tls) @@ -71,6 +74,7 @@ #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (guix build-system gnu) + #:use-module (guix build-system meson) #:use-module (guix build-system pyproject) #:use-module (guix build-system trivial) #:use-module (guix download) @@ -631,7 +635,7 @@ The SUBDIR argument defaults to \"efi/Guix\", as it is also the case for (define-public dtc (package (name "dtc") - (version "1.6.1") + (version "1.7.0") (source (origin (method url-fetch) (uri (string-append @@ -639,42 +643,56 @@ The SUBDIR argument defaults to \"efi/Guix\", as it is also the case for "dtc-" version ".tar.gz")) (sha256 (base32 - "0xm38h31jb29xfh2sfyk48d8wdfq4b8lmb412zx9vjr35izjb9iq")))) - (build-system gnu-build-system) + "0cij9399snpn672pdbda8qbxljdkfg068kvv3g5811rz6yslx124")) + (patches + (search-patches "dtc-meson-cell-overflow.patch")))) + (build-system meson-build-system) (arguments (list - #:modules `(,@%gnu-build-system-modules (srfi srfi-26)) - #:make-flags - #~(list (string-append "CC=" #$(cc-for-target)) - ;; /bin/fdt{get,overlay,put} need help finding libfdt.so.1. - (string-append "LDFLAGS=-Wl,-rpath=" #$output "/lib") - (string-append "PREFIX=" #$output) - (string-append "SETUP_PREFIX=" #$output) - "INSTALL=install") + #:modules '((guix build meson-build-system) + (guix build utils) + (srfi srfi-26)) #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'patch-pkg-config + (add-after 'unpack 'preparations (lambda _ - (substitute* '("Makefile" - "tests/run_tests.sh") - (("pkg-config") - #$(pkg-config-for-target))))) - (delete 'configure) ;no configure script - (add-before 'build 'install-doc + ;; The version string is usually derived via setuptools-scm, but + ;; without the git metadata available this fails. + (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" #$version) + + ;; Needed by setup.py. + (setenv "DESTDIR" "/") + + ;; Native gcc needed by run_test.sh. + (setenv "CC" "gcc") + + ;; /bin/fdt{get,overlay,put} need help finding libfdt.so.1. + (setenv "LDFLAGS" + (string-append "-Wl,-rpath=" #$output "/lib")))) + (add-after 'unpack 'install-doc (lambda _ (with-directory-excursion "Documentation" (for-each (cut install-file <> (string-append #$output "/share/doc/dtc/")) '("dts-format.txt" "dt-object-internal.txt" - "manual.txt")))))))) + "manual.txt"))))) + (add-after 'unpack 'patch-pkg-config + (lambda _ + (substitute* '("tests/run_tests.sh") + (("pkg-config") + #$(pkg-config-for-target)))))))) (native-inputs (append (list bison flex libyaml + ninja pkg-config - swig) + python + python-setuptools-scm + swig + which) (if (member (%current-system) (package-supported-systems valgrind)) (list valgrind) '()))) diff --git a/gnu/packages/patches/dtc-meson-cell-overflow.patch b/gnu/packages/patches/dtc-meson-cell-overflow.patch new file mode 100644 index 00000000000..1c319312f70 --- /dev/null +++ b/gnu/packages/patches/dtc-meson-cell-overflow.patch @@ -0,0 +1,32 @@ +Taken from upstream: +https://git.kernel.org/pub/scm/utils/dtc/dtc.git/commit/?id=32174a66efa4ad19fc6a2a6422e4af2ae4f055cb + +From 32174a66efa4ad19fc6a2a6422e4af2ae4f055cb Mon Sep 17 00:00:00 2001 +From: David Gibson +Date: Tue, 28 Feb 2023 10:33:58 +1100 +Subject: [PATCH] meson: Fix cell overflow tests when running from meson + +Because meson always builds out-of-tree we need to reference things in the +original source tree via $SRCDIR from run_tests.sh. We forgot a couple of +cases for the cell overflow tests. Fix them. + +Signed-off-by: David Gibson +--- + tests/run_tests.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/run_tests.sh b/tests/run_tests.sh +index 91350ad3..f899d8cb 100755 +--- a/tests/run_tests.sh ++++ b/tests/run_tests.sh +@@ -519,8 +519,8 @@ libfdt_tests () { + check_tests "$SRCDIR/phandle-args-overflow.dts" clocks_property + + ## https://github.com/dgibson/dtc/issues/74 +- run_dtc_test -I dts -O dtb -o cell-overflow-results.test.dtb cell-overflow-results.dts +- run_dtc_test -I dts -O dtb -o cell-overflow.test.dtb cell-overflow.dts ++ run_dtc_test -I dts -O dtb -o cell-overflow-results.test.dtb "$SRCDIR/cell-overflow-results.dts" ++ run_dtc_test -I dts -O dtb -o cell-overflow.test.dtb "$SRCDIR/cell-overflow.dts" + run_test dtbs_equal_ordered cell-overflow.test.dtb cell-overflow-results.test.dtb + + # check full tests -- cgit v1.3 From fdafa8060f9661d321291f0d348d98391aec5d62 Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Thu, 4 Jan 2024 21:56:12 -0800 Subject: gnu: icewm: Update to 3.4.5 * gnu/packages/wm.scm (icewm): Update to 3.4.5 Change-Id: Ibf30644fbc01dd89378f41f978201e84e0ca39ad Signed-off-by: Mathieu Othacehe --- gnu/packages/wm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index a87eb204284..bd7589b2a68 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -787,7 +787,7 @@ desktop environment.") (define-public icewm (package (name "icewm") - (version "3.4.4") + (version "3.4.5") (source (origin (method url-fetch) (uri (string-append @@ -795,7 +795,7 @@ desktop environment.") version "/icewm-" version ".tar.lz")) (sha256 (base32 - "0cdsb2d45dwcr2dm4jfh0z5g6pkb0ghd4jaybxqiz74mbw5rmjhv")))) + "1wd5k0whh2b43a72223cy19pwc29fhrhd2dnc61fha2y5ndgw6ld")))) (build-system gnu-build-system) (native-inputs (list pkg-config)) (inputs (list fontconfig -- cgit v1.3 From cd9c90823452fa7b88c5e2f2133dac51d9e2bd1e Mon Sep 17 00:00:00 2001 From: Roman Scherer Date: Fri, 5 Jan 2024 11:53:04 +0100 Subject: gnu: mesa: Build asahi driver on aarch64. * gnu/packages/gl.scm (mesa): Build asahi driver on aarch64. Change-Id: I597e70732b9ebd18960131f1b664b2dc83683b8e Signed-off-by: Mathieu Othacehe --- gnu/packages/gl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index b0ee413acd0..9d1a8a1e72e 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -350,7 +350,7 @@ also known as DXTn or DXTC) for Mesa.") #$@(cond ((target-aarch64?) ;; TODO: Fix svga driver for non-Intel architectures. - '("-Dgallium-drivers=etnaviv,freedreno,kmsro,lima,nouveau,\ + '("-Dgallium-drivers=asahi,etnaviv,freedreno,kmsro,lima,nouveau,\ panfrost,r300,r600,swrast,tegra,v3d,vc4,virgl")) ((target-arm32?) ;; Freedreno FTBFS when built on a 64-bit machine. -- cgit v1.3 From 0a9fd5536aa4ba446b47b8cb5fb72a8856e54bff Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Thu, 4 Jan 2024 21:49:07 -0800 Subject: gnu: parallel: Update to 20231222 * gnu/packages/parallel.scm (parallel): Update to 20231222 Change-Id: I4a32d93e7d7d5e79280d8d804701bb4a7ed57bb9 Signed-off-by: Mathieu Othacehe --- gnu/packages/parallel.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index e12035e47d4..8f59331a022 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -64,14 +64,14 @@ (define-public parallel (package (name "parallel") - (version "20231122") + (version "20231222") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/parallel/parallel-" version ".tar.bz2")) (sha256 - (base32 "1qpa3dhmdddw7l5906y8ck8rnri66kqkxcbxhsnj058pmbw9qb42")) + (base32 "1alvva2dlnlq5rbbklzc2a7l84mg550l1xc632zdgfx9dzf6sihr")) (snippet '(begin (use-modules (guix build utils)) -- cgit v1.3 From e7403acb345a59d580607fbfe7ef2aa0c410767a Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Sun, 31 Dec 2023 13:16:35 -0800 Subject: gnu: swig-next: Update to 4.2.0 * gnu/packages/swig.scm (swig-next): Update to 4.2.0 Change-Id: Ic6580f0d2c3ab578de6bc0bd9a98c61b28cc1cd6 Signed-off-by: Mathieu Othacehe --- gnu/packages/swig.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/swig.scm b/gnu/packages/swig.scm index 3f38cd9f9f5..7025d05038a 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.1.1") + (version "4.2.0") (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 - "16xc767gf5ip40jh698wbdrxrghli5v2c966bkdmrmpwv378mw1a")))) + "15wwh9215rdkflpr85r7zxr2nmrib03jr4bvh5i0f9lyb3bs4716")))) (inputs (list pcre2)))) -- cgit v1.3 From 560cc91e46c1955f830c0196f6cb972410338a3a Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 7 Jan 2024 22:34:15 +0100 Subject: Revert "gnu: mesa: Build asahi driver on aarch64." This reverts commit cd9c90823452fa7b88c5e2f2133dac51d9e2bd1e. Move it to mesa-updates. --- gnu/packages/gl.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 9d1a8a1e72e..b0ee413acd0 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -350,7 +350,7 @@ also known as DXTn or DXTC) for Mesa.") #$@(cond ((target-aarch64?) ;; TODO: Fix svga driver for non-Intel architectures. - '("-Dgallium-drivers=asahi,etnaviv,freedreno,kmsro,lima,nouveau,\ + '("-Dgallium-drivers=etnaviv,freedreno,kmsro,lima,nouveau,\ panfrost,r300,r600,swrast,tegra,v3d,vc4,virgl")) ((target-arm32?) ;; Freedreno FTBFS when built on a 64-bit machine. -- cgit v1.3 From 3de361d9c9d320aefbd43710124d7b07af891de1 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 7 Jan 2024 22:54:54 +0100 Subject: gnu: fet: Update to 6.15.0. * gnu/packages/education.scm (fet): Update to 6.15.0. Change-Id: Iec5ed880fd09dcc63e1650ceffc0f072c1236190 --- gnu/packages/education.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index 2fd1d4a632b..7b72ed03496 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2017-2023 Efraim Flashner ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice -;;; Copyright © 2018-2023 Nicolas Goaziou +;;; Copyright © 2018-2024 Nicolas Goaziou ;;; Copyright © 2020 Robert Smith ;;; Copyright © 2020 Guy Fleury Iteriteka ;;; Copyright © 2020 Jakub Kądziołka @@ -564,7 +564,7 @@ a pen-tablet display and a beamer.") (define-public fet (package (name "fet") - (version "6.9.0") + (version "6.15.0") (source (origin (method url-fetch) @@ -573,7 +573,7 @@ a pen-tablet display and a beamer.") (list (string-append directory base) (string-append directory "old/" base)))) (sha256 - (base32 "1lnw58ga1ldhqfznclmk9l21698pg152w3slq2cwmr69ywqr5wys")))) + (base32 "0mmk9f0b23lmmk40mv25wf9vgb7wdgfn5zsa1qrkvkh7dh1hjpax")))) (build-system gnu-build-system) (arguments (list -- cgit v1.3 From 728d471d73c3731b86cbf5f3dee22229d3a92d4b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 7 Jan 2024 22:21:19 +0200 Subject: gnu: json-glib: Fix cross-compiling. * gnu/packages/gnome.scm (json-glib)[native-inputs]: Only add more inputs when not cross-compiling. Change-Id: I987f382f02d9f7b79b6e281d1f6f6824c1b2dfd3 --- gnu/packages/gnome.scm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b2d4b730887..b43e5337690 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2023 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017, 2018, 2021 Mark H Weaver ;;; Copyright © 2015 David Thompson -;;; Copyright © 2015-2023 Efraim Flashner +;;; Copyright © 2015-2024 Efraim Flashner ;;; Copyright © 2016, 2017, 2018 Rene Saavedra ;;; Copyright © 2016 Jochem Raat ;;; Copyright © 2016, 2017, 2019 Kei Kebreau @@ -4781,12 +4781,15 @@ GLib and GObject, and integrates JSON with GLib data types.") (string-append #$output:doc "/share/gtk-doc")))))))))) (native-inputs - (modify-inputs (package-native-inputs json-glib-minimal) - (prepend docbook-xml-4.3 - docbook-xsl - gobject-introspection - gtk-doc - libxslt))))) + (if (%current-target-system) + ;; No docs, no additional inputs. + (package-native-inputs json-glib-minimal) + (modify-inputs (package-native-inputs json-glib-minimal) + (prepend docbook-xml-4.3 + docbook-xsl + gobject-introspection + gtk-doc + libxslt)))))) (define-public libxklavier (package -- cgit v1.3 From 9018c6af4907c4532a95017df9f45d9439c30064 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Sat, 6 Jan 2024 18:24:56 +0300 Subject: gnu: obs: Fix VLC plugin. * gnu/packages/video.scm (obs)[arguments]<#:phases>: Wrap LD_LIBRARY_PATH. Change-Id: If22b5294284ea500da0e6d9ee4d4bbcc765c6771 --- gnu/packages/video.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 4181013b0d4..de812ac7628 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -3642,7 +3642,10 @@ be used for realtime video capture via Linux-specific APIs.") (lambda* _ (let ((plugin-path (getenv "QT_PLUGIN_PATH"))) (wrap-program (string-append #$output "/bin/obs") - `("QT_PLUGIN_PATH" ":" prefix (,plugin-path))))))))) + `("QT_PLUGIN_PATH" ":" prefix (,plugin-path)) + `("LD_LIBRARY_PATH" ":" prefix + (,(string-append #$(this-package-input "vlc") + "/lib")))))))))) (native-search-paths (list (search-path-specification (variable "OBS_PLUGINS_DIRECTORY") -- cgit v1.3 From bdf0ba4ca1c6596aac079a3eac61c01b99c13bec Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Tue, 26 Dec 2023 01:35:17 +0300 Subject: tests: docker-system: Increase image size. * gnu/tests/docker.scm (run-docker-system-test)[vm]: Increase 'disk-image-size'. Change-Id: If88588d8981efdfdc539460900f1cbb9a663f9cb --- gnu/tests/docker.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu') diff --git a/gnu/tests/docker.scm b/gnu/tests/docker.scm index edc98044141..9e9d2e2d07c 100644 --- a/gnu/tests/docker.scm +++ b/gnu/tests/docker.scm @@ -212,7 +212,7 @@ inside %DOCKER-OS." (virtual-machine (operating-system os) (volatile? #f) - (disk-image-size (* 5500 (expt 2 20))) + (disk-image-size (* 6000 (expt 2 20))) (memory-size 2048) (port-forwardings '()))) -- cgit v1.3 From 519e1e3eb88ec532fc83ebb742d9919269b57c87 Mon Sep 17 00:00:00 2001 From: Oleg Pykhalov Date: Tue, 26 Dec 2023 03:58:37 +0300 Subject: scripts: system: Build layered images. * guix/scripts/system.scm (show-help, %docker-format-options, %options, %default-options, show-docker-format-options, show-docker-format-options/detailed, process-action): Handle '--max-layers' option. * gnu/system/image.scm (system-docker-image): Same. * gnu/image.scm ()[max-layers]: New record field. Change-Id: I2726655aefd6688b976057fd5a38e9972ebfc292 --- gnu/image.scm | 4 ++++ gnu/system/image.scm | 41 ++++++++++++++++++++++++++++------------- guix/scripts/system.scm | 31 +++++++++++++++++++++++++++++-- 3 files changed, 61 insertions(+), 15 deletions(-) (limited to 'gnu') diff --git a/gnu/image.scm b/gnu/image.scm index 523653dd778..7fb06dec10a 100644 --- a/gnu/image.scm +++ b/gnu/image.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020, 2022 Mathieu Othacehe +;;; Copyright © 2023 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -42,6 +43,7 @@ image-format image-platform image-size + image-max-layers image-operating-system image-partition-table-type image-partitions @@ -170,6 +172,8 @@ that is not in SET, mentioning FIELD in the error message." (size image-size ;size in bytes as integer (default 'guess) (sanitize validate-size)) + (max-layers image-max-layers ;number of layers as integer + (default #false)) (operating-system image-operating-system) ; (partition-table-type image-partition-table-type ; 'mbr or 'gpt (default 'mbr) diff --git a/gnu/system/image.scm b/gnu/system/image.scm index b8258922329..2cc10128930 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2022 Denis 'GNUtoo' Carikli ;;; Copyright © 2022 Alex Griffin ;;; Copyright © 2023 Efraim Flashner +;;; Copyright © 2023 Oleg Pykhalov ;;; ;;; This file is part of GNU Guix. ;;; @@ -686,7 +687,8 @@ returns an image record where the first partition's label is set to