Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-haskell/hpack/, dev-haskell/hpack/files/
Date: Sun, 28 May 2017 17:53:40
Message-Id: 1495993978.b1804a87a8bcf950a2fc12a2960bf68703f4b90a.slyfox@gentoo
1 commit: b1804a87a8bcf950a2fc12a2960bf68703f4b90a
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 28 12:52:43 2017 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Sun May 28 17:52:58 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1804a87
7
8 dev-haskell/hpack: new package, a depend of dev-haskell/stack
9
10 An alternative format for Haskell packages
11
12 Package-Manager: Portage-2.3.6, Repoman-2.3.2
13
14 dev-haskell/hpack/Manifest | 1 +
15 dev-haskell/hpack/files/hpack-0.14.1-aeson-1.patch | 24 +++++++++++++
16 dev-haskell/hpack/hpack-0.14.1.ebuild | 39 ++++++++++++++++++++++
17 dev-haskell/hpack/metadata.xml | 11 ++++++
18 4 files changed, 75 insertions(+)
19
20 diff --git a/dev-haskell/hpack/Manifest b/dev-haskell/hpack/Manifest
21 new file mode 100644
22 index 00000000000..7c0ced9a5ff
23 --- /dev/null
24 +++ b/dev-haskell/hpack/Manifest
25 @@ -0,0 +1 @@
26 +DIST hpack-0.14.1.tar.gz 38373 SHA256 a930e8719c52f42826efab92f33252e3dfbf664296ce8075334b48e38bc51280 SHA512 5bd7b5335aef1a3d866c07937e457397c82235c99b578b6270b699895b9a5d39259eef324e6741af9a6e296bfe56587fc9888dc0fc2e4bd6fe99bbc74a7e0b04 WHIRLPOOL 5ae4e8e65009b5a576176590abd276bedd4a46a8c8adaeff7f14cc7752d17ee10b1f3c1530caab45ad7ac53ae1daf5d273717081da6edba875f1450064436ecd
27
28 diff --git a/dev-haskell/hpack/files/hpack-0.14.1-aeson-1.patch b/dev-haskell/hpack/files/hpack-0.14.1-aeson-1.patch
29 new file mode 100644
30 index 00000000000..a4b3fd1f4b6
31 --- /dev/null
32 +++ b/dev-haskell/hpack/files/hpack-0.14.1-aeson-1.patch
33 @@ -0,0 +1,24 @@
34 +diff --git a/src/Hpack/Config.hs b/src/Hpack/Config.hs
35 +index cb84f71..5566b8c 100644
36 +--- a/src/Hpack/Config.hs
37 ++++ b/src/Hpack/Config.hs
38 +@@ -101,3 +101,9 @@ githubBaseUrl = "https://github.com/"
39 +
40 +-genericParseJSON_ :: forall a. (Generic a, GFromJSON (Rep a), HasTypeName a) => Value -> Parser a
41 ++#if MIN_VERSION_aeson(1,0,0)
42 ++# define AESON_ARITY Zero
43 ++#else
44 ++# define AESON_ARITY
45 ++#endif
46 ++
47 ++genericParseJSON_ :: forall a. (Generic a, GFromJSON AESON_ARITY (Rep a), HasTypeName a) => Value -> Parser a
48 + genericParseJSON_ = genericParseJSON defaultOptions {fieldLabelModifier = hyphenize name}
49 +diff --git a/test/Hpack/ConfigSpec.hs b/test/Hpack/ConfigSpec.hs
50 +index 320ba9a..d13d932 100644
51 +--- a/test/Hpack/ConfigSpec.hs
52 ++++ b/test/Hpack/ConfigSpec.hs
53 +@@ -971,3 +971,3 @@ spec = do
54 + |]
55 +- readPackageConfig file `shouldReturn` Left (file ++ ": Error in $.executables.foo: failed to parse field executables: The key \"main\" was not found")
56 ++ readPackageConfig file `shouldReturn` Left (file ++ ": Error in $.executables.foo: key \"main\" not present")
57 +
58
59 diff --git a/dev-haskell/hpack/hpack-0.14.1.ebuild b/dev-haskell/hpack/hpack-0.14.1.ebuild
60 new file mode 100644
61 index 00000000000..7ae2c30ef74
62 --- /dev/null
63 +++ b/dev-haskell/hpack/hpack-0.14.1.ebuild
64 @@ -0,0 +1,39 @@
65 +# Copyright 1999-2017 Gentoo Foundation
66 +# Distributed under the terms of the GNU General Public License v2
67 +
68 +EAPI=6
69 +
70 +# ebuild generated by hackport 0.5.9999
71 +
72 +CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
73 +inherit haskell-cabal
74 +
75 +DESCRIPTION="An alternative format for Haskell packages"
76 +HOMEPAGE="https://github.com/sol/hpack#readme"
77 +SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
78 +
79 +LICENSE="MIT"
80 +SLOT="0/${PV}"
81 +KEYWORDS="~amd64 ~x86"
82 +IUSE=""
83 +
84 +RDEPEND=">=dev-haskell/aeson-0.8:=[profile?]
85 + >=dev-haskell/base-compat-0.8:=[profile?]
86 + dev-haskell/glob:=[profile?]
87 + dev-haskell/text:=[profile?]
88 + dev-haskell/unordered-containers:=[profile?]
89 + dev-haskell/yaml:=[profile?]
90 + >=dev-lang/ghc-7.8.2:=
91 +"
92 +DEPEND="${RDEPEND}
93 + >=dev-haskell/cabal-1.18.1.3
94 + test? ( >=dev-haskell/aeson-0.10
95 + dev-haskell/aeson-qq
96 + >=dev-haskell/hspec-2 <dev-haskell/hspec-3
97 + dev-haskell/interpolate
98 + >=dev-haskell/mockery-0.3
99 + dev-haskell/quickcheck
100 + dev-haskell/temporary )
101 +"
102 +
103 +PATCHES=("${FILESDIR}"/${P}-aeson-1.patch)
104
105 diff --git a/dev-haskell/hpack/metadata.xml b/dev-haskell/hpack/metadata.xml
106 new file mode 100644
107 index 00000000000..acec350af77
108 --- /dev/null
109 +++ b/dev-haskell/hpack/metadata.xml
110 @@ -0,0 +1,11 @@
111 +<?xml version="1.0" encoding="UTF-8"?>
112 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
113 +<pkgmetadata>
114 + <maintainer type="project">
115 + <email>haskell@g.o</email>
116 + <name>Gentoo Haskell</name>
117 + </maintainer>
118 + <longdescription>
119 + An alternative format for Haskell packages
120 + </longdescription>
121 +</pkgmetadata>