me/guix
Archived
1
0
Fork 0
Code Activity

gnu: Fix merge mistakes.

Browse source 
* gnu/packages/chez.scm (chez-scheme)[native-inputs]: Use correct
texlive implementation.
* gnu/packages/music.scm (python-abjad)[native-inputs],
* gnu/packages/python-check.scm (python-pytest-helpers-namespace)
[native-inputs]: Use correct variable for python-pytest.
This commit is contained in:
Efraim Flashner 2021-04-18 00:21:16 +03:00
parent 71572e28b2
commit c9a61dff82
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/packages/chez.scm
View file

@ -114,7 +114,7 @@
;; for docs
("stex" ,stex)
("xorg-rgb" ,xorg-rgb)
("texlive" ,(texlive-union (list texlive-latex-oberdiek
("texlive" ,(texlive-updmap.cfg (list texlive-latex-oberdiek
texlive-generic-epsf)))
("ghostscript" ,ghostscript)
("netpbm" ,netpbm)))

2
gnu/packages/music.scm
View file

@ -1530,7 +1530,7 @@ Guile.")
("python-isort" ,python-isort)
("python-mypy" ,python-mypy)
("python-ply" ,python-ply)
("python-pytest" ,python-pytest-6)
("python-pytest" ,python-pytest)
("python-pytest-cov" ,python-pytest-cov)
("python-sphinx-autodoc-typehints" ,python-sphinx-autodoc-typehints)))
(propagated-inputs

2
gnu/packages/python-check.scm
View file

@ -396,7 +396,7 @@ sub-package.")
(add-installed-pythonpath inputs outputs)
(invoke "pytest" "-vv"))))))
(native-inputs
`(("python-pytest" ,python-pytest-6)
`(("python-pytest" ,python-pytest)
("python-setuptools" ,python-setuptools) ; needs setuptools >= 50.3.2
("python-setuptools-scm" ,python-setuptools-scm)
("python-setuptools-declarative-requirements"