diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-09-16 09:32:48 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-09-16 09:32:48 +0100 |
| commit | 9ee6d97c2883d42f204a533a8bc1f4562df778fb (patch) | |
| tree | b690ddc0ca30f1472887edbb0b8313629bfcbbb2 /dev-haskell/hpack | |
| parent | b17a3ef12038de50228bade1f05502c74e135321 (diff) | |
gentoo resync : 16.09.2020
Diffstat (limited to 'dev-haskell/hpack')
| -rw-r--r-- | dev-haskell/hpack/Manifest | 5 | ||||
| -rw-r--r-- | dev-haskell/hpack/files/hpack-0.14.1-aeson-1.patch | 24 | ||||
| -rw-r--r-- | dev-haskell/hpack/hpack-0.14.1.ebuild | 39 | ||||
| -rw-r--r-- | dev-haskell/hpack/metadata.xml | 3 |
4 files changed, 1 insertions, 70 deletions
diff --git a/dev-haskell/hpack/Manifest b/dev-haskell/hpack/Manifest index cf92c3e82bab..f988dd3b7897 100644 --- a/dev-haskell/hpack/Manifest +++ b/dev-haskell/hpack/Manifest @@ -1,6 +1,3 @@ -AUX hpack-0.14.1-aeson-1.patch 1088 BLAKE2B fbdac681ca35879fe0cf789cf8f4f8b459e3900a6b56bedb48afd8fef7b6cc890341c5649da8127752a4131402d8e67f50c3722ce9ba41cbd5a97f4976809d76 SHA512 ac178c92f2dbd1e0b498b82363b5c03525597c2f3d0fe834f9e7b6e80312e6adae773861b6c18768cd45c2ea323b10ea65b8e5f2991cd3678e9966d9fd876172 -DIST hpack-0.14.1.tar.gz 38373 BLAKE2B d5c3b900e3e2fd852081934f4a7b4a327f4647608ceecf76ac65faf4e464bed7428e4b444f7b06f8a0e7661458e1817aedaaa2ea2dd8161a362be9f596f7f0be SHA512 5bd7b5335aef1a3d866c07937e457397c82235c99b578b6270b699895b9a5d39259eef324e6741af9a6e296bfe56587fc9888dc0fc2e4bd6fe99bbc74a7e0b04 DIST hpack-0.33.0.tar.gz 60260 BLAKE2B 555178af9cc84e8c0dcf55890908933c9d17d3c7d45d3ec0d309a4e561bf4ea2eb7fbacae7cff232215de59dad3e36734d03f0d574c28d891bdb5c68c1113b45 SHA512 8d70bea1c18e9a26fe137f6e20fec4af28dff6ebc50981d2f57ad9a8e0b9574ff158adb5ba16597b6a5f0e4d843c09fee57dd82407dc1383b1e07453b64d010b -EBUILD hpack-0.14.1.ebuild 1026 BLAKE2B 87f608e3f3f6406f8058db7e15ef4f49dd354b85cf67015d4e7e1c6811facb2fb9884daf111e883ee9dc186adfb581fbc4186da872a8722fbfbd61c76a64879b SHA512 185578951d9dffbf17004ebf23eb9900c364923a89a39d11d2fc92364a889b9b8e4a685807b4c198bc751aab415e121598ad4a526e764ba0ceb03bad1d5ccb63 EBUILD hpack-0.33.0.ebuild 1319 BLAKE2B 1ab4afe3df91a437e9cf246fbaba5172c007327a1712e93d477b77f54b9e0126239753627b7b6f425f0f9f7c67734708d9c31e3be00d14d90407cd1c51ac9d6d SHA512 fef932f0f9ba1cd685f5dc61e75ffdcc2b8087e24d55afe31a6677294e6b2a2fe65df85a2c61cb77f4625f9574dd9dfa2f4e828891284b0f6a63755dbcfff178 -MISC metadata.xml 333 BLAKE2B e31588ab4845a712814c6d194bcf1d2b4600011055f83c672ee183f2f8bfdc4d8da339027953a59aabf0765c683a1aaf92f3dcfb8eb6899f2b77c2df856f08e4 SHA512 0de08ff54a63322f19c4b560d10130fe7d78ff9c4880fdac2da4d5ebcdeb1fe3800e8910b60319e4218c8cc9ac547fa4b01885f8a21078da2f4c80e6e84b405b +MISC metadata.xml 249 BLAKE2B 84b809c265ff2a09d1f06c66d4797652ff4c64205d94323e07333ae0fbddcfb8c58d0176a8cc52bd37e9353371d987b9b473b9747cb082e1c2871ed80fcfa144 SHA512 ce055b41ff1c10209e88579fe21ce16550be7e9b21f87724564f06430aa6f478974f186a10c8ff7e92398f534c09109aeed57eae1c6d2b56b5c99ebfb64a0015 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 deleted file mode 100644 index a4b3fd1f4b6a..000000000000 --- a/dev-haskell/hpack/files/hpack-0.14.1-aeson-1.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/Hpack/Config.hs b/src/Hpack/Config.hs -index cb84f71..5566b8c 100644 ---- a/src/Hpack/Config.hs -+++ b/src/Hpack/Config.hs -@@ -101,3 +101,9 @@ githubBaseUrl = "https://github.com/" - --genericParseJSON_ :: forall a. (Generic a, GFromJSON (Rep a), HasTypeName a) => Value -> Parser a -+#if MIN_VERSION_aeson(1,0,0) -+# define AESON_ARITY Zero -+#else -+# define AESON_ARITY -+#endif -+ -+genericParseJSON_ :: forall a. (Generic a, GFromJSON AESON_ARITY (Rep a), HasTypeName a) => Value -> Parser a - genericParseJSON_ = genericParseJSON defaultOptions {fieldLabelModifier = hyphenize name} -diff --git a/test/Hpack/ConfigSpec.hs b/test/Hpack/ConfigSpec.hs -index 320ba9a..d13d932 100644 ---- a/test/Hpack/ConfigSpec.hs -+++ b/test/Hpack/ConfigSpec.hs -@@ -971,3 +971,3 @@ spec = do - |] -- readPackageConfig file `shouldReturn` Left (file ++ ": Error in $.executables.foo: failed to parse field executables: The key \"main\" was not found") -+ readPackageConfig file `shouldReturn` Left (file ++ ": Error in $.executables.foo: key \"main\" not present") - diff --git a/dev-haskell/hpack/hpack-0.14.1.ebuild b/dev-haskell/hpack/hpack-0.14.1.ebuild deleted file mode 100644 index cb1770d7b30a..000000000000 --- a/dev-haskell/hpack/hpack-0.14.1.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# ebuild generated by hackport 0.5.9999 - -CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite" -inherit haskell-cabal - -DESCRIPTION="An alternative format for Haskell packages" -HOMEPAGE="https://github.com/sol/hpack#readme" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-haskell/aeson-0.8:=[profile?] - >=dev-haskell/base-compat-0.8:=[profile?] - dev-haskell/glob:=[profile?] - dev-haskell/text:=[profile?] - dev-haskell/unordered-containers:=[profile?] - dev-haskell/yaml:=[profile?] - >=dev-lang/ghc-7.8.2:= -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.18.1.3 - test? ( >=dev-haskell/aeson-0.10 - dev-haskell/aeson-qq - >=dev-haskell/hspec-2 <dev-haskell/hspec-3 - dev-haskell/interpolate - >=dev-haskell/mockery-0.3 - dev-haskell/quickcheck - dev-haskell/temporary ) -" - -PATCHES=("${FILESDIR}"/${P}-aeson-1.patch) diff --git a/dev-haskell/hpack/metadata.xml b/dev-haskell/hpack/metadata.xml index acec350af770..b7878815d80d 100644 --- a/dev-haskell/hpack/metadata.xml +++ b/dev-haskell/hpack/metadata.xml @@ -5,7 +5,4 @@ <email>haskell@gentoo.org</email> <name>Gentoo Haskell</name> </maintainer> - <longdescription> - An alternative format for Haskell packages - </longdescription> </pkgmetadata> |