[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
326/328: gnu: ngless: Update to 1.0.1.
From: |
guix-commits |
Subject: |
326/328: gnu: ngless: Update to 1.0.1. |
Date: |
Sat, 16 Nov 2019 19:33:35 -0500 (EST) |
samplet pushed a commit to branch wip-haskell-updates
in repository guix.
commit 5f24ed0eecafa05f571f304add9176aca87559ff
Author: Timothy Sample <address@hidden>
Date: Wed Nov 13 22:59:24 2019 -0500
gnu: ngless: Update to 1.0.1.
* gnu/packages/bioinformatics.scm (ngless): Update to 1.0.1.
[arguments]: Add a 'create-Versions.hs' phase that patches the Makefile
and invokes 'make' to generate a required file.
[inputs]: Remove 'ghc-chart', 'ghc-chart-cairo', and
'ghc-conduit-combinators'; add 'ghc-diagrams-core', 'ghc-diagrams-lib',
'ghc-diagrams-svg', and 'ghc-tar-conduit'.
---
gnu/packages/bioinformatics.scm | 30 ++++++++++++++++++++++++------
1 file changed, 24 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 07c70fb..511146b 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -13890,7 +13890,7 @@ datasets.")
(define-public ngless
(package
(name "ngless")
- (version "0.9.1")
+ (version "1.0.1")
(source
(origin
(method git-fetch)
@@ -13900,7 +13900,7 @@ datasets.")
(file-name (git-file-name name version))
(sha256
(base32
- "0mc2gi7h4lx74zylvyp76mvc0w6706j858ii9vlgzqsw6acpr117"))))
+ "06ygv8q2zjqsnrid1302yrlhhvb8ik48nq6n0higk3i1mdc8r0dg"))))
(build-system haskell-build-system)
(arguments
`(#:haddock? #f ; The haddock phase fails with: NGLess/CmdArgs.hs:20:1:
@@ -13908,7 +13908,24 @@ datasets.")
; import Options.Applicative
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'create-cabal-file
+ (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")
+ #t))
+ (add-after 'create-Versions.hs 'create-cabal-file
(lambda _ (invoke "hpack") #t))
;; These tools are expected to be installed alongside ngless.
(add-after 'install 'link-tools
@@ -13937,15 +13954,15 @@ datasets.")
("ghc-async" ,ghc-async)
("ghc-atomic-write" ,ghc-atomic-write)
("ghc-bytestring-lexing" ,ghc-bytestring-lexing)
- ("ghc-chart" ,ghc-chart)
- ("ghc-chart-cairo" ,ghc-chart-cairo)
("ghc-conduit" ,ghc-conduit)
("ghc-conduit-algorithms" ,ghc-conduit-algorithms)
- ("ghc-conduit-combinators" ,ghc-conduit-combinators)
("ghc-conduit-extra" ,ghc-conduit-extra)
("ghc-configurator" ,ghc-configurator)
("ghc-convertible" ,ghc-convertible)
("ghc-data-default" ,ghc-data-default)
+ ("ghc-diagrams-core" ,ghc-diagrams-core)
+ ("ghc-diagrams-lib" ,ghc-diagrams-lib)
+ ("ghc-diagrams-svg" ,ghc-diagrams-svg)
("ghc-double-conversion" ,ghc-double-conversion)
("ghc-edit-distance" ,ghc-edit-distance)
("ghc-either" ,ghc-either)
@@ -13966,6 +13983,7 @@ datasets.")
("ghc-safeio" ,ghc-safeio)
("ghc-strict" ,ghc-strict)
("ghc-tar" ,ghc-tar)
+ ("ghc-tar-conduit" ,ghc-tar-conduit)
("ghc-unliftio" ,ghc-unliftio)
("ghc-unliftio-core" ,ghc-unliftio-core)
("ghc-vector" ,ghc-vector)
- 314/328: gnu: Add ghc-testing-feat., (continued)
- 314/328: gnu: Add ghc-testing-feat., guix-commits, 2019/11/16
- 229/328: gnu: ghc-conduit: Update to 1.3.1.1., guix-commits, 2019/11/16
- 276/328: gnu: Add ghc-edit-distance-vector., guix-commits, 2019/11/16
- 288/328: gnu: ghc-tasty-rerun: Update to 1.1.14., guix-commits, 2019/11/16
- 306/328: gnu: Add ghc-timezone-series., guix-commits, 2019/11/16
- 310/328: gnu: Add ghc-tar-conduit., guix-commits, 2019/11/16
- 319/328: gnu: Add ghc-numeric-extras., guix-commits, 2019/11/16
- 316/328: gnu: Add ghc-monoid-extras., guix-commits, 2019/11/16
- 320/328: gnu: Add ghc-intervals., guix-commits, 2019/11/16
- 324/328: gnu: Add ghc-svg-builder., guix-commits, 2019/11/16
- 326/328: gnu: ngless: Update to 1.0.1.,
guix-commits <=
- 291/328: gnu: ghc-microlens-aeson: Patch tests for i686-linux., guix-commits, 2019/11/16
- 303/328: gnu: idris: Fix Cabal dependency constraints., guix-commits, 2019/11/16
- 304/328: gnu: elm-compiler: Fix Cabal dependency constraints., guix-commits, 2019/11/16
- 305/328: gnu: Add ghc-alsa-mixer., guix-commits, 2019/11/16
- 308/328: gnu: Add ghc-dbus., guix-commits, 2019/11/16
- 315/328: gnu: Add ghc-groups., guix-commits, 2019/11/16
- 317/328: gnu: Add ghc-dual-tree., guix-commits, 2019/11/16
- 311/328: gnu: Add ghc-testing-type-modifiers., guix-commits, 2019/11/16
- 325/328: gnu: Add ghc-diagrams-svg., guix-commits, 2019/11/16
- 327/328: gnu: ghc-haddock-api: Update to 2.22.0., guix-commits, 2019/11/16