From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.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 SG4NMui2uGZAQgAAe85BDQ:P1 (envelope-from ) for ; Sun, 11 Aug 2024 13:04:41 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id SG4NMui2uGZAQgAAe85BDQ (envelope-from ) for ; Sun, 11 Aug 2024 15:04:40 +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=RhOzDTYX; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=krg1qhu0; 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=1723381480; 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=37RlqtBN1i8IihMtwTnFIfRlhHDHsIxkdH0XA7VtBp0=; b=aEjOxQ3IHWKvOhzOLlxoFHpOR0t75JQnSM/wsBp9JQBGGA9ZLm7TdJ05GhFTUb2BougDgT IecJSbQE+kyY0p8r1tk6RbawiJLerRmZ2rJ1twdsu/SEqKdTmNPT+uo/JU0Dj5/MkEpbvk pfuPzXgFEgYnp2YOJo0Zy2duqzP6iMAO/sN/mp25PR7LIIK0vzzUDcACMc4yG3gNOAxG5S wjKLmgtZftGOhRUpO5/CJ/n0RgmRBxRhewof+mBQxvhsizA4HRSatXnCR+/l8pFVNx1qbn GE6q74HAeYIv1qiJVUqbgx4UfJsYIHWsYaes7ygsnJXNM+8ogn7oC7j67UFb3g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=RhOzDTYX; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=krg1qhu0; 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=1723381480; a=rsa-sha256; cv=none; b=bjkG8CNtw62zfqrz3JLmgiBl7N2qSFnpGTzsXIvpfIwBOj7ed5mUVyADODQmpUglCLXU7k y2apGp1zuqMynde0r3mpEoH89ACEQ13KYL52vrWDX1LK1N1CpuuXUKnjL8TsFk5bSsfWkP CjyZuY1c9VMS+KINi7v/Q9+POZxZ3vZdKL5B2w/KEYmqgQC7VpKohbBlEcHkH0bnzckvQz v8x0PaBFVYwQ7CfeBgzyDDEYMhnnwIh3P1/3YHZWufMRuivwx7/+AyXP8V8A9++hGa6K9m LC762BByF2Zit3oytzsjSD2Vy/n3Wzgw5oj0QO4xl4EP2t4dm5OZNjCbOxzXbA== 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 9AF24203EC for ; Sun, 11 Aug 2024 15:04:40 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sd8E7-0003fa-04; 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 1sd8Dc-0003Tv-BX for guix-patches@gnu.org; Sun, 11 Aug 2024 09:02:45 -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 1sd8Db-0003Tm-PC for guix-patches@gnu.org; Sun, 11 Aug 2024 09:02:44 -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=37RlqtBN1i8IihMtwTnFIfRlhHDHsIxkdH0XA7VtBp0=; b=RhOzDTYX30eypenLY8kN+g9Sk+e5fAui95N5GkAvtf7IbmhdDPc3zG6DXIqv4BJKhLwZuJ6wXEeSdMkthOHy45j96RpGgQ6e87Hq3DHT2mfvSHH8oBEpvc3AYuV4813B2iCltc5gb9CijqGEIDegAcUV5njFQHX86DtPxf8+3aX3mz+yjd2R76vqF8BI1Mt5g0gtrsxjeavv2+HpbQ6dJUEFosl8X/RnWLF7qkCmSyBbMYveZgHn7NVst5mcVSqlYT2FWHbmC8QY5YWnNzywrgzo37zveHy/vYQd8b5y4JE9CeiLhMAFoWzLeKC1dHnx4EG64x+4LmW1spDWuQQyCw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sd8E5-0003my-68; Sun, 11 Aug 2024 09:03:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72406] [PATCH emacs-team WIP v4 18/24] [WIP] gnu: emacs-dvc: 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:13 +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.172338138814474 (code B ref 72406); Sun, 11 Aug 2024 13:03:13 +0000 Received: (at 72406) by debbugs.gnu.org; 11 Aug 2024 13:03:08 +0000 Received: from localhost ([127.0.0.1]:41016 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sd8Dz-0003lK-PM for submit@debbugs.gnu.org; Sun, 11 Aug 2024 09:03:08 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:54667) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sd8Dn-0003ga-Dq for 72406@debbugs.gnu.org; Sun, 11 Aug 2024 09:02:56 -0400 Received: by mail-lj1-f194.google.com with SMTP id 38308e7fff4ca-2f1870c355cso34120731fa.1 for <72406@debbugs.gnu.org>; Sun, 11 Aug 2024 06:02:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723381279; x=1723986079; 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=37RlqtBN1i8IihMtwTnFIfRlhHDHsIxkdH0XA7VtBp0=; b=krg1qhu0OAoBhCDb3KTHCEyHOj/wXUFyX78M5OMA0WXqKpCBbmLrRZ8Il8Titpw2pV Au8eFEx8Pw05llA9It5MAUTQP/OPAY/Qo3Sl0CshjD+cqOJtlNP0C0Tqxghx+Hiicbg7 NQtmDXN4gJiNyYD2FFLCxyPYcRPBv7wY/XROHspc3r1fERzD0nRrzDCSSyocgGI8/Ayn u+Hsw5DWebGneRxwYbgbdRkG6pu/IJ2bmCNrEp0IDIrIyP+8TykCIPcy45qiXokECiDI B6mZaYpT8zm4YKiRlboG/fOleWwrz5UON0CMuh5r0WwgDgJ5GCctzHqy7Z/kcy2AOS7S eosw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723381279; x=1723986079; 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=37RlqtBN1i8IihMtwTnFIfRlhHDHsIxkdH0XA7VtBp0=; b=og5lQo27JwCcq8ibNqvnltPH5h8IhwX/vbr0Bi3PNP8eoxXrRJMRgi8owFSsanhf/u xL/ac46RmfS+6gxzIlgqiJPRL70vJ9YA9mioRBo2TOAkSk4XZieVjRYhAXoV14QmztUJ a4dehgV4uRvI7IFdRf83qHNTxRwhzkayVvCVoRjO0Ea3pP46BxxSl4UxCyhe517qwGqK b8bKZ+I+gqAcoFI+AxNAV9ZJLtsSXK8CzlC1el2NTd88jXksVyr+WPCwfwzi9zO/chd2 swVMb+vElGzmROP+Pb8tYBVdHYI8apghKm8dMESkk6F2c7HbtV4je5JnzEBqRBp7HQM+ LfsA== X-Gm-Message-State: AOJu0YzWXIyNZylXsg0960qQ7CrKkUt/ToK6VK3vNH0A/rAgeuIbPJQm 7J+TNv55ZYmsEet0gSC/YYE8cBlUs1e9XrFrGloB+gtKsVa/cwYMv+i4M/LJ X-Google-Smtp-Source: AGHT+IFJIXYXyDwdTuqqrxF3oflSINNy/b4a80iSe/VnBX+GiVP5niCwj4VW+wBa2Zuxw88YE5Qm1A== X-Received: by 2002:a05:6512:2344:b0:52e:97b3:42a1 with SMTP id 2adb3069b0e04-530ee9cf372mr4480632e87.24.1723381278641; Sun, 11 Aug 2024 06:01:18 -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.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Aug 2024 06:01:18 -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: 9AF24203EC X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -3.99 X-TUID: 8TrrcGk/cSiC XXX: Only emacs-minimal-dvc and emacs-next-dvc build currently. * gnu/packages/emacs-xyz.scm (emacs-dvc)[native-inputs]: Replace emacs-minimal with emacs. [properties]: Add ‘minimal-variant’, ‘next-variant’ and ‘pgtk-variant’. (emacs-minimal-dvc, emacs-next-dvc, emacs-pgtk-dvc): New variables. --- gnu/packages/emacs-xyz.scm | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 764b535d45..f0fb00a697 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -9349,14 +9349,36 @@ (define-public emacs-dvc (("@itemx drop") "@item drop") (("@itemx left file") "@item left file"))))))) (native-inputs - (list autoconf automake emacs-minimal texinfo)) + (list autoconf automake emacs texinfo)) (home-page "http://xsteve.at/prg/emacs_dvc/index.html") (synopsis "Emacs front-end for various distributed version control systems") (description "DVC is a legacy Emacs front-end for a number of distributed version control systems. It currently supports GNU Arch, GNU Bazaar, git, Mercurial, and Monotone. It also provides some integration with Gnus, e.g., for applying patches received by email.") - (license license:gpl2+)))) + (license license:gpl2+) + (properties + `((minimal-variant . ,(delay emacs-minimal-dvc)) + (next-variant . ,(delay emacs-next-dvc)) + (pgtk-variant . ,(delay emacs-pgtk-dvc))))))) + +(define-public emacs-minimal-dvc + (package/inherit emacs-dvc + (name "emacs-minimal-dvc") + (native-inputs (modify-inputs (package-native-inputs emacs-dvc) + (replace "emacs" emacs-minimal))))) + +(define-public emacs-next-dvc + (package/inherit emacs-dvc + (name "emacs-next-dvc") + (native-inputs (modify-inputs (package-native-inputs emacs-dvc) + (replace "emacs" emacs-next))))) + +(define-public emacs-pgtk-dvc + (package/inherit emacs-dvc + (name "emacs-pgtk-dvc") + (native-inputs (modify-inputs (package-native-inputs emacs-dvc) + (replace "emacs" emacs-pgtk))))) (define-public emacs-sudo-edit (package -- 2.45.2