version-control: dvc: Improve style.

* guix-science/packages/version-control.scm (dvc)
  [arguments]<#:phases>: Use full phase names,
  use serach-input-file instead of which.
  [inputs]: Move below propagated-inputs.

1 files changed, 9 insertions, 10 deletions

diff --git a/guix-science/packages/version-control.scm b/guix-science/packages/version-control.scm
index 4314b81..7b793c6 100644
--- a/guix-science/packages/version-control.scm
+++ b/guix-science/packages/version-control.scm
@@ -55,30 +55,28 @@
          "tests/unit")
       #:phases
       #~(modify-phases %standard-phases
-          (add-after 'unpack 'fix-pandas-2.2
+          (add-after 'unpack 'fix-pandas-compatibility
             (lambda _
               (substitute* "dvc/database.py"
                 (("Serializer\\(sql, con\\)")
                  "Serializer(sql, con.connection)"))))
           (add-after 'unpack 'patch-shell
-            (lambda _
-              (substitute* "dvc/stage/run.py"
-                (("/bin/sh")
-                 (which "bash")))
-              (substitute* "tests/func/repro/test_repro.py"
-                (("/bin/sh")
-                 (which "bash")))))
+            (lambda* (#:key inputs #:allow-other-keys)
+              (let ((bash (search-input-file inputs "/bin/bash")))
+                (substitute* (list "dvc/stage/run.py"
+                                   "tests/func/repro/test_repro.py")
+                  (("/bin/sh")
+                   bash)))))
           (add-before 'build 'set-version
             (lambda _
               (setenv "SETUPTOOLS_SCM_PRETEND_VERSION"
                       #$version)))
-          (add-before 'check 'fix-pytest-config
+          (add-before 'check 'fix-pytest-configuration
             (lambda _
               (substitute* "pyproject.toml"
                 ;; no python-pytest-cov
                 (("--cov-config pyproject.toml")
                  "")))))))
-    (inputs (list bash-minimal))
     (propagated-inputs (list python-attrs
                              python-celery
                              python-colorama
@@ -123,6 +121,7 @@
                              python-tqdm
                              python-voluptuous
                              python-zc-lockfile))
+    (inputs (list bash-minimal))
     (native-inputs (list python-beautifulsoup4
                          python-dvc-s3
                          python-dvc-ssh