From patchwork Wed Sep 21 13:38:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 42808 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 EAC0C27BBEA; Wed, 21 Sep 2022 15:03:56 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 A753427BBE9 for ; Wed, 21 Sep 2022 15:03:56 +0100 (BST) Received: from localhost ([::1]:42202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ob0KR-0007FV-Ov for patchwork@mira.cbaines.net; Wed, 21 Sep 2022 10:03:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oazwN-00056L-K6 for guix-patches@gnu.org; Wed, 21 Sep 2022 09:39:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33934) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oazwN-0007sJ-CM for guix-patches@gnu.org; Wed, 21 Sep 2022 09:39:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oazwM-00080N-3K for guix-patches@gnu.org; Wed, 21 Sep 2022 09:39:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57979] [PATCH 1/1] gnu: emacs-lua-mode: Fix build. References: <20220921133624.2052935-1-zimon.toutoune@gmail.com> In-Reply-To: <20220921133624.2052935-1-zimon.toutoune@gmail.com> Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Sep 2022 13:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57979 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57979@debbugs.gnu.org Cc: zimoun Received: via spool by 57979-submit@debbugs.gnu.org id=B57979.166376753930762 (code B ref 57979); Wed, 21 Sep 2022 13:39:02 +0000 Received: (at 57979) by debbugs.gnu.org; 21 Sep 2022 13:38:59 +0000 Received: from localhost ([127.0.0.1]:33012 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oazwI-000806-R7 for submit@debbugs.gnu.org; Wed, 21 Sep 2022 09:38:59 -0400 Received: from mail-wr1-f53.google.com ([209.85.221.53]:39661) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oazw8-0007za-N2 for 57979@debbugs.gnu.org; Wed, 21 Sep 2022 09:38:57 -0400 Received: by mail-wr1-f53.google.com with SMTP id cc5so9953966wrb.6 for <57979@debbugs.gnu.org>; Wed, 21 Sep 2022 06:38:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=J/KDdAi2HkInRmrTho1+o7wE/UfVs0HtAy8J0dwEfWw=; b=AM3/JKDhLW7EMVtC0CHjOWB49j7mSUCVx9xiCQ9eLfAgOI8ifDKg+E9rECq0DW0zxY d9OILNZeWYT7mOZxSnQrABM/hhOgdCExw1VYI/gnaSnw3Yd1cJcpMjrfErZQyJonqzlA mUMfn8APs/qY1JvOyrGeY78Bb2g+BQSSIdmHHah7pWHCU7UyF4GkX315scE4rZK0i+9P eSvyBpz448NJWrC50r1Q3ed10ePxvUDghi90WqlwCykfxaZBzqGR9VPuk6aR8oEEM8GZ 4YfM84EzTXyDbrh8+GCLYdsuWQS56hcnTlMlJBrhlmJxNpiMBDaSJH0wp/l6SnHH8a7v FaRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=J/KDdAi2HkInRmrTho1+o7wE/UfVs0HtAy8J0dwEfWw=; b=47ulliCrleT4q5ZjE73KgCOy1MrOrD+XwI/WJGYcidFOrIy/fi8qUjLJ9yfxIXBcpt ATu+MGiaJqhIB0muq20MgkuMf87VCXV1pHam/2arkhwKwJD1HR05F8HGhFZXhfHZ7mJp Flsq6v4vCJiHHFLyD2/V5WByiSrMq8DFVcPreS1StUWBZ1J5VHl2rSTLwzZifnvt3+Nm VMxFMhmDQVUusGq7Zs/4QSZmWaZYzchn0e7EDItsu8iN6mMBwZe0mIWc0VggR2dEX21Y ki9vE+WJzWXCGvsuJiukLGRq8EngG59sVsj4/qoFtkIfXWvN4kCjWTEWkvTOwHEtWs4F iGSg== X-Gm-Message-State: ACrzQf31cXfoDrl7+MaZF48D3/N9yx4aRZDr4reCWyVvZFKyl+NFdhOw Ou5DUXXjW/w0Z85tgwieqKDBodmWvXI= X-Google-Smtp-Source: AMsMyM7gNNSM+8KW2JvMWQh3ZTLNS0bsiWp5qm/bR88RLqownBC/NBZnxkzLfS4+Xh95EYf0ju0w3A== X-Received: by 2002:a05:6000:2cd:b0:22a:4831:dfd with SMTP id o13-20020a05600002cd00b0022a48310dfdmr16800397wry.706.1663767522673; Wed, 21 Sep 2022 06:38:42 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id v10-20020a5d590a000000b002206203ed3dsm2609262wrd.29.2022.09.21.06.38.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Sep 2022 06:38:42 -0700 (PDT) From: zimoun Date: Wed, 21 Sep 2022 15:38:35 +0200 Message-Id: <20220921133835.2053713-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.36.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs-xyz.scm (emacs-buttercup-1.25): New variable. (emacs-lua-mode): Use it. --- gnu/packages/emacs-xyz.scm | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 32e4c33f16..0cdcb42404 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -95,7 +95,7 @@ ;;; Copyright © 2021 Alexey Abramov ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2021, 2022 Stefan Reichör -;;; Copyright © 2021 Simon Tournier +;;; Copyright © 2021, 2022 Simon Tournier ;;; Copyright © 2021 Eugene Klimov ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 David Dashyan @@ -12816,7 +12816,7 @@ (define-public emacs-lua-mode `(#:tests? #t #:test-command '("buttercup" "-l" "lua-mode.el"))) (native-inputs - (list emacs-buttercup lua)) + (list emacs-buttercup-1.25 lua)) (synopsis "Major mode for lua") (description "This Emacs package provides a mode for @uref{https://www.lua.org/, @@ -24678,6 +24678,23 @@ (define-public emacs-buttercup functions to ensure they are called with the right arguments during testing.") (license license:gpl3+))) +;;; Required by emacs-lua-mode +(define emacs-buttercup-1.25 + (package + (inherit emacs-buttercup) + (name "emacs-buttercup") + (version "1.25") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jorgenschaefer/emacs-buttercup") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0fsysvsypda6b7azc15bpaprq3bwx4gb6rlq2mj6f8rgwdqc8153")))))) + (define-public emacs-cort (package (name "emacs-cort")