From patchwork Sun Sep 15 20:01:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brennan Vincent X-Patchwork-Id: 67974 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 D034427BBE9; Sun, 15 Sep 2024 21:03:14 +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=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS 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 5149527BBE2 for ; Sun, 15 Sep 2024 21:03:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1spvSP-0007xk-JO; Sun, 15 Sep 2024 16:02:53 -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 1spvSO-0007xM-0r for guix-patches@gnu.org; Sun, 15 Sep 2024 16:02:52 -0400 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 1spvSN-0005az-7B for guix-patches@gnu.org; Sun, 15 Sep 2024 16:02:51 -0400 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=RFY170FCLjZ7fCuXeXYfZoRcXz69ybg3cvPTxzhT7M0=; b=Z1qqOotuGLCM34zJqkcws4mr3H+G71z5xfPlk1p6rdkJU1rDNQ6p9edLDY/1RMXtSuqTuG70J3BXSO1GT9HjnA3k4JXn3AexpvXDvjlzvLznkJC23appDLy0gANMIov5DUNx9GWx5kITC8QsERf0tupPXJkCzasKwvheIUa7CaVSNZMplrQQYT5Qmsby6G6/OhF157hB7e+CtonI+zRzWY6z9mCSgXoqmczSMnW9Eb7fuJizWqFxuv+2tOTJWTcjgmkdbwQrd5YdgAUkTSRIsfkGoCpv1UsIUIHnP1sa9b1EJEKGefIQK99XAGqwP7260lNL+FE3EUwDOe5Pbd7ECw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1spvSY-0001UI-Ft for guix-patches@gnu.org; Sun, 15 Sep 2024 16:03:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73281] [PATCH] gnu: emacs: add emacs-nextnext and related packages. Resent-From: Brennan Vincent Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Sep 2024 20:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 73281 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73281@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17264305375639 (code B ref -1); Sun, 15 Sep 2024 20:03:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 Sep 2024 20:02:17 +0000 Received: from localhost ([127.0.0.1]:50560 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1spvRo-0001Ss-Q9 for submit@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 ) id 1spvRm-0001Sk-PX for submit@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 ) id 1spvRa-0007v5-1H for guix-patches@gnu.org; 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 ) id 1spvRY-0005Zl-73 for guix-patches@gnu.org; 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@gnu.org X-Fes-Received-From: From: Brennan Vincent X-Envelope-From: c27137e223ce42a9a169cbedc044c516978feb6a Mon Sep 17 00:00:00 2001 Date: Sun, 15 Sep 2024 16:01:56 -0400 Message-ID: <87ttegheiz.fsf@taipei.mail-host-address-is-not-set> MIME-Version: 1.0 X-Fes-Encrypted: true X-Fes-Ehlo-Domain: localhost Received-SPF: pass client-ip=54.203.248.109; envelope-from=brennan@umanwizard.com; 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-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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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"))