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 EJH+LYx7t2YV1AAAqHPOHw:P1 (envelope-from ) for ; Sat, 10 Aug 2024 14:39:08 +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 EJH+LYx7t2YV1AAAqHPOHw (envelope-from ) for ; Sat, 10 Aug 2024 16:39:08 +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=MOm+kMNu; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=bES4IYPr; 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=1723300748; 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=IS1/i4z0y6JVbww8Kkvdw2vhDplOlfcKWxxP17ig505myXWuBMj+hC4XzOdL3PjQp0JaHi pQ7L5DgGedS5IlOPmQvSYOproIGsGpEkVbatuVUFG92z/lY0lqA5dwaLTQc29sHjeSYl8P OB0uD38wr0AGh9h1OtNiDqZKLO2or1iQ8dDSunlLhX/8yt7wzU7kuoghUHp6sRvkdPq7OM e1emUPxwhcGAAn9k3TJG/40UUgR/mk9n3HvqRYboaw2o3zUUZEVe+Hx6TV2UH7amN/8TTM /JXdsUxGFCsRPX8qzpHVO/L1CmQ8hk0iLI2ilpZb2RdTk5F4aP9QGF8hmGp3uA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=MOm+kMNu; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=bES4IYPr; 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=1723300748; a=rsa-sha256; cv=none; b=S1z8bBPwjuZ7UMaZz1RcWqTFOVcGlo1EoJr7107M+6Eg28UkYgdBYBo831IEhp/oNUROdH fYQhqFuizu8rrXoxNUG4+HAjLukYEkjhi3Hyh8dYMMwqiIun8IlVcT8hbvty6LQYhVHF+k Fp5w8hwwt48+hKL5L2pC+cq+XheM1m0QMhjX30ZMvDxBcJ8oa9+yU2duU4um98cII8xPIX kqOxy7QEXAKXCd7522NFskcI52bEzR+O4Og4z12bjY4Dgq8cnaVJcjXctwl4LsrMg0uER6 YlCAArtKj6Bk0RoZwKkH2wqwIMgcPzxmmPvfzMlvHmKU7d7q54olfJfjNQgUYg== 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 51B7369E4C for ; Sat, 10 Aug 2024 16:39:08 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1scnEt-0002iI-EO; Sat, 10 Aug 2024 10:38:39 -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 1scnEp-0002gy-Bx for guix-patches@gnu.org; Sat, 10 Aug 2024 10:38:35 -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 1scnEp-0005RS-0c for guix-patches@gnu.org; Sat, 10 Aug 2024 10:38:35 -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=MOm+kMNu0MQ0RIOHSu+wTbI45S/ZFaIWUTPWFGpPlV1nINe8WEL8iA+axCMIa4Ks+/c7rs86wh6L9AiFqaYqMJY6TLKk2tkCvocPkPd1c6X1ZeXNDGr7s3iOK0MbA2OBT2LosLQoTyWhVsQk9htloz8KmVmee50lYvgxZSHm3/kiJY2DmFwJtR1WRmXJgFZT1Jv8HybiQHPYe3hLVnmfoxfLr3eu5B8/REuVEq2hs3jbSQFT5eXZGEHA5W2QFBUdN9uKg1mZhhSx3iykQXadFOM1CI7x3DAQ6IPeWvJ8JwTZsRlHUMzHKhd8UM9Hhsq8mHh/bOQxe/kGGFeUay5auQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1scnFH-0000K2-TS; Sat, 10 Aug 2024 10:39:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72406] [PATCH emacs-team WIP v3 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: Sat, 10 Aug 2024 14:39: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.17233006911115 (code B ref 72406); Sat, 10 Aug 2024 14:39:03 +0000 Received: (at 72406) by debbugs.gnu.org; 10 Aug 2024 14:38:11 +0000 Received: from localhost ([127.0.0.1]:40301 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1scnEQ-0000Hm-TE for submit@debbugs.gnu.org; Sat, 10 Aug 2024 10:38:11 -0400 Received: from mail-lf1-f67.google.com ([209.85.167.67]:52452) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1scnEO-0000Gg-Vb for 72406@debbugs.gnu.org; Sat, 10 Aug 2024 10:38:09 -0400 Received: by mail-lf1-f67.google.com with SMTP id 2adb3069b0e04-52f04b3cb33so6124275e87.0 for <72406@debbugs.gnu.org>; Sat, 10 Aug 2024 07:37:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723300594; x=1723905394; 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=bES4IYPrpC8XI03Phnrfbv5p0k8iAwGZYvpynP6kkNCBBNojxefpY4d30sOpjRV+YQ 3BKobzKLU4x5ibfBr51mwnY5YhUqWuUBrfP4KuYLaxWNTVG/mhCtC75hHF8+1CceGZB0 C2OBS7tfiOlGfGIlEu1DUL6QMSOsnire1QqAxo/cwBqZcaVFJ61vf6ghA1wvFNhP8Yec j75994wvigxf8vYxW7EzXFv4i2NziKxQ3+pG2vcf+7pifDnWNEnmJBkfzRNM+ZczRJP/ vBlCXOFKnBV4pBCRU4+gUBl1PGZD3m1WyuoBD4OAx3wrsgpuOsUKoztlgaA6ozeYHU18 NLjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723300594; x=1723905394; 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=uOUj949yijKa0ymiCcm5LYHkkEuE41Q7f5XM+kl8GeDAmyE2iyC8cTr4OAtxfjNAOV n7HsyGwo7dwN0AO81HMXoJ9vTZOtL+T4B8oxNhHmA1Wg/UP2H1dGN37J2/yZXmbGNi8R ZbobBn6xtb3hmL7RQbdm+ta02ueTUQGTVpEVX7pPDySgO2ilLGOdyeUKJn4S7ZN+PuyK URVLIwAYCe7BPKkBsWS1zGUgO/7T00aRAHwv4ICuPFWmSEkwcH1873vKHCWsD5LXceT/ 4VYdx3eDuWHu+fbqQQjPw1X/PZ1aNi7GRvrtY3FbW2quk5GqdzT7m5RAtYS3O3CdGw6k rSKQ== X-Gm-Message-State: AOJu0YzYUAn20k3ZH58BEc3Ita2qqz3H3EvIVCe9ntUBeNOqr6P4jdju 0dIhoULEEVjpB0jcFEwdXdHzPUoTZjqxn15MXNGgcZLiRmCJ2lwShGRiUMSS X-Google-Smtp-Source: AGHT+IEsJe4L2hAuUOTeKxN+RA+TUhMsvJfECL8HfxwHVPp1uDtvVWWsNqmANQVMXl06OnGTJUXUOg== X-Received: by 2002:a05:6512:104f:b0:52e:716a:1898 with SMTP id 2adb3069b0e04-530eea22a54mr3501793e87.58.1723300593503; Sat, 10 Aug 2024 07:36:33 -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 a640c23a62f3a-a80bb09056fsm75280166b.15.2024.08.10.07.36.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Aug 2024 07:36:33 -0700 (PDT) Message-ID: <1f5ef683255789a648c45509a55e42c057b6a724.1723300543.git.liliana.prikler@gmail.com> In-Reply-To: <13d156332d5c04a9ab411ee24dca58f001b6eace.1723300543.git.liliana.prikler@gmail.com> References: <13d156332d5c04a9ab411ee24dca58f001b6eace.1723300543.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Sat, 10 Aug 2024 07:54:19 +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: 51B7369E4C X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -3.99 X-TUID: afdvGphDvBb9 * 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