Message ID | 60bfe771a930daaec6fd53a2a63fae7fbdb6ac38.1726194205.git.maxim.cournoyer@gmail.com |
---|---|
State | New |
Headers |
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0DF4627BBE2; Fri, 13 Sep 2024 03:25:16 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4B60227BBE9 for <patchwork@mira.cbaines.net>; Fri, 13 Sep 2024 03:25:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) id 1sovzU-0004JE-Rf; Thu, 12 Sep 2024 22:24:56 -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 <Debian-debbugs@debbugs.gnu.org>) id 1sovzS-0004J4-Em for guix-patches@gnu.org; Thu, 12 Sep 2024 22:24:54 -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 <Debian-debbugs@debbugs.gnu.org>) id 1sovzS-0005mi-0n for guix-patches@gnu.org; Thu, 12 Sep 2024 22:24:54 -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:To:Subject; bh=jsJajWAKKWjWb2U96/kkKy/BQqYMM161kCvpyKE9gZk=; b=HuAOfS7AyuGI4K2dj6hhYqj+EBNnBT3SAqF8L6Tf74zzMFQyBng1BPrQxO1FX0gioO66qdxiCRqtiFzoNZH0OfkYvwcLC7QaIJJlOGzRrunE4UN2zgtQhb8CcxEXPXtyr8NSoOJcxUoBk04zv8R47LkqZ+eOhD56XSNRAbAAaLVSp5ydrO/vqLx4MJof/CJVGknzMwBYRHvJ2BWzHL1t7MLlUilw6W6/yDrGbmrHJLl0ERt9l/bdLcLw+qns+CyVDDzs/mghGNIot1JEmbBYYsQTnyDGMxmZv2BtNXOZEjN56LXwk/jL2GA5ILbY+WH4fCFI6eC8oVd8a/K0eVAWiA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1sovza-0002LN-23; Thu, 12 Sep 2024 22:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73216] [PATCH 1/2] gnu: Add emacs-org-texlive-collection. Resent-From: Maxim Cournoyer <maxim.cournoyer@gmail.com> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: andrew@trop.in, cox.katherine.e+guix@gmail.com, liliana.prikler@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 13 Sep 2024 02:25:01 +0000 Resent-Message-ID: <handler.73216.B.17261942638916@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 73216 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73216@debbugs.gnu.org Cc: Maxim Cournoyer <maxim.cournoyer@gmail.com>, Andrew Tropin <andrew@trop.in>, Katherine Cox-Buday <cox.katherine.e+guix@gmail.com>, Liliana Marie Prikler <liliana.prikler@gmail.com> X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Andrew Tropin <andrew@trop.in>, Katherine Cox-Buday <cox.katherine.e+guix@gmail.com>, Liliana Marie Prikler <liliana.prikler@gmail.com> Received: via spool by submit@debbugs.gnu.org id=B.17261942638916 (code B ref -1); Fri, 13 Sep 2024 02:25:01 +0000 Received: (at submit) by debbugs.gnu.org; 13 Sep 2024 02:24:23 +0000 Received: from localhost ([127.0.0.1]:42150 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1sovyw-0002Jk-Dl for submit@debbugs.gnu.org; Thu, 12 Sep 2024 22:24:22 -0400 Received: from lists.gnu.org ([209.51.188.17]:49400) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <maxim.cournoyer@gmail.com>) id 1sovyt-0002Ja-9J for submit@debbugs.gnu.org; Thu, 12 Sep 2024 22:24:20 -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 <maxim.cournoyer@gmail.com>) id 1sovyk-0004H5-7U for guix-patches@gnu.org; Thu, 12 Sep 2024 22:24:10 -0400 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <maxim.cournoyer@gmail.com>) id 1sovyi-0005hy-EP for guix-patches@gnu.org; Thu, 12 Sep 2024 22:24:09 -0400 Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-71781f42f75so1314852b3a.1 for <guix-patches@gnu.org>; Thu, 12 Sep 2024 19:24:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726194246; x=1726799046; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=jsJajWAKKWjWb2U96/kkKy/BQqYMM161kCvpyKE9gZk=; b=foaS19ySBmKzuxDEdHPcOe4FC4jO9OpAvlWPS4tub5U5epGlgosaZCsLdEMZWlJq9h eCYXoH335JgHoQoJ5Hgce4UxpK/3DrzLWlH4dlTyrvCD3tA1CA5lcb36yAYep7PxJM9u mHhCaYTYOepZEd5Juz6jMkOIYC9s2q9RNzfE4GTepMAO2XCgj6jSFmdWPcBfljXqL2U4 8wUrQcFVV2QjM24o8MEwRNmOLu/+QxSBE/iCBukQeBCASz4ThlxCnHq8+8UXs1h1yVif YAXp2xzLSjMrXNxUsejGIjpdRXiReZqNFnbcSnWgv+/J2r7Vz09fNjHcvvPrgO3Erwfz G+sQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726194246; x=1726799046; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=jsJajWAKKWjWb2U96/kkKy/BQqYMM161kCvpyKE9gZk=; b=M7xApEWIngaxYvp+/Xx/GQqHv5ayLlwK/oRoVp2VoS/bAeS/lnOsIIpYI6rNFO4OA6 lEESYI990CbWAnJAhs9SCjQgck74nL65b9IhuQiwPignQEYKbJkL1s/odYoHiqAC4yrL iTmvTX4yHWYcR93NsRsfZbWVknyH98XEiPI/STDXTW6RADj9wLYMG77yH4bTZO38xVE3 4Jkwccdt85n4OZKwxmlFQiQ53/qAii9iarYR4XrgGx6nJTh2pw9z2uJ1RYcWFxakbAtL TQSM4wPgOGqkjn5xejmvc7aX60YKI4bxTDUrFDTsXYNge4h/BYTHK1Sw5JApXWhNDbnS 88cg== X-Gm-Message-State: AOJu0Yyu7TSKItbVZbQ4KQfehqmhnI5CU4kPufocFC9RUwCxjtmKbrtQ wy1HEblYJsL+cqrjJxoNxBqr3x24YeMo5jCuINCQa+8Y1SHgFbuOJLtJGQ== X-Google-Smtp-Source: AGHT+IEeAVlzAEKCsP04/Sx6ujQ/jmkAlLciEiqioayjr4aVLfdi1ZeHpzTwK6vFw1BF81yE5O1Idw== X-Received: by 2002:a05:6a21:458a:b0:1cf:4c48:5c07 with SMTP id adf61e73a8af0-1cf75f5a6c1mr7604491637.23.1726194245586; Thu, 12 Sep 2024 19:24:05 -0700 (PDT) Received: from hurd.lan ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-71908fe2657sm5199948b3a.63.2024.09.12.19.24.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Sep 2024 19:24:05 -0700 (PDT) From: Maxim Cournoyer <maxim.cournoyer@gmail.com> Date: Fri, 13 Sep 2024 11:23:35 +0900 Message-ID: <60bfe771a930daaec6fd53a2a63fae7fbdb6ac38.1726194205.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::42b; envelope-from=maxim.cournoyer@gmail.com; helo=mail-pf1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=subscribe> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches |
Series |
[bug#73216,1/2] gnu: Add emacs-org-texlive-collection.
|
|
Commit Message
Maxim Cournoyer
Sept. 13, 2024, 2:23 a.m. UTC
* gnu/packages/emacs-xyz.scm (emacs-org-texlive-collection): New variable. Change-Id: I4039e67f174d0440f351da6d11634f0ceea191cd --- gnu/packages/emacs-xyz.scm | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) base-commit: f5449685143be0805a8a9b54ddecee94e368c6e9
Comments
Am Freitag, dem 13.09.2024 um 11:23 +0900 schrieb Maxim Cournoyer: > * gnu/packages/emacs-xyz.scm (emacs-org-texlive-collection): New > variable. > > Change-Id: I4039e67f174d0440f351da6d11634f0ceea191cd > --- > gnu/packages/emacs-xyz.scm | 25 ++++++++++++++++++++++++- > 1 file changed, 24 insertions(+), 1 deletion(-) > > diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm > index 7368589d7b..de42d9ebd9 100644 > --- a/gnu/packages/emacs-xyz.scm > +++ b/gnu/packages/emacs-xyz.scm > @@ -31,7 +31,7 @@ > ;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com> > ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr> > ;;; Copyright © 2017 Mike Gerwitz <mtg@gnu.org> > -;;; Copyright © 2017, 2018, 2019, 2020, 2021, 2022, 2023 Maxim > Cournoyer <maxim.cournoyer@gmail.com> > +;;; Copyright © 2017-2024 Maxim Cournoyer > <maxim.cournoyer@gmail.com> > ;;; Copyright © 2018 Sohom Bhattacharjee > <soham.bhattacharjee15@gmail.com> > ;;; Copyright © 2018, 2019 Mathieu Lirzin <mthl@gnu.org> > ;;; Copyright © 2018, 2019, 2020, 2021 Pierre Neidhardt > <mail@ambrevar.xyz> > @@ -17655,6 +17655,29 @@ (define-public emacs-org-contrib > compatible with the Org stable version.") > (license license:gpl3+))) > > +(define-public emacs-org-texlive-collection > + (package > + (inherit emacs-org) > + (name "emacs-org-texlive-collection") > + (source #f) > + (build-system trivial-build-system) > + (arguments (list #:builder #~(mkdir #$output))) > + (native-inputs '()) > + (inputs '()) > + (propagated-inputs > + (list texlive-amsmath > + texlive-capt-of > + texlive-graphics ;for graphicx, rotating > + texlive-hyperref > + texlive-titling > + texlive-tools ;for longtable > + texlive-ulem > + texlive-wrapfig > + texlive-scheme-small)) ;for amsfonts, fontspec, > inputenc, etc. Nitpick: these comments are not aligned. As a personal thing, I also suggest using a space between ; and for, but I see both styles used in Guix. > + (synopsis "Basic TexLive packages for Org-mode LaTeX export") > + (description "This meta-package propagates the TexLive packages > minimally > +required by the Org-mode produced LaTeX output."))) > + > (define-public emacs-org-contacts > ;; XXX: Upstream does not tag version bumps. Commit below matches > latest > ;; version bump. > > base-commit: f5449685143be0805a8a9b54ddecee94e368c6e9 Cheers
Hi Liliana, Liliana Marie Prikler <liliana.prikler@gmail.com> writes: [...] >> +(define-public emacs-org-texlive-collection >> + (package >> + (inherit emacs-org) >> + (name "emacs-org-texlive-collection") >> + (source #f) >> + (build-system trivial-build-system) >> + (arguments (list #:builder #~(mkdir #$output))) >> + (native-inputs '()) >> + (inputs '()) >> + (propagated-inputs >> + (list texlive-amsmath >> + texlive-capt-of >> + texlive-graphics ;for graphicx, rotating >> + texlive-hyperref >> + texlive-titling >> + texlive-tools ;for longtable >> + texlive-ulem >> + texlive-wrapfig >> + texlive-scheme-small)) ;for amsfonts, fontspec, >> inputenc, etc. > Nitpick: these comments are not aligned. This is actually how Emacs aligns them automatically, which I tend to stick to to avoid noise in diffs. > As a personal thing, I also suggest using a space between ; and for, > but I see both styles used in Guix. A space following ';' for inline comments is actually what seems to be our adopted convention (see "Riastradh's Lisp Style Rules", https://mumble.net/~campbell/scheme/style.txt referenced from (info '(guix) Formatting Code')). I must have dreamt Ludo suggestion to drop the space at some point in the distant past. I'll try to go back to '; comment' in my code, I guess! -- Thanks, Maxim
Hi again, Liliana Marie Prikler <liliana.prikler@gmail.com> writes: [...] > Nitpick: these comments are not aligned. > As a personal thing, I also suggest using a space between ; and for, > but I see both styles used in Guix. Actually, re-reading our referenced style [0], it opines for no spaces between ';' and the comment, at least it says it's acceptable and uses that in its example: The only comments in which omission of a space between the semicolon and the text is acceptable are margin comments. Examples: ;;;; Frob Grovel ;;; This section of code has some important implications: ;;; 1. Foo. ;;; 2. Bar. ;;; 3. Baz. (define (fnord zarquon) ;; If zob, then veeblefitz. (quux zot mumble ;Zibblefrotz. frotz)) Phew. I can continue writing my inline comments the way I got accustomed to :-). [0] https://mumble.net/~campbell/scheme/style.txt
Am Freitag, dem 13.09.2024 um 23:16 +0900 schrieb Maxim Cournoyer: > Hi Liliana, > > Liliana Marie Prikler <liliana.prikler@gmail.com> writes: > > [...] > > > > +(define-public emacs-org-texlive-collection > > > + (package > > > + (inherit emacs-org) > > > + (name "emacs-org-texlive-collection") > > > + (source #f) > > > + (build-system trivial-build-system) > > > + (arguments (list #:builder #~(mkdir #$output))) > > > + (native-inputs '()) > > > + (inputs '()) > > > + (propagated-inputs > > > + (list texlive-amsmath > > > + texlive-capt-of > > > + texlive-graphics ;for graphicx, rotating > > > + texlive-hyperref > > > + texlive-titling > > > + texlive-tools ;for longtable > > > + texlive-ulem > > > + texlive-wrapfig > > > + texlive-scheme-small)) ;for amsfonts, fontspec, > > > inputenc, etc. > > Nitpick: these comments are not aligned. > > This is actually how Emacs aligns them automatically, which I tend to > stick to to avoid noise in diffs. You might want to press M-; on that last one – I don't think it's aligned as per Emacs. > > As a personal thing, I also suggest using a space between ; and > > for, but I see both styles used in Guix. > > A space following ';' for inline comments is actually what seems to > be our adopted convention (see "Riastradh's Lisp Style Rules", > https://mumble.net/~campbell/scheme/style.txt referenced from (info > '(guix) Formatting Code')). > > I must have dreamt Ludo suggestion to drop the space at some point in > the distant past. I'll try to go back to '; comment' in my code, I > guess! Oh, good to know! Cheers
Am Freitag, dem 13.09.2024 um 23:28 +0900 schrieb Maxim Cournoyer: > Hi again, > > Liliana Marie Prikler <liliana.prikler@gmail.com> writes: > > [...] > > > Nitpick: these comments are not aligned. > > As a personal thing, I also suggest using a space between ; and > > for, but I see both styles used in Guix. > > Actually, re-reading our referenced style [0], it opines for no > spaces between ';' and the comment, at least it says it's acceptable > and uses that in its example: > > The only comments in which omission of a space between the > semicolon and the text is acceptable are margin comments. > […] Yeah, again, it's a personal thing, not at all binding ;)
Hello, Maxim Cournoyer <maxim.cournoyer@gmail.com> writes: > +(define-public emacs-org-texlive-collection > + (package > + (inherit emacs-org) I don't understand why this inherits from Emacs Org. You're basically creating a specific TeX Live collection here. This should probably go to "tex.scm". > + (name "emacs-org-texlive-collection") > + (source #f) > + (build-system trivial-build-system) > + (arguments (list #:builder #~(mkdir #$output))) > + (native-inputs '()) > + (inputs '()) > + (propagated-inputs > + (list texlive-amsmath > + texlive-capt-of > + texlive-graphics ;for graphicx, rotating > + texlive-hyperref > + texlive-titling > + texlive-tools ;for longtable > + texlive-ulem > + texlive-wrapfig > + texlive-scheme-small)) ;for amsfonts, fontspec, inputenc, etc. This is much larger than what Org expects. The scheme above provides XeTeX and Metapost, for example. I think it should be leaner if it propagated provided texlive-collection-latexrecommended and a few additional packages. Note that texlive-tools, texlive-graphics and texlive-amsmath are included already in texlive-scheme-small (and texlive-collection-latexrecommended for that matter). Out of my memories, I think it also needs texlive-soul. > + (synopsis "Basic TexLive packages for Org-mode LaTeX export") Nitpick: TeX Live. Org mode. > + (description "This meta-package propagates the TexLive packages minimally > +required by the Org-mode produced LaTeX output."))) Ditto. > + > (define-public emacs-org-contacts > ;; XXX: Upstream does not tag version bumps. Commit below matches latest > ;; version bump. > > base-commit: f5449685143be0805a8a9b54ddecee94e368c6e9 Regards,
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 7368589d7b..de42d9ebd9 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -31,7 +31,7 @@ ;;; Copyright © 2017 Peter Mikkelsen <petermikkelsen10@gmail.com> ;;; Copyright © 2017–2021 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017 Mike Gerwitz <mtg@gnu.org> -;;; Copyright © 2017, 2018, 2019, 2020, 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2017-2024 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2018 Sohom Bhattacharjee <soham.bhattacharjee15@gmail.com> ;;; Copyright © 2018, 2019 Mathieu Lirzin <mthl@gnu.org> ;;; Copyright © 2018, 2019, 2020, 2021 Pierre Neidhardt <mail@ambrevar.xyz> @@ -17655,6 +17655,29 @@ (define-public emacs-org-contrib compatible with the Org stable version.") (license license:gpl3+))) +(define-public emacs-org-texlive-collection + (package + (inherit emacs-org) + (name "emacs-org-texlive-collection") + (source #f) + (build-system trivial-build-system) + (arguments (list #:builder #~(mkdir #$output))) + (native-inputs '()) + (inputs '()) + (propagated-inputs + (list texlive-amsmath + texlive-capt-of + texlive-graphics ;for graphicx, rotating + texlive-hyperref + texlive-titling + texlive-tools ;for longtable + texlive-ulem + texlive-wrapfig + texlive-scheme-small)) ;for amsfonts, fontspec, inputenc, etc. + (synopsis "Basic TexLive packages for Org-mode LaTeX export") + (description "This meta-package propagates the TexLive packages minimally +required by the Org-mode produced LaTeX output."))) + (define-public emacs-org-contacts ;; XXX: Upstream does not tag version bumps. Commit below matches latest ;; version bump.