diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2021-04-18 00:21:16 +0300 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2021-04-18 00:21:16 +0300 |
| commit | c9a61dff8242612ae8275829a5ee31ff45ff08b1 (patch) | |
| tree | 057df9fed9dc13c8db9af1c59d6e91badfdb20bd | |
| parent | 71572e28b2017f3538bcbef3195845bcb1d5cbeb (diff) | |
| download | guix-c9a61dff8242612ae8275829a5ee31ff45ff08b1.tar.gz guix-c9a61dff8242612ae8275829a5ee31ff45ff08b1.zip | |
gnu: Fix merge mistakes.
* 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.
| -rw-r--r-- | gnu/packages/chez.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/music.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/python-check.scm | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/chez.scm b/gnu/packages/chez.scm index 25a4d5f156..a886e59130 100644 --- a/gnu/packages/chez.scm +++ b/gnu/packages/chez.scm @@ -114,8 +114,8 @@ ;; for docs ("stex" ,stex) ("xorg-rgb" ,xorg-rgb) - ("texlive" ,(texlive-union (list texlive-latex-oberdiek - texlive-generic-epsf))) + ("texlive" ,(texlive-updmap.cfg (list texlive-latex-oberdiek + texlive-generic-epsf))) ("ghostscript" ,ghostscript) ("netpbm" ,netpbm))) (native-search-paths diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 4288f8867d..18b7196e42 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -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 diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index da6d088f25..476ab383c5 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -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" |