From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id IGH/ENe2uGbdfQEAe85BDQ:P1 (envelope-from ) for ; Sun, 11 Aug 2024 13:04:23 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id IGH/ENe2uGbdfQEAe85BDQ (envelope-from ) for ; Sun, 11 Aug 2024 15:04:23 +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="cLmWr/HN"; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=JILqskDw; 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=1723381463; 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=LV25mUHM19oetEZruEJsN5XvS0DoXiWnsIZ2iIV9jXM=; b=trXhOUEviDndNWpp5xK0LwWJvls15Lv96v0wS4WV0WhLDABHeo64pUwSC6aZS4Mp498EyT WXuVEEcU2NmpvdBxb7SRaZovIqcVcy9l5+AAc+XFfDK7PHochfjC/ycfk9BxQ9wxQjNU3S QuQnqANCGQAYE9Do0XsuGKZpMs+NujHZ438u8jLO/uJJgOUzdc/tqf6KkfId/hexiMKe/n Bcfwama7txpHjAHCXlMGxkCfChFpNRIhgnm9wI7vCh1q4/H39+M/dmtK+Jl7XnEtRl53F+ wcE4ZnUs2vrXIDnhcp4aM+apoaaNtNy7ofbc+OFEjLwFsNR9otFqSoNC0gsY9g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="cLmWr/HN"; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=JILqskDw; 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=1723381463; a=rsa-sha256; cv=none; b=mVg9AGs3O/U7ZcbWTppxIPLGNsBxxqIsew8x1/boYA04s4leH2qn7iVn3CwJiOLyQmJFMK A8mAD9vOaB/8EIqgX5DljCHhLuOICk4wQFsqK5i0fXV1YeL1Cc9MgtYfauMw2AXNpHkPzE go5QVr0hx05XVxTtDhxfCHGEKHoKcnhT3VS0TBuqvYwJVq2gzJaW4iTUMyfAo1x9gRb2LR i8zAN4H5XcQot5pIe1J667E9uBi9sOZ6HQr9cdG+DVAhUx4/N38vbwloZCF7OUmEPCx7Sn dLkfxKaIuBDfefYEbnJkiodCclbjHjQIXUbExDaO9SQWbuLx2f6u4+exzTy2Xg== 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 10CA950D46 for ; Sun, 11 Aug 2024 15:04:23 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sd8Ew-0004In-VS; Sun, 11 Aug 2024 09:04:11 -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 1sd8EQ-00040O-DJ for guix-patches@gnu.org; Sun, 11 Aug 2024 09:03:34 -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 1sd8EO-0003bE-Se for guix-patches@gnu.org; Sun, 11 Aug 2024 09:03:33 -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=LV25mUHM19oetEZruEJsN5XvS0DoXiWnsIZ2iIV9jXM=; b=cLmWr/HNXoTkAqaSvSnbptLILgnR+1MNQ4wSDyJuE6bNvSwNQx8XoBu253YDs9CCmWSwS0Ulka8nF5uvX3ajvgyxNyHaOM9DBq3pqho/WcDXTXOd6EjMs1pOS5s+9KajvO32WWhK676GQ3G1Bs32D0bWRunsE77TKZYhrcvH0SscIN0Q/88rVRKt9nE+RrR4YOX41kxR/XcdLjL/KK+RRU4WSJ9SBmX9MhUiyMFovWq2sIi0vemX1nzSJFT2p3zGXje1X2+Mp6ds7cXsSdXnAquODz7uSZCyeu/7tFV/23POBylzOU1SDk2pf+8VOLI6XrHATvXbPj8tXSnMUesxsw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sd8Es-0003pm-Mn; Sun, 11 Aug 2024 09:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72406] [PATCH emacs-team WIP v4 21/24] gnu: emacs-exwm: 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:04: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.172338139814617 (code B ref 72406); Sun, 11 Aug 2024 13:04:02 +0000 Received: (at 72406) by debbugs.gnu.org; 11 Aug 2024 13:03:18 +0000 Received: from localhost ([127.0.0.1]:41053 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sd8EA-0003nb-5T for submit@debbugs.gnu.org; Sun, 11 Aug 2024 09:03:18 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:61931) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sd8Dp-0003h8-BS for 72406@debbugs.gnu.org; Sun, 11 Aug 2024 09:02:57 -0400 Received: by mail-ed1-f68.google.com with SMTP id 4fb4d7f45d1cf-5a309d1a788so3716332a12.3 for <72406@debbugs.gnu.org>; Sun, 11 Aug 2024 06:02:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723381281; x=1723986081; 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=LV25mUHM19oetEZruEJsN5XvS0DoXiWnsIZ2iIV9jXM=; b=JILqskDwYktkfIk+qe3jWnMCLn+yCw+MZPqiz4h0bXEZcqSjryLw5MZqm+E2nqD/W/ BKQuO08vOxBBzzn7+KwdFGDT1QF+hmAwcBLPslLpqlW+vC2zWT/3Zgecq77R4FBoIuB2 GKw3igUOl0yv1sZQSekBUCd4IrCCr/FCPdDMEA7tBf/v+He19cZZsaLfdUk/RRHFNF5e NDgNuPb2t4qcTXqDE5TKE9d5hBeNCQZ3bmF6xcvbFUOYorsWsUHh9bC0UGvVB39SRxJ+ yFJDH71Plt1A4EZy98zgYs+j1PXm9nov2pOTdgIm8FP58A+uL2aqOOGTJUD5nJNMAwcG uYuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723381281; x=1723986081; 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=LV25mUHM19oetEZruEJsN5XvS0DoXiWnsIZ2iIV9jXM=; b=waSZgtWVRw/v7zamKSMqDvSjlDTCG6UMEmplNrQ+pLwx/jI9zqhXbG7g8tAEnY5RVO DgV00zD4QlKVrqCu6gvV7HTYD83O2JHcUsHv8NP9NXGP97ncBctFmR5Uq7lSIWAxErwM W3HjG3snhBkMOiEZITi+T+ehMbcC4yARDhR4dMNOb84tau13OYb7GLruUlXcGV3mNpEl A9yy9QowhpFCiGJ3IGkRPYAxRqQMUeoxi8K8TGWU/NpU9VlsdRCEp0z6L65ngXHEbvUf qjgjHRbV05l5wV5jByMG5FvDCxG4gf7P7kUnVYA8vLT/QNO8Wyf+R2UBKrLSurJUn72r 2pFw== X-Gm-Message-State: AOJu0Yzn1K/EJXYVM9unL0W47nzZ5tN4PqcF7SAiZ7yBV12nquy9xLZT lFs1Zg8jKXktLvdz9YMUNOqJY378yCyxx4eGBERAHyLTIx/6mmMeHA2iVQFZ X-Google-Smtp-Source: AGHT+IH1YmRJkPCHzStBxmD6MraUjK7BF3owNg9IuD1stsMutTgvU4muGbLV8FH6T71HDevSqvAQfg== X-Received: by 2002:a05:6402:458f:b0:5a1:c40a:3a81 with SMTP id 4fb4d7f45d1cf-5bd0a6603a2mr3203546a12.35.1723381280915; Sun, 11 Aug 2024 06:01:20 -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.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Aug 2024 06:01:20 -0700 (PDT) Message-ID: <50bc1699a6adb4523809ae0cdfb34e3c6345f599.1723381183.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 11 Aug 2024 14:58:49 +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-Migadu-Queue-Id: 10CA950D46 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -8.89 X-Spam-Score: -8.89 X-TUID: 3LqcPBaSCmW1 * gnu/packages/emacs-xyz.scm (emacs-exwm)[arguments]: Drop #:emacs. [properties]: Add ‘minimal-variant’. (emacs-no-x-toolkit-exwm, emacs-next-exwm, emacs-pgtk-exwm): New variables. (emacs-exwm-no-x-toolkit): Deprecate in favour of emacs-no-x-toolkit-exwm. --- gnu/packages/emacs-xyz.scm | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index b825cd26e0..b63bd372a3 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -20302,7 +20302,6 @@ (define-public emacs-exwm ;; x-display-pixel-width, x-display-pixel-height (arguments (list - #:emacs emacs #:phases #~(modify-phases %standard-phases (add-after 'build 'install-xsession @@ -20343,26 +20342,20 @@ (define-public emacs-exwm (description "EXWM is a full-featured tiling X window manager for Emacs built on top of XELB.") - (license license:gpl3+))) + (license license:gpl3+) + (properties `((minimal-variant . ,(delay emacs-no-x-toolkit-exwm)))))) -(define-public emacs-xelb-no-x-toolkit - (package - (inherit emacs-xelb) - (name "emacs-xelb-no-x-toolkit") - (arguments - (substitute-keyword-arguments (package-arguments emacs-xelb) - ((#:emacs emacs) `,emacs-no-x-toolkit))))) +(define-public emacs-next-exwm + (package-with-emacs-next emacs-exwm)) + +(define-public emacs-pgtk-exwm + (package-with-emacs-pgtk emacs-exwm)) + +(define-public emacs-no-x-toolkit-exwm + (package-with-emacs-no-x-toolkit emacs-exwm)) (define-public emacs-exwm-no-x-toolkit - (package - (inherit emacs-exwm) - (name "emacs-exwm-no-x-toolkit") - (synopsis "Emacs X window manager (without an X toolkit)") - (propagated-inputs - (list emacs-xelb-no-x-toolkit)) - (arguments - (substitute-keyword-arguments (package-arguments emacs-exwm) - ((#:emacs emacs) `,emacs-no-x-toolkit))))) + (deprecated-package "emacs-exwm-no-x-toolkit" emacs-no-x-toolkit-exwm)) (define-public emacs-switch-window (package -- 2.45.2