[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
31/66: gnu: samtools: Remove patch-makefile-curses phase.
From: |
Manolis Fragkiskos Ragkousis |
Subject: |
31/66: gnu: samtools: Remove patch-makefile-curses phase. |
Date: |
Thu, 21 May 2015 12:51:58 +0000 |
phant0mas pushed a commit to branch wip-hurd
in repository guix.
commit 665737739959a788552466bd84b68078bdf59071
Author: Ricardo Wurmus <address@hidden>
Date: Thu Apr 23 15:23:26 2015 +0200
gnu: samtools: Remove patch-makefile-curses phase.
* gnu/packages/bioinformatics.scm (samtools)[arguments]: Remove
patch-makefile-curses phase, use make-flags instead.
---
gnu/packages/bioinformatics.scm | 41 +++++++++++++++++---------------------
1 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index bcb7eba..9db8fa4 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -1068,32 +1068,27 @@ distribution, coverage uniformity, strand specificity,
etc.")
;; systems.
#:tests? ,(string=? (or (%current-system) (%current-target-system))
"x86_64-linux")
- #:make-flags (list (string-append "prefix=" (assoc-ref %outputs "out")))
+ #:make-flags (list "LIBCURSES=-lncurses"
+ (string-append "prefix=" (assoc-ref %outputs "out")))
#:phases
(alist-cons-after
'unpack
- 'patch-makefile-curses
- (lambda _
- (substitute* "Makefile"
- (("-lcurses") "-lncurses")))
- (alist-cons-after
- 'unpack
- 'patch-tests
- (lambda* (#:key inputs #:allow-other-keys)
- (let ((bash (assoc-ref inputs "bash")))
- (substitute* "test/test.pl"
- ;; The test script calls out to /bin/bash
- (("/bin/bash")
- (string-append bash "/bin/bash"))
- ;; There are two failing tests upstream relating to the "stats"
- ;; subcommand in test_usage_subcommand ("did not have Usage"
- ;; and "usage did not mention samtools stats"), so we disable
- ;; them.
- (("(test_usage_subcommand\\(.*\\);)" cmd)
- (string-append "unless ($subcommand eq 'stats') {" cmd
"};")))))
- (alist-delete
- 'configure
- %standard-phases)))))
+ 'patch-tests
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((bash (assoc-ref inputs "bash")))
+ (substitute* "test/test.pl"
+ ;; The test script calls out to /bin/bash
+ (("/bin/bash")
+ (string-append bash "/bin/bash"))
+ ;; There are two failing tests upstream relating to the "stats"
+ ;; subcommand in test_usage_subcommand ("did not have Usage"
+ ;; and "usage did not mention samtools stats"), so we disable
+ ;; them.
+ (("(test_usage_subcommand\\(.*\\);)" cmd)
+ (string-append "unless ($subcommand eq 'stats') {" cmd "};")))))
+ (alist-delete
+ 'configure
+ %standard-phases))))
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("ncurses" ,ncurses)
("perl" ,perl)
- 29/66: guix package: Introduce 'evaluate-search-paths'., (continued)
- 29/66: guix package: Introduce 'evaluate-search-paths'., Manolis Fragkiskos Ragkousis, 2015/05/21
- 30/66: gnu: gcc-5.1: Add specific libvtv patch., Manolis Fragkiskos Ragkousis, 2015/05/21
- 24/66: gnu: Add zeromq., Manolis Fragkiskos Ragkousis, 2015/05/21
- 32/66: gnu: samtools: Install libbam.a library., Manolis Fragkiskos Ragkousis, 2015/05/21
- 38/66: doc: Fix dangling references in the 'sh-symlink' monad example., Manolis Fragkiskos Ragkousis, 2015/05/21
- 37/66: doc: Suggest 'groupadd --system'., Manolis Fragkiskos Ragkousis, 2015/05/21
- 34/66: gnu: Add taskwarrior., Manolis Fragkiskos Ragkousis, 2015/05/21
- 39/66: gnu: Add python-sympy., Manolis Fragkiskos Ragkousis, 2015/05/21
- 35/66: gnu: bamtools: Set rpath via LDFLAGS., Manolis Fragkiskos Ragkousis, 2015/05/21
- 33/66: gnu: Add samtools-0.1.19., Manolis Fragkiskos Ragkousis, 2015/05/21
- 31/66: gnu: samtools: Remove patch-makefile-curses phase.,
Manolis Fragkiskos Ragkousis <=
- 36/66: doc: Clarify installation from the binary tarball., Manolis Fragkiskos Ragkousis, 2015/05/21
- 43/66: substitute: Increase TTL from 24h to 36h., Manolis Fragkiskos Ragkousis, 2015/05/21
- 40/66: gnu: curl: Update to 7.42.1., Manolis Fragkiskos Ragkousis, 2015/05/21
- 44/66: gnu: Add markdown., Manolis Fragkiskos Ragkousis, 2015/05/21
- 47/66: search-paths: Add 'environment-variable-definition'., Manolis Fragkiskos Ragkousis, 2015/05/21
- 49/66: profiles: Use a &message error condition instead of 'error'., Manolis Fragkiskos Ragkousis, 2015/05/21
- 48/66: search-paths: 'evaluate-search-paths' now returns spec/value pairs., Manolis Fragkiskos Ragkousis, 2015/05/21
- 42/66: gnu: Add libwpg., Manolis Fragkiskos Ragkousis, 2015/05/21
- 41/66: guix: build: Fix indentation for --sources in help output., Manolis Fragkiskos Ragkousis, 2015/05/21
- 46/66: search-paths: Add 'evaluate-search-paths', from (guix scripts package)., Manolis Fragkiskos Ragkousis, 2015/05/21