From 534d6caa0b41fa762b7db81962512a809e1918c7 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Wed, 24 Jun 2020 23:57:56 +0200 Subject: gnu: Add "static" output to Haskell packages with custom outputs. All these packages have non-standard outputs. As a result the build system cannot automatically add the "static" output, so we do this manually. * gnu/packages/haskell-check.scm (ghc-quickcheck, ghc-hunit)[outputs]: Add "static" output. * gnu/packages/haskell-web.scm (ghc-http)[outputs]: Same. * gnu/packages/haskell-xyz.scm (ghc-case-insensitive, ghc-fgl, ghc-hashable, ghc-network, ghc-network-uri, ghc-parallel, ghc-paths, ghc-primitive, ghc-random, ghc-split, ghc-syb, ghc-tf-random, ghc-unordered-containers, ghc-vector, ghc-zlib)[outputs]: Same. --- gnu/packages/haskell-web.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index c53dc064b1..82da50f456 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -171,7 +171,7 @@ (define-public ghc-http (package (name "ghc-http") (version "4000.3.14") - (outputs '("out" "doc")) + (outputs '("out" "static" "doc")) (source (origin (method url-fetch) -- cgit v1.2.3 From d39512776f85087234998765bbe2f2ebdcee511a Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 26 Jun 2020 15:23:24 +0200 Subject: gnu: ghc-blaze-html: Add "doc" output. * gnu/packages/haskell-web.scm (ghc-blaze-html)[outputs]: Add "doc" output next to "out" and "static". --- gnu/packages/haskell-web.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 82da50f456..f9af538c63 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -904,6 +904,7 @@ (define-public ghc-blaze-html (base32 "0k1r1hddjgqighazcazxrx6xfhvy2gm8il8l82ainv3cai13yl30")))) (build-system haskell-build-system) + (outputs '("out" "static" "doc")) (inputs `(("ghc-blaze-builder" ,ghc-blaze-builder) ("ghc-blaze-markup" ,ghc-blaze-markup))) -- cgit v1.2.3 From b2509e608a463ad9a349b431013ed988843ce9b1 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 26 Jun 2020 15:23:54 +0200 Subject: gnu: ghc-aeson: Add "doc" output. * gnu/packages/haskell-web.scm (ghc-aeson)[outputs]: Add "doc" output next to "out" and "static". --- gnu/packages/haskell-web.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index f9af538c63..abbc17e4ee 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -935,6 +935,7 @@ (define-public ghc-aeson "1jhabz1lbbv6yqxqiybifi86cb5xlsadrn368n5dd0wzzc7ja4iz")))) (build-system haskell-build-system) (arguments `(#:tests? #f)) ; FIXME: testing libraries are missing. + (outputs '("out" "static" "doc")) (inputs `(("ghc-attoparsec" ,ghc-attoparsec) ("ghc-base-compat" ,ghc-base-compat) -- cgit v1.2.3 From 3a6f490c48785dc0568a2dff84700f5b747c33ba Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 26 Jun 2020 15:25:07 +0200 Subject: gnu: ghc-hxt: Add "doc" output. * gnu/packages/haskell-web.scm (ghc-hxt)[outputs]: Add "doc" output next to "out" and "static". --- gnu/packages/haskell-web.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index abbc17e4ee..5931fcaea5 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -1472,6 +1472,7 @@ (define-public ghc-hxt (base32 "0836k65px3w9c5h1h2bmzq5a7mp6ajxwvfg3pfr2kbxwkgc0j63j")))) (build-system haskell-build-system) + (outputs '("out" "static" "doc")) (inputs `(("ghc-hxt-charproperties" ,ghc-hxt-charproperties) ("ghc-hxt-unicode" ,ghc-hxt-unicode) -- cgit v1.2.3 From f79e4b1fcd2bf082610e868fbd4c9e5c505c9f49 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sat, 27 Jun 2020 22:36:14 +0200 Subject: gnu: ghc-http: Prevent embedding of spurious references. * gnu/packages/haskell-web.scm (ghc-http)[arguments]: Add build phase "create-simple-paths-module" to avoid retaining unnecessary references. --- gnu/packages/haskell-web.scm | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'gnu/packages/haskell-web.scm') diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm index 5931fcaea5..b9474c973a 100644 --- a/gnu/packages/haskell-web.scm +++ b/gnu/packages/haskell-web.scm @@ -197,7 +197,23 @@ (define-public ghc-http ("ghc-network-uri" ,ghc-network-uri) ("ghc-split" ,ghc-split))) (arguments - `(#:tests? #f)) ; FIXME: currently missing libraries used for tests. + `(#:tests? #f ; FIXME: currently missing libraries used for tests. + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'create-simple-paths-module + (lambda _ + (call-with-output-file "Paths_HTTP.hs" + (lambda (port) + (format port "\ +{-# LANGUAGE CPP #-} +{-# LANGUAGE NoRebindableSyntax #-} +{-# OPTIONS_GHC -fno-warn-missing-import-lists #-} +module Paths_HTTP (version) where +import Data.Version (Version(..)) +version :: Version +version = Version [~a] [] +" (string-map (lambda (chr) (if (eq? chr #\.) #\, chr)) ,version)))) + #t))))) (home-page "https://github.com/haskell/HTTP") (synopsis "Library for client-side HTTP") (description -- cgit v1.2.3