[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/06: gnu: ngless: Use gexp.
From: |
guix-commits |
Subject: |
02/06: gnu: ngless: Use gexp. |
Date: |
Fri, 6 Jan 2023 08:07:21 -0500 (EST) |
rekado pushed a commit to branch master
in repository guix.
commit e20ca244db20d89a93cf4d27d69763b6d3ff1eb9
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Fri Jan 6 13:56:34 2023 +0100
gnu: ngless: Use gexp.
* gnu/packages/bioinformatics.scm (ngless)[arguments]: Use gexp.
---
gnu/packages/bioinformatics.scm | 71 +++++++++++++++++++++--------------------
1 file changed, 36 insertions(+), 35 deletions(-)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index fdc87f1e80..e92611ce15 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -14171,41 +14171,42 @@ datasets.")
(patches (search-patches "ngless-unliftio.patch"))))
(build-system haskell-build-system)
(arguments
- `(#:haddock? #f ; The haddock phase fails with: NGLess/CmdArgs.hs:20:1:
- ; error: parse error on input import
- ; import Options.Applicative
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'create-Versions.hs
- (lambda _
- (substitute* "Makefile"
- (("BWA_VERSION = .*")
- (string-append "BWA_VERSION = "
- ,(package-version bwa) "\n"))
- (("SAM_VERSION = .*")
- (string-append "SAM_VERSION = "
- ,(package-version samtools) "\n"))
- (("PRODIGAL_VERSION = .*")
- (string-append "PRODIGAL_VERSION = "
- ,(package-version prodigal) "\n"))
- (("MINIMAP2_VERSION = .*")
- (string-append "MINIMAP2_VERSION = "
- ,(package-version minimap2) "\n")))
- (invoke "make" "NGLess/Dependencies/Versions.hs")))
- (add-after 'create-Versions.hs 'create-cabal-file
- (lambda _ (invoke "hpack")))
- ;; These tools are expected to be installed alongside ngless.
- (add-after 'install 'link-tools
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let ((bin (string-append (assoc-ref outputs "out") "/bin/")))
- (symlink (search-input-file inputs "/bin/prodigal")
- (string-append bin "ngless-" ,version "-prodigal"))
- (symlink (search-input-file inputs "/bin/minimap2")
- (string-append bin "ngless-" ,version "-minimap2"))
- (symlink (search-input-file inputs "/bin/samtools")
- (string-append bin "ngless-" ,version "-samtools"))
- (symlink (search-input-file inputs "/bin/bwa")
- (string-append bin "ngless-" ,version "-bwa"))))))))
+ (list
+ #:haddock? #f ;The haddock phase fails with: NGLess/CmdArgs.hs:20:1:
+ ;error: parse error on input import
+ ;import Options.Applicative
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'create-Versions.hs
+ (lambda _
+ (substitute* "Makefile"
+ (("BWA_VERSION = .*")
+ (string-append "BWA_VERSION = "
+ #$(package-version bwa) "\n"))
+ (("SAM_VERSION = .*")
+ (string-append "SAM_VERSION = "
+ #$(package-version samtools) "\n"))
+ (("PRODIGAL_VERSION = .*")
+ (string-append "PRODIGAL_VERSION = "
+ #$(package-version prodigal) "\n"))
+ (("MINIMAP2_VERSION = .*")
+ (string-append "MINIMAP2_VERSION = "
+ #$(package-version minimap2) "\n")))
+ (invoke "make" "NGLess/Dependencies/Versions.hs")))
+ (add-after 'create-Versions.hs 'create-cabal-file
+ (lambda _ (invoke "hpack")))
+ ;; These tools are expected to be installed alongside ngless.
+ (add-after 'install 'link-tools
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((bin (string-append #$output "/bin/")))
+ (symlink (search-input-file inputs "/bin/prodigal")
+ (string-append bin "ngless-" #$version "-prodigal"))
+ (symlink (search-input-file inputs "/bin/minimap2")
+ (string-append bin "ngless-" #$version "-minimap2"))
+ (symlink (search-input-file inputs "/bin/samtools")
+ (string-append bin "ngless-" #$version "-samtools"))
+ (symlink (search-input-file inputs "/bin/bwa")
+ (string-append bin "ngless-" #$version "-bwa"))))))))
(inputs
(list prodigal
bwa
- branch master updated (ba35d6ba12 -> 8ace894681), guix-commits, 2023/01/06
- 01/06: gnu: ngless: Remove trailing #T from build phases., guix-commits, 2023/01/06
- 04/06: gnu: filtlong: Drop input labels., guix-commits, 2023/01/06
- 03/06: gnu: filtlong: Remove trailing #T from build phases., guix-commits, 2023/01/06
- 02/06: gnu: ngless: Use gexp.,
guix-commits <=
- 06/06: gnu: filtlong: Use Python 3., guix-commits, 2023/01/06
- 05/06: gnu: filtlong: Use gexp., guix-commits, 2023/01/06