guix/guix - Disroot Forgejo: Brace yourself, merge conflicts ahead.

Commit Graph

Author	SHA1	Message	Date
Nicolas Goaziou	7a18bd9e74	gnu: Rationalize texlive-updmap.cfg and texlive-tiny inputs. TEXLIVE-UPDMAP.CFG and TEXLIVE-TINY should only be used as native inputs. Also remove texlive packages already provided by them. * doc/build.scm (pdf-manual): * gnu/packages/algebra.scm (pari-gp): * gnu/packages/bioinformatics.scm (discrover): (phyml): (velvet): * gnu/packages/chemistry.scm (yaehmop): * gnu/packages/chez.scm (stex-bootstrap): (chez-web): (chez-sockets): * gnu/packages/cran.scm (r-prereg): * gnu/packages/docbook.scm (dblatex): * gnu/packages/emacs-xyz.scm (emacs-auctex): * gnu/packages/engineering.scm (fastcap): * gnu/packages/fsf.scm (book-faif): * gnu/packages/graphviz.scm (dot2tex): * gnu/packages/maths.scm (hypre): * gnu/packages/ocaml.scm (unison): (ocaml-bibtex2html): * gnu/packages/plotutils.scm (asymptote): * gnu/packages/python-xyz.scm (python-nbconvert): (python-pypandoc): * gnu/packages/radio.scm (gnuradio): (libosmo-dsp): * gnu/packages/statistics.scm (r-with-tests): * gnu/packages/tex.scm (texlive-makecmds): (texlive-innerscript): (teximpatient): (texlive-xkeyval): Remove texlive packages already provided by TEXLIVE-UPDMAP.CFG. Don't add TEXLIVE-TINY or TEXLIVE-UPDMAP.CFG as inputs.	2023-07-18 18:16:47 +02:00
Nicolas Goaziou	f4dadc5b49	gnu: faif: Update texlive package names. * gnu/packages/fsf.scm (book-faif)[native-inputs]: Replace TEXLIVE-FONTS-EC, TEXLIVE-LATEX-FNCYCHAP, TEXLIVE-LATEX-GEOMETRY, TEXLIVE-LATEX-UCS with TEXLIVE-EC, TEXLIVE-FNCYCHAP, TEXLIVE-GEOMETRY, TEXLIVE-UCS.	2023-07-18 18:12:48 +02:00
宋文武	6419ca7fd7	gnu: Add Free as in Freedom (2.0). * gnu/packages/fsf.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it.	2023-05-12 20:22:02 +08:00

Author

SHA1

Message

Date

Nicolas Goaziou

7a18bd9e74

gnu: Rationalize texlive-updmap.cfg and texlive-tiny inputs.

TEXLIVE-UPDMAP.CFG and TEXLIVE-TINY should only be used as native inputs.
Also remove texlive packages already provided by them.

* doc/build.scm (pdf-manual):
* gnu/packages/algebra.scm (pari-gp):
* gnu/packages/bioinformatics.scm (discrover):
(phyml):
(velvet):
* gnu/packages/chemistry.scm (yaehmop):
* gnu/packages/chez.scm (stex-bootstrap):
(chez-web):
(chez-sockets):
* gnu/packages/cran.scm (r-prereg):
* gnu/packages/docbook.scm (dblatex):
* gnu/packages/emacs-xyz.scm (emacs-auctex):
* gnu/packages/engineering.scm (fastcap):
* gnu/packages/fsf.scm (book-faif):
* gnu/packages/graphviz.scm (dot2tex):
* gnu/packages/maths.scm (hypre):
* gnu/packages/ocaml.scm (unison):
(ocaml-bibtex2html):
* gnu/packages/plotutils.scm (asymptote):
* gnu/packages/python-xyz.scm (python-nbconvert):
(python-pypandoc):
* gnu/packages/radio.scm (gnuradio):
(libosmo-dsp):
* gnu/packages/statistics.scm (r-with-tests):
* gnu/packages/tex.scm (texlive-makecmds):
(texlive-innerscript):
(teximpatient):
(texlive-xkeyval): Remove texlive packages already provided by
TEXLIVE-UPDMAP.CFG.  Don't add TEXLIVE-TINY or TEXLIVE-UPDMAP.CFG as inputs.

2023-07-18 18:16:47 +02:00

Nicolas Goaziou

f4dadc5b49

gnu: faif: Update texlive package names.

* gnu/packages/fsf.scm (book-faif)[native-inputs]: Replace TEXLIVE-FONTS-EC,
TEXLIVE-LATEX-FNCYCHAP, TEXLIVE-LATEX-GEOMETRY, TEXLIVE-LATEX-UCS with
TEXLIVE-EC, TEXLIVE-FNCYCHAP, TEXLIVE-GEOMETRY, TEXLIVE-UCS.

2023-07-18 18:12:48 +02:00

宋文武

6419ca7fd7

gnu: Add Free as in Freedom (2.0).

* gnu/packages/fsf.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.

2023-05-12 20:22:02 +08:00

3 Commits