From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id ILK+I7i2uGYlPwAAqHPOHw:P1 (envelope-from ) for ; Sun, 11 Aug 2024 13:03:52 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id ILK+I7i2uGYlPwAAqHPOHw (envelope-from ) for ; Sun, 11 Aug 2024 15:03:52 +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=IMDpXdme; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=Qk6DrsP5; 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"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1723381432; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: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=yfUi0Z9w+vHHRoXlCrRoTigY8hqlCXq1KppZcdQARNU=; b=oQvTFblMieBvcmEMAO4o20iIkI0B5wQJDc2Z4HiRdgUXbXpdqtR8r60IrmBEDgfPUbtEzv sYm0YWWJQp7tQbFA8hTUug7CXB3JtzmInxYBhPhcag8ChbZw3ddesxdldzqR/lzCi5b15b 3WCUAGdpJkk+xT64Yg3+iUYSRsdgvppZCB5HCQy4YTRiWpioopFnpCkV+SI3xX2OETHdnZ j1NYNLQdywRubsGliJEJ8R+e9Vds8xDsK2KE1/E9iqFYqq/FONOXZlaabmtzs8rIzc0ORs cG3Z2RNqoHx/1Sil0f/bE8qq8Htwg1cut38IHaVr/xioL8/yMlgsBrFcazUcow== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=IMDpXdme; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=Qk6DrsP5; 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"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1723381432; a=rsa-sha256; cv=none; b=g6E/5XdURt3KyocAg8wGz2oXcc9Ydk7KxOzJJpP7k/OXV/FiMymjNGPJ7d0PJplHrQzY3L XJEw/OFkout6u4d/NKkF/zwnTSSfMQv7x/+xJRbkAcTBK8gneFMkkxWVd3n4Vz1EgWLP0c XejCA8uxVKo202bN/Cx1n4Vkma3oih46h/4tPw6SVCjZrpG9jnpRPeBgHL3dk59zaGA7dL Vmlf6KiAhZPnEoItC9OL8t9SwY+ZP9jB0AQIJK0Z2jWQpSZYS95LvFq14ZUxqgO0xOO6M6 6u3Te0OjhxaqawhHfN7EErKr6d1CAHY729+6q5s8QuidRtfp84unq5Sp9/AAtA== 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 62FBE2054F for ; Sun, 11 Aug 2024 15:03:52 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sd8E6-0003eb-Ij; Sun, 11 Aug 2024 09:03:14 -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 1sd8Da-0003Sq-FE for guix-patches@gnu.org; Sun, 11 Aug 2024 09:02:43 -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 1sd8Da-0003Tc-4M for guix-patches@gnu.org; Sun, 11 Aug 2024 09:02:42 -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=yfUi0Z9w+vHHRoXlCrRoTigY8hqlCXq1KppZcdQARNU=; b=IMDpXdme8dV2Etsp00rG3N1TJh/jQjZJwltvjnjn7lfeZOrlTd+O3hgnAXz5QkqZjX9knooQen9ev9XWTyQcvfuXZSkpIJdTHMbwQxVgvehBc6URwUWF2cFiHBaWrlHO8wwpVr88lC1HJgRwOYrI96afVA4NFw1t6wA70dPo3yrbXacDm1eZoQvulXV2x2ruHGX6nniHeKaCeNEAFlLXcMXStRfgOgZHfiSx7wOw1Z8DAtQCH42JDuS11aU0+XHVyqAeQnoB5Sf0IjYSqGxoHyplEu1wB2oFNkmx/SmJZn2Qk7+k2KAHeazcqJxX68TY8QtxAXk9yYSDDxxJz1QPHA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sd8E4-0003mo-Lx; Sun, 11 Aug 2024 09:03:12 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72406] [PATCH emacs-team WIP v4 17/24] gnu: emacs-guix: Build 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:12 +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.172338138714464 (code B ref 72406); Sun, 11 Aug 2024 13:03:12 +0000 Received: (at 72406) by debbugs.gnu.org; 11 Aug 2024 13:03:07 +0000 Received: from localhost ([127.0.0.1]:41011 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sd8Dz-0003ky-0Y for submit@debbugs.gnu.org; Sun, 11 Aug 2024 09:03:07 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:55354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sd8Dm-0003gH-Ct for 72406@debbugs.gnu.org; Sun, 11 Aug 2024 09:02:54 -0400 Received: by mail-ed1-f68.google.com with SMTP id 4fb4d7f45d1cf-5a156557029so4078792a12.2 for <72406@debbugs.gnu.org>; Sun, 11 Aug 2024 06:02:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723381278; x=1723986078; 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=yfUi0Z9w+vHHRoXlCrRoTigY8hqlCXq1KppZcdQARNU=; b=Qk6DrsP5wVCfObHk/U7ZTYCCbW3eQDIffvupM7VrdtCUKRskn9R2nc9kKEa1L6QCEP eUsIB8Gbaysb3BL3hCYeLYm8AwRMm/8UMdHFToal8A9da5DYtMaE+g+LmfMOuIukVUCx ijVONMaobUtFzj/6SBo4jZX63pfMmEgSHcgXsRmYw1AIU5V0RDKQGhAZAWG7u3ZOSQr2 Omggk6u8DVMsfhrxehRP286170gyZIoDw1Zw4ByunpGwkaAVJitKc/CcS/2941/R5bBK zMMEBcRqFaHRXnhnhEEkH++XgDqPnECcLjbat4CbzciEDo6WWVhkqO/TjTq7Phic4Uw0 jpBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723381278; x=1723986078; 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=yfUi0Z9w+vHHRoXlCrRoTigY8hqlCXq1KppZcdQARNU=; b=l+8Xnj5DAgorEYJK02WehOMqYK47zrXUhEU4Q/FIkRCMmw8H8xrqw6S3SyUWGKrUoN jeA4udXbI/pVsQfs9mXQo4SCWGogEqOOjrvxrVb0ICYAvX8Ior07yWXTyLbIjqp+R1cb 2ZyB+znAIaihowKBsTON6buWJzBAzTtaRU5R8Sqpverk0LRr+Qyk0yzG8OPnHxSY0Hp/ /LibEGPjGz51DLc5Zz9EKXFUMmSJMr5Z/J7zTMMDdXWk9IfqKa68H1wNn71sdQLP80eh tstOCnx3UswYfvz2ikW+Z8inixb6wxpA79jtSRR34PKzJnDbPRZ4+tLVD3c/5CTYgGHF MZDw== X-Gm-Message-State: AOJu0YyoZJMi4373OGVCOkzvPff79MgViuc9oKubAFOrrzwdr8CXUXjz bA9lKDan8lYiAvDUmZLu7La3SfzWaRpDO6K4x246RoZLE6zEVuns0cbANHAK X-Google-Smtp-Source: AGHT+IEtxQU2aZQeBV8bXaDvouQ0yRjpdXTC7/Lr6gds+MPTY/AXyUaFzH65k36CPyxHKbL2GomSuw== X-Received: by 2002:a05:6402:5107:b0:5a2:8bef:c370 with SMTP id 4fb4d7f45d1cf-5bd0a55295emr4705393a12.15.1723381277948; Sun, 11 Aug 2024 06:01:17 -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.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Aug 2024 06:01:17 -0700 (PDT) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 11 Aug 2024 14:58:48 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: -3.99 X-Migadu-Queue-Id: 62FBE2054F X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -3.99 X-TUID: KbfVi2I+/k1L * gnu/packages/emacs-xyz.scm (emacs-guix)[native-inputs]: Replace emacs-minimal with emacs. [properties]: Add ‘minimal-variant’, ‘next-variant’ and ‘pgtk-variant’. (emacs-minimal-guix, emacs-next-guix, emacs-pgtk-guix): New variables. --- gnu/packages/emacs-xyz.scm | 47 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index d10b2c0f1b..764b535d45 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -6216,7 +6216,7 @@ (define-public emacs-guix ((assoc-ref emacs:%standard-phases 'expand-load-path) #:prepend-source? #f)))))) (native-inputs - (list autoconf automake emacs-minimal pkg-config texinfo)) + (list autoconf automake emacs pkg-config texinfo)) (inputs (list (lookup-package-input guix "guile") guix)) @@ -6235,7 +6235,50 @@ (define-public emacs-guix Guix package manager. Particularly, it allows you to do various package management tasks from Emacs. To begin with, run @code{M-x guix-about} or @code{M-x guix-help} command.") - (license license:gpl3+)))) + (license license:gpl3+) + (properties + `((minimal-variant . ,(delay emacs-minimal-pdf-tools)) + (next-variant . ,(delay emacs-next-pdf-tools)) + (pgtk-variant . ,(delay emacs-pgtk-pdf-tools))))))) + +(define-public emacs-minimal-guix + (package/inherit emacs-guix + (name "emacs-minimal-guix") + (native-inputs (modify-inputs (package-native-inputs emacs-guix) + (replace "emacs" emacs-minimal))) + (propagated-inputs (list emacs-minimal-bui + emacs-minimal-dash + emacs-minimal-edit-indirect + emacs-minimal-geiser + emacs-minimal-geiser-guile + emacs-minimal-magit-popup + guile-gcrypt)))) + +(define-public emacs-next-guix + (package/inherit emacs-guix + (name "emacs-next-guix") + (native-inputs (modify-inputs (package-native-inputs emacs-guix) + (replace "emacs" emacs-next))) + (propagated-inputs (list emacs-next-bui + emacs-next-dash + emacs-next-edit-indirect + emacs-next-geiser + emacs-next-geiser-guile + emacs-next-magit-popup + guile-gcrypt)))) + +(define-public emacs-pgtk-guix + (package/inherit emacs-guix + (name "emacs-pgtk-guix") + (native-inputs (modify-inputs (package-native-inputs emacs-guix) + (replace "emacs" emacs-pgtk))) + (propagated-inputs (list emacs-pgtk-bui + emacs-pgtk-dash + emacs-pgtk-edit-indirect + emacs-pgtk-geiser + emacs-pgtk-geiser-guile + emacs-pgtk-magit-popup + guile-gcrypt)))) (define-public emacs-build-farm (package -- 2.45.2