From patchwork Wed Jan 24 22:34:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Edward Wilson X-Patchwork-Id: 59378 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D3DF327BBEA; Thu, 25 Jan 2024 13:53:13 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CC64A27BBE2 for ; Thu, 25 Jan 2024 13:53:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rT0A0-0006ek-0M; Thu, 25 Jan 2024 08:52:55 -0500 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 1rSrS6-0005Ba-Pl for guix-patches@gnu.org; Wed, 24 Jan 2024 23:34:59 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rSrS6-0005wY-Gf for guix-patches@gnu.org; Wed, 24 Jan 2024 23:34:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rSrSB-0002Cu-GP; Wed, 24 Jan 2024 23:35:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68709] [PATCH] gnu: emacs-citar: Fix autoloads and restore tests Resent-From: Edward Wilson Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Thu, 25 Jan 2024 04:35:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68709 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68709@debbugs.gnu.org Cc: Edward Wilson , Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Andrew Tropin , Katherine Cox-Buday , Liliana Marie Prikler Received: via spool by submit@debbugs.gnu.org id=B.17061572738392 (code B ref -1); Thu, 25 Jan 2024 04:35:03 +0000 Received: (at submit) by debbugs.gnu.org; 25 Jan 2024 04:34:33 +0000 Received: from localhost ([127.0.0.1]:47024 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSrRg-0002BC-Gp for submit@debbugs.gnu.org; Wed, 24 Jan 2024 23:34:32 -0500 Received: from lists.gnu.org ([2001:470:142::17]:50424) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rSlqe-0003Ub-Jr for submit@debbugs.gnu.org; Wed, 24 Jan 2024 17:35:57 -0500 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 1rSlqT-0001QG-4D for guix-patches@gnu.org; Wed, 24 Jan 2024 17:35:45 -0500 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rSlqQ-0000aS-TY for guix-patches@gnu.org; Wed, 24 Jan 2024 17:35:44 -0500 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-3394bec856fso71389f8f.0 for ; Wed, 24 Jan 2024 14:35:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706135739; x=1706740539; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=tbfvbRLe2YaUADviJ1rT24lYSrGZDlCxk14nm3qPjNk=; b=LlVMiBuPsvNatj3vDg+lqb5l4UBSCZzjLXQgDioop3etANvT0g+SwomgUrd2POdInz zbJmlC8vk56SrrV2nJ+yGQpOnaDRjJXR2yyQerRvye7Oi/Er5O+UvUjM4y/iUQIhHPPt sn+ehR2eji1hlxfuJ6FEifcMn8O06stEn3x1/LCYFADncUAjzyQRwonIKCQk1t9SETch CsWvHu4dfE6BRSr0jFiOqVMr5O42WX0vkubHMfTxvhppXwXBMqiw7NIQjoxDXdUH+3rF iLGj+tM6zL65j9t4aHEeCVDlfqurFFTxMueHP5hlbE0w+utLFee2AH9RucG4txI1OEF0 9qtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706135739; x=1706740539; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=tbfvbRLe2YaUADviJ1rT24lYSrGZDlCxk14nm3qPjNk=; b=oaOgxV7GWqxfNPhvWnTJado3cC+wp7AusftF4+N884CEW4uTYN7Iwnu9wuTwW7jXvU 14sYptw24sbcfwi4hXGbVY3p/Z0m0wmZCAGdrFjrH9XxfFMxrVOYmHHjFOsyMSo2oJqz /ykmlH+JDSvm4KjAQTnV7ezbUrfOvu3ybbYeyGm655h2SO2DyqBYGAyuFlyVRIFgiOF7 MM/sK+QqbBLX4TFoo+o14V+hVt8Xo4tgjRXKyeq3OpKF8a/M5pn1yf+Z0y6NQN08EAVJ 1eFfMm18Wr7KV+zzafom5+aeE0zAKgKPeJzFybs7BEVjqJPWm07kSxE4qu1PX5jhw9vB pCXQ== X-Gm-Message-State: AOJu0Yx0Uy7fGexeIrVo8VOnyMHCxd0HS4EGyEAQpv/Aql1NQAEd86El 6Jb+VkIfz6kLo34tiA/lhu92e5riYLxAZLbWKOe9fpguNjuNrTj9a6JCnFUof5Tnyw== X-Google-Smtp-Source: AGHT+IFE60McRJqcS9ly7pbDDdKDU1TfMmlCCRqm2fIrL2s3HWQxMNyrNDlzMMBirdLUMeL5nIfTJg== X-Received: by 2002:a5d:63c7:0:b0:336:7a5c:ffc3 with SMTP id c7-20020a5d63c7000000b003367a5cffc3mr109783wrw.14.1706135739192; Wed, 24 Jan 2024 14:35:39 -0800 (PST) Received: from localhost ([2a02:c7c:3692:7f00:524f:3302:d96e:ba4e]) by smtp.gmail.com with ESMTPSA id s16-20020a5d5110000000b0033763a9ea2dsm10489193wrt.63.2024.01.24.14.35.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jan 2024 14:35:38 -0800 (PST) From: Edward Wilson Date: Wed, 24 Jan 2024 22:34:40 +0000 Message-ID: <10f970b791c6281a24e643714c0415fcab656246.1706135680.git.bienjensu@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::432; envelope-from=bienjensu@gmail.com; helo=mail-wr1-x432.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Wed, 24 Jan 2024 23:34:29 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Thu, 25 Jan 2024 08:52:31 -0500 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches The default build-system emacs doesn't properly expand cl-lib macros when compiling autoloads. This patch changes the `#:emacs` build argument, fixing a present bug (reproducible by requiring citar-autoloads in a minimal environment). This change also allows the validation of compiled autoloads to succeed, hence the test phase is restored. * gnu/packages/emacs-xyz.scm (emacs-citar): Change build-system emacs and restore tests Change-Id: Id56de922e5220383f8c5015a01e39b4aa2ea8cfb --- gnu/packages/emacs-xyz.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) base-commit: ffc5fefce370f5fc01091869e13fdf525be1e0c0 diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ad8c72e97d..b8c97d1767 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -23633,6 +23633,7 @@ (define-public emacs-citar (build-system emacs-build-system) (arguments (list + #:emacs emacs-no-x #:tests? #true #:test-command #~(list "emacs" "--batch" "-L" "." "-l" "test/citar-test.el" @@ -23642,10 +23643,7 @@ (define-public emacs-citar #:phases #~(modify-phases %standard-phases (add-before 'build 'set-home (lambda _ - (setenv "HOME" "/tmp"))) - ;; XXX: The following phase reports bogus errors. Suppress - ;; it for now. - (delete 'validate-compiled-autoloads)))) + (setenv "HOME" "/tmp")))))) (propagated-inputs (list emacs-auctex emacs-citeproc-el emacs-embark