unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Liliana Marie Prikler <liliana.prikler@gmail.com>
To: 72406@debbugs.gnu.org
Cc: gemmaro.dev@gmail.com, andrew@trop.in,
	cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com
Subject: [bug#72406] [PATCH emacs-team WIP v4 06/24] gnu: emacs-libgit: Build variants.
Date: Sun, 11 Aug 2024 14:58:45 +0200	[thread overview]
Message-ID: <0440d2b1479b505d88502afe87d9a1ae1b68915c.1723381182.git.liliana.prikler@gmail.com> (raw)
In-Reply-To: <cover.1723381182.git.liliana.prikler@gmail.com>

* 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 <jlicht@fsfe.org>
 ;;; Copyright © 2019 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
 ;;; Copyright © 2019 Stephen Webber <montokapro@gmail.com>
-;;; Copyright © 2019, 2021 Liliana Marie Prikler <liliana.prikler@gmail.com>
+;;; Copyright © 2019, 2021, 2024 Liliana Marie Prikler <liliana.prikler@gmail.com>
 ;;; Copyright © 2019 David Wilson <david@daviwil.com>
 ;;; Copyright © 2020 Paul Garlick <pgarlick@tourbillion-technology.com>
 ;;; Copyright © 2020 Robert Smith <robertsmith@posteo.net>
@@ -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





  parent reply	other threads:[~2024-08-11 13:03 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-31 19:58 [bug#72406] [PATCH emacs-team WIP 0/4] Simplify creation of emacs package variants Liliana Marie Prikler
2024-07-31 18:41 ` [bug#72406] [PATCH emacs-team WIP 2/4] build-system: emacs: Make emacs the default variant Liliana Marie Prikler
2024-07-31 18:42 ` [bug#72406] [PATCH emacs-team WIP 3/4] build-system: emacs: Define common variants Liliana Marie Prikler
2024-07-31 19:54 ` [bug#72406] [PATCH emacs-team WIP 4/4] etc: Provide snippet for defining emacs variants Liliana Marie Prikler
2024-07-31 19:57 ` [bug#72406] [PATCH emacs-team WIP 1/4] build-system: emacs: Define package-with-explicit-emacs Liliana Marie Prikler
2024-08-01  3:23 ` [bug#72406] [PATCH emacs-team WIP 0/4] Simplify creation of emacs package variants Suhail Singh
2024-08-01  4:32   ` Liliana Marie Prikler
2024-08-01  6:02     ` Suhail Singh
2024-08-01 16:54       ` Liliana Marie Prikler
2024-08-01 19:40         ` Suhail Singh
2024-08-11 12:59 ` [bug#72406] [PATCH emacs-team WIP v4 00/24] Build variants for other Emacsen Liliana Marie Prikler
2024-08-11 12:58   ` [bug#72406] [PATCH emacs-team WIP v4 01/24] build-system: emacs: Define package-with-explicit-emacs Liliana Marie Prikler
2024-09-03 15:18     ` Simon Tournier
2024-08-11 12:58   ` [bug#72406] [PATCH emacs-team WIP v4 02/24] build-system: emacs: Make emacs the default variant Liliana Marie Prikler
2024-09-03 15:29     ` Simon Tournier
2024-08-11 12:58   ` [bug#72406] [PATCH emacs-team WIP v4 03/24] build-system: emacs: Define common variants Liliana Marie Prikler
2024-09-03 15:21     ` Simon Tournier
2024-09-03 15:39       ` Simon Tournier
2024-08-11 12:58   ` [bug#72406] [PATCH emacs-team WIP v4 04/24] build-system: emacs: Handle variants in elpa naming Liliana Marie Prikler
2024-08-11 12:58   ` [bug#72406] [PATCH emacs-team WIP v4 05/24] etc: Provide snippet for defining emacs variants Liliana Marie Prikler
2024-08-11 12:58   ` Liliana Marie Prikler [this message]
2024-09-03 15:32     ` [bug#72406] [PATCH emacs-team WIP v4 06/24] gnu: emacs-libgit: Build variants Simon Tournier
2024-09-03 16:57       ` Liliana Marie Prikler
2024-08-11 12:58   ` [bug#72406] [PATCH emacs-team WIP v4 07/24] gnu: emacs-eweouz: " Liliana Marie Prikler
2024-09-03 15:47     ` Simon Tournier
2024-08-11 12:58   ` [bug#72406] [PATCH emacs-team WIP v4 10/24] gnu: emacs-fontaine: Reindent Liliana Marie Prikler
2024-08-11 12:58   ` [bug#72406] [PATCH emacs-team WIP v4 09/24] gnu: emacs-pdf-tools: Build variants Liliana Marie Prikler
2024-08-11 12:58   ` [bug#72406] [PATCH emacs-team WIP v4 08/24] gnu: emacs-tablist: Define variants Liliana Marie Prikler
2024-08-11 12:58   ` [bug#72406] [PATCH emacs-team WIP v4 14/24] gnu: emacs-geiser: " Liliana Marie Prikler
2024-08-11 12:58   ` [bug#72406] [PATCH emacs-team WIP v4 11/24] gnu: emacs-bui: " Liliana Marie Prikler
2024-08-11 12:58   ` [bug#72406] [PATCH emacs-team WIP v4 12/24] gnu: emacs-dash: " Liliana Marie Prikler
2024-08-11 12:58   ` [bug#72406] [PATCH emacs-team WIP v4 13/24] gnu: emacs-edit-indirect: " Liliana Marie Prikler
2024-08-11 12:58   ` [bug#72406] [PATCH emacs-team WIP v4 19/24] gnu: emacspeak: Build variants Liliana Marie Prikler
2024-08-11 12:58   ` [bug#72406] [PATCH emacs-team WIP v4 17/24] gnu: emacs-guix: " Liliana Marie Prikler
2024-08-11 12:58   ` [bug#72406] [PATCH emacs-team WIP v4 16/24] gnu: emacs-magit-popup: Define variants Liliana Marie Prikler
2024-08-11 12:58   ` [bug#72406] [PATCH emacs-team WIP v4 18/24] [WIP] gnu: emacs-dvc: Build variants Liliana Marie Prikler
2024-08-11 12:58   ` [bug#72406] [PATCH emacs-team WIP v4 20/24] gnu: emacs-xelb: " Liliana Marie Prikler
2024-08-11 12:58   ` [bug#72406] [PATCH emacs-team WIP v4 15/24] gnu: emacs-geiser-guile: Define variants Liliana Marie Prikler
2024-08-11 12:58   ` [bug#72406] [PATCH emacs-team WIP v4 21/24] gnu: emacs-exwm: Build variants Liliana Marie Prikler
2024-08-11 12:58   ` [bug#72406] [PATCH emacs-team WIP v4 24/24] gnu: Build all the other emacs-* variants Liliana Marie Prikler
2024-08-11 12:58   ` [bug#72406] [PATCH emacs-team WIP v4 23/24] gnu: eless: Build variants Liliana Marie Prikler
2024-08-11 12:58   ` [bug#72406] [PATCH emacs-team WIP v4 22/24] gnu: emacs-exwm-x: " Liliana Marie Prikler
2024-09-03 15:51   ` [bug#72406] [PATCH emacs-team WIP v4 00/24] Build variants for other Emacsen Simon Tournier
2024-09-03 16:52     ` Liliana Marie Prikler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0440d2b1479b505d88502afe87d9a1ae1b68915c.1723381182.git.liliana.prikler@gmail.com \
    --to=liliana.prikler@gmail.com \
    --cc=72406@debbugs.gnu.org \
    --cc=andrew@trop.in \
    --cc=cox.katherine.e+guix@gmail.com \
    --cc=gemmaro.dev@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).