From unknown Sun Jun 22 17:12:33 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#65376 <65376@debbugs.gnu.org> To: bug#65376 <65376@debbugs.gnu.org> Subject: Status: [PATCH emacs-team 0/7] Fix some more builds Reply-To: bug#65376 <65376@debbugs.gnu.org> Date: Mon, 23 Jun 2025 00:12:33 +0000 retitle 65376 [PATCH emacs-team 0/7] Fix some more builds reassign 65376 guix-patches submitter 65376 Liliana Marie Prikler severity 65376 normal tag 65376 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 19 02:48:11 2023 Received: (at submit) by debbugs.gnu.org; 19 Aug 2023 06:48:11 +0000 Received: from localhost ([127.0.0.1]:49261 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXFko-000264-R7 for submit@debbugs.gnu.org; Sat, 19 Aug 2023 02:48:11 -0400 Received: from lists.gnu.org ([2001:470:142::17]:32858) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXFkm-00025C-TB for submit@debbugs.gnu.org; Sat, 19 Aug 2023 02:48:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qXFka-0006tY-W9 for guix-patches@gnu.org; Sat, 19 Aug 2023 02:48:00 -0400 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qXFkY-0004kG-S0 for guix-patches@gnu.org; Sat, 19 Aug 2023 02:47:56 -0400 Received: by mail-ed1-x543.google.com with SMTP id 4fb4d7f45d1cf-5280ef23593so1945665a12.3 for ; Fri, 18 Aug 2023 23:47:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692427672; x=1693032472; h=to:content-transfer-encoding:mime-version:subject:date:from :message-id:from:to:cc:subject:date:message-id:reply-to; bh=pBgcFpWU6/De+UCRLG72CsjFh3g2ORbdQr0VbPU3EEI=; b=Oz1iyJAgd9blPHen2bhLri+3HIqnfmkitvZwFxA3zjoiWsqw/evLaRHpfjRGhOv7mJ L5TFZMaiueEGl8LWPJetFSuTWxf8SFE3j1G2uRzDNE7o2mNLUtS/DZoRqxrU2Pf0veVr VjIVYCA3TO9rhXt+Lo6Y4h3hgmpLqet1lmLzoG4ZTopRpBglQQmvLCS0E2nORy9BY6pO oDyQOTwci2gAk+qUPixSBNtM9UrlXIACSpNkPrtxxYWQYn4PI9IAU0Pc0H1xAFyNVI8N kwxFLJk2RbPovO6AsKVlFpwS9AoG0vER8w5lPG5H7eI6mdbWhvw50saD7u4B51WtZENR 5NYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692427672; x=1693032472; h=to:content-transfer-encoding:mime-version:subject:date:from :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pBgcFpWU6/De+UCRLG72CsjFh3g2ORbdQr0VbPU3EEI=; b=KNXQDo9D5QeeoxuewD/wM1hKbGSV8FRjRE4qaHirZWReTB66NbnSc7JOe3Grh+xkwu 8wL2/j6y9s1oV2IyUMYZI9C5G+is4bO2j6yZvv9qSQesuWn34zh23DXtmUuAMXjeoKjJ 9gIPwlvmdrZDdBiznJ18Rn/3Dua/1wZrfMiaeBHa2MCCmXHKfIatBP9SVHNDmXEvrhNM 01Cv1+iSqTwX3vFikKIBSFZt1y1HWj6GY+/8nna83QdJKrZR+xIIJJIoJv6LtL2QvJH8 +qSJtfWvv9KNcHu6ljMSghiUkOsPhDGaBi0WicgQ0u1e7cZl4278YrqC9WaIL8mURvo7 NxMw== X-Gm-Message-State: AOJu0Yy4e5LMAN9QMyk75FEGl6Ha7nyUBP6j+GyxLpuScdQ0FFZYmRmL 4YklvBl8sa6cxORYMgkyqCqgnLMbjHyDaQ== X-Google-Smtp-Source: AGHT+IHeEz31gOiyy2ivvozT6yB+sQARHL3YN+wYCL/2fT8QV05L0KiC1OFwVnPt8ChfcKVEyTm6ZA== X-Received: by 2002:a17:906:8a68:b0:9a1:64b9:d374 with SMTP id hy8-20020a1709068a6800b009a164b9d374mr883230ejc.68.1692427671974; Fri, 18 Aug 2023 23:47:51 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id lf26-20020a170907175a00b0098733a40bb7sm2167129ejc.155.2023.08.18.23.47.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 23:47:51 -0700 (PDT) Message-ID: From: Liliana Marie Prikler Date: Sat, 19 Aug 2023 08:46:00 +0200 Subject: [PATCH emacs-team 0/7] Fix some more builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: andrew@trop.in, liliana.prikler@gmail.com to: guix-patches@gnu.org Received-SPF: pass client-ip=2a00:1450:4864:20::543; envelope-from=liliana.prikler@gmail.com; helo=mail-ed1-x543.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Hi Andrew, hi other Guixers Since we're planning to make Emacs 29 the new default soon™, we should probably take care of some packages that fail to build. Here's a batch to do so. Cheers Liliana Marie Prikler (7): gnu: emacs-all-the-icons: Honour #:tests? gnu: emacs-haskell-mode: Update to 17.4. gnu: emacs-helpful: Update to 0.21. guix: emacs-utils: Add ert-number-tests. gnu: emacs-libgit: Fix build. gnu: emacs-all-the-icons: Fix build. gnu: emacs-yasnippet: Fix build. gnu/local.mk | 4 + gnu/packages/emacs-xyz.scm | 252 +++++++++--------- ...cs-all-the-icons-remove-duplicate-rs.patch | 21 ++ ...acs-haskell-mode-no-redefine-builtin.patch | 75 ++++++ .../patches/emacs-helpful-fix-tests.patch | 28 ++ ...acs-yasnippet-fix-empty-snippet-next.patch | 59 ++++ .../patches/emacs-yasnippet-fix-tests.patch | 14 + guix/build/emacs-utils.scm | 14 + 8 files changed, 345 insertions(+), 122 deletions(-) create mode 100644 gnu/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch create mode 100644 gnu/packages/patches/emacs-haskell-mode-no-redefine-builtin.patch create mode 100644 gnu/packages/patches/emacs-helpful-fix-tests.patch create mode 100644 gnu/packages/patches/emacs-yasnippet-fix-empty-snippet-next.patch base-commit: d58c6e25ff3d1e70fd9b0e07bdad1b335de8a979 prerequisite-patch-id: db4b84876b1a475e9e7846dd33ecd6d33dc14907 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 19 04:43:13 2023 Received: (at 65376) by debbugs.gnu.org; 19 Aug 2023 08:43:14 +0000 Received: from localhost ([127.0.0.1]:49391 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXHY8-00057c-1s for submit@debbugs.gnu.org; Sat, 19 Aug 2023 04:43:13 -0400 Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]:61676) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXHY6-00057I-FJ for 65376@debbugs.gnu.org; Sat, 19 Aug 2023 04:43:10 -0400 Received: by mail-ej1-x641.google.com with SMTP id a640c23a62f3a-99c1c66876aso214883866b.2 for <65376@debbugs.gnu.org>; Sat, 19 Aug 2023 01:43:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692434583; x=1693039383; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=epWxXFHiP6f5IiB/3e+TaYWM1igtKZTaU/1V/ndUJaY=; b=sCbN84duVfZOhUew93UvTCx/1L2VrLFeoAmLRDFbjjecbBLj2Iu+rF280PMkjG0PhK 7Fjk4ui93E3MomMh12lUXKkgHQo1x52MFahYQMFiogsqbtBc5YqRnM8aGWEOqPnLX0ZD oBULrDJiNUwAxsE3IGqcnqoB3wmjSsdmHjvk7MqMmQhjpognpwesPMFKaoCymJg5njig KYqC6xCZzyGpcmiPcpnl6ATi8a7bbzCJ17IqEzCkOySCMK+8PFZdz2LDHlddD8/3w74y eG/qEwEk0YlWI1sW3rtoGdOpXvgM2Xu0sWF2eUiTaTpqunpbyrNh4qL2cRpEoBnGwGRO 4H+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692434583; x=1693039383; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=epWxXFHiP6f5IiB/3e+TaYWM1igtKZTaU/1V/ndUJaY=; b=WmFsDZO+z628xbdH9PDKlUvWFnGx33z44MiIVNBUWeP2kbetGSD358hi4aAwdRj1K9 jF4PrMThIxIFAVCDxPr8tBWCp1xMmKiNapSXauLU5E/YsKtJzsYv923tQ8xNER0ReHQj WNo3CN5d3lkun8ObViCJv1f9EJnZuyPYcIUTeiYvnIiCaz91GYGetquZQJ+SP8VNeM67 kHmDaEUiBa1kmlgRaanKo+fr8WG7amiOVIBEbaf+k+WwVKsuwbf8+7NQkO59xjFZ9rzR Aw6ZGgUDpO+NGzB+AorVInpa2+b9T+m34z7EG9AgL7p4Uxs6fHUkg11p2Vq99VjmLwYT dpVA== X-Gm-Message-State: AOJu0YwcNT9O8uYcJVjn0VqxjjjlUrItDRtkYZfdZq5RTvh/MUQBFOJj 74kwYnazM7ldm7OCYmd3gVE00LpqpIy2sA== X-Google-Smtp-Source: AGHT+IFpzbYgX6Te76uq8DM2H0fyQUg5Y6HBZAuUQz0jz7vJMSwuyHmPqtkGzLKAQHj4/u+kkLau3A== X-Received: by 2002:a17:906:5dd9:b0:99e:112e:7708 with SMTP id p25-20020a1709065dd900b0099e112e7708mr1059021ejv.76.1692434583475; Sat, 19 Aug 2023 01:43:03 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id w14-20020a1709064a0e00b0099d804da2e9sm2316168eju.225.2023.08.19.01.43.01 for <65376@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Aug 2023 01:43:02 -0700 (PDT) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Sat, 19 Aug 2023 00:22:25 +0200 Subject: [PATCH emacs-team 1/7] gnu: emacs-all-the-icons: Honour #:tests? X-Debbugs-Cc: andrew@trop.in, liliana.prikler@gmail.com to: 65376@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/emacs-xyz.scm (emacs-all-the-icons)[#:phases]: Honour tests. --- gnu/packages/emacs-xyz.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9c23c69f79..30f924a3fb 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -27793,10 +27793,12 @@ (de [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:641 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 1.1 DATE_IN_PAST_06_12 Date: is 6 to 12 hours before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Debbugs-Envelope-To: 65376 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.1 (/) * gnu/packages/emacs-xyz.scm (emacs-all-the-icons)[#:phases]: Honour tests. --- gnu/packages/emacs-xyz.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9c23c69f79..30f924a3fb 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -27793,10 +27793,12 @@ (define-public emacs-all-the-icons (install-file "octicons.ttf" fonts) (install-file "weathericons.ttf" fonts))))) (replace 'check - (lambda* (#:key outputs #:allow-other-keys) - (apply invoke "ert-runner" "-l" - (append (find-files "data" "\\.el") - '("all-the-icons-faces.el")))))))) + (lambda* (#:key tests? outputs #:allow-other-keys) + (if tests? + (apply invoke "ert-runner" "-l" + (append (find-files "data" "\\.el") + '("all-the-icons-faces.el"))) + (format #t "test suite not run~%"))))))) (native-inputs (list emacs-f emacs-ert-runner)) (propagated-inputs -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 19 04:43:16 2023 Received: (at 65376) by debbugs.gnu.org; 19 Aug 2023 08:43:17 +0000 Received: from localhost ([127.0.0.1]:49396 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXHYB-00058A-SL for submit@debbugs.gnu.org; Sat, 19 Aug 2023 04:43:16 -0400 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:45274) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXHY7-00057K-Es for 65376@debbugs.gnu.org; Sat, 19 Aug 2023 04:43:12 -0400 Received: by mail-ej1-x643.google.com with SMTP id a640c23a62f3a-99357737980so212838166b.2 for <65376@debbugs.gnu.org>; Sat, 19 Aug 2023 01:43:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692434585; x=1693039385; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=oLGvl2u9hTRYkcVxQQIX3kA70Fn+WdLPaTcFDsmaG+w=; b=j53rCV4f/r0Pe3b1EnFTDs+SopFYGQNesaeYmuVTko2yrxVXDVfL2fd583aRxlGJon JgUMAf+LlQrdq0XlDQ62okGwZYZUj6b1ED1kvKaoh3n01t+3TWK+uU1KFuG22OTk1wjN Lcngf9fbgzpisAyFoBIWIrrXOh9S4DYRLlYMAnV2Q/MTjG70TW2eOiVWSCBLqeSS+ohN 1mZiJZLWguINSmg8qFMas7ejN3sM6QaUMi47s7cFEllOlumXIMsNlQvSSzJSdykc/z2v K6KLOJ/Sfsdl7SvxygTueYP6WEuedI8uOKT0upRyWIiPRXLlLg0NrciDg1EmymjpbBfa Q4Nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692434585; x=1693039385; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=oLGvl2u9hTRYkcVxQQIX3kA70Fn+WdLPaTcFDsmaG+w=; b=a1EnO1XzvTjKQ7eDT76/nAXOltgC4S3OAS95wogH//kbHySL0g6nrOa/fTXiyC6GkD YadGZ4jZ15rdKxmARyhG/IVHfQfseTj8wnrPok2OGtDIGxSp+m3wCnzmudcfJyeoF1dP uE9nl9WpheqIpYuAB9a5gRMwOEoidgRQ8+i/jRO1nxDOL7aGvFYipvQMfz4TiyjEf5QS /kGmbD0y/ryyRz6kgrDu2HDql4okuSPvpeDenmpfjwV0uVlOM15MR2KXZEeIW1cyRdiW 1e224sCImQ89EgGddXGoqZThm7zXsOd05bmiY4n/jMFR7E48YpfsmpZhki9bT7n1bASx MWXA== X-Gm-Message-State: AOJu0YxKqrof5ZgfTK2cqpwILaIJD3rAO8NiacUSMebOGUnSdNgLCJOE eGqSOIxSkMS17COKBp2mh1qdsrqLeLD4MQ== X-Google-Smtp-Source: AGHT+IFFEPXy+PvJrsU6U+01w5CUZF+jiSXSob7EZpVtNqWusM3No7CrqlJL/H2aTd8H33xh6EQbnQ== X-Received: by 2002:a17:907:7818:b0:99d:eb3c:5239 with SMTP id la24-20020a170907781800b0099deb3c5239mr1136829ejc.43.1692434584664; Sat, 19 Aug 2023 01:43:04 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id w14-20020a1709064a0e00b0099d804da2e9sm2316168eju.225.2023.08.19.01.43.03 for <65376@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Aug 2023 01:43:03 -0700 (PDT) Message-ID: <5a989fc417de48b64cb2ee6a5228c3af391acc25.1692427560.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sat, 19 Aug 2023 00:52:53 +0200 Subject: [PATCH emacs-team 2/7] gnu: emacs-haskell-mode: Update to 17.4. X-Debbugs-Cc: andrew@trop.in, liliana.prikler@gmail.com to: 65376@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/patches/emacs-haskell-mode-no-redefine-builtin.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/emacs-xyz.scm (emacs-haskell-mode): Update to 17.4. [s [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:643 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 1.1 DATE_IN_PAST_06_12 Date: is 6 to 12 hours before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Debbugs-Envelope-To: 65376 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.1 (/) * gnu/packages/patches/emacs-haskell-mode-no-redefine-builtin.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/emacs-xyz.scm (emacs-haskell-mode): Update to 17.4. [source]: Use it here. --- gnu/local.mk | 1 + gnu/packages/emacs-xyz.scm | 182 +++++++++--------- ...acs-haskell-mode-no-redefine-builtin.patch | 75 ++++++++ 3 files changed, 167 insertions(+), 91 deletions(-) create mode 100644 gnu/packages/patches/emacs-haskell-mode-no-redefine-builtin.patch diff --git a/gnu/local.mk b/gnu/local.mk index 7af2755a2b..e14a9adc33 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1096,6 +1096,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-git-email-missing-parens.patch \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ %D%/packages/patches/emacs-json-reformat-fix-tests.patch \ + %D%/packages/patches/emacs-haskell-mode-no-redefine-builtin.patch \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ %D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \ %D%/packages/patches/emacs-native-comp-driver-options.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 30f924a3fb..1e03625f62 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -2249,99 +2249,99 @@ (define-public emacs-unpackaged-el (license license:gpl3+)))) (define-public emacs-haskell-mode - (let ((revision "0") - (commit "5a9f8072c7b9168f0a8409adf9d62a3e4ad4ea3d")) - (package - (name "emacs-haskell-mode") - (version (git-version "17.2" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/haskell/haskell-mode") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0np1wrwdq7b9hpqpl9liampacnkx6diphyk8h2sbz2mfn9qr7pxs")))) - (propagated-inputs - (list emacs-dash)) - (native-inputs - (list emacs-minimal emacs-el-search emacs-stream texinfo)) - (build-system gnu-build-system) - (arguments - (list - #:make-flags #~(list - (string-append "EMACS=" #$emacs-minimal "/bin/emacs")) - #:modules `((ice-9 match) - (srfi srfi-26) - ((guix build emacs-build-system) #:prefix emacs:) - ,@%gnu-build-system-modules) - #:imported-modules `(,@%gnu-build-system-modules - (guix build emacs-build-system) - (guix build emacs-utils)) - #:phases - #~(modify-phases %standard-phases - (delete 'configure) - (add-before 'build 'pre-build - (lambda* (#:key inputs #:allow-other-keys) - (define (el-dir store-dir) - (match (find-files store-dir "\\.el$") - ((f1 f2 ...) (dirname f1)) - (_ ""))) + (package + (name "emacs-haskell-mode") + (version "17.4") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/haskell/haskell-mode") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03j94fgw1bljbjqmikbn9mnrfifxf7g9zrb727zmnnrjwyi0wd4n")) + (patches + (search-patches "emacs-haskell-mode-no-redefine-builtin.patch")))) + (propagated-inputs + (list emacs-dash)) + (native-inputs + (list emacs-minimal emacs-el-search emacs-stream texinfo)) + (build-system gnu-build-system) + (arguments + (list + #:make-flags #~(list + (string-append "EMACS=" #$emacs-minimal "/bin/emacs")) + #:modules `((ice-9 match) + (srfi srfi-26) + ((guix build emacs-build-system) #:prefix emacs:) + ,@%gnu-build-system-modules) + #:imported-modules `(,@%gnu-build-system-modules + (guix build emacs-build-system) + (guix build emacs-utils)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'pre-build + (lambda* (#:key inputs #:allow-other-keys) + (define (el-dir store-dir) + (match (find-files store-dir "\\.el$") + ((f1 f2 ...) (dirname f1)) + (_ ""))) - (let ((sh (search-input-file inputs "/bin/sh"))) - (define emacs-prefix? (cut string-prefix? "emacs-" <>)) - - (setenv "SHELL" "sh") - (setenv "EMACSLOADPATH" - (string-concatenate - (map (match-lambda - (((? emacs-prefix? name) . dir) - (string-append (el-dir dir) ":")) - (_ "")) - inputs))) - (substitute* (find-files "." "\\.el") (("/bin/sh") sh))))) - (add-before 'check 'delete-failing-tests - ;; XXX: these tests require GHC executable, which would be a big - ;; native input. - (lambda _ - (with-directory-excursion "tests" - ;; File `haskell-indent-tests.el' fails with - ;; `haskell-indent-put-region-in-literate-2' - ;; on Emacs 27.1+ - ;; XXX: https://github.com/haskell/haskell-mode/issues/1714 - (for-each delete-file - '("haskell-indent-tests.el" - "haskell-customize-tests.el" - "inferior-haskell-tests.el")) - - ;; requires many external tools (e.g. git, hasktags) - (substitute* "haskell-mode-tests.el" - (("\\(ert-deftest haskell-generate-tags.*" all) - (string-append all " (skip-unless nil)")))))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (el-dir (emacs:elpa-directory out)) - (doc (string-append - out "/share/doc/haskell-mode-" #$version)) - (info (string-append out "/share/info"))) - (define (copy-to-dir dir files) - (for-each (lambda (f) - (install-file f dir)) - files)) - - (with-directory-excursion "doc" - (invoke "makeinfo" "haskell-mode.texi") - (install-file "haskell-mode.info" info)) - (copy-to-dir doc '("CONTRIBUTING.md" "NEWS" "README.md")) - (copy-to-dir el-dir (find-files "." "\\.elc?")))))))) - (home-page "https://github.com/haskell/haskell-mode") - (synopsis "Haskell mode for Emacs") - (description - "This is an Emacs mode for editing, debugging and developing Haskell + (let ((sh (search-input-file inputs "/bin/sh"))) + (define emacs-prefix? (cut string-prefix? "emacs-" <>)) + + (setenv "SHELL" "sh") + (setenv "EMACSLOADPATH" + (string-concatenate + (map (match-lambda + (((? emacs-prefix? name) . dir) + (string-append (el-dir dir) ":")) + (_ "")) + inputs))) + (substitute* (find-files "." "\\.el") (("/bin/sh") sh))))) + (add-before 'check 'delete-failing-tests + ;; XXX: these tests require GHC executable, which would be a big + ;; native input. + (lambda _ + (with-directory-excursion "tests" + ;; File `haskell-indent-tests.el' fails with + ;; `haskell-indent-put-region-in-literate-2' + ;; on Emacs 27.1+ + ;; XXX: https://github.com/haskell/haskell-mode/issues/1714 + (for-each delete-file + '("haskell-indent-tests.el" + "haskell-customize-tests.el" + "inferior-haskell-tests.el")) + + ;; requires many external tools (e.g. git, hasktags) + (substitute* "haskell-mode-tests.el" + (("\\(ert-deftest haskell-generate-tags.*" all) + (string-append all " (skip-unless nil)")))))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (el-dir (emacs:elpa-directory out)) + (doc (string-append + out "/share/doc/haskell-mode-" #$version)) + (info (string-append out "/share/info"))) + (define (copy-to-dir dir files) + (for-each (lambda (f) + (install-file f dir)) + files)) + + (with-directory-excursion "doc" + (invoke "makeinfo" "haskell-mode.texi") + (install-file "haskell-mode.info" info)) + (copy-to-dir doc '("CONTRIBUTING.md" "NEWS" "README.md")) + (copy-to-dir el-dir (find-files "." "\\.elc?")))))))) + (home-page "https://github.com/haskell/haskell-mode") + (synopsis "Haskell mode for Emacs") + (description + "This is an Emacs mode for editing, debugging and developing Haskell programs.") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-dante (package diff --git a/gnu/packages/patches/emacs-haskell-mode-no-redefine-builtin.patch b/gnu/packages/patches/emacs-haskell-mode-no-redefine-builtin.patch new file mode 100644 index 0000000000..65ace2ee5e --- /dev/null +++ b/gnu/packages/patches/emacs-haskell-mode-no-redefine-builtin.patch @@ -0,0 +1,75 @@ +From faa95a784d2c74c72e70367a5d531df6dd61aeab Mon Sep 17 00:00:00 2001 +From: Steve Purcell +Date: Sun, 6 Aug 2023 16:41:48 +0200 +Subject: [PATCH] Don't redefine built-in function + +Fixes #1817 +--- + tests/haskell-indent-tests.el | 14 ++++++++------ + tests/haskell-indentation-tests.el | 14 ++++++++------ + 2 files changed, 16 insertions(+), 12 deletions(-) + +diff --git a/tests/haskell-indent-tests.el b/tests/haskell-indent-tests.el +index 7196405b8..9a3de4ad3 100644 +--- a/tests/haskell-indent-tests.el ++++ b/tests/haskell-indent-tests.el +@@ -40,11 +40,13 @@ + ;; (haskell-indent-put-region-in-literate (point-min) (point-max) -1) + ;; (buffer-substring-no-properties (point-min) (point-max)))))) + +-(defsubst string-trim-left (string) +- "Remove leading whitespace from STRING." +- (if (string-match "\\`[ \t\n\r]+" string) +- (replace-match "" t t string) +- string)) ++(if (fboundp 'string-trim-left) ++ (defalias 'haskell--string-trim-left 'string-trim-left) ++ (defun haskell--string-trim-left (string &optional regexp) ++ "Remove leading whitespace from STRING." ++ (if (string-match (concat "\\`\\(?:" (or regexp "[ \t\n\r]+") "\\)") string) ++ (substring string (match-end 0)) ++ string))) + + (defun haskell-indent-format-info (info) + (if (cdr info) +@@ -128,7 +130,7 @@ macro quotes them for you." + :expected-result + ,(if allow-failure :failed :passed) + (haskell-indent-check +- ,(string-trim-left source) ++ ,(haskell--string-trim-left source) + ,@(mapcar (lambda (x) + (list 'quote x)) + test-cases)))))) +diff --git a/tests/haskell-indentation-tests.el b/tests/haskell-indentation-tests.el +index 4889b76a7..cd783a4f4 100644 +--- a/tests/haskell-indentation-tests.el ++++ b/tests/haskell-indentation-tests.el +@@ -33,11 +33,13 @@ + + ;;; Code: + +-(defsubst string-trim-left (string) +- "Remove leading whitespace from STRING." +- (if (string-match "\\`[ \t\n\r]+" string) +- (replace-match "" t t string) +- string)) ++(if (fboundp 'string-trim-left) ++ (defalias 'haskell--string-trim-left 'string-trim-left) ++ (defun haskell--string-trim-left (string &optional regexp) ++ "Remove leading whitespace from STRING." ++ (if (string-match (concat "\\`\\(?:" (or regexp "[ \t\n\r]+") "\\)") string) ++ (substring string (match-end 0)) ++ string))) + + (defun haskell-indentation-check (source &rest test-cases) + "Check if `haskell-indentation-find-indentations' returns expected results. +@@ -115,7 +117,7 @@ macro quotes them for you." + :expected-result + ,(if allow-failure :failed :passed) + (haskell-indentation-check +- ,(string-trim-left source) ++ ,(haskell--string-trim-left source) + ,@(mapcar (lambda (x) + (list 'quote x)) + test-cases)))))) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 19 04:43:17 2023 Received: (at 65376) by debbugs.gnu.org; 19 Aug 2023 08:43:18 +0000 Received: from localhost ([127.0.0.1]:49399 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXHYC-00058C-R4 for submit@debbugs.gnu.org; Sat, 19 Aug 2023 04:43:17 -0400 Received: from mail-ej1-x644.google.com ([2a00:1450:4864:20::644]:47279) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXHY8-00057M-LL for 65376@debbugs.gnu.org; Sat, 19 Aug 2023 04:43:13 -0400 Received: by mail-ej1-x644.google.com with SMTP id a640c23a62f3a-977e0fbd742so206787366b.2 for <65376@debbugs.gnu.org>; Sat, 19 Aug 2023 01:43:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692434586; x=1693039386; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=ZF/UGVjC2qG0eH0BzVSt+Js1KJ2yxQT3GhEcC7e3tXw=; b=Wimqz9gdjT6zSMzxEbvcHJVIcxHD4mb58PTiOuhaFlsAB4NgQ24ApEPrx/W1OE4v+E Bz/FpDS3ndR2LusyQKGqXpP8avYeEM16mmExWkVr9Vw3xL8FauNpTrbaPUu5hauLQV8O 5dKjbquLyJWteKb50hnlk7zVM04UAlzggP9wfp6JfxRjOkySgeo08NjY2JKuiXiS9S76 OiuexOcJpSnwMFgyQOsEJjwX/QKsxjjEsGzFIEEvKZ3HAT5vBZAEDN75ebp18fSsu7ek dracqt7O+wI+CEivAqSBAzghed3mrIGiHNmLnE5Cur6dO/0wpOcgUkl6rppoOlOzsosf 4aMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692434586; x=1693039386; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ZF/UGVjC2qG0eH0BzVSt+Js1KJ2yxQT3GhEcC7e3tXw=; b=MtGI+7QNVmyc8HfEfp42ie+69lhf5M9byBP2RYzA+yLaptNfxO02IbF10krZWDOZD/ YMJabHwtnHgNfdGHd7ooPygJdEM8ZeytlqSZr/xFUd5WHaSxRC8U0h9qwCzqKoVRVJh9 oSizk+CcIe6kWK6S7RN60N8uYUKMFYNsyi2fJoVcco+FG4qal3x0+HEkDNzsl5tIv3sY Kvr/hERX68DaVUiau6bgBziH5XDuaquiGQOdwbTLfdZdX5nVrOB30NFoC2SqLy8iXIQt xf6kJv7dh+NLVhLurZsULZLXKQZhiNcVbgV6PJ3b4VRg45nL48bUoE5eomeMJhr72fAq 4Aiw== X-Gm-Message-State: AOJu0YyVCoW6dAsywy2V1SBMJ9aHlOKTxiOHjiw6QN4PvTeQdzOHDu69 eJZjgAdOEfx/sNrj8qzCWpZf8pTxvFdaQw== X-Google-Smtp-Source: AGHT+IEx8yXJOllr7NIStcIHLQBKCnK70FaAHDv7W3UPUGs3rQpTJzT7Z5J5JeYhEMFZCc9sJ/AMWA== X-Received: by 2002:a17:906:9bdc:b0:99b:bf82:75fc with SMTP id de28-20020a1709069bdc00b0099bbf8275fcmr997239ejc.32.1692434585807; Sat, 19 Aug 2023 01:43:05 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id w14-20020a1709064a0e00b0099d804da2e9sm2316168eju.225.2023.08.19.01.43.04 for <65376@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Aug 2023 01:43:05 -0700 (PDT) Message-ID: <1fcf9c0d7de956e7029090bdcc5b921932e95082.1692427560.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sat, 19 Aug 2023 01:05:22 +0200 Subject: [PATCH emacs-team 3/7] gnu: emacs-helpful: Update to 0.21. X-Debbugs-Cc: andrew@trop.in, liliana.prikler@gmail.com to: 65376@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/patches/emacs-helpful-fix-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/emacs-xyz.scm (emacs-helpful): Update to 0.21. [source]: Use [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:644 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 1.1 DATE_IN_PAST_06_12 Date: is 6 to 12 hours before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Debbugs-Envelope-To: 65376 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.1 (/) * gnu/packages/patches/emacs-helpful-fix-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/emacs-xyz.scm (emacs-helpful): Update to 0.21. [source]: Use it here. --- gnu/local.mk | 1 + gnu/packages/emacs-xyz.scm | 51 +++++++++---------- .../patches/emacs-helpful-fix-tests.patch | 28 ++++++++++ 3 files changed, 54 insertions(+), 26 deletions(-) create mode 100644 gnu/packages/patches/emacs-helpful-fix-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index e14a9adc33..3b087a6d5e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1097,6 +1097,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ %D%/packages/patches/emacs-json-reformat-fix-tests.patch \ %D%/packages/patches/emacs-haskell-mode-no-redefine-builtin.patch \ + %D%/packages/patches/emacs-helpful-fix-tests.patch \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ %D%/packages/patches/emacs-lispy-fix-thread-last-test.patch \ %D%/packages/patches/emacs-native-comp-driver-options.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1e03625f62..dbc176e379 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -24363,31 +24363,30 @@ (define-public emacs-download-region (license license:gpl3+)))) (define-public emacs-helpful - (let ((commit "1c98f6f06a85def5d34c735f8cd407f20cebddf9") - (revision "1")) - (package - (name "emacs-helpful") - (version (git-version "0.19" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/Wilfred/helpful") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 "18b5hjfji51zxjrxhkklxx3j9svk295awmxv8n95mp8ilas2kd3l")))) - (build-system emacs-build-system) - (propagated-inputs - (list emacs-dash emacs-elisp-refs emacs-f emacs-s)) - (native-inputs - (list emacs-ert-runner emacs-undercover)) - (arguments - `(#:tests? #t - #:test-command '("ert-runner"))) - (home-page "https://github.com/Wilfred/helpful") - (synopsis "More contextual information in Emacs help") - (description "@code{helpful} is an alternative to the built-in Emacs help + (package + (name "emacs-helpful") + (version "0.21") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/Wilfred/helpful") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "03afgdbs5nmhw833svrqky7fmfs1zlvqzcj7j5g29sakivs60xqc")) + (patches (search-patches "emacs-helpful-fix-tests.patch")))) + (build-system emacs-build-system) + (propagated-inputs + (list emacs-dash emacs-elisp-refs emacs-f emacs-s)) + (native-inputs + (list emacs-ert-runner emacs-undercover)) + (arguments + `(#:tests? #t + #:test-command '("ert-runner"))) + (home-page "https://github.com/Wilfred/helpful") + (synopsis "More contextual information in Emacs help") + (description "@code{helpful} is an alternative to the built-in Emacs help that provides much more contextual information. @itemize @@ -24406,7 +24405,7 @@ (define-public emacs-helpful @item Trace, disassemble functions from inside Helpful. This is discoverable and doesn't require memorisation of commands. @end itemize\n") - (license license:gpl3+)))) + (license license:gpl3+))) (define-public emacs-logview (package diff --git a/gnu/packages/patches/emacs-helpful-fix-tests.patch b/gnu/packages/patches/emacs-helpful-fix-tests.patch new file mode 100644 index 0000000000..61ed0671a4 --- /dev/null +++ b/gnu/packages/patches/emacs-helpful-fix-tests.patch @@ -0,0 +1,28 @@ +From 233e254bbe44f70ca899a506b3706af489228fda Mon Sep 17 00:00:00 2001 +From: aagon +Date: Thu, 10 Aug 2023 20:03:52 +0200 +Subject: [PATCH] Repair helpful--display-implementations test for emacs 29.1 + +--- + test/helpful-unit-test.el | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/test/helpful-unit-test.el b/test/helpful-unit-test.el +index 0f5177b..0716b0d 100644 +--- a/test/helpful-unit-test.el ++++ b/test/helpful-unit-test.el +@@ -1089,8 +1089,12 @@ find the source code." + (require 'xref) + (helpful-function 'xref-location-marker) + (should (s-contains-p "Implementations" (buffer-string))) +- (should (s-contains-p "((l xref-file-location))" (buffer-string))) +- (should (s-contains-p "((l xref-buffer-location))" (buffer-string)))) ++ (should (if (version< emacs-version "29.1") ++ (s-contains-p "((l xref-file-location))" (buffer-string)) ++ (s-contains-p "(xref-location-marker (L xref-file-location))" (buffer-string)))) ++ (should (if (version< emacs-version "29.1") ++ (s-contains-p "((l xref-buffer-location))" (buffer-string)) ++ (s-contains-p "(xref-location-marker (L xref-buffer-location))" (buffer-string))))) + + (defun helpful--boring-advice (orig-fn &rest args) + (apply orig-fn args)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 19 04:43:18 2023 Received: (at 65376) by debbugs.gnu.org; 19 Aug 2023 08:43:18 +0000 Received: from localhost ([127.0.0.1]:49402 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXHYD-00058Q-Qp for submit@debbugs.gnu.org; Sat, 19 Aug 2023 04:43:18 -0400 Received: from mail-ej1-x641.google.com ([2a00:1450:4864:20::641]:46204) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXHY9-00057O-Gb for 65376@debbugs.gnu.org; Sat, 19 Aug 2023 04:43:14 -0400 Received: by mail-ej1-x641.google.com with SMTP id a640c23a62f3a-98377c5d53eso208583566b.0 for <65376@debbugs.gnu.org>; Sat, 19 Aug 2023 01:43:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692434587; x=1693039387; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=rZXtsSlb+BBb+aydZO95YzFQL+nfq28g/XQtoLjNY5Q=; b=VCHEj8i2fJd5UmzTgVHUySmXzVUAx3g0BayP615CqvEuW6pp6wq+4s2oq2hQ9VM1Yw 2og4GjP5/CPTNiz9sP9iA/c5tc6Oj8C/g0vOuprZK2xUM4uWsoOr8LAXojDQMwigYVpD 82GxRJg12A3dWaolTc0uKepg1WU6IzUWgUckqg7lYet1i/KeELdhdo5RyyLeFJH/neeE GP9BcePvGBM532G376kn6THgOlmyDjDhT5DT5ssFDDS6R8jSAp4/2JNffKbgHgOqng3D Q9rzkd+F5RSqxlPnO4FxLIx2BsAsFfUZa++vHzegWIrXcZQrV+BVNYr3mnH0YJbZTd4N 1ZNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692434587; x=1693039387; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=rZXtsSlb+BBb+aydZO95YzFQL+nfq28g/XQtoLjNY5Q=; b=DiH0lNX8o6jz/VQhgrgAxgIDuP9wzwWV5Q+R49SY3KlImC02SooVKZEDf45603s6ak AnOLU+Ezx1l3VMNfl5lGBkLyhjvQH+5UMuI4yhHTEOE60y8GMxPlvJuISk9GzLpUhay7 s1y788XteayRxX3T8YqS0f+smiGHzhKlJghynCfHCHXa5JNOI+PE/hPKwjhlpI7Cj2Vg NL8Uo8VACLtppTjCHvyGUX21VPCvsXQadfqC9UsNeiANDsyWIRqKBebS9WC07ByGVZJC TPLEOQy6TZGMTbJi2JnAKYr2PumqLGR5buIR56pqDVnOuWP/Bd4iKELsXY8CAw/am++h H6qA== X-Gm-Message-State: AOJu0Yz+UOX5SwnQNlLQPoeO7o5U6901OvkZr99oC6s1kFUIGa/FVYeg 9B+jEgCRTNj/L/KBCB9UL2zeZQksrcC9vw== X-Google-Smtp-Source: AGHT+IHNS0a9p5lIclBBlgcfVUwVdwFddSg6oGH8tSXInLL67JRsFCuDoeIRJBPMEEtlHxNvu2e8BQ== X-Received: by 2002:a17:906:7696:b0:99b:4956:e4e3 with SMTP id o22-20020a170906769600b0099b4956e4e3mr1051609ejm.8.1692434586924; Sat, 19 Aug 2023 01:43:06 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id w14-20020a1709064a0e00b0099d804da2e9sm2316168eju.225.2023.08.19.01.43.05 for <65376@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Aug 2023 01:43:06 -0700 (PDT) Message-ID: <50b2db40ea03d8b3c78b3a774e057ebab0f98790.1692427560.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sat, 19 Aug 2023 01:37:20 +0200 Subject: [PATCH emacs-team 4/7] guix: emacs-utils: Add ert-number-tests. X-Debbugs-Cc: andrew@trop.in, liliana.prikler@gmail.com to: 65376@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * guix/build/utils.scm (ert-number-tests): New variable. --- guix/build/emacs-utils.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/guix/build/emacs-utils.scm b/guix/build/emacs-utils.scm index 850b1f5f2a..ac3dac57d1 100644 --- a/guix/build/emacs-utils.scm +++ b/guix/build/emacs-utils.scm @@ -40,6 +40,7 @@ (define-mod [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:641 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 1.1 DATE_IN_PAST_06_12 Date: is 6 to 12 hours before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Debbugs-Envelope-To: 65376 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.1 (/) * guix/build/utils.scm (ert-number-tests): New variable. --- guix/build/emacs-utils.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/guix/build/emacs-utils.scm b/guix/build/emacs-utils.scm index 850b1f5f2a..ac3dac57d1 100644 --- a/guix/build/emacs-utils.scm +++ b/guix/build/emacs-utils.scm @@ -40,6 +40,7 @@ (define-module (guix build emacs-utils) emacs-byte-compile-directory emacs-compile-directory emacs-header-parse + ert-number-tests as-display emacs-substitute-sexps @@ -183,6 +184,19 @@ (define-syntax replacement-helper (insert " ") (insert ,(format #f "~s" replacement)))))) +(define (ert-number-tests file test-name) + "Add a numerically increasing suffix to tests of the same name. +This fixes test errors of the pattern \"Test TEST_NAME redefined\"." + (emacs-batch-edit-file file + `(let ((i 0)) + (while (re-search-forward ,(string-append "ert-deftest " test-name) + nil t) + (goto-char (match-beginning 0)) + (kill-region (match-beginning 0) (match-end 0)) + (insert (format "ert-deftest %s-%d" ,test-name i)) + (setq i (+ i 1))) + (basic-save-buffer)))) + (define-syntax emacs-substitute-sexps (syntax-rules () "Substitute the S-expression immediately following the first occurrence of -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 19 04:43:18 2023 Received: (at 65376) by debbugs.gnu.org; 19 Aug 2023 08:43:18 +0000 Received: from localhost ([127.0.0.1]:49404 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXHYE-00058Z-9D for submit@debbugs.gnu.org; Sat, 19 Aug 2023 04:43:18 -0400 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:44060) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXHYA-00057Q-My for 65376@debbugs.gnu.org; Sat, 19 Aug 2023 04:43:15 -0400 Received: by mail-ej1-x643.google.com with SMTP id a640c23a62f3a-99bfcf4c814so215257166b.0 for <65376@debbugs.gnu.org>; Sat, 19 Aug 2023 01:43:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692434588; x=1693039388; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=84Fi0Jv+Dr50mXf69S6/QQmJkttI32+310ZK3Uvw4QY=; b=VhXOqko+f1bfqG/sT3GEyOqbXYnKWivdFXnCuW/Q+OPYgNEkl5GfsVOYB6XOvsJUdp 5C+3+8vqn+je/53mBk+OXSJu5DmhXwbFxQN4149HrzvY+UOiWhjEF2QFADailcj2Zjap HlHcucKcpjV5tA62e6KqcQaFhRhDYjPJboiFtDLIIi2yMixiLupAAHVuP0bUbYqzepUc WpQxpDiYuc97b//+Q2PkemnqSIKxdZ8pf8SU6rJ9TpaoJNNJo+gO0yLRRzYtUs5sNWpj RH53tPVsRaqFO6Ez6jC4bbRNNx5+2gPbUmKw8egRvMqnlDYlhXyArJlLo/IFQEXe/i0K sfxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692434588; x=1693039388; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=84Fi0Jv+Dr50mXf69S6/QQmJkttI32+310ZK3Uvw4QY=; b=H7bnl5xFfZD1cuWMsP8buC6bsSK4ulkWaJlAPxjBoJdK+7ZG43HDSfR1qJMEvSKVx4 0EFQJopQg1Lp2k41AZTupt745djMnhmzFVqfDko/F09aPIT7v6e9eA0Cbwvbx4GlWg9q 4lN7IJ0V7J+VNddv/3vZnZic3urqN27k4BcVJoLt+BfX2bAX9pTDiV56+ukM3plUVITI Qk+2yHipsTOTxzGTUChee3sjlYyLua+e6JisdMl/akiahWauUVTGfUqa36IWAm5+dAo3 cVikL46QQFj6QDSxXfG9hRofF9+Y819Y7MZR7WjJSTRdlY26pGyioBV8FrknWqbRDt+o s9gg== X-Gm-Message-State: AOJu0Yx2NqXZpf1fasWZs09dX66VACUYNiMdznWoZO+AhvR4onnzhvRq auhCGYeXYWtxcy1SQppnBBOg9MHaKjf7gg== X-Google-Smtp-Source: AGHT+IGT8NLt4HKNklCGYND/Xmqbh8ii/udcphbYrjUnhQfYaCOpMYgPUXrzxWpLNq+7HJtpusdX3A== X-Received: by 2002:a17:906:289:b0:994:555a:e49f with SMTP id 9-20020a170906028900b00994555ae49fmr1192836ejf.31.1692434588098; Sat, 19 Aug 2023 01:43:08 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id w14-20020a1709064a0e00b0099d804da2e9sm2316168eju.225.2023.08.19.01.43.07 for <65376@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Aug 2023 01:43:07 -0700 (PDT) Message-ID: <51bbc440f432523b68a0ef40176d3ab8c27de81c.1692427560.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sat, 19 Aug 2023 01:37:53 +0200 Subject: [PATCH emacs-team 5/7] gnu: emacs-libgit: Fix build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Debbugs-Cc: andrew@trop.in, liliana.prikler@gmail.com to: 65376@debbugs.gnu.org X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/emacs-xyz.scm (emacs-libgit)[#:phases]: Add ‘ert-number-tests’. --- gnu/packages/emacs-xyz.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index dbc176e379..9aaac5142f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1407,6 +1407,10 @@ (defin [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:643 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 1.1 DATE_IN_PAST_06_12 Date: is 6 to 12 hours before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Debbugs-Envelope-To: 65376 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.1 (/) * gnu/packages/emacs-xyz.scm (emacs-libgit)[#:phases]: Add ‘ert-number-tests’. --- gnu/packages/emacs-xyz.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index dbc176e379..9aaac5142f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1407,6 +1407,10 @@ (define-public emacs-libgit (substitute* "test/submodule-test.el" (("\\(ert-deftest (status|ids) .*" all) (string-append all " (skip-unless nil)"))))) + (add-after 'unpack 'ert-number-tests + (lambda _ + (ert-number-tests "test/repository-test.el" + "repository-head-for-worktree"))) (add-before 'install 'prepare-for-install (lambda _ (let ((s "../source")) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 19 04:43:27 2023 Received: (at 65376) by debbugs.gnu.org; 19 Aug 2023 08:43:27 +0000 Received: from localhost ([127.0.0.1]:49406 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXHYM-00058y-N1 for submit@debbugs.gnu.org; Sat, 19 Aug 2023 04:43:27 -0400 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]:44504) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXHYC-00057V-57 for 65376@debbugs.gnu.org; Sat, 19 Aug 2023 04:43:17 -0400 Received: by mail-ej1-x642.google.com with SMTP id a640c23a62f3a-99c136ee106so213932166b.1 for <65376@debbugs.gnu.org>; Sat, 19 Aug 2023 01:43:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692434589; x=1693039389; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=BJg/AYoWDStOtDgWQJmPZkO+OIikRa/2+Ho9uVMbQSY=; b=W0xibdXLCna1kKw5yfF3ojnrF1pGex9UjVTSECqGhTqBKs/Z/9IxlE58lPWFE/rr5D aQV/NizCVyaKDxDTSpS/qv9uak4GLsTFLcZXoHS+Uy/y8r7F+pQgb/IYQxZ88Czp3WsU O7U5qCrzaHCv2LPZImBe4AFp/vjKdighAmemHa2zUk5Y71PMw8sTDKxU9aXkQe9TbPS1 MWRdeT8KWDIqx7lg3vz/7KCgIkXNHfYouTDhSZiK0R4FK55hahafBZ3hgsSR65oetKN7 R/TlejNXmKn0xamqMoWLF9SfxMBRLAcEegAuHecxv6DhO2aMlXE/tVIEaYRcusVUpKn9 weKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692434589; x=1693039389; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=BJg/AYoWDStOtDgWQJmPZkO+OIikRa/2+Ho9uVMbQSY=; b=iNMfZRl7dvAYIjPnJSrNv/xc6cZcVFTDeNvtJ1t4BItB9SkXQab8/nHPjRIijagmnn DqV3r84K+xW0THMr+H41k0v/k37YrmdKianc05cqIf0R8Cq6WiyrQ2EzfSA0N2vPtW0L idjgYtX41MWl4B2Xtw2xXsPIqoQdDSZr7XqA3uGQ/Xb3FPmCEdPpd8U1lTjqHw8zLc20 DGWKRguyQqz0FTxIGrspbFXxdaKZvrEfJk+SXxkDvr287a4opzVhEtSBubGu6orslxMD nr6bN7TKDWwy46WApr53oMug/1IO5oRi2UvcUXmDhmHxb6nJrJsQ7lD54MPhfqsC3yoj KcQw== X-Gm-Message-State: AOJu0YwAmAdgt2psO7w5TC71a4bpfhvTgyTSWMnGeqBZTVfN2i54fUYE dPbVS3oFqRXXCHk6lUP519JabhOILPMMzw== X-Google-Smtp-Source: AGHT+IGZbWzYPcv1OjnOBNexum1HTNLcke9h6gv7robp9Xpcpx2f3cteWyhMdysd5eKY/a8d1UfK+w== X-Received: by 2002:a17:906:2011:b0:99b:f820:5d0e with SMTP id 17-20020a170906201100b0099bf8205d0emr1066801ejo.25.1692434589261; Sat, 19 Aug 2023 01:43:09 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id w14-20020a1709064a0e00b0099d804da2e9sm2316168eju.225.2023.08.19.01.43.08 for <65376@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Aug 2023 01:43:08 -0700 (PDT) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Sat, 19 Aug 2023 01:55:30 +0200 Subject: [PATCH emacs-team 6/7] gnu: emacs-all-the-icons: Fix build. X-Debbugs-Cc: andrew@trop.in, liliana.prikler@gmail.com to: 65376@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: 1.1 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: * gnu/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/emacs-xyz.scm (emacs-all-the-icons)[source]: [...] Content analysis details: (1.1 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:642 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (liliana.prikler[at]gmail.com) 1.1 DATE_IN_PAST_06_12 Date: is 6 to 12 hours before Received: date 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Debbugs-Envelope-To: 65376 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.1 (/) * gnu/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/emacs-xyz.scm (emacs-all-the-icons)[source]: Use it here. --- gnu/local.mk | 1 + gnu/packages/emacs-xyz.scm | 2 ++ ...cs-all-the-icons-remove-duplicate-rs.patch | 21 +++++++++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 gnu/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3b087a6d5e..fb58b4eac8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1090,6 +1090,7 @@ dist_patch_DATA = \ %D%/packages/patches/elm-offline-package-registry.patch \ %D%/packages/patches/elm-reactor-static-files.patch \ %D%/packages/patches/elogind-revert-polkit-detection.patch \ + %D%/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch \ %D%/packages/patches/emacs-deferred-fix-number-of-arguments.patch \ %D%/packages/patches/emacs-exec-path.patch \ %D%/packages/patches/emacs-ess-fix-obsolete-function-alias.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9aaac5142f..89ce0fa900 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -27776,6 +27776,8 @@ (define-public emacs-all-the-icons (url "https://github.com/domtronn/all-the-icons.el") (commit version))) (file-name (git-file-name name version)) + (patches + (search-patches "emacs-all-the-icons-remove-duplicate-rs.patch")) (sha256 (base32 "0lwgvgnqf7vihglm0c5bwsxbl4x7f641289cji5s7jwy2dbsqk7g")))) (build-system emacs-build-system) diff --git a/gnu/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch b/gnu/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch new file mode 100644 index 0000000000..2c6b14e0aa --- /dev/null +++ b/gnu/packages/patches/emacs-all-the-icons-remove-duplicate-rs.patch @@ -0,0 +1,21 @@ +From 24b8d5b63e347bd4cdcf79bf897fc0097fa20fc7 Mon Sep 17 00:00:00 2001 +From: Michael Wernthaler +Date: Thu, 22 Jul 2021 11:27:31 +0200 +Subject: [PATCH] Fixed icon for .rs-files + +--- + all-the-icons.el | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/all-the-icons.el b/all-the-icons.el +index e1f4cb7695..3399906cfb 100644 +--- a/all-the-icons.el ++++ b/all-the-icons.el +@@ -194,7 +194,6 @@ + ("r" all-the-icons-fileicon "R" :face all-the-icons-lblue) + ("rd" all-the-icons-fileicon "R" :face all-the-icons-lblue) + ("rdx" all-the-icons-fileicon "R" :face all-the-icons-lblue) +- ("rs" all-the-icons-fileicon "R" :face all-the-icons-lblue) + ("rsx" all-the-icons-fileicon "R" :face all-the-icons-lblue) + ;; There seems to be a a bug with this font icon which does not + ;; let you propertise it without it reverting to being a lower -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Aug 19 04:43:27 2023 Received: (at 65376) by debbugs.gnu.org; 19 Aug 2023 08:43:27 +0000 Received: from localhost ([127.0.0.1]:49408 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXHYN-000592-5G for submit@debbugs.gnu.org; Sat, 19 Aug 2023 04:43:27 -0400 Received: from mail-ej1-x642.google.com ([2a00:1450:4864:20::642]:52270) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXHYC-00057b-VW for 65376@debbugs.gnu.org; Sat, 19 Aug 2023 04:43:18 -0400 Received: by mail-ej1-x642.google.com with SMTP id a640c23a62f3a-986d8332f50so219370066b.0 for <65376@debbugs.gnu.org>; Sat, 19 Aug 2023 01:43:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692434590; x=1693039390; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=ZxEpccG6/MtVGRnjPlrAfLjJwaMIoozjkRqVe4fUFhE=; b=n8I/3EypevIAoGGPxolSMEPknpUrM29MAOwZkX2KD+nkH+Agwbem+owwsHcSKpA0SS VA0dWDw3t8GaQUDjxrbrIkYD1eOveyAOG+y+owT24BNdrLoPUO8nIPP8UdgWv8G15B6T lIn+wMD1nMRp/DfRGtI5etdC5NYsiad1ZM7vFpA5nl7w91b0m+tE3E6UvLSZqU7AQQj4 0wbn8rjRZ/Z3uCPq4tn6P9bx0Zo/Hf5O0ylsCYqZsO5/Kxvl46eo8cBUz8Noxz/8HDrW cZ1kack8PpUXeseWvfZABNU5R6sV/4TEgK3J9UMzLpoSIYpHoN4/KjE8/3+jAiV0ULR/ 5e6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692434590; x=1693039390; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ZxEpccG6/MtVGRnjPlrAfLjJwaMIoozjkRqVe4fUFhE=; b=TtEsjs3g1ANnisQ9JB7/SN53V0YsdNoxENFEY04uNU5GymRsGa1M3UGmzHp87RwJmq YSX8ckSj/cdb3yg2brSBPVyIuIBSCSQA9VHYbErBPVVatIGJQk5UQscUoyLbExtjCNnP 8bqGk2jgBwlu76cu1/zCdD+T6+ddPq3Q/FThOzf4Uj8+Qrq18AlLYMvxipF/BL8XC/eZ +5t1JhyPdKNBFlcraYnTRonZc12PyFlVZ9Z8P8LLW9z4mnF6UDJ9MmqiDZCrKcY+DYxs IDVFHIRI1TTJ2iVAGhb8KO+l68A9jOzjc7vS9qqvL2peIZEws1AYFQQEzHU+O2bKDeLR 7vWA== X-Gm-Message-State: AOJu0YzLgJdUneNaDoDvDMIJqQdmsdUzBrsmZHxmxBPyCkko0ZEhIB88 ZsM4kAPprG9+UDDcgSC4rCfORObhfK6usg== X-Google-Smtp-Source: AGHT+IEgSNdQu2K+yxOhciASyF7gPcTDzUVIj6Stof9Fvz431/iSXPciZmqyKy4x/z9X+Aqa5lVn2A== X-Received: by 2002:a17:907:60c7:b0:99c:da06:bca with SMTP id hv7-20020a17090760c700b0099cda060bcamr1071752ejc.4.1692434590351; Sat, 19 Aug 2023 01:43:10 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id w14-20020a1709064a0e00b0099d804da2e9sm2316168eju.225.2023.08.19.01.43.09 for <65376@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 19 Aug 2023 01:43:09 -0700 (PDT) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Sat, 19 Aug 2023 08:40:03 +0200 Subject: [PATCH emacs-team 7/7] gnu: emacs-yasnippet: Fix build. X-Debbugs-Cc: andrew@trop.in, liliana.prikler@gmail.com to: 65376@debbugs.gnu.org MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65376 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/patches/emacs-yasnippet-fix-empty-snippet-next.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/emacs-xyz.scm (emacs-yasnippet)[source]: Use it here. * gnu/packages/patches/emacs-yasnippet-fix-tests.patch: Also fix delete-numberless-inner-snippet-issue-562. --- gnu/local.mk | 1 + gnu/packages/emacs-xyz.scm | 3 +- ...acs-yasnippet-fix-empty-snippet-next.patch | 59 +++++++++++++++++++ .../patches/emacs-yasnippet-fix-tests.patch | 14 +++++ 4 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/emacs-yasnippet-fix-empty-snippet-next.patch diff --git a/gnu/local.mk b/gnu/local.mk index fb58b4eac8..bdaa9935b1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1107,6 +1107,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-telega-path-placeholder.patch \ %D%/packages/patches/emacs-telega-test-env.patch \ %D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch \ + %D%/packages/patches/emacs-yasnippet-fix-empty-snippet-next.patch \ %D%/packages/patches/emacs-yasnippet-fix-tests.patch \ %D%/packages/patches/emacs-kv-fix-tests.patch \ %D%/packages/patches/emacs-pgtk-super-key-fix.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 89ce0fa900..811728d170 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17117,7 +17117,8 @@ (define-public emacs-yasnippet (sha256 (base32 "0via9dzw8m5lzymg1h78xkwjssh39zr3g6ccyamlf1rjzjsyxknv")) (patches - (search-patches "emacs-yasnippet-fix-tests.patch")))) + (search-patches "emacs-yasnippet-fix-empty-snippet-next.patch" + "emacs-yasnippet-fix-tests.patch")))) (build-system emacs-build-system) (arguments `(#:tests? #t diff --git a/gnu/packages/patches/emacs-yasnippet-fix-empty-snippet-next.patch b/gnu/packages/patches/emacs-yasnippet-fix-empty-snippet-next.patch new file mode 100644 index 0000000000..1faea2b456 --- /dev/null +++ b/gnu/packages/patches/emacs-yasnippet-fix-empty-snippet-next.patch @@ -0,0 +1,59 @@ +From 925292484162bc35c4258e72c36462bb13a5c69a Mon Sep 17 00:00:00 2001 +From: Liliana Marie Prikler +Date: Sat, 19 Aug 2023 08:38:17 +0200 +Subject: [PATCH] Guard against empty snippet in yas-next-field. + +--- + yasnippet.el | 29 +++++++++++++++-------------- + 1 file changed, 15 insertions(+), 14 deletions(-) + +diff --git a/yasnippet.el b/yasnippet.el +index e0b5537..41d86dd 100644 +--- a/yasnippet.el ++++ b/yasnippet.el +@@ -136,6 +136,7 @@ + (declare-function cl-progv-after "cl-extra") ; Needed for 23.4. + (require 'easymenu) + (require 'help-mode) ++(require 'subr-x) + + (defvar yas--editing-template) + (defvar yas--guessed-modes) +@@ -3386,20 +3387,20 @@ Otherwise delegate to `yas-next-field'." + If there's none, exit the snippet." + (interactive) + (unless arg (setq arg 1)) +- (let* ((active-field (overlay-get yas--active-field-overlay 'yas--field)) +- (snippet (car (yas-active-snippets (yas--field-start active-field) +- (yas--field-end active-field)))) +- (target-field (yas--find-next-field arg snippet active-field))) +- (yas--letenv (yas--snippet-expand-env snippet) +- ;; Apply transform to active field. +- (when active-field +- (let ((yas-moving-away-p t)) +- (when (yas--field-update-display active-field) +- (yas--update-mirrors snippet)))) +- ;; Now actually move... +- (if target-field +- (yas--move-to-field snippet target-field) +- (yas-exit-snippet snippet))))) ++ (and-let* ((active-field (overlay-get yas--active-field-overlay 'yas--field)) ++ (snippet (car (yas-active-snippets (yas--field-start active-field) ++ (yas--field-end active-field))))) ++ (let ((target-field (yas--find-next-field arg snippet active-field))) ++ (yas--letenv (yas--snippet-expand-env snippet) ++ ;; Apply transform to active field. ++ (when active-field ++ (let ((yas-moving-away-p t)) ++ (when (yas--field-update-display active-field) ++ (yas--update-mirrors snippet)))) ++ ;; Now actually move... ++ (if target-field ++ (yas--move-to-field snippet target-field) ++ (yas-exit-snippet snippet)))))) + + (defun yas--place-overlays (snippet field) + "Correctly place overlays for SNIPPET's FIELD." +-- +2.41.0 + diff --git a/gnu/packages/patches/emacs-yasnippet-fix-tests.patch b/gnu/packages/patches/emacs-yasnippet-fix-tests.patch index c70cc75d92..5995b0afa4 100644 --- a/gnu/packages/patches/emacs-yasnippet-fix-tests.patch +++ b/gnu/packages/patches/emacs-yasnippet-fix-tests.patch @@ -10,6 +10,11 @@ Content-Transfer-Encoding: 8bit - A test that was temporarily broken passes again. - The default for ‘org-adapt-indentation’ has changed. - buffer-list may be called with arguments when native-comp is enabled. + +2023-08-19 Liliana Marie Prikler + + * delete-numberless-inner-snippet-issue-562: Correct value in + looking-at. --- yasnippet-tests.el | 45 ++++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 17 deletions(-) @@ -26,6 +31,15 @@ index f7ca2bb..7618ab7 100644 ;; Author: João Távora ;; Keywords: emulations, convenience +@@ -289,7 +289,7 @@ attention to case differences." + (should (looking-at "testblable")) + (ert-simulate-command '(yas-next-field-or-maybe-expand)) + (ert-simulate-command '(yas-skip-and-clear-field)) +- (should (looking-at "ble")) ++ (should (looking-at "blable")) + (should (null (yas-active-snippets))))) + + (ert-deftest delete-nested-simple-field-issue-824 () @@ -556,16 +556,19 @@ XXXXX ------------------------")))) (yas-mock-insert "foo bar") (ert-simulate-command '(yas-next-field)) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Aug 20 12:54:10 2023 Received: (at 65376) by debbugs.gnu.org; 20 Aug 2023 16:54:10 +0000 Received: from localhost ([127.0.0.1]:54727 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXlgn-000467-Lc for submit@debbugs.gnu.org; Sun, 20 Aug 2023 12:54:10 -0400 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:42821) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qXlgk-00045a-I7 for 65376@debbugs.gnu.org; Sun, 20 Aug 2023 12:54:08 -0400 Received: by mail.gandi.net (Postfix) with ESMTPSA id 7CE4360004; Sun, 20 Aug 2023 16:53:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=trop.in; s=gm1; t=1692550438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=PLDbE6yv9E+O7PSJPt/02Ty1SyNtCwrh45iAQiry2Hs=; b=Z1KL5u+BZs2h+DFVpE51MtZv90FOyTPS2oaaUtZOzB9ZScoOa1YWfLEya1eGCuI3jq4Hhz BPB0J26JoousOhwPIcAmUcSuIqb61P7IgFAdO+ZTdy5LeDkQhBaNxr6/OAUjUI/zdzWyqg lxod5ffQ4znbUyRHJNZWC/rmZ2ai8o+4rv1iUILVStUoUDv0tbebkCt2mkbtpN/zUp29Dr y0scXJJhPONDTR8BFVcBXxh2Nxqeh9b4u/IrZHfLaL28LUtwSap9VXkRm1ACopRh2Ebp6m 2T7jgbm2YkCG7UiM+IuOIZBHvpnKr9kdH6j+gtOR4CmOHunmOipCv6Y/3gFPPg== From: Andrew Tropin To: Liliana Marie Prikler , 65376@debbugs.gnu.org Subject: Re: [bug#65376] [PATCH emacs-team 0/7] Fix some more builds In-Reply-To: References: Date: Sun, 20 Aug 2023 20:53:51 +0400 Message-ID: <87edjxirj4.fsf@trop.in> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-GND-Sasl: andrew@trop.in X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 65376 Cc: liliana.prikler@gmail.com X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2023-08-19 08:46, Liliana Marie Prikler wrote: > Hi Andrew, hi other Guixers > > Since we're planning to make Emacs 29 the new default soon=E2=84=A2, we s= hould probably > take care of some packages that fail to build. Here's a batch to do so. > > Cheers > > Liliana Marie Prikler (7): > gnu: emacs-all-the-icons: Honour #:tests? > gnu: emacs-haskell-mode: Update to 17.4. > gnu: emacs-helpful: Update to 0.21. > guix: emacs-utils: Add ert-number-tests. > gnu: emacs-libgit: Fix build. > gnu: emacs-all-the-icons: Fix build. > gnu: emacs-yasnippet: Fix build. > > gnu/local.mk | 4 + > gnu/packages/emacs-xyz.scm | 252 +++++++++--------- > ...cs-all-the-icons-remove-duplicate-rs.patch | 21 ++ > ...acs-haskell-mode-no-redefine-builtin.patch | 75 ++++++ > .../patches/emacs-helpful-fix-tests.patch | 28 ++ > ...acs-yasnippet-fix-empty-snippet-next.patch | 59 ++++ > .../patches/emacs-yasnippet-fix-tests.patch | 14 + > guix/build/emacs-utils.scm | 14 + > 8 files changed, 345 insertions(+), 122 deletions(-) > create mode 100644 gnu/packages/patches/emacs-all-the-icons-remove-dupli= cate-rs.patch > create mode 100644 gnu/packages/patches/emacs-haskell-mode-no-redefine-b= uiltin.patch > create mode 100644 gnu/packages/patches/emacs-helpful-fix-tests.patch > create mode 100644 gnu/packages/patches/emacs-yasnippet-fix-empty-snippe= t-next.patch > > > base-commit: d58c6e25ff3d1e70fd9b0e07bdad1b335de8a979 > prerequisite-patch-id: db4b84876b1a475e9e7846dd33ecd6d33dc14907 Hi Liliana, went throught the patches, my eye didn't catch any obvious issues, so I think we can merge them. Thank you very much for taking care of those packages! :) =2D-=20 Best regards, Andrew Tropin --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmTiRR8ACgkQIgjSCVjB 3rAEuQ/9GYOVufXct0ofvt43eN4GSvj3u9Xcw3NUyyG2lVxyJpGN72yKbFRSyPdd sTTGSPwoN/L7Iy2NZ7vILt1rNvXemFTCFgbq/dK5opIGgsCk51lJYDLGrDpFweZr WcUDrOyMMlzparw0Pq0tF3W9mC4uu4CM+TI49qzqV6sAe3julQQS3hf4+TPJndzk aeCZ4vcsc2s7OiF++fZuVBr3pZrWabEUlr949HQrWJwB8eSO3fsmyydVLzhkUyli 6QjMrjcd3+i3rDVqDiV4bhqIw5GVCv22tuluse80WIaBUoHBqTZUb5LEUYnHKXdi fvitGcyZeGM4R+sW4D7ulBKcpFdjpkuyekViczvnFYz5YgLh6nbr7UGeCID50rho JjxIRsSvM6qzCX0WRiJY5qMVZgIqEQ3EiROtiq5riP1FEXvxTUr8ZGpshhPwkEIM HzneFJO+ZdvjyeeHVyJepGOuFaKo3LxBKGdqaI+WR5a4/xEW9wAOOJnwwNKFA9fY zAgZEO8/yRJ7dnDCMaPItRL7uAa5DSyaCj70Jk8DF1yOGsS+e+D6yX7AG+VAtCnS 2JNSLChq81xI5sh26bpgAz3xHDVJ+v5MnaXfcYDid2zMpRIpbdrHYHsxmg5H0ctO l32v1L9zlIEVxJcrFHd/DV7kvTHxLeqZEkEsZfZuENVb/DzlTe8= =ld19 -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 07 14:23:14 2023 Received: (at 65376-done) by debbugs.gnu.org; 7 Sep 2023 18:23:14 +0000 Received: from localhost ([127.0.0.1]:41389 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeJes-0006gR-67 for submit@debbugs.gnu.org; Thu, 07 Sep 2023 14:23:14 -0400 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]:46281) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qeJeo-0006fw-CV for 65376-done@debbugs.gnu.org; Thu, 07 Sep 2023 14:23:12 -0400 Received: by mail-ed1-x541.google.com with SMTP id 4fb4d7f45d1cf-52a23227567so1750771a12.0 for <65376-done@debbugs.gnu.org>; Thu, 07 Sep 2023 11:23:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694110982; x=1694715782; darn=debbugs.gnu.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:from:to:cc:subject:date :message-id:reply-to; bh=4QiKOD4213BU/CyEKtA9M1hpsKEMESUwc7O/fsGg/28=; b=sPL9r1+4/sy3cQhkLqZFKoPIL9YN1PLWu+fw3Kdid7Gp6ddWHA8302Zwpf1g7xV6mU SqhoORLPOvfjhVMjtBocYFUg9Uc4g42Z4BiVgfjM4OoPeASdeyXS8qbhaGClQlvTbV4+ JsfCnC0K+yeStJtyxCWkVSxCbbxUOJNP8kIDw5xpSLsvD07qqjpb9iKioPHsJs0Ax2ml z2Gm25zxqrIq8YBIdFeRgeiblLHf0K2UTpnwYtCCyly9HcfX4b+narvVOxVI0VGTDAVT VhFo7LvctaZHi5/ISgZltLVRTEvCNYZPZtvdClE6T7I2nUPijjNHWpj0Z0Rw2UQP2/7M gN9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694110982; x=1694715782; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:to:from:subject:message-id:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=4QiKOD4213BU/CyEKtA9M1hpsKEMESUwc7O/fsGg/28=; b=j6gMqpWn6f5oj///Xo5pxL++QGokKjn8d79wE+Uz/vvxm40j0YScovXxYWfDPkXBbk jDq0ONzaNpaJMFmdADpcg/Q32x2V7JaMauGMRAWAe+K0yq2VuWM41jYEzlsadXVxMJxU pD5dHkwD8FEuZID71NHR9Sakcj/hUJfsvGH8QKg14RfhbwzpicEpny8VRMj/S8ugA7bv nJNyDv3AkC11MCWL7qp2igFGmSlOkRafzAjUApbXmieKoP/z9pELHCpasiAseR3kChND adGVyY2MGeE+vPJGuMM/JRhw+M3nG8zywhC6DEKbbj+yZzecFObn+0g1Q0j3UlfrEyyT 7+vg== X-Gm-Message-State: AOJu0YxDGBDJqgqVU7fawgeY2i8frXMryNtbiCxVBxR9GyjpJ94dwVHv QQfwC7gYkWQJ0twTQqsBtEg= X-Google-Smtp-Source: AGHT+IEMHW51E1OSnt2Dx16z1+RjjpOB33aCDaCQ39TXEkVQeL2GY2dr33B6YgrMPqzHe4C27SkWyw== X-Received: by 2002:a05:6402:5147:b0:523:38eb:395d with SMTP id n7-20020a056402514700b0052338eb395dmr96930edd.9.1694110982164; Thu, 07 Sep 2023 11:23:02 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id n2-20020aa7d042000000b005256e0797acsm84198edo.37.2023.09.07.11.23.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Sep 2023 11:23:01 -0700 (PDT) Message-ID: Subject: Re: [bug#65376] [PATCH emacs-team 0/7] Fix some more builds From: Liliana Marie Prikler To: Andrew Tropin , 65376-done@debbugs.gnu.org Date: Thu, 07 Sep 2023 20:22:59 +0200 In-Reply-To: <87edjxirj4.fsf@trop.in> References: <87edjxirj4.fsf@trop.in> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.46.4 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 65376-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Am Sonntag, dem 20.08.2023 um 20:53 +0400 schrieb Andrew Tropin: > On 2023-08-19 08:46, Liliana Marie Prikler wrote: >=20 > > Hi Andrew, hi other Guixers > >=20 > > Since we're planning to make Emacs 29 the new default soon=E2=84=A2, we > > should probably > > take care of some packages that fail to build.=C2=A0 Here's a batch to > > do so. > >=20 > > Cheers > >=20 > > Liliana Marie Prikler (7): > > =C2=A0 gnu: emacs-all-the-icons: Honour #:tests? > > =C2=A0 gnu: emacs-haskell-mode: Update to 17.4. > > =C2=A0 gnu: emacs-helpful: Update to 0.21. > > =C2=A0 guix: emacs-utils: Add ert-number-tests. > > =C2=A0 gnu: emacs-libgit: Fix build. > > =C2=A0 gnu: emacs-all-the-icons: Fix build. > > =C2=A0 gnu: emacs-yasnippet: Fix build. > >=20 > > =C2=A0gnu/local.mk=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |= =C2=A0=C2=A0 4 + > > =C2=A0gnu/packages/emacs-xyz.scm=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= | 252 +++++++++----- > > ---- > > =C2=A0...cs-all-the-icons-remove-duplicate-rs.patch |=C2=A0 21 ++ > > =C2=A0...acs-haskell-mode-no-redefine-builtin.patch |=C2=A0 75 ++++++ > > =C2=A0.../patches/emacs-helpful-fix-tests.patch=C2=A0=C2=A0=C2=A0=C2=A0= |=C2=A0 28 ++ > > =C2=A0...acs-yasnippet-fix-empty-snippet-next.patch |=C2=A0 59 ++++ > > =C2=A0.../patches/emacs-yasnippet-fix-tests.patch=C2=A0=C2=A0 |=C2=A0 1= 4 + > > =C2=A0guix/build/emacs-utils.scm=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= |=C2=A0 14 + > > =C2=A08 files changed, 345 insertions(+), 122 deletions(-) > > =C2=A0create mode 100644 gnu/packages/patches/emacs-all-the-icons- > > remove-duplicate-rs.patch > > =C2=A0create mode 100644 gnu/packages/patches/emacs-haskell-mode-no- > > redefine-builtin.patch > > =C2=A0create mode 100644 gnu/packages/patches/emacs-helpful-fix- > > tests.patch > > =C2=A0create mode 100644 gnu/packages/patches/emacs-yasnippet-fix-empty= - > > snippet-next.patch > >=20 > >=20 > > base-commit: d58c6e25ff3d1e70fd9b0e07bdad1b335de8a979 > > prerequisite-patch-id: db4b84876b1a475e9e7846dd33ecd6d33dc14907 >=20 > Hi Liliana, went throught the patches, my eye didn't catch any > obvious issues, so I think we can merge them.=C2=A0 Thank you very much > for taking care of those packages! :) Merged them, forgot to mark as done. Sorry for the delay, cheers! From unknown Sun Jun 22 17:12:33 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 06 Oct 2023 11:24:16 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator