From 7931ac810b8feaadcbbfa3a31786087da2d5ee73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 24 Apr 2023 10:10:00 +0200 Subject: [PATCH 01/12] read-print: 'pretty-print-with-comments' keeps newlines on long strings. * guix/read-print.scm (printed-string)[preserve-newlines?]: New procedure. Use it to preserve newlines on long strings. * tests/read-print.scm: Add test. --- guix/read-print.scm | 11 +++++++++-- tests/read-print.scm | 5 +++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/guix/read-print.scm b/guix/read-print.scm index 515eb7669c..d834105dce 100644 --- a/guix/read-print.scm +++ b/guix/read-print.scm @@ -420,11 +420,18 @@ (define %natural-whitespace-string-forms (define (printed-string str context) "Return the read syntax for STR depending on CONTEXT." + (define (preserve-newlines? str) + (and (> (string-length str) 40) + (string-index str #\newline))) + (match context (() - (object->string str)) + (if (preserve-newlines? str) + (escaped-string str) + (object->string str))) ((head . _) - (if (memq head %natural-whitespace-string-forms) + (if (or (memq head %natural-whitespace-string-forms) + (preserve-newlines? str)) (escaped-string str) (object->string str))))) diff --git a/tests/read-print.scm b/tests/read-print.scm index f4627e076a..c2b236b172 100644 --- a/tests/read-print.scm +++ b/tests/read-print.scm @@ -194,6 +194,11 @@ (define-syntax-rule (test-pretty-print/sequence str args ...) (test-pretty-print "\ (string-append \"a\\tb\" \"\\n\")") +(test-pretty-print "\ +(display \"This is a very long string. +It contains line breaks, which are preserved, +because it's a long string.\")") + (test-pretty-print "\ (description \"abcdefghijkl mnopqrstuvwxyz.\")" From a386edb4dc334b54a75d845719247da6c9078458 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 18 Apr 2023 17:58:50 +0200 Subject: [PATCH 02/12] gnu: openmpi: Update to 4.1.5. * gnu/packages/mpi.scm (openmpi): Update to 4.1.5. --- gnu/packages/mpi.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm index f21bd16d3a..20fc1a16a4 100644 --- a/gnu/packages/mpi.scm +++ b/gnu/packages/mpi.scm @@ -184,7 +184,7 @@ (define-public hwloc (define-public openmpi (package (name "openmpi") - (version "4.1.4") + (version "4.1.5") (source (origin (method url-fetch) @@ -192,7 +192,7 @@ (define-public openmpi (version-major+minor version) "/downloads/openmpi-" version ".tar.bz2")) (sha256 - (base32 "03ckngrff1cl0l81vfvrfhp99rbgk7s0633kr1l468yibwbjx4cj")) + (base32 "1qyvc77diyrxmviirdwqpibgm32c4vkdlvw8g79rsf2pq9mrhh56")) (patches (search-patches "openmpi-mtl-priorities.patch")))) (properties From f4a6a65d683762bd58944c7d555dc79708e5981e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= Date: Tue, 18 Apr 2023 14:14:46 +0200 Subject: [PATCH 03/12] gnu: fatrace: Update to 0.17.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/monitoring.scm (fatrace): Update to 0.17.0 Signed-off-by: Ludovic Courtès --- gnu/packages/monitoring.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index 5ef40bdf58..d36ba707c7 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -681,7 +681,7 @@ (define-public hostscope (define-public fatrace (package (name "fatrace") - (version "0.16.3") + (version "0.17.0") (source (origin (method git-fetch) (uri (git-reference @@ -690,7 +690,7 @@ (define-public fatrace (file-name (git-file-name name version)) (sha256 (base32 - "1bxz6v1z0icp716jnv3knjyqp8bv6xnkz8gqd8z3g2b6yxj5xff3")))) + "067pj0z4np4mmhlin9411zpwwbfmn38ykvmxw35fnidf3kxcq49i")))) (build-system gnu-build-system) (arguments `(#:phases From 589aa32fbdb0f4cf7af62e02259db1dd4d332074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20M=C3=A9lotte?= Date: Tue, 18 Apr 2023 14:26:11 +0200 Subject: [PATCH 04/12] gnu: eid-mw: Update to 5.1.10. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/security-token.scm (eid-mw): Update to 5.1.10 Signed-off-by: Ludovic Courtès --- gnu/packages/security-token.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/security-token.scm b/gnu/packages/security-token.scm index 3cf585480e..8566207cb1 100644 --- a/gnu/packages/security-token.scm +++ b/gnu/packages/security-token.scm @@ -123,7 +123,7 @@ (define-public ccid (define-public eid-mw (package (name "eid-mw") - (version "5.1.8") + (version "5.1.10") (source (origin (method git-fetch) @@ -132,7 +132,7 @@ (define-public eid-mw (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "11jf828ag8y5iykcfjmjc3n8g5mchpl3fxkr110civ3qqbdiw882")))) + (base32 "14nx0hdpv0w5wwsg3894g8pzxlzgp9ryd38k4djhcsyarvzfwynr")))) (build-system glib-or-gtk-build-system) (native-inputs (list autoconf From 9350347dabd0f25f89fd2a703a250b20872ad911 Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Tue, 11 Apr 2023 21:19:24 -0700 Subject: [PATCH 05/12] gnu: openshot: Update to 3.1.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/audio.scm (libopenshot-audio): Update to 0.3.1. * gnu/packages/video.scm (libopenshot): Update to 0.3.1. (openshot): Update to 3.1.0. Signed-off-by: Ludovic Courtès --- gnu/packages/audio.scm | 4 ++-- gnu/packages/video.scm | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 473b248c2e..d6cf171bb4 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -5187,7 +5187,7 @@ (define-public libfreeaptx (define-public libopenshot-audio (package (name "libopenshot-audio") - (version "0.3.0") + (version "0.3.1") (source (origin (method git-fetch) (uri (git-reference @@ -5196,7 +5196,7 @@ (define-public libopenshot-audio (file-name (git-file-name name version)) (sha256 (base32 - "1y3apyn71ysks88bv71knjvk832imnbpbb8mgib3q9b8pvdmjw3g")))) + "164ibsp5g162cyjgpa0ap35h75igmfnmhxmwkkk1fvm1cpbf1jgj")))) (build-system cmake-build-system) (inputs (list alsa-lib diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 8013d41fa0..6e711e0046 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -4765,7 +4765,7 @@ (define-public vidstab (define-public libopenshot (package (name "libopenshot") - (version "0.3.0") + (version "0.3.1") (source (origin (method git-fetch) (uri (git-reference @@ -4774,7 +4774,7 @@ (define-public libopenshot (file-name (git-file-name name version)) (sha256 (base32 - "0q2899hbaqwh1gxyl9x84l116g82glk0wmr3r1xvfwb107m3mvx9")) + "10s76x4hwm4ccxdy8cv1nks028hldjmx25yy42fnjc4vscy7yd8a")) (modules '((guix build utils))) (snippet '(begin ;; Allow overriding of the python installation dir @@ -4829,7 +4829,7 @@ (define-public libopenshot (define-public openshot (package (name "openshot") - (version "3.0.0") + (version "3.1.0") (source (origin (method git-fetch) (uri (git-reference @@ -4838,7 +4838,7 @@ (define-public openshot (file-name (git-file-name name version)) (sha256 (base32 - "1az59whx9sga6m8m2c3ndfls5h07r0jn4jipnyxckpxl32vpd147")) + "1m1mq8kws00mwijx8j5gqharkw63jqyywbnzsswgcxlhmsyv3k4v")) (modules '((guix build utils))) (snippet '(begin From d0575a984721f175f10c3d925470a90424c17811 Mon Sep 17 00:00:00 2001 From: Janneke Nieuwenhuizen Date: Mon, 24 Apr 2023 15:17:37 +0200 Subject: [PATCH 06/12] gnu: dezyne: Update to 2.17.2. * gnu/packages/dezyne.scm (dezyne): Update to 2.17.2. --- gnu/packages/dezyne.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dezyne.scm b/gnu/packages/dezyne.scm index 6dd1c2426f..303c3f0436 100644 --- a/gnu/packages/dezyne.scm +++ b/gnu/packages/dezyne.scm @@ -31,14 +31,14 @@ (define-module (gnu packages dezyne) (define-public dezyne (package (name "dezyne") - (version "2.17.1") + (version "2.17.2") (source (origin (method url-fetch) (uri (string-append "https://dezyne.org/download/dezyne/" name "-" version ".tar.gz")) (sha256 - (base32 "008svf32sy80c98nax3xkvxb0b93xgh9xjvw5ygzkq8zflr3ihm8")))) + (base32 "1v0anwr0iic26ck796b29dfyj1dxkjf935g134z98s95hvzzrhm3")))) (inputs (list bash-minimal guile-3.0-latest guile-json-4 From 70b52b5614e8da166281ee5233e2c27f78902856 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 24 Apr 2023 13:35:52 +0100 Subject: [PATCH 07/12] gnu: mumi: Move to Savannah. * gnu/packages/mail.scm (source, home-page): Move to Savannah. --- gnu/packages/mail.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 353773de09..11b67c9f50 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -4085,7 +4085,7 @@ (define-public mumi (source (origin (method git-fetch) (uri (git-reference - (url "https://git.elephly.net/software/mumi.git") + (url "https://git.savannah.gnu.org/git/guix/mumi.git/") (commit commit))) (file-name (git-file-name name version)) (sha256 @@ -4145,7 +4145,7 @@ (define-public mumi (sha256 (base32 "1gs1li48hqizx7lc4n2fdxn9i2v4vafkqpza7svvfpcamfz29jpi"))))) - (home-page "https://git.elephly.net/software/mumi.git") + (home-page "https://git.savannah.gnu.org/cgit/guix/mumi.git/") (synopsis "Debbugs web interface") (description "Mumi is a Debbugs web interface.") (license license:agpl3+)))) From ec020345d1aa61917bc3b641f1261a2ede54e645 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 24 Apr 2023 15:15:14 +0100 Subject: [PATCH 08/12] gnu: mumi: Update to 0.0.5-2.85d5efb. * gnu/packages/mail.scm (mumi): Update to 0.0.5-2.85d5efb. --- gnu/packages/mail.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index 11b67c9f50..c1deca0ac3 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -4077,8 +4077,8 @@ (define-public tnef (license license:gpl2+))) (define-public mumi - (let ((commit "b2a8280f158957e18d714dea78637f6504dd7613") - (revision "1")) + (let ((commit "85d5efb4367b9178eb7093e3ebca760745de0753") + (revision "2")) (package (name "mumi") (version (git-version "0.0.5" revision commit)) @@ -4090,7 +4090,7 @@ (define-public mumi (file-name (git-file-name name version)) (sha256 (base32 - "1ygcbrnwvqa4zi93mbry5afw6dr4fbm7pgkn1gbsydp6qjfsm88q")))) + "0yn8dfj3krqwfsdn888vbv903kfa7clmbj2xxin263zqcyzc3alq")))) (build-system gnu-build-system) (arguments (list From 4b7294cfb8fda9d4612c1772b01b26949bb6911d Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 24 Apr 2023 15:18:22 +0100 Subject: [PATCH 09/12] gnu: mumi: Add bash-minimal to inputs. * gnu/packages/mail.scm (mumi)[inputs]: Add bash-minimal. --- gnu/packages/mail.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index c1deca0ac3..f10c70db52 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -4123,7 +4123,8 @@ (define-public mumi `("GUILE_LOAD_COMPILED_PATH" ":" prefix (,go ,(getenv "GUILE_LOAD_COMPILED_PATH")))))))))) (inputs - (list guile-email + (list bash-minimal + guile-email guile-fibers guile-gcrypt guile-json-4 From 23f11afacdfe755ffa514a8cbf93ba1121b9db0d Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Mon, 24 Apr 2023 15:25:40 +0100 Subject: [PATCH 10/12] Add mumi config. * .mumi/config: New file. * .gitignore: Add .mumi/current-issue. --- .gitignore | 1 + .mumi/config | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 .mumi/config diff --git a/.gitignore b/.gitignore index 34414d1e95..543dc1c655 100644 --- a/.gitignore +++ b/.gitignore @@ -159,3 +159,4 @@ tmp /gnu/packages/aux-files/guile-guile-launcher.o /guile .DS_Store +.mumi/current-issue \ No newline at end of file diff --git a/.mumi/config b/.mumi/config new file mode 100644 index 0000000000..6823e1c425 --- /dev/null +++ b/.mumi/config @@ -0,0 +1,3 @@ +((debbugs-host . "debbugs.gnu.org") + (patch-email-address . "guix-patches@gnu.org") + (mumi-host . "issues.guix.gnu.org")) From e29571afc642dd4dd3388f742755f1675b3058e6 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 24 Apr 2023 12:46:22 -0400 Subject: [PATCH 11/12] guix-install.sh: Fix GUIX_ALLOW_OVERWRITE condition. Before this change, the "Overwriting existing installation!" would be displayed erroneously. * etc/guix-install.sh (sys_create_store): Fix overwrite conditional. --- etc/guix-install.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/etc/guix-install.sh b/etc/guix-install.sh index bbb4219965..e81da7ae71 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -9,7 +9,7 @@ # Copyright © 2020 Daniel Brooks # Copyright © 2021 Jakub Kądziołka # Copyright © 2021 Chris Marusich -# Copyright © 2021, 2022 Maxim Cournoyer +# Copyright © 2021, 2022, 2023 Maxim Cournoyer # Copyright © 2022 Prafulla Giri # Copyright © 2023 Andrew Tropin # @@ -353,10 +353,12 @@ sys_create_store() _debug "--- [ ${FUNCNAME[0]} ] ---" - if [[ -z $GUIX_ALLOW_OVERWRITE && (-e /var/guix || -e /gnu) ]]; then - die "A previous Guix installation was found. Refusing to overwrite." - else - _msg "${WAR}Overwriting existing installation!" + if [[ -e /var/guix && -e /gnu ]]; then + if [ -n "$GUIX_ALLOW_OVERWRITE" ]; then + _msg "${WAR}Overwriting existing installation!" + else + die "A previous Guix installation was found. Refusing to overwrite." + fi fi cd "$tmp_path" From c7cdd4a6c7e795575c1baf6a655cb317f56fcf81 Mon Sep 17 00:00:00 2001 From: Janneke Nieuwenhuizen Date: Tue, 18 Apr 2023 16:50:02 +0200 Subject: [PATCH 12/12] gnu: emacs-git-timemachine: Update to 4.11-0-13769fb6. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes #62932; command-execute: Symbol’s function definition is void: define-transient-command * gnu/packages/emacs-xyz.scm (emacs-git-timemachine)[source]: Update outdated source URI. Update to commit "13769fb603ae88c64566529eae4525ce88026e86". The 4.11 latest release is four years old. --- gnu/packages/emacs-xyz.scm | 41 ++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 234b0f6868..f46ccde1e8 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -25,7 +25,7 @@ ;;; Copyright © 2017 Kei Kebreau ;;; Copyright © 2017 George Clemmer ;;; Copyright © 2017, 2018 Feng Shu -;;; Copyright © 2017, 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2017, 2020, 2023 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2017, 2018, 2019, 2020 Oleg Pykhalov ;;; Copyright © 2017 Mekeor Melire ;;; Copyright © 2017 Peter Mikkelsen @@ -5812,25 +5812,28 @@ (define-public emacs-apheleia (license license:gpl3+))) (define-public emacs-git-timemachine - (package - (name "emacs-git-timemachine") - (version "4.11") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/pidu/git-timemachine.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1pz4l1xnq6s67w5yq9107vm8dg7rqf8n9dmbn90jys97c722g70n")))) - (build-system emacs-build-system) - (home-page "https://gitlab.com/pidu/git-timemachine") - (synopsis "Step through historic versions of Git-controlled files") - (description "This package enables you to step through historic versions + (let ((version "4.11") + (revision "0") + (commit "13769fb603ae88c64566529eae4525ce88026e86")) + (package + (name "emacs-git-timemachine") + (version (git-version version revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/pidu/git-timemachine.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0d1aj9xhcyksg115xl2yw0rd62hp53ig06y54jvii1l8vavb94jy")))) + (build-system emacs-build-system) + (home-page "https://gitlab.com/pidu/git-timemachine") + (synopsis "Step through historic versions of Git-controlled files") + (description "This package enables you to step through historic versions of files under Git version control from within Emacs.") - (license license:gpl3+))) + (license license:gpl3+)))) (define-public emacs-minitest (package