From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id ICaJDTu6K2dRFwEAe85BDQ:P1 (envelope-from ) for ; Wed, 06 Nov 2024 18:49:31 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id ICaJDTu6K2dRFwEAe85BDQ (envelope-from ) for ; Wed, 06 Nov 2024 19:49:31 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=IprS++OF; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=g4+WsDJc; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1730918971; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=EzyT64VJNtSMOwYggBilcDS1vyNbdVW1R29vBjSx4nw=; b=Ft8tEdq4CCn4bK0vS0aidBQm0FX6okqYIdyN2+Ri3YmdQTeXkeYSCEZR7QRXOH68wrXB/q UujDzq5rOrwvNlr14t5PqcIk9nYRV1DdCkvZiBSeh3FExXhwPlf7iQfHYNssgpybUq6mR4 fdLbZVlFi3dMxbBaN6UHlsA7GKuhk3XkVOLXZo+sk6lbWorAscYwkYYMHFRyilyCQyo92w OaVFAULqAn1mcIo6cm+cQWiD/AYoTgxu9btYkCkVbrCOVq55vMYITi3JokBrjFcVN3bj7z 3eNFi+osmZZsdJqCewBJ+HiuRl2OWPaPQE0TXPWf+TSeWwhL9BpeakIm6a2/2w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=IprS++OF; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=g4+WsDJc; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1730918971; a=rsa-sha256; cv=none; b=gmpYEsktKlA79uBOSvN53n+2R4bKaZBga2slfhYMtPOtqwLkTGaFmORVTz5R9nq+WoLpOs oytWn6FeKu/UVt4FmuVYdgICdZnP7hUPqg33YG7mMryWsNW9j74DZZQUu5r8urWwrl7nt1 x5T4agXYXGheGLeQfl2SGpH4ALTyjfiJe5AHIJQfjY+PBx6JsLKCuIjlSGgVadwfxoGhka 0cJRnEYfTmW34Hu5dUxiMOzzRe81qkwZ1qKEOI3zhg4a4nPwL2uakC/k4vztYODSao0aGy Z1KonzIU1WpdjttOT5pHJmGkQzo7KEaJlg98+q44jZjmfUtPE4UwywBIcdSq2Q== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 15E1A7FC8A for ; Wed, 06 Nov 2024 19:49:30 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t8l5W-0003v0-H3; Wed, 06 Nov 2024 13:49:06 -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 1t8l5T-0003uR-S1 for guix-patches@gnu.org; Wed, 06 Nov 2024 13:49:04 -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 1t8l5T-0001BM-7Q for guix-patches@gnu.org; Wed, 06 Nov 2024 13:49:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=EzyT64VJNtSMOwYggBilcDS1vyNbdVW1R29vBjSx4nw=; b=IprS++OFY8cMOuPIhZhH2it26gNLV4zWW+t5xzudKod4iNCnnAY4l+Mx6uuROvnqVBMWDTit2/K0IwT/v2TpWUMbPy/lbxaiFCJnMDsX/4q2DpLiEHbCIjjEQhsXqQeayhgPIQ+OxiYoCk4NsJ7SHUPzRWVFLQ2mEWmFzURDpLZM0qdy2essYCqHMwZ0A3aqJHJt8RsxqcMk/92nGx41O2niT4q2JOhrEoWLa7kCFueDKbZYvueQqi8rC6GGqzPzHvjEk4sEpVJWQlchXYE1Vjr4XLs1pLMarvEaLADkCYTvFgnEm8tAlt/M3bEEkPuvCkFm1i3uvD2yim9soal1tA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t8l5S-0006Xk-0I; Wed, 06 Nov 2024 13:49:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74231] [PATCH] gnu: emacs-git-email: Update to 0.5.0. Resent-From: "Suhail Singh" 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: Wed, 06 Nov 2024 18:49:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 74231 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74231@debbugs.gnu.org Cc: 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.173091889225087 (code B ref -1); Wed, 06 Nov 2024 18:49:01 +0000 Received: (at submit) by debbugs.gnu.org; 6 Nov 2024 18:48:12 +0000 Received: from localhost ([127.0.0.1]:45420 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t8l4d-0006WZ-PX for submit@debbugs.gnu.org; Wed, 06 Nov 2024 13:48:12 -0500 Received: from lists.gnu.org ([209.51.188.17]:41520) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t8l4a-0006WO-8h for submit@debbugs.gnu.org; Wed, 06 Nov 2024 13:48:11 -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 1t8l4Y-00031I-HP for guix-patches@gnu.org; Wed, 06 Nov 2024 13:48:07 -0500 Received: from mail-qk1-x744.google.com ([2607:f8b0:4864:20::744]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t8l4V-00015R-IE for guix-patches@gnu.org; Wed, 06 Nov 2024 13:48:05 -0500 Received: by mail-qk1-x744.google.com with SMTP id af79cd13be357-7b1488fde46so6674785a.2 for ; Wed, 06 Nov 2024 10:48:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730918881; x=1731523681; darn=gnu.org; h=mime-version:message-id:date:subject:to:from:from:to:cc:subject :date:message-id:reply-to; bh=EzyT64VJNtSMOwYggBilcDS1vyNbdVW1R29vBjSx4nw=; b=g4+WsDJcKjmSJtldePYNlgXF6wKch4oO1KOX0gnuCdEtZURSQGOX4/iy/Q9k3EPyTn vfQJ0U+RBNbpN3OFa71QlmHGa8wbCq6UeR66pskIyZIrvOuGwvKARahktyl/eumI3q3m TUzMLYlZjHQSvz5e6Xv4mJCwkPJZEjwA3CzDPNIyIsvZ7kwyDj1RVf9SRulv6uq4dQSX 5pZcPhy6z2Op9tYcdOcmVirh/cyO/rjnFcwUrBhY4Op0Up1E8Hj0tyU5lQl73Qrd0m/h 8Pn9Za8H8FRGAa8KnwIDf41ZXbaLsY2yhemKYqO2rLkg8OnksT4GcAOS+Ua242IMvddU P5ew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730918881; x=1731523681; h=mime-version:message-id:date:subject:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=EzyT64VJNtSMOwYggBilcDS1vyNbdVW1R29vBjSx4nw=; b=GSmaFZksCgRyuHS460oIE6rVya+9CEoQRSEZRpEDFbQuXeq2fOXIaDW218EWyzCrcQ /wiIARWrmkR5qjXbL+FRzpmgi9BtMWh2dW2Xd+jfYkM2RYdXb4uMK0yQhYkQOGHS0MhQ hb5wbs9wu25939S85gqwd6tTuw0t+/je56E3U4fu1Q4X7ANRTJHXkGiLKpogV25T0v7U 4KBGHgJVhIiePO9vrdVaILNtWbRx0raZHJXZ7ZLF5FYNaw1XiVI0UwPKPY//PUYpJVHI v7vIgX1wszYL7BBfHl7MW6iOM6Ihlk6FTtsC7Z313pTwyCZLnRFVrvmUGUv/BR1BiS3p OO8Q== X-Gm-Message-State: AOJu0Yzl6tNzJqi52uGxoRw9MZ/RBNze7wYluOkcrADiB4hz4uiZoOYj phzgvdYjQ5TVs0QCoUHGa/YNieirgc4sFJuPJKKssk8q9weXfsjlAyL9rzfY X-Google-Smtp-Source: AGHT+IFvUanfTZ4BnG6lfOBLtp2oRwYHOv/pu3fHeBGbplRoPs6GJ0AyS+XF4v9txHQ1/MC8j1neSg== X-Received: by 2002:a05:620a:409:b0:7b1:e77b:26cc with SMTP id af79cd13be357-7b1e77b27e1mr3129682085a.9.1730918881120; Wed, 06 Nov 2024 10:48:01 -0800 (PST) Received: from gnus ([174.92.178.190]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7b2f39f900asm658707585a.40.2024.11.06.10.48.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Nov 2024 10:48:00 -0800 (PST) From: "Suhail Singh" Date: Wed, 6 Nov 2024 13:37:51 -0500 Message-Id: <578f2ae3ba7cc4838ffdbc0929e6d3a5c8a6a9cc.1730918803.git.suhail@bayesians.ca> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=2607:f8b0:4864:20::744; envelope-from=suhailsingh247@gmail.com; helo=mail-qk1-x744.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 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_ENVFROM_END_DIGIT=0.25, 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-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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: 5.00 X-Spam-Score: 5.00 X-Migadu-Queue-Id: 15E1A7FC8A X-TUID: Yx9/xO2sEoPC * gnu/packages/emacs-xyz.scm (emacs-git-email): Update to 0.5.0 on actively maintained fork. Update homepage. Add emacs-piem as a build-time dependency. Don't propagate mu, emacs-magit, and emacs-notmuch since they are optional. * gnu/local.mk (dist_patch_DATA): Delete emacs-git-email-missing-parens.patch, since it's no longer needed. * gnu/packages/patches/emacs-git-email-missing-parens.patch: Delete unnecessary patch. Change-Id: I47f5aa12cfa676772e281a45cdc9ec3bb3eae544 --- gnu/local.mk | 1 - gnu/packages/emacs-xyz.scm | 63 ++++++++----------- .../emacs-git-email-missing-parens.patch | 27 -------- 3 files changed, 25 insertions(+), 66 deletions(-) delete mode 100644 gnu/packages/patches/emacs-git-email-missing-parens.patch diff --git a/gnu/local.mk b/gnu/local.mk index 945d89d550..90ef82204d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1186,7 +1186,6 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-disable-jit-compilation.patch \ %D%/packages/patches/emacs-exec-path.patch \ %D%/packages/patches/emacs-fix-scheme-indent-function.patch \ - %D%/packages/patches/emacs-git-email-missing-parens.patch \ %D%/packages/patches/emacs-helpful-fix-tests.patch \ %D%/packages/patches/emacs-highlight-stages-add-gexp.patch \ %D%/packages/patches/emacs-json-reformat-fix-tests.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 59c804066a..57ae548a3b 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -22159,44 +22159,31 @@ (define-public emacs-gitpatch (license license:gpl3+))) (define-public emacs-git-email - ;; Use latest commit since latest tagged release is missing important - ;; changes. - (let ((commit "b5ebade3a48dc0ce0c85699f25800808233c73be") - (revision "0")) - (package - (name "emacs-git-email") - (version (git-version "0.2.0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://git.sr.ht/~yoctocell/git-email") - (commit commit))) - (patches - (search-patches "emacs-git-email-missing-parens.patch")) - (file-name (git-file-name name version)) - (sha256 - (base32 "1lk1yds7idgawnair8l3s72rgjmh80qmy4kl5wrnqvpmjrmdgvnx")))) - (build-system emacs-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - ;; piem is not yet packaged in Guix. - (add-after 'unpack 'remove-piem - (lambda _ - (delete-file "git-email-piem.el"))) - (add-before 'install 'makeinfo - (lambda _ - (invoke "makeinfo" "doc/git-email.texi")))))) - (native-inputs - (list texinfo)) - (propagated-inputs - (list mu emacs-magit emacs-notmuch)) - (license license:gpl3+) - (home-page "https://sr.ht/~yoctocell/git-email") - (synopsis "Format and send Git patches in Emacs") - (description "This package provides utilities for formatting and -sending Git patches via Email, without leaving Emacs.")))) + (package + (name "emacs-git-email") + (version "0.5.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/suhail/git-email") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0q70k0pn0dkbrcsah0hcwxa2c3f8aw89bbds5k2dslacn93ghws7")))) + (build-system emacs-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-before 'install 'makeinfo + (lambda _ + (invoke "makeinfo" "doc/git-email.texi")))))) + (inputs (list mu emacs-magit emacs-notmuch emacs-piem)) + (native-inputs (list texinfo)) + (license license:gpl3+) + (home-page "https://suhail.codeberg.page/git-email") + (synopsis "Format and send Git patches in Emacs") + (description "This package provides utilities for formatting and +sending Git patches via Email, without leaving Emacs."))) (define-public emacs-erc-hl-nicks (package diff --git a/gnu/packages/patches/emacs-git-email-missing-parens.patch b/gnu/packages/patches/emacs-git-email-missing-parens.patch deleted file mode 100644 index 051e2bf1eb..0000000000 --- a/gnu/packages/patches/emacs-git-email-missing-parens.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 820ad7eb2e919e3f880bec22bd4f737fa55c4d22 Mon Sep 17 00:00:00 2001 -From: Niklas Eklund -Date: Thu, 5 May 2022 12:43:49 +0200 -Subject: [PATCH] Fix missing parens in git-email-mu4e.el - -The incorrect number of parens in this file lead to Emacs failing to -parse the file. ---- - git-email-mu4e.el | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/git-email-mu4e.el b/git-email-mu4e.el -index d5b8770..9220bf9 100644 ---- a/git-email-mu4e.el -+++ b/git-email-mu4e.el -@@ -51,7 +51,7 @@ from Lisp, enable the mode if ARG is omitted or nil." - ;; built in context feature. - (seq-filter (lambda (header) - (not (eq (car header) 'from))) -- headers) -+ headers)))) - (setq git-email-compose-email-function 'message-mail))) - - (provide 'git-email-mu4e) --- -2.34.0 - base-commit: ba9466481d10992d35f09d010166d616fdb6a637