GNU bug report logs - #73281
[PATCH] gnu: emacs: add emacs-nextnext and related packages.

Message received at submit <at> debbugs.gnu.org:

Received: (at submit) by debbugs.gnu.org; 15 Sep 2024 20:02:17 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Sep 15 16:02:17 2024
Received: from localhost ([127.0.0.1]:50560 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1spvRo-0001Ss-Q9
	for submit <at> debbugs.gnu.org; Sun, 15 Sep 2024 16:02:17 -0400
Received: from lists.gnu.org ([209.51.188.17]:43334)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <brennan@HIDDEN>) id 1spvRm-0001Sk-PX
 for submit <at> debbugs.gnu.org; Sun, 15 Sep 2024 16:02:15 -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 <brennan@HIDDEN>)
 id 1spvRa-0007v5-1H
 for guix-patches@HIDDEN; Sun, 15 Sep 2024 16:02:02 -0400
Received: from smtp.umanwizard.com ([54.203.248.109])
 by eggs.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <brennan@HIDDEN>) id 1spvRY-0005Zl-73
 for guix-patches@HIDDEN; Sun, 15 Sep 2024 16:02:01 -0400
Received: from localhost ([108.6.22.48]) by smtp.umanwizard.com ;
 15 Sep 2024 20:01:58 +0000
X-Fes-Received-For: guix-patches@HIDDEN
X-Fes-Received-From: <brennan@HIDDEN>
From: Brennan Vincent <brennan@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: emacs: add emacs-nextnext and related packages.
X-Envelope-From: c27137e223ce42a9a169cbedc044c516978feb6a Mon Sep 17
 00:00:00 2001
Date: Sun, 15 Sep 2024 16:01:56 -0400
Message-ID: <87ttegheiz.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
X-Fes-Encrypted: true
X-Fes-Ehlo-Domain: localhost
Received-SPF: pass client-ip=54.203.248.109;
 envelope-from=brennan@HIDDEN; helo=smtp.umanwizard.com
X-Spam_score_int: -18
X-Spam_score: -1.9
X-Spam_bar: -
X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.4 (-)
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.4 (--)

emacs-30 has been branched, and upstream git master is now version 31. Add
this for those who want to test the bleeding-edge version.

We keep emacs-next for emacs-30, since it is still not released. Thus,
the new naming scheme is "emacs-nextnext".

* gnu/packages/emacs.scm (emacs-nextnext): new variable.
  (emacs-nextnext-pgtk): new variable.
  (emacs-nextnext-pgtk-xwidgets): new variable.

Change-Id: I42abca804e8595c90092adbfd9605b38527ffe40
---

Suggestions for a better naming scheme than "nextnext" are welcome,
should anyone have one.

 gnu/packages/emacs.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm
index 3ce01f1a24..8448e2778a 100644
--- a/gnu/packages/emacs.scm
+++ b/gnu/packages/emacs.scm
@@ -588,6 +588,28 @@ (define-public emacs-next-minimal
                         "emacs-next-native-comp-driver-options.patch"
                         "emacs-pgtk-super-key-fix.patch")))))))
 
+(define-public emacs-nextnext-minimal
+  (let ((commit "f27553c30a772a0103d2e6762e4d7f588f302e4b")
+        (revision "1"))
+   (package
+    (inherit emacs-minimal)
+    (name "emacs-nextnext-minimal")
+    (version (git-version "31.0.50" revision commit))
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://git.savannah.gnu.org/git/emacs.git")
+             (commit commit)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0s9mh6pz3lp4cjh2j0vn5fy2ihphqhvgx7ac4idikj66k4y98w2c"))
+       (patches
+        (search-patches "emacs-next-exec-path.patch"
+                        "emacs-fix-scheme-indent-function.patch"
+                        "emacs-next-native-comp-driver-options.patch"
+                        "emacs-pgtk-super-key-fix.patch")))))))
+
 (define* (emacs->emacs-next emacs #:optional name
                             #:key (version (package-version emacs-next-minimal))
                             (source (package-source emacs-next-minimal)))
@@ -628,6 +650,19 @@ (define-public emacs-next-pgtk-xwidgets (emacs->emacs-next emacs-pgtk-xwidgets))
 (define-public emacs-next-tree-sitter
   (deprecated-package "emacs-next-tree-sitter" emacs-next))
 
+(define (emacs->emacs-nextnext emacs)
+  (emacs->emacs-next emacs
+                     (and (string-prefix? "emacs" (package-name emacs))
+                          (string-append "emacs-nextnext"
+                                         (string-drop (package-name emacs)
+                                                      (string-length "emacs"))))
+                     #:version (package-version emacs-nextnext-minimal)
+                     #:source (package-source emacs-nextnext-minimal)))
+
+(define-public emacs-nextnext (emacs->emacs-nextnext emacs))
+(define-public emacs-nextnext-pgtk (emacs->emacs-nextnext emacs-pgtk))
+(define-public emacs-nextnext-pgtk-xwidgets (emacs->emacs-nextnext emacs-pgtk-xwidgets))
+
 (define-public guile-emacs
   (let ((commit "41120e0f595b16387eebfbf731fff70481de1b4b")
         (revision "0"))
-- 
2.45.2