From db5646d957895944007c1bb44fcd998ea392f168 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 4 Dec 2021 12:22:11 +0100 Subject: [PATCH] gnu: Adjust for python-build-system behavior change. Commit cb72f9a773e0931ee3758c851d96007ded034e4c changed the semantics of SITE-PACKAGES, but did not adjust all callers. * gnu/packages/bioinformatics.scm (python-pyvcf)[arguments]: Adjust for missing trailing slash. * gnu/packages/maths.scm (nomad-optimizer)[arguments]: Likewise. * gnu/packages/patchutils.scm (patchwork)[arguments]: Likewise. --- gnu/packages/bioinformatics.scm | 3 +-- gnu/packages/maths.scm | 2 +- gnu/packages/patchutils.scm | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index fb3ceb8c83..f3cc1eac89 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -15281,8 +15281,7 @@ for the analysis and visualization of raw nanopore signal.") (lambda* (#:key inputs outputs #:allow-other-keys) (delete-file-recursively (string-append (site-packages inputs outputs) - "vcf/test")) - #t))))) + "/vcf/test"))))))) (native-inputs `(("python-cython" ,python-cython))) (propagated-inputs `(("python-pysam" ,python-pysam) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 14aecb955d..3ff3c14bc8 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2009,7 +2009,7 @@ interfaces.") (lambda* (#:key inputs outputs #:allow-other-keys) (delete-file (string-append (site-packages inputs outputs) - "PyNomad-0.0.0-py" + "/PyNomad-0.0.0-py" (python-version (assoc-ref inputs "python")) ".egg-info")) #t))))) diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm index 3ad795ac5a..e5a03d4d28 100644 --- a/gnu/packages/patchutils.scm +++ b/gnu/packages/patchutils.scm @@ -390,7 +390,7 @@ application = get_wsgi_application()\n") port))))) (for-each (lambda (directory) (copy-recursively directory - (string-append out-site-packages directory))) + (string-append out-site-packages "/" directory))) '(;; Contains the python code "patchwork" ;; Contains the templates for the generated HTML @@ -403,9 +403,9 @@ application = get_wsgi_application()\n") port))))) (install-file file (string-append out "/bin"))) (list (string-append out-site-packages - "patchwork/bin/parsemail.sh") + "/patchwork/bin/parsemail.sh") (string-append out-site-packages - "patchwork/bin/parsemail-batch.sh"))) + "/patchwork/bin/parsemail-batch.sh"))) ;; Collect the static assets, this includes JavaScript, CSS and ;; fonts. This is a standard Django process when running a