guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: java-picard: Fix manifest.


From: Gábor Boskovits
Subject: 01/01: gnu: java-picard: Fix manifest.
Date: Thu, 26 Jul 2018 06:47:19 -0400 (EDT)

boskovits pushed a commit to branch master
in repository guix.

commit d60772dcdd55c0f8e236d40b76eb06eab790ab77
Author: Gábor Boskovits <address@hidden>
Date:   Thu Jul 26 12:42:59 2018 +0200

    gnu: java-picard: Fix manifest.
    
    * gnu/packages/bioinformatics.scm (java-picard)[arguments]: Adjust phase
    'edit-classpath-in-manifest for the new manifest generation code.
---
 gnu/packages/bioinformatics.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 245e7dd..73cca16 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -10,6 +10,7 @@
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
 ;;; Copyright © 2017 Arun Isaac <address@hidden>
 ;;; Copyright © 2018 Joshua Sierles, Nextjournal <address@hidden>
+;;; Copyright © 2018 Gábor Boskovits <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3240,12 +3241,16 @@ VCF.")
                                            (msg (format #f
                                                         "\
 Class-Path: /~a \
- ~a/share/java/htsjdk.jar${line.separator}"
+ ~a/share/java/htsjdk.jar${line.separator}${line.separator}"
                                                         ;; maximum line length 
is 70
                                                         (string-tabulate 
(const #\b) 57)
                                                         (assoc-ref inputs 
"java-htsjdk"))))
                                        (if (member "manifest" name)
                                            `(,tag ,@kids
+                                                  (replaceregexp
+                                                   (@ (file "${manifest.file}")
+                                                      (match "\\r\\n\\r\\n")
+                                                      (replace 
"${line.separator}")))
                                                   (echo
                                                    (@ (message ,msg)
                                                       (file "${manifest.file}")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]