From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.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 CNKhLvC2uGZpZwEA62LTzQ:P1 (envelope-from ) for ; Sun, 11 Aug 2024 13:04:48 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id CNKhLvC2uGZpZwEA62LTzQ (envelope-from ) for ; Sun, 11 Aug 2024 15:04:48 +0200 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=QUl9SIKr; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=eeFlTLod; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none); 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1723381488; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=OTIvbzcdHP4VOeLr4GHNQ8AKmTHR+13J050Ht/JJdaU=; b=UGgAJevwOcUzGeGCkJJdf0a3lV1e+SODtyhVXIKMJLxaeJM7Eqrr4Cgd6Tws4zlt7Nqch5 +fU0LKFMU+rohLonCRaXUdTohPmjssBuXRjWK9o+FiARnwTvb71XjMXFziQ3pFtXJcIThJ pvxEVKISAVwNmZeaI+4x2tg8R7PkoYBUTZp3vqIaZfMD3Sx1f6fHh30YOKIwDnUJvYjUjD /VGQFmia1p+5YenRiojhKRszse/vO6ONLGhrvqwiiROFaVIiIJ1os86d999olbDF325U8p iEq+l10lxc1w1w+fYgrJi0eK63LC0SpVh5btpvnGB+F0Ze1KSK3XiUxmbFuBOA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1723381488; a=rsa-sha256; cv=none; b=iK6I0fPO0m2TXfpe0aaVS7W/Tt2PlLY77f09YAqojjexDRNZY4loxm/4D8/6JSdgp9vWgw xxhX+cLN3W+sNGssbu0xhgBm6zO1IlNGk97W5ZS+WBvWveY2Z89CKkughuFWrrtZPcAX6N dUkPzq0iaQb5jq2+K1yprjWurDvw/8rdCq4t+ucHWEpWGDuC1uJ62CenBuaEfj0axgR0u+ 251KvtXA7JXksvVWOxOoZ2/GLSsaOjMGR/GhrHVzaPVtQwGDun0MBA3m0lY844eVA3Vk6P iUblFva+YRH3XFq/jwsGpzT/avucCUB9piNjt9TqMgh9y5Df8lQ5c44fC9szLg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=QUl9SIKr; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=eeFlTLod; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none); 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" 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 3CFF23F08D for ; Sun, 11 Aug 2024 15:04:48 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sd8E7-0003gu-DL; Sun, 11 Aug 2024 09:03: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 1sd8DS-0003R5-KR for guix-patches@gnu.org; Sun, 11 Aug 2024 09:02:36 -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 1sd8DR-0003QR-Kw for guix-patches@gnu.org; Sun, 11 Aug 2024 09:02:34 -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=OTIvbzcdHP4VOeLr4GHNQ8AKmTHR+13J050Ht/JJdaU=; b=QUl9SIKrduhxx4K15E+7J3e014pv+ULnAENd5vdT1D3n3k86DPVntcWjb3LaFaY1OSaJApsyeRaRr1Culnk7MWX0GSV37BElSb5457zSwIYfjxAaecQ+p3+nfc/iQX1i3Y+RlYIeFvV5QdyeZR+mMVejGiPDFxtM9eB0lETjYhAYUPekh4UPkpbmT5GOh1JgXD6xxwgeLrOKoS07o0w2Ftw8wgS6dzktrCgQTQDPdqshMl43yq3f+R7tpf48kH2hQKvk5Fj2eZo8SwT0sJ2hwRoZhxYADLEby9ssLKa/vnukR00gGPh3szUvgua3tWaB5R9yNusJCZOBeyu6rwiGPA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sd8Dv-0003jT-DH; Sun, 11 Aug 2024 09:03:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72406] [PATCH emacs-team WIP v4 03/24] 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: Sun, 11 Aug 2024 13:03: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.172338136914158 (code B ref 72406); Sun, 11 Aug 2024 13:03:03 +0000 Received: (at 72406) by debbugs.gnu.org; 11 Aug 2024 13:02:49 +0000 Received: from localhost ([127.0.0.1]:40944 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sd8Dg-0003fw-CA for submit@debbugs.gnu.org; Sun, 11 Aug 2024 09:02:49 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:48330) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sd8Dc-0003ef-Rv for 72406@debbugs.gnu.org; Sun, 11 Aug 2024 09:02:45 -0400 Received: by mail-lj1-f194.google.com with SMTP id 38308e7fff4ca-2ef1c12ae23so35441901fa.0 for <72406@debbugs.gnu.org>; Sun, 11 Aug 2024 06:02:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723381268; x=1723986068; 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=OTIvbzcdHP4VOeLr4GHNQ8AKmTHR+13J050Ht/JJdaU=; b=eeFlTLod1ux7BUgYs9/0cEHtfazmmbO67JuWdcqOGGeFbhhJTJDIC966lNi7JVNgdj ALyknNXLK6kpw38M1Z3kUfgJ+gjdPyxYRbN0j+Q8VU8QefDxQQTMWwrpUicVEdJkF7XE gENq1pt0F1Bfci+zNi1xUzv5btghEbCu9TEJtXi40BHq2BEmu1r9/0SZLCcgtNns+P+y JEVEIWqP/bBe3jDnAF8u9qg8QbM1mJJNqqW5RMTWvvSGSPHkM/E5zjhC3qMJmW8Q8hpX B+Izxro0Ev7nOV1ANEufJOP/LDwFcUvy8m/f2/U7/F6ZqmKw401cgr+DWI941b7jfldz Vmsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723381268; x=1723986068; 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=OTIvbzcdHP4VOeLr4GHNQ8AKmTHR+13J050Ht/JJdaU=; b=SdWrs4M7wQjpudKWdJCGEQjJKUL7GElOPiFhuaCTjeqWiYWLO7IZD8ZRh4aP7A0EJc A5NpDj0ruf8okNRacPmQukAxDINoUivpirOYY5fSCLrBU1vhnsTMLAn4awDywKNKRIEt mtDmrXMRXPABhJ+zdymoq9qecDDIP6bFJH5olraO/EnTV0qfroX3+qf6mLIsgoo6Rn9S sgH8EDCp0NNuQ1ETBm48B8D4sXph3CdsIsZKNGIT18hk/nXFGcCxmsxmUkz07M/O3TI5 OsOvfEWKwgyp+JXsORtPaF1g45dC4+W2E+RlxEXhPtKv8hK5oyfL9jtI4aob1+BI7ti3 G12g== X-Gm-Message-State: AOJu0YzL4wecuRBsFkMdxAoqKwek99T7ko3J3AhUUfX7CyX031d7vP0J CMr9BfbmVUab0k0VsLcev+GX8/eiTmERVDEDyLFjv6/cl9udABJYyw3yTjzt X-Google-Smtp-Source: AGHT+IG4Ybu4Pi/pLQmtSiYyfZO505H78TbDcp2Vq9Gc64z/tgGG+ZRP7843zyyozaFdYk7J1XJijg== X-Received: by 2002:a2e:350e:0:b0:2ef:1808:7523 with SMTP id 38308e7fff4ca-2f1a6d1d0efmr42334201fa.18.1723381267979; Sun, 11 Aug 2024 06:01:07 -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-5bd1a5dfc9fsm1320046a12.66.2024.08.11.06.01.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Aug 2024 06:01:07 -0700 (PDT) Message-ID: <58426c2331204c75d230d62b226c033957583460.1723381182.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 11 Aug 2024 14:58:43 +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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -5.89 X-Spam-Score: -5.89 X-Migadu-Queue-Id: 3CFF23F08D X-Migadu-Scanner: mx11.migadu.com X-TUID: wW30jyIk8eJX * guix/build-system/emacs.scm (package-with-emacs-minimal) (package-with-emacs-next, package-with-emacs-pgtk): New variables. --- guix/build-system/emacs.scm | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/guix/build-system/emacs.scm b/guix/build-system/emacs.scm index 88304b9ce1..9ab8b493a7 100644 --- a/guix/build-system/emacs.scm +++ b/guix/build-system/emacs.scm @@ -31,7 +31,13 @@ (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 + package-with-explicit-emacs + ;; Common variants. + package-with-emacs-minimal + package-with-emacs-next + package-with-emacs-no-x-toolkit + package-with-emacs-pgtk) #:re-export (%default-include ;for convenience %default-exclude)) @@ -181,4 +187,25 @@ (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-next + (package-with-explicit-emacs (delay (resolve-emacs 'emacs-next)) + "emacs-" "emacs-next-" + #:variant-property 'emacs-next-variant)) + +;; We prefer emacs-minimal, but sometimes the "minimal" variant still needs +;; X support. +(define package-with-emacs-no-x-toolkit + (package-with-explicit-emacs (delay (resolve-emacs 'emacs-no-x-toolkit)) + "emacs-" "emacs-no-x-toolkit-")) + +(define package-with-emacs-pgtk + (package-with-explicit-emacs (delay (resolve-emacs 'emacs-pgtk)) + "emacs-" "emacs-pgtk-" + #:variant-property 'emacs-pgtk-variant)) + ;;; emacs.scm ends here -- 2.45.2