diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 11:33:18 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2023-01-30 12:39:40 +0200 |
| commit | 4cf1acc7f3033b50b0bf19e02c9f522d522d338c (patch) | |
| tree | 9fd64956ee60304c15387eb394cd649e49f01467 /gnu/packages/patches/guile-email-fix-tests.patch | |
| parent | edb8c09addd186d9538d43b12af74d6c7aeea082 (diff) | |
| parent | 595b53b74e3ef57a1c0c96108ba86d38a170a241 (diff) | |
| download | guix-4cf1acc7f3033b50b0bf19e02c9f522d522d338c.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts: doc/guix.texi gnu/local.mk gnu/packages/admin.scm gnu/packages/base.scm gnu/packages/chromium.scm gnu/packages/compression.scm gnu/packages/databases.scm gnu/packages/diffoscope.scm gnu/packages/freedesktop.scm gnu/packages/gnome.scm gnu/packages/gnupg.scm gnu/packages/guile.scm gnu/packages/inkscape.scm gnu/packages/llvm.scm gnu/packages/openldap.scm gnu/packages/pciutils.scm gnu/packages/ruby.scm gnu/packages/samba.scm gnu/packages/sqlite.scm gnu/packages/statistics.scm gnu/packages/syndication.scm gnu/packages/tex.scm gnu/packages/tls.scm gnu/packages/version-control.scm gnu/packages/xml.scm guix/build-system/copy.scm guix/scripts/home.scm
Diffstat (limited to 'gnu/packages/patches/guile-email-fix-tests.patch')
| -rw-r--r-- | gnu/packages/patches/guile-email-fix-tests.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/gnu/packages/patches/guile-email-fix-tests.patch b/gnu/packages/patches/guile-email-fix-tests.patch deleted file mode 100644 index 8621aaea02..0000000000 --- a/gnu/packages/patches/guile-email-fix-tests.patch +++ /dev/null @@ -1,35 +0,0 @@ -This patch has been proposed upstream: -https://lists.systemreboot.net/guile-email/87mtnv1r2p.fsf@gnu.org/T/#u. - -From c21fe0f0e28b80b606973d3e372e2bc8528c9766 Mon Sep 17 00:00:00 2001 -From: Mathieu Othacehe <othacehe@gnu.org> -Date: Wed, 29 Sep 2021 12:47:35 +0000 -Subject: [PATCH 1/1] email: Do not use an empty bytevector to test the - charset. - -Using an empty bytevector no longer throws an exception since this Guile -commit: 5ea8c69e9153a970952bf6f0b32c4fad6a28e839. - -* email/email.scm (post-process-content-transfer-encoding): Use a bytevector -containg the 'e' character to test the charset validity. ---- - email/email.scm | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/email/email.scm b/email/email.scm -index 3f4e194..ac70463 100644 ---- a/email/email.scm -+++ b/email/email.scm -@@ -832,7 +832,8 @@ values. The returned headers is a string and body is a bytevector." - (define (valid-charset? charset) - (catch #t - (lambda () -- (bytevector->string (make-bytevector 0 0) charset) -+ ;; Try to convert a bytevector containg the 'e' character. -+ (bytevector->string (make-bytevector 1 48) charset) - #t) - (const #f))) - --- -2.33.0 - |