From 4ca958111908eda0452c47c8cb467a1bd0c9bc87 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 17 May 2018 23:07:00 +0200 Subject: gnu: multiqc: Fix build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/bioinformatics.scm (multiqc)[arguments]: Add a ‘relax-requirements’ phase to fix building with python-matplotlib@2.2. --- gnu/packages/bioinformatics.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'gnu/packages/bioinformatics.scm') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 7a121557db..8bfe01fd6f 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9085,6 +9085,19 @@ replacement for strverscmp.") ("python-numpy" ,python-numpy) ;; MultQC checks for the presence of nose at runtime. ("python-nose" ,python-nose))) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'relax-requirements + (lambda _ + (substitute* "setup.py" + ;; MultiQC 1.5 ‘requires’ a version of python-matplotlib older + ;; than the one in Guix, but should work fine with 2.2.2. + ;; See and + ;; for details. + (("['\"]matplotlib.*?['\"]") + "'matplotlib'")) + #t))))) (home-page "http://multiqc.info") (synopsis "Aggregate bioinformatics analysis reports") (description -- cgit v1.2.3 From c61d822621df97f7d30915ff1d30ac3d34179b88 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 18 May 2018 15:17:33 +0200 Subject: gnu: f-seq: Factorise ‘install’ phase. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/bioinformatics.scm (f-seq)[arguments]: Let-bind more. --- gnu/packages/bioinformatics.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'gnu/packages/bioinformatics.scm') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 8bfe01fd6f..a6d28be4e3 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -11550,7 +11550,9 @@ browser.") (replace 'install (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((target (assoc-ref outputs "out")) - (doc (string-append target "/share/doc/f-seq/"))) + (bin (string-append target "/bin")) + (doc (string-append target "/share/doc/f-seq")) + (lib (string-append target "/lib"))) (mkdir-p target) (mkdir-p doc) (substitute* "bin/linux/fseq" @@ -11559,11 +11561,11 @@ browser.") (string-append (assoc-ref inputs "java-commons-cli") "/share/java/commons-cli.jar")) (("REALDIR=.*") - (string-append "REALDIR=" target "/bin\n"))) + (string-append "REALDIR=" bin "\n"))) (install-file "README.txt" doc) - (install-file "bin/linux/fseq" (string-append target "/bin")) - (install-file "build~/fseq.jar" (string-append target "/lib")) - (copy-recursively "lib" (string-append target "/lib")) + (install-file "bin/linux/fseq" bin) + (install-file "build~/fseq.jar" lib) + (copy-recursively "lib" lib) #t)))))) (inputs `(("perl" ,perl) -- cgit v1.2.3