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 mIaMLKS2uGZSGgAAe85BDQ:P1 (envelope-from ) for ; Sun, 11 Aug 2024 13:03:32 +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 mIaMLKS2uGZSGgAAe85BDQ (envelope-from ) for ; Sun, 11 Aug 2024 15:03:32 +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=EBkJrkUN; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=U8Z67QPv; 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=1723381412; 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=DypNhgjHLP9mL1qaqTf/DKwVgnOxWmygxY4TWQwARyE=; b=GhtgpmvAewzmK6f/leZCdELIDsNRtYTu1w+EqvQXfhgWCFWQgFzIzhtKnvGkMevctFFr57 oyH2yvemuEzRIInNGOMNp3B1rbKoQPPgNNOjPYhomidb5HuOXb2CFjOMZBBtfhf6Np8nm0 xIlWw2mT8b6UIsrrvzvXEd49KDo8TScu3bJjy7P9LdHDRyVOOniZCLULUye2Q2s7YqiYbW pYySQnGvM8MLsln+M/Jbox+cCdBhODl3EDvoVbPm6xPznC3ML6U6mpfJKNgCQKY/HXDJuI iPhhpPcpVoAkMt2SkpG6Gg1CTJvJt7VibhT93ZL2Z8qP5afbvAKZqk6tMBGmUQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=EBkJrkUN; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=U8Z67QPv; 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=1723381412; a=rsa-sha256; cv=none; b=bNhrvMFitin1bgz6QwKNSmLyH4mrzEuTgRRF6QesGJ8HrhBSeHMDphXKoIXDO5aI1z8qGw e8H7JU6SNQhZ89SOf1j1V1nXFH5LqP/kAFqtE30uD0x7f08RPeXWZP8Hiqa46FBcdIljOW YiqIxNCu29W3vAvuBGSHqRCQK/qaKqDqstvAvgUgdb8XciCBTxOIOlXRQaTwxOgtBDDhiR 2zmSXk8p7N58lTHYRQPrWsg1OCpzi/Ap/XTj48su9yb/75CKj2rNOhoRXYWSuQt/NkQMvI WCuS9PsCTEIhMN6BoTrxAyJMmPThmxIuTZ/uRZQglvFZe4H63AtHrRNqTdaUIw== 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 7F65250D90 for ; Sun, 11 Aug 2024 15:03:32 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sd8Dh-0003UZ-5d; Sun, 11 Aug 2024 09:02:49 -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 1sd8DT-0003RA-Ja 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 1sd8DT-0003Qs-9Z for guix-patches@gnu.org; Sun, 11 Aug 2024 09:02: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=DypNhgjHLP9mL1qaqTf/DKwVgnOxWmygxY4TWQwARyE=; b=EBkJrkUN9Tv16uXv6mL29oMXDJr3q1bGkhoBPG+g0ngTHeUKjs7umQYNDg05mwauFULcOgXMsjug8YS7KDmSY4soEwsyijvxuBy0WDV2l9XGaaGlWG9g1Eq1FkWKmTXthpX+/0SjA2Odtu24y8c+2zvYad/x8n6Q6kfTxUteBI+5yJMvhlANBnQNrn5QkEGdaLLjjbNHyck11lbnWktZitahMvQhljbGPKYIL6n4CYLhHVAsZy72a55eaxV/RagC+JJzX7dGBmvGB0kEo0J/HFAGd3822nz7heQ2HmnjFiEKNolJIdcRb5IDQ8j8RO5fvt9FumthBqxVl1BeUkKXKA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sd8Dx-0003kP-QJ; Sun, 11 Aug 2024 09:03:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72406] [PATCH emacs-team WIP v4 06/24] gnu: emacs-libgit: 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:05 +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.172338137714259 (code B ref 72406); Sun, 11 Aug 2024 13:03:05 +0000 Received: (at 72406) by debbugs.gnu.org; 11 Aug 2024 13:02:57 +0000 Received: from localhost ([127.0.0.1]:40962 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sd8Do-0003hm-PZ for submit@debbugs.gnu.org; Sun, 11 Aug 2024 09:02:57 -0400 Received: from mail-ed1-f66.google.com ([209.85.208.66]:42338) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sd8De-0003ek-Fz for 72406@debbugs.gnu.org; Sun, 11 Aug 2024 09:02:48 -0400 Received: by mail-ed1-f66.google.com with SMTP id 4fb4d7f45d1cf-5b9d48d1456so2257079a12.1 for <72406@debbugs.gnu.org>; Sun, 11 Aug 2024 06:02:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723381270; x=1723986070; 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=DypNhgjHLP9mL1qaqTf/DKwVgnOxWmygxY4TWQwARyE=; b=U8Z67QPveRbf9nMz2HarWPCJuZnZJlfrAtnVpCujwnFfZutRACjVxJwpigS8ivyLm2 +G4wLaj1Y2XSwu5qArSCerjAnBATHiWxOvYW2NnNw7WuWF+XcjuxGETzAtUq1tzJrVo8 V5l4Px6C7sNli2L01IizeUHTj6K2OTXs5qZys9qiFgq9CCapURvcDi+GLGErEIO2u6pT UwBPvWEV7Snoikj4tyiFXw2gu3k9FIEzKo4pA6P8boOZtOLSQztBsGrgCflfiH45Paig xq1apg0pLyYVuj0F6O93Ft0TxHshNl5varaXVEVUqkqqdWm2lZvFaEqLit/YPmRlfILP C3Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723381270; x=1723986070; 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=DypNhgjHLP9mL1qaqTf/DKwVgnOxWmygxY4TWQwARyE=; b=tK8abGTxshvdPqgEaVtcOg/s+1j7GpKIq8EzALgP2xEzvdNjHz1iEApQwxJg4yiy/r YEz0cHmlhwadubTKRjjcLght5xMwJTywkgZLMa5pKDNXslQ4A83jBgpHC434fTbVHk8z /Now6T99BgD9dDteNL0glRaPNmMhjQmVWHoHxFh8lyC1fMdKOnedkV9MaXdXr2fk2GJS qpMW+jahi6bi11gyU/tsSR1zOmS73BCjhBDNhx9SqnOGDQj2vMH87rLD59x1Bp08b9UY RR71s77nz83ic1Ehn95Z6V7Cslu1+uZw8b9U8U39oXIIcKGP/XsGCVnwa4X+p+Qpf9aa /t1w== X-Gm-Message-State: AOJu0YyxFfgicO1jUgZZhe66mBuS5gkVYSGsYOutQpBT5T6Nupmb18Qd QPy7gONNG5xTjMygMVvLv0CeghwskCG2kT8eHn/tkxE33X103En+T5cgf1VF X-Google-Smtp-Source: AGHT+IGEtv7fxgFcrrRcPYJV+S5UKw1HheSz/wyfXwgzCbMTLn7TuBAFtmzbQr0TfBkEL72FC1MMbA== X-Received: by 2002:a05:6402:3547:b0:582:7394:a83d with SMTP id 4fb4d7f45d1cf-5bbb3d0bb2bmr9277643a12.12.1723381270071; Sun, 11 Aug 2024 06:01:10 -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.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Aug 2024 06:01:09 -0700 (PDT) Message-ID: <0440d2b1479b505d88502afe87d9a1ae1b68915c.1723381182.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sun, 11 Aug 2024 14:58:45 +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: 7F65250D90 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -8.89 X-Spam-Score: -8.89 X-TUID: LQl1dcbwBmQI * gnu/packages/emacs-xyz.scm (emacs-libgit)[native-inputs]: Replace emacs-no-x with emacs. [properties]: Add ‘next-variant’ and ‘pgtk-variant’. (emacs-next-libgit, emacs-pgtk-libgit): New variables. --- gnu/packages/emacs-xyz.scm | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 2ff1ed4bf0..ce92c12885 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -56,7 +56,7 @@ ;;; Copyright © 2019 Jelle Licht ;;; Copyright © 2019 Björn Höfling ;;; Copyright © 2019 Stephen Webber -;;; Copyright © 2019, 2021 Liliana Marie Prikler +;;; Copyright © 2019, 2021, 2024 Liliana Marie Prikler ;;; Copyright © 2019 David Wilson ;;; Copyright © 2020 Paul Garlick ;;; Copyright © 2020 Robert Smith @@ -1645,14 +1645,29 @@ (define-public emacs-libgit (add-after 'emacs-build 'validate-compiled-autoloads (assoc-ref emacs:%standard-phases 'validate-compiled-autoloads))))) (native-inputs - (list emacs-no-x git-minimal pkg-config)) + (list emacs git-minimal pkg-config)) (inputs (list libgit2)) (home-page "https://github.com/magit/libegit2") (synopsis "Emacs bindings for libgit2") (description "This is an experimental module written in C providing libgit2 bindings for Emacs, intended to boost the performance of Magit.") - (license license:gpl2+)))) + (license license:gpl2+) + (properties + `((next-variant . ,(delay emacs-next-libgit)) + (pgtk-variant . ,(delay emacs-pgtk-libgit))))))) + +(define-public emacs-next-libgit + (package/inherit emacs-libgit + (name "emacs-next-libgit") + (native-inputs (modify-inputs (package-inputs emacs-libgit) + (replace "emacs" emacs-next))))) + +(define-public emacs-pgtk-libgit + (package/inherit emacs-libgit + (name "emacs-pgtk-libgit") + (native-inputs (modify-inputs (package-inputs emacs-libgit) + (replace "emacs" emacs-pgtk))))) (define-public emacs-llm (package -- 2.45.2