[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'staging' into core-updates
From: |
guix-commits |
Subject: |
01/01: Merge branch 'staging' into core-updates |
Date: |
Sat, 10 Sep 2022 11:33:11 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit 1d526f5035ce51305d8f414b8f55066adedb6f91
Merge: b4693f4a58 07140e8b10
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sat Sep 10 17:30:17 2022 +0200
Merge branch 'staging' into core-updates
gnu/packages/bioconductor.scm | 6 +
gnu/packages/bioinformatics.scm | 6 +
gnu/packages/cran.scm | 72 ++++++
gnu/packages/crates-io.scm | 6 +
gnu/packages/emacs-xyz.scm | 6 +
gnu/packages/gnome.scm | 553 ++++++++++++++++++++--------------------
gnu/packages/golang.scm | 28 ++
gnu/packages/guile-xyz.scm | 6 +
gnu/packages/haskell-xyz.scm | 5 +
gnu/packages/java.scm | 6 +
gnu/packages/julia-xyz.scm | 6 +
gnu/packages/kde-frameworks.scm | 2 +-
gnu/packages/linux.scm | 16 +-
gnu/packages/lisp-xyz.scm | 6 +
gnu/packages/mpd.scm | 35 +++
gnu/packages/ocaml.scm | 6 +
gnu/packages/perl.scm | 6 +
gnu/packages/python-science.scm | 6 +
gnu/packages/python-xyz.scm | 10 +-
gnu/packages/ruby.scm | 6 +
gnu/packages/telephony.scm | 6 +-
gnu/packages/tex.scm | 102 ++++++++
22 files changed, 610 insertions(+), 291 deletions(-)
diff --cc gnu/packages/tex.scm
index 86d74b995b,a3c9689759..1f2553fa74
--- a/gnu/packages/tex.scm
+++ b/gnu/packages/tex.scm
@@@ -7176,43 -6853,40 +7232,60 @@@ that is untidy; this package (though i
designed class) helps alleviate this untidiness.")
(license license:lppl)))
+ (define-public texlive-latex-pbox
+ (package
+ (inherit (simple-texlive-package
+ "texlive-latex-pbox"
+ (list "doc/latex/pbox/"
+ "tex/latex/pbox/")
+ (base32 "0902snjidmhjml01zcppcpp4j6pidin1sdvfi7gnbb5v86zd5f0n")
+ #:trivial? #t))
+ (build-system texlive-build-system)
+ (home-page "https://ctan.org/pkg/pbox")
+ (synopsis "\\parbox with a variable width")
+ (description
+ "@code{pbox} defines a \\pbox{<max width>}{<text>} command which adjusts
+ the box width to that of the enclosed text, up to the maximum width given.
The
+ package also defines some associated length commands.")
+ (license license:gpl3+)))
+
-(define-public texlive-latex-pdfpages
- (package
- (name "texlive-latex-pdfpages")
- (version (number->string %texlive-revision))
- (source (origin
- (method svn-fetch)
- (uri (texlive-ref "latex" "pdfpages"))
- (file-name (string-append name "-" version "-checkout"))
- (sha256
- (base32
- "140kl8r7g2ak2frjn5pmwiwibfynyfwp897r9vk8pypmn390lzr2"))))
- (build-system texlive-build-system)
- (arguments '(#:tex-directory "latex/pdfpages"))
- (home-page "https://www.ctan.org/pkg/pdfpages")
- (synopsis "Include PDF documents in LaTeX")
- (description
- "This package simplifies the inclusion of external multi-page PDF
+(define-public texlive-pdfpages
+ (let ((template (simple-texlive-package
+ "texlive-pdfpages"
+ (list "doc/latex/pdfpages/"
+ "source/latex/pdfpages/"
+ "tex/latex/pdfpages/")
+ (base32
+ "0a68vxkygk20fp51fkp7nvs8mc7h6irdvxal8qsnn9zrgr965d76"))))
+ (package
+ (inherit template)
+ (outputs '("out" "doc"))
+ (arguments
+ (substitute-keyword-arguments (package-arguments template)
+ ((#:tex-directory _ '())
+ "latex/pdfpages")
+ ((#:build-targets _ '())
+ #~(list "pdfpages.ins"))
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (add-after 'unpack 'chdir
+ (lambda _
+ (chdir "source/latex/pdfpages")))
+ (replace 'copy-files
+ (lambda _
+ (let ((origin #$(package-source this-package))
+ (source (string-append #$output
+ "/share/texmf-dist/source"))
+ (doc (string-append #$output:doc
+ "/share/texmf-dist/doc")))
+ (copy-recursively (string-append origin "/source") source)
+ (copy-recursively (string-append origin "/doc")
doc))))))))
+ (propagated-inputs
+ (list texlive-tools texlive-oberdiek texlive-graphics texlive-eso-pic))
+ (home-page "https://ctan.org/macros/latex/contrib/pdfpages")
+ (synopsis "Include PDF documents in LaTeX")
+ (description
+ "This package simplifies the inclusion of external multi-page PDF
documents in LaTeX documents. Pages may be freely selected and it is possible
to put several logical pages onto each sheet of paper. Furthermore a lot of
hypertext features like hyperlinks and article threads are provided. The