From patchwork Wed Jul 31 19:57:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 29640 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 848E027BBEA; Wed, 31 Jul 2024 22:12:15 +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=-5.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, PP_MIME_FAKE_ASCII_TEXT,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED 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 0D1B627BBE2 for ; Wed, 31 Jul 2024 22:12:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sZGbx-00053p-5x; Wed, 31 Jul 2024 17:11: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 1sZGbr-0004tI-KQ for guix-patches@gnu.org; Wed, 31 Jul 2024 17:11:48 -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 1sZGbr-0002Zh-Ax for guix-patches@gnu.org; Wed, 31 Jul 2024 17:11:47 -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:References:In-Reply-To:To:Subject; bh=JeWDk95aP1rLpDgnQg9hgjaEq9E0FpUpaBdvKv+m8w8=; b=kAxZUT0uMGaExW+DfywwJVjR84o7zuE6ybv9mKkwCMzoRDSpWF6/WyQR+RH2OwaFsP4WpctF4loSGGgH3mh85cSlvqKhEx1Fyk0igIvEm2qTOsy60CqD3TxBHfXP1X744H3h5jrK9/zYKA69zGKHDs2pLsNX+nYJ+Tvita9cJU8bldtCyoGWCw39nbeLI01yBjupG6UZhJHyeFQQGPjvldsjFI2YHF0CqPT+qt2VR/7H7e1ZgyYefOHw1nQMNRzcClcXZqwP1UZoHhny9/KqgziS4EWRMffAH4TRWuihF4sHy1AqYjdU4kPENgCOn+5yHxaHPBOCv55WNjaDyYDi3g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sZGc6-0003tS-DV; Wed, 31 Jul 2024 17:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72406] [PATCH emacs-team WIP 1/4] build-system: emacs: Define package-with-explicit-emacs. Resent-From: Liliana Marie Prikler 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, 31 Jul 2024 21:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72406 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72406@debbugs.gnu.org Cc: gemmaro.dev@gmail.com, andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com X-Debbugs-Original-Xcc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com Received: via spool by 72406-submit@debbugs.gnu.org id=B72406.172246031414937 (code B ref 72406); Wed, 31 Jul 2024 21:12:02 +0000 Received: (at 72406) by debbugs.gnu.org; 31 Jul 2024 21:11:54 +0000 Received: from localhost ([127.0.0.1]:50375 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZGbx-0003sq-V9 for submit@debbugs.gnu.org; Wed, 31 Jul 2024 17:11:54 -0400 Received: from mail-lf1-f68.google.com ([209.85.167.68]:54421) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZGbv-0003sJ-3t for 72406@debbugs.gnu.org; Wed, 31 Jul 2024 17:11:52 -0400 Received: by mail-lf1-f68.google.com with SMTP id 2adb3069b0e04-52f008aa351so9137750e87.0 for <72406@debbugs.gnu.org>; Wed, 31 Jul 2024 14:11:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722460229; x=1723065029; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:from:to:cc:subject:date:message-id:reply-to; bh=JeWDk95aP1rLpDgnQg9hgjaEq9E0FpUpaBdvKv+m8w8=; b=PdRjygUiqXvWy83pm62kFnJ/Jnrbg0J0Idll72f4xFYiqvS5JoqEG3umfTjoEEwbs0 uAE1HsKnmPzkjaOPa+NYG6fb6X4cTS0WoFgMp3nXuUNhPMFlSEORzb7M6ve6UyxINVd3 M0/IOa/P1RJSF1DtvfdraRlBWVxEWe0/pDePsTI/5qrxhr1M9PNulOrgEPULHTsjykmw yPxmyQR+0Lf70KjJkNdjHq/gd4faLR+jScAv5avzw8QNwi0qQXqhZpH6wsQmrL3vHrwT wmWPqp0fpq5xgPqGFX3JMjsB9OyjhyL2fKnV/pusSQx2ddZ8RjDj+qFsmOUghoG+AEHM 7kEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722460229; x=1723065029; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=JeWDk95aP1rLpDgnQg9hgjaEq9E0FpUpaBdvKv+m8w8=; b=tC2XLQvYGNGFvSiT/SHIUEH8Bse59lfm+xEO2GT35hjtTzbBk2atJxgin+/TDlMo0N RYvIWlujN3MnfuSmX3+4Y/S3oI+MH3la1h3qHrWQ1xblsyIX2xtNl85tvoDuhLWHGk/f DZtxiPZZR8XmMGFL+y/KJuWKb53Ao4Ql5HJ6Ldl4Ljj+WaUMmS8RoXmaQyi1VDfM/CJk DnZ3EJ0YyjpkTzyhnGWVzhydvKe4N3RaoqdToDVfAm5Glie7I4HqLIxJEBrsUICd7Ghh ECWpEF1GGGaWjfCmA/paTmdPmQ1j5F1xw1zs3JGUha/WRuswii2pxrz6Yh/OWDET/oU3 QfRA== X-Gm-Message-State: AOJu0YyZAyaj7bNdl4fx8wbuURaZJ8QgCkFfiaP0dB9CrtjxN37Bkhpr qD85Eg3O4QiLn+Ld1iu/IwSkNk19NBwUhvqTXodB6OD9B3vGB72I5IwBMm2L X-Google-Smtp-Source: AGHT+IFDdnHwpJ+whbVuCn4c291AuGlEDnlpFFL9G9OGW+hA61A2TcbSAaNSVQKT8TrVMmg3hMlO5A== X-Received: by 2002:a05:6512:2302:b0:52c:df9d:7cbe with SMTP id 2adb3069b0e04-530b61f4cd8mr128056e87.39.1722460228467; Wed, 31 Jul 2024 14:10:28 -0700 (PDT) Received: from lumine.fritz.box (85-127-20-124.dsl.dynamic.surfer.at. [85.127.20.124]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5ac64eb3a95sm9047273a12.61.2024.07.31.14.10.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jul 2024 14:10:28 -0700 (PDT) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Wed, 31 Jul 2024 21:57:54 +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 * guix/build-system/emacs.scm (package-with-explicit-emacs): New procedure. --- guix/build-system/emacs.scm | 51 +++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/guix/build-system/emacs.scm b/guix/build-system/emacs.scm index ebf97a5344..3a11738496 100644 --- a/guix/build-system/emacs.scm +++ b/guix/build-system/emacs.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2020 Morgan Smith +;;; Copyright © 2024 Liliana Marie Prikler ;;; ;;; This file is part of GNU Guix. ;;; @@ -128,4 +129,54 @@ (define emacs-build-system (description "The build system for Emacs packages") (lower lower))) +(define* (package-with-explicit-emacs emacs old-prefix new-prefix + #:key variant-property) + "Return a procedure of one argument, P. The procedure creates a package with +the same fields as P, which is assumed to use EMACS-BUILD-SYSTEM, such that +it is compiled with EMACS instead. The inputs are changed recursively +accordingly. If the name of P starts with OLD-PREFIX, this is replaced by +NEW-PREFIX; otherwise, NEW-PREFIX is prepended to the name. + +When VARIANT-PROPERTY is present, it is used as a key to search for +pre-defined variants of this transformation recorded in the 'properties' field +of packages. The property value must be the promise of a package. This is a +convenient way for package writers to force the transformation to use +pre-defined variants." + (define package-variant + (if variant-property + (lambda (package) + (assq-ref (package-properties package) + variant-property)) + (const #f))) + + (define (transform pkg) + (cond + ;; If VARIANT-PROPERTY is present, use that. + ((package-variant pkg) + => force) + + ;; Otherwise build the new package object graph. + ((eq? (package-build-system pkg) emacs-build-system) + (package/inherit pkg + (location (package-location pkg)) + (name (let ((name (package-name pkg))) + (string-append new-prefix + (if (string-prefix? old-prefix name) + (substring name + (string-length old-prefix)) + name)))) + (arguments + (let ((emacs (if (promise? emacs) + (force emacs) + emacs))) + (ensure-keyword-arguments (package-arguments pkg) + `(#:emacs ,emacs)))))) + (else pkg))) + + (define (cut? pkg) + (or (not (eq? (package-build-system pkg) emacs-build-system)) + (package-variant pkg))) + + (package-mapping transform cut?)) + ;;; emacs.scm ends here From patchwork Wed Jul 31 18:41:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 29639 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 2F2FB27BBEA; Wed, 31 Jul 2024 22:12: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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED 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 2930C27BBEC for ; Wed, 31 Jul 2024 22:12:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sZGbx-00056Z-JK; Wed, 31 Jul 2024 17:11: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 1sZGbs-0004uQ-Ku for guix-patches@gnu.org; Wed, 31 Jul 2024 17:11:49 -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 1sZGbs-0002fu-BE for guix-patches@gnu.org; Wed, 31 Jul 2024 17:11:48 -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:References:In-Reply-To:To:Subject; bh=WR1QJQ9AnVh2ZVqiWFkTGEAvYrFrsKVQLREi2D0/2QU=; b=GCQTd0DVsKxcAcDUwCFAgBhCeFxHog3dH51bVDHqBu9CY2oFGgchZ3R+lfBVKD5coz1BJ0qN7orAMozh8c74Z7AIThMpEc0RtPl5SiFipoG3ofTB24861ky2JDAwtz/qwOUutQgZ4AzBUA3uloH5qG6vxWzcFa/d5isychLXx9muTzcqJ+1akkHcu9QB7QQd+2ZcWQ8d4a6lak11qgpY+pCXTf5kHZyBRrWUaDL3zfTRxrrIbhb2Tjf6fVebueM0Hl98lXFRxb2yxdiX6793Ald5CAaLJqTZb1tj1WBw6yw39h8QDA0Wi0DUamGIIbtAzNbMsfFrEvwrBFz43fEXvQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sZGc7-0003tm-BU; Wed, 31 Jul 2024 17:12:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72406] [PATCH emacs-team WIP 2/4] build-system: emacs: Make emacs the default variant. Resent-From: Liliana Marie Prikler 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, 31 Jul 2024 21:12:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72406 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72406@debbugs.gnu.org Cc: gemmaro.dev@gmail.com, andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com X-Debbugs-Original-Xcc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com Received: via spool by 72406-submit@debbugs.gnu.org id=B72406.172246031514951 (code B ref 72406); Wed, 31 Jul 2024 21:12:03 +0000 Received: (at 72406) by debbugs.gnu.org; 31 Jul 2024 21:11:55 +0000 Received: from localhost ([127.0.0.1]:50379 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZGby-0003t0-Lv for submit@debbugs.gnu.org; Wed, 31 Jul 2024 17:11:54 -0400 Received: from mail-lj1-f195.google.com ([209.85.208.195]:45524) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZGbw-0003sK-2T for 72406@debbugs.gnu.org; Wed, 31 Jul 2024 17:11:52 -0400 Received: by mail-lj1-f195.google.com with SMTP id 38308e7fff4ca-2ef7fef3ccfso74080671fa.3 for <72406@debbugs.gnu.org>; Wed, 31 Jul 2024 14:11:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722460229; x=1723065029; darn=debbugs.gnu.org; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=WR1QJQ9AnVh2ZVqiWFkTGEAvYrFrsKVQLREi2D0/2QU=; b=m9uJHY4za9hzdbIMglNCLlgpkwB/PyRdh06S1jI+TPJ3S7HasZwyUtIWbhzW8G5qaQ omcUVy9EmYMmirEO0m7C34UhykYdeAod65GAi9GzvOsNw2H4ASIiAJM758eK215Cq/RQ tB8QEmKOhR7b4dp9xb0RN7sNAcJSS1OMfAa2CizqicqitHrbZDhhi0YOsew4v/6aqJH7 fBfjBNcVb/DiF8MRqrFIfJYk+rpq10XVxjCKMLgu3xMg/+b8Qph80vHvaAzP3OzP2wAi a6XvdEB//b2KwuxWAcPLfqWeceOXmrDTIG7d37Qgpvri2edy0It2iQmT3RdwjlR4HHK0 ySbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722460230; x=1723065030; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WR1QJQ9AnVh2ZVqiWFkTGEAvYrFrsKVQLREi2D0/2QU=; b=PS6BWBo60cs6odDa08kdeQ9Ke9kS61XhntEEOl06RUJI4uyCj6vAJqACzA20Q99wGA PHyoxRU4zlemp37DsVnwvLng6hp6o4+l44i2FtQzUc4jQWcHgtJggaOuw61rWlWoK9dt ef+rOsVq9iEkV5ZGXq7MoQAFIVTMQertXi2BOIlZHXowIXoXj7pjqKl5ztfOOOA42JOB IoEfGDYL1rVO8LF5JRyUcUvZsNjaotouQu2YxqZgBllw3sls6PIKEMYLLCzBCVmBQwPT ppGwIx5byz8GdoK7jEx4YMLnFi891+XW6zZubKzl7aWJEVPcurHnGj5SLbHwJoEuFtnn Jokg== X-Gm-Message-State: AOJu0YyvZ/Q9tjmzoFbUuGedOiVRlbwZGw/rDWN9G0gfrHAs7RCX/TLn BTeMDdYk4qVWSAx9qiHBVZkZoNrKsFtO3YB1pAah4OmX05LuNzxqbIoZuw6B X-Google-Smtp-Source: AGHT+IGCzURWcSpLnfvNEwY6bZaIqBm6lcxfOHmmQsuYIeYncbHWgDltbIAv302uJcc0hiXK/AAO/A== X-Received: by 2002:a2e:b985:0:b0:2ef:26dc:efbe with SMTP id 38308e7fff4ca-2f15329fe18mr3709261fa.42.1722460229275; Wed, 31 Jul 2024 14:10:29 -0700 (PDT) Received: from lumine.fritz.box (85-127-20-124.dsl.dynamic.surfer.at. [85.127.20.124]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5ac64eb3a95sm9047273a12.61.2024.07.31.14.10.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jul 2024 14:10:28 -0700 (PDT) Message-ID: <0b19153db447c6b774bfb69b99ec5eaa502d0d7d.1722455929.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Wed, 31 Jul 2024 20:41:28 +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 * guix/build-system/emacs.scm (resolve-emacs): New variable. (default-emacs): Use it. Change to ‘emacs’ instead of ‘emacs-minimal’. --- guix/build-system/emacs.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/guix/build-system/emacs.scm b/guix/build-system/emacs.scm index 3a11738496..88304b9ce1 100644 --- a/guix/build-system/emacs.scm +++ b/guix/build-system/emacs.scm @@ -49,11 +49,13 @@ (define %emacs-build-system-modules (guix build emacs-utils) ,@%gnu-build-system-modules)) -(define (default-emacs) - "Return the default Emacs package." +(define* (resolve-emacs name) + "Lazily resolve the emacs package by variable NAME." ;; Lazily resolve the binding to avoid a circular dependency. (let ((emacs-mod (resolve-interface '(gnu packages emacs)))) - (module-ref emacs-mod 'emacs-minimal))) + (module-ref emacs-mod name))) + +(define (default-emacs) (resolve-emacs 'emacs)) (define* (lower name #:key source inputs native-inputs outputs system target From patchwork Wed Jul 31 18:42:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 29638 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 579E027BBEB; Wed, 31 Jul 2024 22:12:13 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 1A6E227BBEA for ; Wed, 31 Jul 2024 22:12:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sZGc0-0005Hg-2o; Wed, 31 Jul 2024 17:11:56 -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 1sZGbr-0004tE-EH for guix-patches@gnu.org; Wed, 31 Jul 2024 17:11:48 -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 1sZGbr-0002ZL-5E for guix-patches@gnu.org; Wed, 31 Jul 2024 17:11:47 -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:References:In-Reply-To:To:Subject; bh=FbXvrUb07eOUDalEPhJSdtPfNP2cQHkVdfr3c7b9IvY=; b=j1mv80T+qkJhYjxzmwzJb5lq3suVM/tN+iWeU9Qd/WW9+84OdHeFimNXWLdlq6bmNVyLqiFj5cXdtEmAQinUp73KMN5ilyduQRbEm8cxgWeYYjH/18t3mPNBaRC+Nt6d05Jx+ideFp2AK+SIQh+J7zllvOj4Fr2o/q+wPg2NGfJ5Z05hG3T4AYXgAuYHgbkBABQD22x01Xy7n2S0JkuDMcI0KTOyLM6pMcS4KsAuPSTXFWtltvtrCnAjNrlklZpxDy1QjhEijxt6T5H1R61FVHPKcxlgVYigbIk9Cywkj2sJNsQodwXK2HXX/voYYbm5gAfWn7DCKGESNJaRGfgriA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sZGc6-0003tb-SF; Wed, 31 Jul 2024 17:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72406] [PATCH emacs-team WIP 3/4] build-system: emacs: Define common variants. Resent-From: Liliana Marie Prikler 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, 31 Jul 2024 21:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72406 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72406@debbugs.gnu.org Cc: gemmaro.dev@gmail.com, andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com X-Debbugs-Original-Xcc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com Received: via spool by 72406-submit@debbugs.gnu.org id=B72406.172246031414945 (code B ref 72406); Wed, 31 Jul 2024 21:12:02 +0000 Received: (at 72406) by debbugs.gnu.org; 31 Jul 2024 21:11:54 +0000 Received: from localhost ([127.0.0.1]:50377 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZGby-0003ss-BE for submit@debbugs.gnu.org; Wed, 31 Jul 2024 17:11:54 -0400 Received: from mail-lf1-f68.google.com ([209.85.167.68]:56564) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZGbw-0003sM-5I for 72406@debbugs.gnu.org; Wed, 31 Jul 2024 17:11:52 -0400 Received: by mail-lf1-f68.google.com with SMTP id 2adb3069b0e04-52ed741fe46so7074597e87.0 for <72406@debbugs.gnu.org>; Wed, 31 Jul 2024 14:11:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722460230; x=1723065030; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:from:to:cc:subject:date:message-id:reply-to; bh=FbXvrUb07eOUDalEPhJSdtPfNP2cQHkVdfr3c7b9IvY=; b=lD6ImJa5Rx6grT3/dqCVZ8GOGTsEpKtvqYChEP2StAtn+3SOJVvAjE2+ppBQg23Qei ih4EGdd4KTBK0RFLYb/C2Z153cZkpZnUT7tUyilVF9HfOKmWapIkhkzs4171DvB8Ilm6 N5dAnrIaemIElbE5rLkfItJOeXcV2VEBirikhOYobjVVUTqffyq1oN7B3UBPDxBopesL tzGP+NtxaRUjX7ZvZNxaulZXqANPQChNBm5Q2hIBDgkHUMUdk1ZqWAv2xGUbIa/upSvN t0NZgoavFKgYWYHfaTXmzrDsQtH5gS+L1tBjV9qBtluj+/67YSHmS6GhEtA49K/2/sHr eb7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722460230; x=1723065030; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=FbXvrUb07eOUDalEPhJSdtPfNP2cQHkVdfr3c7b9IvY=; b=iv8eNaLEQA/Hi8b50LEAVD/5mEpTCYIrlLi6DTZ87SooP/bAy+1Z4zN5nU38AMeK8N I6MqY1op1fbFeu47MPnKrGJaPA6wTwtn7ZnuG2c+UlUcWVHt+g1QLofFpQL9mlg/D0Bz 3tGhJ8RW2VC4a4hPLczW5rR3bzkGqs9Ka2rlJmqaqMFwkQFIvSaXK45V8xQL4VXAes6x T6aS1q0I920S/YqPFZEJFz0daXQarCi4HYXBBDYcF9GKL3Fu1u/6z4J8XgKe0qt+8O6d mBP17PzZ6WtD89mBslsojFJn8LTfI2Cx5bqfHylQeqZyMyPa05pl0WG+R4qDQELBc8/D Uilw== X-Gm-Message-State: AOJu0YwFj5CjQlEJbshPjaYG250vEmqU+vRQako13xzYWIfTFJ3hyZD8 b/axqF4e1SOuXsWoczmGFSXiHQ6+tWxnoDT32Vg6TePS6OifHszhto5vSGOT X-Google-Smtp-Source: AGHT+IEvYsLMvH0gb5aUx3lH99uX7hJmYgmXLc0SPjyf8r8vHYHK4fU0MW+Y1IyTKMFqQn2uzfQc5A== X-Received: by 2002:ac2:4dbc:0:b0:52e:7f6b:5786 with SMTP id 2adb3069b0e04-530b61fee51mr81093e87.61.1722460230087; Wed, 31 Jul 2024 14:10:30 -0700 (PDT) Received: from lumine.fritz.box (85-127-20-124.dsl.dynamic.surfer.at. [85.127.20.124]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5ac64eb3a95sm9047273a12.61.2024.07.31.14.10.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jul 2024 14:10:29 -0700 (PDT) Message-ID: <096695fa7db5074fef4c970b674cc4798c15dd7d.1722455929.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Wed, 31 Jul 2024 20:42:31 +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 * guix/build-system/emacs.scm (package-with-emacs-minimal) (package-with-emacs-next, package-with-emacs-pgtk): New variables. --- guix/build-system/emacs.scm | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/guix/build-system/emacs.scm b/guix/build-system/emacs.scm index 88304b9ce1..74bb047e63 100644 --- a/guix/build-system/emacs.scm +++ b/guix/build-system/emacs.scm @@ -31,7 +31,11 @@ (define-module (guix build-system emacs) #:use-module (guix build-system gnu) #:export (%emacs-build-system-modules emacs-build - emacs-build-system) + emacs-build-system + ;; Common variants. + package-with-emacs-minimal + package-with-emacs-next + package-with-emacs-pgtk) #:re-export (%default-include ;for convenience %default-exclude)) @@ -181,4 +185,19 @@ (define* (package-with-explicit-emacs emacs old-prefix new-prefix (package-mapping transform cut?)) +(define package-with-emacs-minimal + (package-with-explicit-emacs (delay (resolve-emacs 'emacs-minimal)) + "emacs-" "emacs-minimal-" + #:variant-property 'emacs-minimal-variant)) + +(define package-with-emacs-pgtk + (package-with-explicit-emacs (delay (resolve-emacs 'emacs-pgtk)) + "emacs-" "emacs-pgtk-" + #:variant-property 'emacs-pgtk-variant)) + +(define package-with-emacs-next + (package-with-explicit-emacs (delay (resolve-emacs 'emacs-next)) + "emacs-" "emacs-next-" + #:variant-property 'emacs-next-variant)) + ;;; emacs.scm ends here From patchwork Wed Jul 31 19:54:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 29641 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 CECB727BBE9; Wed, 31 Jul 2024 22:13:03 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 0803527BBE2 for ; Wed, 31 Jul 2024 22:13:02 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sZGcq-0005z4-Q3; Wed, 31 Jul 2024 17:12:48 -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 1sZGco-0005yf-97 for guix-patches@gnu.org; Wed, 31 Jul 2024 17:12:46 -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 1sZGcn-0003Ce-Vk for guix-patches@gnu.org; Wed, 31 Jul 2024 17:12:46 -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:References:In-Reply-To:To:Subject; bh=W9vqde+S292p692CO/Vk2uHAgrOYhKvD/OhAv/bXtyk=; b=c5ES/ssSUWf5sd9QqTkW0UJAt6vJLH57v+1xMHmyTVkVFVm5LTVRrUuvqC4uC3zNFGW/INdxscsEIR/N9N1Hr3xXgQZhh4zHN8WLNjr+SpFYH9AmfIlbQbN2yj6lUBf6ZRck6/nqYIguZrmd816xp5XDu2YemDV5zjphZ+e+EqKbO118jhIzd9ZazczsPvT6WzGqUlwycCDRPRhbYDWVfOXe0zK73AXYfS+GHo94XHb8o4oI1JHlArqBiY69U55bDNOCieI3K/X7ir1JcRxVoqPipjnZhFWY5DT0P2ix0ou5OMFBwTJSW9il9uhmrDBsenTJYcITzUGnRZqTXWFSqw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sZGd3-0003vJ-SP; Wed, 31 Jul 2024 17:13:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72406] [PATCH emacs-team WIP 4/4] etc: Provide snippet for defining emacs variants. Resent-From: Liliana Marie Prikler 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, 31 Jul 2024 21:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72406 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72406@debbugs.gnu.org Cc: gemmaro.dev@gmail.com, andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com X-Debbugs-Original-Xcc: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com Received: via spool by 72406-submit@debbugs.gnu.org id=B72406.172246032314997 (code B ref 72406); Wed, 31 Jul 2024 21:13:01 +0000 Received: (at 72406) by debbugs.gnu.org; 31 Jul 2024 21:12:03 +0000 Received: from localhost ([127.0.0.1]:50383 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZGc7-0003tg-1f for submit@debbugs.gnu.org; Wed, 31 Jul 2024 17:12:03 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:54678) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sZGbw-0003sP-Tp for 72406@debbugs.gnu.org; Wed, 31 Jul 2024 17:11:53 -0400 Received: by mail-ed1-f66.google.com with SMTP id 4fb4d7f45d1cf-5af6a1afa7bso6744955a12.1 for <72406@debbugs.gnu.org>; Wed, 31 Jul 2024 14:11:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722460231; x=1723065031; darn=debbugs.gnu.org; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:from:to:cc:subject:date:message-id:reply-to; bh=W9vqde+S292p692CO/Vk2uHAgrOYhKvD/OhAv/bXtyk=; b=PZZTcM8ixKxT/qWZpz5u+YMkoPyebdM0xObMFuc69t/X09wpy4u3qt1ImRgRstdyKo vwrPdamGVvTgkTMH4GLe8lnodt5wUB9nqwlUCF5vjV012Nd0n6DK6PNrXBpQmLR3R0TZ HLEH3X6p2EV7RfHkMo3RxLyOY9Kg5aJwEaZouPjiON2FFKGHA0Tj5HmaIz1vI4KdU7UJ GaXg1cPyjVz6uIrAAC+6UbqgOma7GFtUnboxr7CnN36qCDYkmVmW6LuqWDUH67q29ptm O7S40e8QvphJKgrpI1pT1EVAEE7Qpy0GJgOoi5HaaWegkJlqppAGV15SmhPkmHSTmjtB 9hhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722460231; x=1723065031; h=mime-version:cc:to:subject:date:from:references:in-reply-to :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=W9vqde+S292p692CO/Vk2uHAgrOYhKvD/OhAv/bXtyk=; b=i4ewutV8uVo5nNe/m1EhwTZNLuAqAstz6jxdIQm2tYHXPoIAN2GIjHS8I9dvtSVQhL /sAwk3XhjNtgGso+IWEv6EiHxwBO2uqKgz2LjGFvNFXYYdFrRhZdaTnj8XxX4sZI9WwT gQwv9jTqQyFdVSl0Mtg++Dsr2EREfEDabHCDGMzjvtH2qe9hWwImmXPQ2ZOSa1rtzSsd 5B4oy5NkeYdGEyq0W/oZpY491rCE6W7U/c7u750+I85KbTtwN8pMJ9Ch247HtNXvVhS5 3vKl9LWauDCpibU/NHMfZ7KfglivK8e1/HMWj2VJEm3ODQJDZQPaDc07dbwbalhywJQb 1r4w== X-Gm-Message-State: AOJu0YzfSzRsMUKLTcpN6cfzgt5fochSJaWCLmJDvfQMFqRxsvPv10hc DcAHyL79RwT4Ug9JLCK6hVOKC7xX2y0rdbnF5C+9WaSg/abhtGAtnnyAZUrY X-Google-Smtp-Source: AGHT+IEBZ8hLfskCdxvh0nzwa20qEFbmaA9lJo25DnIYk2j/UqPY+lo00G7ldWXSDemVoas7hANGdg== X-Received: by 2002:a05:6402:33d0:b0:5a1:a447:9fab with SMTP id 4fb4d7f45d1cf-5b7005c4493mr127746a12.28.1722460230925; Wed, 31 Jul 2024 14:10:30 -0700 (PDT) Received: from lumine.fritz.box (85-127-20-124.dsl.dynamic.surfer.at. [85.127.20.124]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5ac64eb3a95sm9047273a12.61.2024.07.31.14.10.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jul 2024 14:10:30 -0700 (PDT) Message-ID: <8462cdbd0591cc0ed1b8e6bf8f5882edc2115648.1722455929.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Wed, 31 Jul 2024 21:54:55 +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 * etc/snippets/tempel/scheme-mode (emacs-variants...): New snippet. --- etc/snippets/tempel/scheme-mode | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/etc/snippets/tempel/scheme-mode b/etc/snippets/tempel/scheme-mode index 249f4ce8e3..5ad9fd48a7 100644 --- a/etc/snippets/tempel/scheme-mode +++ b/etc/snippets/tempel/scheme-mode @@ -14,6 +14,14 @@ scheme-mode n > "(description \"" p "\")" n > "(license license:" (p "unknown") ")))" n) +(emacs-variants... + "(define-public emacs-next-" (s name) + n> "(package-with-emacs-next emacs-" (s name) "))" n n + "(define-public emacs-minimal-" (s name) + n> "(package-with-emacs-minimal emacs-" (s name) "))" n n + "(define-public emacs-pgtk-" (s name) + n> "(package-with-emacs-pgtk emacs-" (s name) "))") + (origin... "(origin" n> "(method " (p "url-fetch" method) ")"