From 83b9d121a78e6bb4e3d57474d3e01d0a3c4dd5e9 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 9 Dec 2017 11:26:07 +0100 Subject: gnu: bedtools-2.18: Fix build. * gnu/packages/bioinformatics.scm (bedtools-2.18)[arguments]: Restore custom install phase. Reported by Mark H Weaver . --- gnu/packages/bioinformatics.scm | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'gnu/packages/bioinformatics.scm') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index fedc8aec4c..171b13d0d5 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -466,7 +466,19 @@ BED, GFF/GTF, VCF.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "05vrnr8yp7swfagshzpgqmzk1blnwnq8pq5pckzi1m26w98d63vf")))))) + "05vrnr8yp7swfagshzpgqmzk1blnwnq8pq5pckzi1m26w98d63vf")))) + (arguments + '(#:test-target "test" + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((bin (string-append (assoc-ref outputs "out") "/bin/"))) + (for-each (lambda (file) + (install-file file bin)) + (find-files "bin" ".*"))) + #t))))))) (define-public ribotaper (package -- cgit v1.2.3 From 9cf5f134d584c46f6ab034bb48027b0c79ab9b5a Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Fri, 1 Dec 2017 07:58:24 +0000 Subject: gnu: Switch to using the version-major procedure. * gnu/packages/audio.scm (ardour)[arguments]: Switch to using version-major. (hmmer)[source]: Switch to using version-major. (pidgin)[native-search-paths]: Switch to using version-major. (r-minimal)[source]: Switch to using version-major. --- gnu/packages/audio.scm | 2 +- gnu/packages/bioinformatics.scm | 2 +- gnu/packages/messaging.scm | 2 +- gnu/packages/statistics.scm | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/bioinformatics.scm') diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 4f6e4a4095..b0c3eca0ca 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -222,7 +222,7 @@ namespace ARDOUR { const char* revision = \"" version "\" ; }"))))) (modify-phases %standard-phases (add-after 'unpack 'set-rpath-in-LDFLAGS - ,(ardour-rpath-phase (version-prefix version 1)))) + ,(ardour-rpath-phase (version-major version)))) #:test-target "test" #:python ,python-2)) (inputs diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 171b13d0d5..f81db2c84d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2917,7 +2917,7 @@ indexing scheme is called a @dfn{Hierarchical Graph FM index} (HGFM).") (method url-fetch) (uri (string-append "http://eddylab.org/software/hmmer" - (version-prefix version 1) "/" + (version-major version) "/" version "/hmmer-" version ".tar.gz")) (sha256 (base32 diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 9525c9f5d1..1780536d05 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -387,7 +387,7 @@ authentication.") (list (search-path-specification (variable "PURPLE_PLUGIN_PATH") (files (list (string-append "lib/purple-" - (version-prefix version 1)) + (version-major version)) "lib/pidgin"))))) (home-page "http://www.pidgin.im/") (synopsis "Graphical multi-protocol instant messaging client") diff --git a/gnu/packages/statistics.scm b/gnu/packages/statistics.scm index fc18719f32..5e356a3b65 100644 --- a/gnu/packages/statistics.scm +++ b/gnu/packages/statistics.scm @@ -114,7 +114,7 @@ be output in text, PostScript, PDF or HTML.") (source (origin (method url-fetch) (uri (string-append "mirror://cran/src/base/R-" - (version-prefix version 1) "/R-" + (version-major version) "/R-" version ".tar.gz")) (sha256 (base32 -- cgit v1.2.3 From 4e0b3583eab7dd67c2e13ad614e48f8d31c59c90 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Thu, 14 Dec 2017 09:12:56 +1000 Subject: gnu: diamond: Update to 0.9.14. * gnu/packages/bioinformatics.scm (diamond): Update to 0.9.14. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/bioinformatics.scm') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index f81db2c84d..d325258feb 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -2073,7 +2073,7 @@ identify enrichments with functional annotations of the genome.") (define-public diamond (package (name "diamond") - (version "0.9.13") + (version "0.9.14") (source (origin (method url-fetch) (uri (string-append @@ -2082,7 +2082,7 @@ identify enrichments with functional annotations of the genome.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1pi5ncqwmynqpmmp3j3lhnqrjhj34sr6wpmsgrpkv3wyxx22fv86")))) + "07li3chjdna0wjyh680j3bhwiqh1fbfq9dy9jxxs82mc0rw0m1yy")))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no "check" target -- cgit v1.2.3 From 6098a386a90f63fc8c6f18c5edfce15320789941 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Fri, 15 Dec 2017 13:47:46 +1000 Subject: gnu: bedtools: Update to 2.27.1. * gnu/packages/ruby.scm (bedtools): Update to 2.27.1. --- gnu/packages/bioinformatics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/bioinformatics.scm') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index d325258feb..58421d35e8 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -421,7 +421,7 @@ computational cluster.") (define-public bedtools (package (name "bedtools") - (version "2.27.0") + (version "2.27.1") (source (origin (method url-fetch) (uri (string-append "https://github.com/arq5x/bedtools2/releases/" @@ -429,7 +429,7 @@ computational cluster.") "bedtools-" version ".tar.gz")) (sha256 (base32 - "0q6fsiz4s52yzxs6h2vxwq95fsi3n64wkpinkk05mfh4dmhybw74")))) + "1ndg5yknrxl4djx8ddzgk12rrbiidfpmkkg5z3f95jzryfxarhn8")))) (build-system gnu-build-system) (arguments '(#:test-target "test" -- cgit v1.2.3 From 8271b8d22a84ded6bfd2a81531116d00347c653c Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 18 Dec 2017 11:56:12 +0100 Subject: gnu: r-seurat: Fix ModularityOptimizer.jar. * gnu/packages/bioinformatics.scm (r-seurat)[arguments]: Include Main-Class attribute in manifest. --- gnu/packages/bioinformatics.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'gnu/packages/bioinformatics.scm') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 58421d35e8..99693bd62d 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9427,11 +9427,17 @@ and irregular enzymatic cleavages, mass measurement accuracy, etc.") (let ((classesdir "tmp-classes")) (setenv "JAVA_HOME" (assoc-ref inputs "jdk")) (mkdir classesdir) - (and (zero? (apply system* `("javac" "-d" ,classesdir - ,@(find-files "java" "\\.java$")))) - (zero? (system* "jar" - "-cf" "inst/java/ModularityOptimizer.jar" - "-C" classesdir "."))))))))) + + (with-output-to-file "manifest" + (lambda _ + (display "Manifest-Version: 1.0 +Main-Class: ModularityOptimizer\n"))) + (and (zero? (apply system* `("javac" "-d" ,classesdir + ,@(find-files "java" "\\.java$")))) + (zero? (system* "jar" + "-cmf" "manifest" + "inst/java/ModularityOptimizer.jar" + "-C" classesdir "."))))))))) (native-inputs `(("jdk" ,icedtea "jdk"))) (propagated-inputs -- cgit v1.2.3 From f1a2b1cb20cdc0c7f3e58bab4acea39eabfbd5a5 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Mon, 18 Dec 2017 11:59:50 +0100 Subject: gnu: r-seurat: Update to 2.1.0. * gnu/packages/bioinformatics.scm (r-seurat): Update to 2.1.0. [propagated-inputs]: Add r-diffusionmap, r-dtw, r-ggjoy, r-hmisc, r-ica, r-mass, r-matrix, r-nmf, r-plotly, r-sdmtools, r-tidyr; remove r-plyr, r-rcppeigen, r-fastica. --- gnu/packages/bioinformatics.scm | 140 ++++++++++++++++++++-------------------- 1 file changed, 70 insertions(+), 70 deletions(-) (limited to 'gnu/packages/bioinformatics.scm') diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 99693bd62d..cf026ab24e 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -9397,38 +9397,30 @@ and irregular enzymatic cleavages, mass measurement accuracy, etc.") (license license:artistic2.0))) (define-public r-seurat - ;; Source releases are only made for new x.0 versions. All newer versions - ;; are only released as pre-built binaries. At the time of this writing the - ;; latest binary release is 1.4.0.12, which is equivalent to this commit. - (let ((commit "fccb77d1452c35ee47e47ebf8e87bddb59f3b08d") - (revision "1")) - (package - (name "r-seurat") - (version (string-append "1.4.0.12-" revision "." (string-take commit 7))) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/satijalab/seurat") - (commit commit))) - (file-name (string-append name "-" version "-checkout")) - (sha256 - (base32 - "101wq3aqrdmbfi3lqmq4iivk9iwbf10d4z216ss25hf7n9091cyl")) - ;; Delete pre-built jar. - (snippet - '(begin (delete-file "inst/java/ModularityOptimizer.jar") - #t)))) - (build-system r-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'build-jar - (lambda* (#:key inputs #:allow-other-keys) - (let ((classesdir "tmp-classes")) - (setenv "JAVA_HOME" (assoc-ref inputs "jdk")) - (mkdir classesdir) - - (with-output-to-file "manifest" + (package + (name "r-seurat") + (version "2.1.0") + (source (origin + (method url-fetch) + (uri (cran-uri "Seurat" version)) + (sha256 + (base32 + "1hqaq6bciikrsyw157w8fn4jw885air7xbkxrmism93rp4qx483x")) + ;; Delete pre-built jar. + (snippet + '(begin (delete-file "inst/java/ModularityOptimizer.jar") + #t)))) + (properties `((upstream-name . "Seurat"))) + (build-system r-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'build-jar + (lambda* (#:key inputs #:allow-other-keys) + (let ((classesdir "tmp-classes")) + (setenv "JAVA_HOME" (assoc-ref inputs "jdk")) + (mkdir classesdir) + (with-output-to-file "manifest" (lambda _ (display "Manifest-Version: 1.0 Main-Class: ModularityOptimizer\n"))) @@ -9437,49 +9429,57 @@ Main-Class: ModularityOptimizer\n"))) (zero? (system* "jar" "-cmf" "manifest" "inst/java/ModularityOptimizer.jar" - "-C" classesdir "."))))))))) - (native-inputs - `(("jdk" ,icedtea "jdk"))) - (propagated-inputs - `(("r-ape" ,r-ape) - ("r-caret" ,r-caret) - ("r-cowplot" ,r-cowplot) - ("r-dplyr" ,r-dplyr) - ("r-fastica" ,r-fastica) - ("r-fnn" ,r-fnn) - ("r-fpc" ,r-fpc) - ("r-gdata" ,r-gdata) - ("r-ggplot2" ,r-ggplot2) - ("r-gplots" ,r-gplots) - ("r-gridextra" ,r-gridextra) - ("r-igraph" ,r-igraph) - ("r-irlba" ,r-irlba) - ("r-lars" ,r-lars) - ("r-mixtools" ,r-mixtools) - ("r-pbapply" ,r-pbapply) - ("r-plyr" ,r-plyr) - ("r-ranger" ,r-ranger) - ("r-rcolorbrewer" ,r-rcolorbrewer) - ("r-rcpp" ,r-rcpp) - ("r-rcppeigen" ,r-rcppeigen) - ("r-rcppprogress" ,r-rcppprogress) - ("r-reshape2" ,r-reshape2) - ("r-rocr" ,r-rocr) - ("r-rtsne" ,r-rtsne) - ("r-stringr" ,r-stringr) - ("r-tclust" ,r-tclust) - ("r-tsne" ,r-tsne) - ("r-vgam" ,r-vgam))) - (home-page "http://www.satijalab.org/seurat") - (synopsis "Seurat is an R toolkit for single cell genomics") - (description - "This package is an R package designed for QC, analysis, and + "-C" classesdir "."))))))))) + (native-inputs + `(("jdk" ,icedtea "jdk"))) + (propagated-inputs + `(("r-ape" ,r-ape) + ("r-caret" ,r-caret) + ("r-cowplot" ,r-cowplot) + ("r-diffusionmap" ,r-diffusionmap) + ("r-dplyr" ,r-dplyr) + ("r-dtw" ,r-dtw) + ("r-fnn" ,r-fnn) + ("r-fpc" ,r-fpc) + ("r-gdata" ,r-gdata) + ("r-ggjoy" ,r-ggjoy) + ("r-ggplot2" ,r-ggplot2) + ("r-gplots" ,r-gplots) + ("r-gridextra" ,r-gridextra) + ("r-hmisc" ,r-hmisc) + ("r-ica" ,r-ica) + ("r-igraph" ,r-igraph) + ("r-irlba" ,r-irlba) + ("r-lars" ,r-lars) + ("r-mass" ,r-mass) + ("r-matrix" ,r-matrix) + ("r-mixtools" ,r-mixtools) + ("r-nmf" ,r-nmf) + ("r-pbapply" ,r-pbapply) + ("r-plotly" ,r-plotly) + ("r-ranger" ,r-ranger) + ("r-rcolorbrewer" ,r-rcolorbrewer) + ("r-rcpp" ,r-rcpp) + ("r-rcppprogress" ,r-rcppprogress) + ("r-reshape2" ,r-reshape2) + ("r-rocr" ,r-rocr) + ("r-rtsne" ,r-rtsne) + ("r-sdmtools" ,r-sdmtools) + ("r-stringr" ,r-stringr) + ("r-tclust" ,r-tclust) + ("r-tidyr" ,r-tidyr) + ("r-tsne" ,r-tsne) + ("r-vgam" ,r-vgam))) + (home-page "http://www.satijalab.org/seurat") + (synopsis "Seurat is an R toolkit for single cell genomics") + (description + "This package is an R package designed for QC, analysis, and exploration of single cell RNA-seq data. It easily enables widely-used analytical techniques, including the identification of highly variable genes, dimensionality reduction; PCA, ICA, t-SNE, standard unsupervised clustering algorithms; density clustering, hierarchical clustering, k-means, and the discovery of differentially expressed genes and markers.") - (license license:gpl3)))) + (license license:gpl3))) (define-public r-aroma-light (package -- cgit v1.2.3