build-system: haskell: Drop default "static" output.
* guix/build-system/haskell.scm (lower): Pass outputs to lowered bag. * guix/build/haskell-build-system.scm (install): Remove static library moving code. * gnu/packages/haskell-check.scm (ghc-hunit): Remove "static" output. * gnu/packages/haskell-crypto.scm (ghc-crypto-api-tests): Likewise. * gnu/packages/haskell-xyz.scm (ghc-case-insensitive): Likewise. (ghc-cmdargs): Likewise. (ghc-conduit): Likewise. (ghc-fgl): Likewise. (ghc-haskell-src-exts): Likewise. (ghc-lib-parser): Likewise. (ghc-mono-traversable): Likewise. (ghc-parallel): Likewise. (ghc-paths): Likewise. (ghc-profunctors): Likewise. (ghc-tf-random): Likewise. (ghc-vector): Likewise.
parent
ebea18357b
commit
4bb40b098d
|
@ -629,7 +629,7 @@ using Template Haskell")
|
||||||
(package
|
(package
|
||||||
(name "ghc-hunit")
|
(name "ghc-hunit")
|
||||||
(version "1.6.2.0")
|
(version "1.6.2.0")
|
||||||
(outputs '("out" "static" "doc"))
|
(outputs '("out" "doc"))
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
|
|
@ -141,7 +141,6 @@ algorithm (ex: padding) is within scope of this package.")
|
||||||
"0w3j43jdrlj28jryp18hc6q84nkl2yf4vs1hhgrsk7gb9kfyqjpl"))))
|
"0w3j43jdrlj28jryp18hc6q84nkl2yf4vs1hhgrsk7gb9kfyqjpl"))))
|
||||||
(build-system haskell-build-system)
|
(build-system haskell-build-system)
|
||||||
(properties '((upstream-name . "crypto-api-tests")))
|
(properties '((upstream-name . "crypto-api-tests")))
|
||||||
(outputs '("out" "static" "doc"))
|
|
||||||
(inputs (list ghc-test-framework-quickcheck2
|
(inputs (list ghc-test-framework-quickcheck2
|
||||||
ghc-crypto-api
|
ghc-crypto-api
|
||||||
ghc-cereal
|
ghc-cereal
|
||||||
|
|
|
@ -1395,7 +1395,7 @@ call stacks with different versions of the compiler.")
|
||||||
(package
|
(package
|
||||||
(name "ghc-case-insensitive")
|
(name "ghc-case-insensitive")
|
||||||
(version "1.2.1.0")
|
(version "1.2.1.0")
|
||||||
(outputs '("out" "static" "doc"))
|
(outputs '("out" "doc"))
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
@ -1993,7 +1993,7 @@ of the C library.")
|
||||||
"0xfabq187n1vqrnnm4ciprpl0dcjq97rksyjnpcniwva9rffmn7p"))))
|
"0xfabq187n1vqrnnm4ciprpl0dcjq97rksyjnpcniwva9rffmn7p"))))
|
||||||
(build-system haskell-build-system)
|
(build-system haskell-build-system)
|
||||||
(properties '((upstream-name . "cmdargs")))
|
(properties '((upstream-name . "cmdargs")))
|
||||||
(outputs '("out" "static" "doc"))
|
(outputs '("out" "doc"))
|
||||||
(home-page
|
(home-page
|
||||||
"http://community.haskell.org/~ndm/cmdargs/")
|
"http://community.haskell.org/~ndm/cmdargs/")
|
||||||
(synopsis "Command line argument processing")
|
(synopsis "Command line argument processing")
|
||||||
|
@ -2171,7 +2171,7 @@ concurrent threads. Can be used for progress displays etc.")
|
||||||
"18izjgff4pmrknc8py06yvg3g6x27nx0rzmlwjxcflwm5v4szpw4"))))
|
"18izjgff4pmrknc8py06yvg3g6x27nx0rzmlwjxcflwm5v4szpw4"))))
|
||||||
(build-system haskell-build-system)
|
(build-system haskell-build-system)
|
||||||
(properties '((upstream-name . "conduit")))
|
(properties '((upstream-name . "conduit")))
|
||||||
(outputs '("out" "static" "doc"))
|
(outputs '("out" "doc"))
|
||||||
(inputs
|
(inputs
|
||||||
(list ghc-exceptions
|
(list ghc-exceptions
|
||||||
ghc-lifted-base
|
ghc-lifted-base
|
||||||
|
@ -3855,7 +3855,7 @@ consuming feeds in both RSS (Really Simple Syndication) and Atom format.")
|
||||||
(package
|
(package
|
||||||
(name "ghc-fgl")
|
(name "ghc-fgl")
|
||||||
(version "5.7.0.3")
|
(version "5.7.0.3")
|
||||||
(outputs '("out" "static" "doc"))
|
(outputs '("out" "doc"))
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
@ -4958,7 +4958,7 @@ package are to parse or generate Haskell 98 code.")
|
||||||
"01bcrxs9af4yqpclw43aijmsd1g19qhyzb47blz7vzwz2r3k11b7"))))
|
"01bcrxs9af4yqpclw43aijmsd1g19qhyzb47blz7vzwz2r3k11b7"))))
|
||||||
(build-system haskell-build-system)
|
(build-system haskell-build-system)
|
||||||
(properties '((upstream-name . "haskell-src-exts")))
|
(properties '((upstream-name . "haskell-src-exts")))
|
||||||
(outputs '("out" "static" "doc"))
|
(outputs '("out" "doc"))
|
||||||
(inputs
|
(inputs
|
||||||
(list cpphs ghc-happy ghc-pretty-show))
|
(list cpphs ghc-happy ghc-pretty-show))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
|
@ -6349,7 +6349,7 @@ Music Player Daemon.")
|
||||||
"1xh8rm5lwbh96g4v34whkcbb1yjsyvx3rwwycj30lrglhqk7f4c4"))))
|
"1xh8rm5lwbh96g4v34whkcbb1yjsyvx3rwwycj30lrglhqk7f4c4"))))
|
||||||
(build-system haskell-build-system)
|
(build-system haskell-build-system)
|
||||||
(properties '((upstream-name . "ghc-lib-parser")))
|
(properties '((upstream-name . "ghc-lib-parser")))
|
||||||
(outputs '("out" "static" "doc")) ; documentation is 39M
|
(outputs '("out" "doc")) ; documentation is 39M
|
||||||
(native-inputs (list ghc-alex ghc-happy))
|
(native-inputs (list ghc-alex ghc-happy))
|
||||||
(home-page "https://github.com/digital-asset/ghc-lib")
|
(home-page "https://github.com/digital-asset/ghc-lib")
|
||||||
(synopsis "The GHC API, decoupled from GHC versions")
|
(synopsis "The GHC API, decoupled from GHC versions")
|
||||||
|
@ -7314,7 +7314,7 @@ the @code{mtl-tf} package.")
|
||||||
"1dvlp7r7r1lc3fxkwaz68f1nffg83240q8a989x24x1x67rj1clq"))))
|
"1dvlp7r7r1lc3fxkwaz68f1nffg83240q8a989x24x1x67rj1clq"))))
|
||||||
(build-system haskell-build-system)
|
(build-system haskell-build-system)
|
||||||
(properties '((upstream-name . "mono-traversable")))
|
(properties '((upstream-name . "mono-traversable")))
|
||||||
(outputs '("out" "static" "doc"))
|
(outputs '("out" "doc"))
|
||||||
(inputs (list ghc-unordered-containers ghc-hashable ghc-vector
|
(inputs (list ghc-unordered-containers ghc-hashable ghc-vector
|
||||||
ghc-vector-algorithms ghc-split))
|
ghc-vector-algorithms ghc-split))
|
||||||
(native-inputs (list ghc-hspec ghc-hunit ghc-quickcheck ghc-foldl))
|
(native-inputs (list ghc-hspec ghc-hunit ghc-quickcheck ghc-foldl))
|
||||||
|
@ -8320,7 +8320,7 @@ building up, manipulating and serialising @code{Pandoc} structures.")
|
||||||
(package
|
(package
|
||||||
(name "ghc-parallel")
|
(name "ghc-parallel")
|
||||||
(version "3.2.2.0")
|
(version "3.2.2.0")
|
||||||
(outputs '("out" "static" "doc"))
|
(outputs '("out" "doc"))
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
@ -8480,7 +8480,7 @@ files/directories, and more.")
|
||||||
(package
|
(package
|
||||||
(name "ghc-paths")
|
(name "ghc-paths")
|
||||||
(version "0.1.0.12")
|
(version "0.1.0.12")
|
||||||
(outputs '("out" "static" "doc"))
|
(outputs '("out" "doc"))
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
@ -9118,7 +9118,7 @@ API.")
|
||||||
"0an9v003ivxmjid0s51qznbjhd5fsa1dkcfsrhxllnjja1xmv5b5"))))
|
"0an9v003ivxmjid0s51qznbjhd5fsa1dkcfsrhxllnjja1xmv5b5"))))
|
||||||
(build-system haskell-build-system)
|
(build-system haskell-build-system)
|
||||||
(properties '((upstream-name . "profunctors")))
|
(properties '((upstream-name . "profunctors")))
|
||||||
(outputs '("out" "static" "doc"))
|
(outputs '("out" "doc"))
|
||||||
(inputs
|
(inputs
|
||||||
(list ghc-base-orphans
|
(list ghc-base-orphans
|
||||||
ghc-bifunctors
|
ghc-bifunctors
|
||||||
|
@ -11894,7 +11894,7 @@ string metrics efficiently.")
|
||||||
(package
|
(package
|
||||||
(name "ghc-tf-random")
|
(name "ghc-tf-random")
|
||||||
(version "0.5")
|
(version "0.5")
|
||||||
(outputs '("out" "static" "doc"))
|
(outputs '("out" "doc"))
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
@ -13163,7 +13163,7 @@ representing a store for a single element.")
|
||||||
(package
|
(package
|
||||||
(name "ghc-vector")
|
(name "ghc-vector")
|
||||||
(version "0.12.3.1")
|
(version "0.12.3.1")
|
||||||
(outputs '("out" "static" "doc"))
|
(outputs '("out" "doc"))
|
||||||
(source
|
(source
|
||||||
(origin
|
(origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
|
|
|
@ -109,10 +109,7 @@ version REVISION."
|
||||||
,@(standard-packages)))
|
,@(standard-packages)))
|
||||||
(build-inputs `(("haskell" ,haskell)
|
(build-inputs `(("haskell" ,haskell)
|
||||||
,@native-inputs))
|
,@native-inputs))
|
||||||
;; XXX: this is a hack to get around issue #41569.
|
(outputs outputs)
|
||||||
(outputs (match outputs
|
|
||||||
(("out") (cons "static" outputs))
|
|
||||||
(_ outputs)))
|
|
||||||
(build haskell-build)
|
(build haskell-build)
|
||||||
(arguments
|
(arguments
|
||||||
(substitute-keyword-arguments
|
(substitute-keyword-arguments
|
||||||
|
|
|
@ -129,17 +129,7 @@ and parameters ~s~%"
|
||||||
|
|
||||||
(define* (install #:key outputs #:allow-other-keys)
|
(define* (install #:key outputs #:allow-other-keys)
|
||||||
"Install a given Haskell package."
|
"Install a given Haskell package."
|
||||||
(run-setuphs "copy" '())
|
(run-setuphs "copy" '()))
|
||||||
(when (assoc-ref outputs "static")
|
|
||||||
(let ((static (assoc-ref outputs "static"))
|
|
||||||
(lib (or (assoc-ref outputs "lib")
|
|
||||||
(assoc-ref outputs "out"))))
|
|
||||||
(for-each (lambda (static-lib)
|
|
||||||
(let* ((subdir (string-drop static-lib (string-length lib)))
|
|
||||||
(new (string-append static subdir)))
|
|
||||||
(mkdir-p (dirname new))
|
|
||||||
(rename-file static-lib new)))
|
|
||||||
(find-files lib "\\.a$")))))
|
|
||||||
|
|
||||||
(define* (setup-compiler #:key system inputs outputs #:allow-other-keys)
|
(define* (setup-compiler #:key system inputs outputs #:allow-other-keys)
|
||||||
"Setup the compiler environment."
|
"Setup the compiler environment."
|
||||||
|
|
Reference in New Issue