From 0a1faccd5765b0005dccb4bdffb8badd87986286 Mon Sep 17 00:00:00 2001 From: Ben Woodcroft Date: Sat, 9 Jan 2016 16:27:37 +1000 Subject: [PATCH] gnu: bedtools: Update to 2.25.0. * gnu/packages/bioinformatics.scm (bedtools): Update to 0.25.0. [arguments]: Use 'modify-phases'. Remove 'patch-makefile-SHELL-definition' phase. [source]: Remove patch merged upstream. --- gnu/packages/bioinformatics.scm | 35 ++++++++++++----------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index c598327..55b7cb1 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015 Ricardo Wurmus -;;; Copyright © 2015 Ben Woodcroft +;;; Copyright © 2015, 2016 Ben Woodcroft ;;; Copyright © 2015 Pjotr Prins ;;; Copyright © 2015 Andreas Enge ;;; @@ -207,7 +207,7 @@ computational cluster.") (define-public bedtools (package (name "bedtools") - (version "2.24.0") + (version "2.25.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/arq5x/bedtools2/archive/v" @@ -215,8 +215,7 @@ computational cluster.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "0lnxrjvs3nnmb4bmskag1wg3h2hd80przz5q3xd0bvs7vyxrvpbl")) - (patches (list (search-patch "bedtools-32bit-compilation.patch"))))) + "1ywcy3yfwzhl905b51l0ffjia55h75vv3mw5xkvib04pp6pj548m")))) (build-system gnu-build-system) (native-inputs `(("python" ,python-2))) (inputs `(("samtools" ,samtools) @@ -224,25 +223,15 @@ computational cluster.") (arguments '(#:test-target "test" #:phases - (alist-cons-after - 'unpack 'patch-makefile-SHELL-definition - (lambda _ - ;; patch-makefile-SHELL cannot be used here as it does not - ;; yet patch definitions with `:='. Since changes to - ;; patch-makefile-SHELL result in a full rebuild, features - ;; of patch-makefile-SHELL are reimplemented here. - (substitute* "Makefile" - (("^SHELL := .*$") (string-append "SHELL := " (which "bash") " -e \n")))) - (alist-delete - 'configure - (alist-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" ".*")))) - %standard-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))))) (home-page "https://github.com/arq5x/bedtools2") (synopsis "Tools for genome analysis and arithmetic") (description -- 2.6.3