From patchwork Sat Sep 9 14:29:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 53690 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 B46D027BBEA; Sat, 9 Sep 2023 16:20:32 +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 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 357D727BBE2 for ; Sat, 9 Sep 2023 16:20:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qezkf-00077d-4J; Sat, 09 Sep 2023 11:20:01 -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 1qezke-00077O-1d for guix-patches@gnu.org; Sat, 09 Sep 2023 11:20:00 -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 1qezkd-00054L-PP for guix-patches@gnu.org; Sat, 09 Sep 2023 11:19:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qezkf-0005B3-Tt; Sat, 09 Sep 2023 11:20:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65841] [PATCH emacs-team 2/5] gnu: Add emacs-next. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: andrew@trop.in, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 09 Sep 2023 15:20:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65841 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65841@debbugs.gnu.org Cc: andrew@trop.in, liliana.prikler@gmail.com X-Debbugs-Original-Xcc: andrew@trop.in, liliana.prikler@gmail.com Received: via spool by 65841-submit@debbugs.gnu.org id=B65841.169427276619823 (code B ref 65841); Sat, 09 Sep 2023 15:20:01 +0000 Received: (at 65841) by debbugs.gnu.org; 9 Sep 2023 15:19:26 +0000 Received: from localhost ([127.0.0.1]:48282 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qezk5-00059e-J2 for submit@debbugs.gnu.org; Sat, 09 Sep 2023 11:19:25 -0400 Received: from mail-ej1-x643.google.com ([2a00:1450:4864:20::643]:44479) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qezk2-000596-Jy for 65841@debbugs.gnu.org; Sat, 09 Sep 2023 11:19:24 -0400 Received: by mail-ej1-x643.google.com with SMTP id a640c23a62f3a-99c136ee106so365646266b.1 for <65841@debbugs.gnu.org>; Sat, 09 Sep 2023 08:19:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694272754; x=1694877554; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=Kk5Cn0DPa5vkYdRc4asVC9IpyCmDzYwPFtYpaDgNEMg=; b=hDcm/CjV3VB9C/9CGzViGfL5F6O8yj5/AP/KVW6Nk4V8obGwXcbIQyoCahNuaWzDUP UNXR4Iw+mfcq04U/XqGvpuH33PamaUTgDYMkGx4bUyw2yL0aE7vviDWekWk/7Zg/qEoF mvsBdYl8JzvXq0nJuM16XGcJvT/ZCf3F+mSB8ELWlrYTb423W96V/IMu4+PdSc+hHvKX k8UeYCIKT3RsoaSJFsGMc9o7ltohyJPY9XWoPe/GBMHKyAHO2ROX/JCN8MYCf2jD5ufA L7CIuo7Iz/+VYAqrVwLfNTj9pwWcxXxL6SPJd0iRpOGCIyrLdwDWKvsj0WxTJTOHk+Oz Zp1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694272754; x=1694877554; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Kk5Cn0DPa5vkYdRc4asVC9IpyCmDzYwPFtYpaDgNEMg=; b=N2oSBH0bffQQP5UK7sFXHVJx53kQCPfd4CNhpE1k8G7OhaQ8NiAWvm1kf5eP3FayrJ 7nm+6xEbdfqM+RswuSbJXaFH9JVUBV+DtCA9/7DWpDT7yAZK2/LJWRTRhNn2vxOmUkwh MxO7didQGZ08FD0ATU5Xo1k2hTVF6Vw+0YNwAK9F5LDcAF5iv5HNFH1rFzeJZN4r+Xt8 j5ekUFTIbWZV3mCdpBX2hITvot4sRKMUvb2E5J8ASyMY5n586k1VwhE8GoQRImXpsdfk YGdQfJpyIVkaPWIIZtbXNhl0FwvckFix9kXm1nNz3O+J6CAc+NoUWXRrAxlq2TliJfyk wo6g== X-Gm-Message-State: AOJu0Yxt3P+jZo7a0rj12WEIWipydJdKM9lL6vW2AHAoLqH/pJPrY/lg UOEa6NWoiyzl5YJoVgVepvn5Tr4ykAAQ7Lw/wJM= X-Google-Smtp-Source: AGHT+IGmqJT+GDU3V0eMu4JEiRKkQPejW49yHGQeZ54xayW/RRex41wZnW6oEHjk8lrgTsTDESPJQw== X-Received: by 2002:a17:906:8251:b0:99b:d580:546c with SMTP id f17-20020a170906825100b0099bd580546cmr4230008ejx.23.1694272753649; Sat, 09 Sep 2023 08:19:13 -0700 (PDT) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id hb5-20020a170906b88500b009828e26e519sm2427318ejb.122.2023.09.09.08.19.12 for <65841@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Sep 2023 08:19:12 -0700 (PDT) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Sat, 9 Sep 2023 16:29:07 +0200 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/emacs.scm (emacs->emacs-next, emacs-next): New variable. --- gnu/packages/emacs.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index 469c5e36f2..1be58bd5c1 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -86,7 +86,8 @@ (define-module (gnu packages emacs) #:use-module (gnu packages xorg) #:use-module (guix utils) #:use-module (ice-9 match) - #:use-module (srfi srfi-1)) + #:use-module (srfi srfi-1) + #:export (emacs->emacs-next)) (define (%emacs-modules build-system) (let ((which (build-system-name build-system))) @@ -499,6 +500,21 @@ (define-public emacs-next-minimal (sha256 (base32 "00mwpq1msr3jij281w5piqmbwq968xr8dn9hqbf4r947ck754kn9"))))))) +(define* (emacs->emacs-next emacs #:optional name + #:key (version (package-version emacs-next-minimal)) + (source (package-source emacs-next-minimal))) + (package + (inherit emacs) + (name (or name + (and (string-prefix? "emacs" (package-name emacs)) + (string-append "emacs-next" + (string-drop (package-name emacs) + (string-length "emacs")))))) + (version version) + (source source))) + +(define-public emacs-next (emacs->emacs-next emacs)) + (define-public guile-emacs (let ((commit "41120e0f595b16387eebfbf731fff70481de1b4b") (revision "0"))