branch core-updates updated: gnu: Fix merge mistakes.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

efraim pushed a commit to branch core-updates
in repository guix.

The following commit(s) were added to refs/heads/core-updates by this push:
     new c9a61df  gnu: Fix merge mistakes.
c9a61df is described below

commit c9a61dff8242612ae8275829a5ee31ff45ff08b1
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun Apr 18 00:21:16 2021 +0300

    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.
---
 gnu/packages/chez.scm         | 4 ++--
 gnu/packages/music.scm        | 2 +-
 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 25a4d5f..a886e59 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 4288f88..18b7196 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 da6d088..476ab38 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"