summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhololeap <hololeap@protonmail.com>2023-10-02 23:07:35 -0600
committerSam James <sam@gentoo.org>2023-10-23 04:09:37 +0100
commit9b468f8f974bd480cc93e9fde2b421b4fa313755 (patch)
treeb3fe6a2a1edd31ed183722fa1f908aa8bbec64ed /dev-haskell/hackage-security
parentdev-haskell/git-lfs: Loosen constraint on aeson (diff)
downloadgentoo-9b468f8f974bd480cc93e9fde2b421b4fa313755.tar.gz
gentoo-9b468f8f974bd480cc93e9fde2b421b4fa313755.tar.bz2
gentoo-9b468f8f974bd480cc93e9fde2b421b4fa313755.zip
dev-haskell/hackage-security: add 0.6.2.3-r2
Signed-off-by: hololeap <hololeap@protonmail.com> Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-haskell/hackage-security')
-rw-r--r--dev-haskell/hackage-security/Manifest2
-rw-r--r--dev-haskell/hackage-security/files/hackage-security-0.6.2.3-change-cabal-syntax-dep.patch33
-rw-r--r--dev-haskell/hackage-security/hackage-security-0.6.2.3-r2.ebuild75
-rw-r--r--dev-haskell/hackage-security/metadata.xml4
4 files changed, 114 insertions, 0 deletions
diff --git a/dev-haskell/hackage-security/Manifest b/dev-haskell/hackage-security/Manifest
index f57f5b49c431..6e22cb418693 100644
--- a/dev-haskell/hackage-security/Manifest
+++ b/dev-haskell/hackage-security/Manifest
@@ -1 +1,3 @@
DIST hackage-security-0.6.1.0.tar.gz 86243 BLAKE2B f28651d9c0506e4e1b9085e1efd6647ad3dd0dea4fcec2823f3072504831e7d01be34f6a14619cc352ef236214a1fd7073449f00c82c8f7ef5e95cdca1ad3133 SHA512 0a303e8c594a5fef52bf95f3ff75379aeec44fdaebc6ba78da8bf7911798040b43c3c289f0c4d7bcd2c1903d82c29d5ffa012360660c3548c0f3fb4b719a9327
+DIST hackage-security-0.6.2.3-rev3.cabal 12712 BLAKE2B 329c7ad4039411932fc8cdb6f5f31274de8adb11ab68a6688a03bd9d20043ee7df66e9c063aba33aaf7435470190d3e775f7d121011c5ef4b8dd8dfe2837eeb2 SHA512 cf4545d393745efd29da0882b093299d7a6cf8072c3219d71a3d5d1f754bf8b435e135df686447dd785f18ab190287ca57f2a749bb3b1d59199d6d00225684f5
+DIST hackage-security-0.6.2.3.tar.gz 86611 BLAKE2B 4cc851be655c6b4dc9435f129bcd1bda4b31dc16e0a97181c6e68a91c374d662937d5b629934087b6eb13db4c3b49217e3ed924f98024f2b868dca4eced13750 SHA512 d2bd80a940a2bacdbe6c6f5086ae846eb27548f0013952e0fe95dfbdea7bc4f17631f86f295d62b02a491f3903d8a5ab316bad2d8227fd240f459cbe966b1b84
diff --git a/dev-haskell/hackage-security/files/hackage-security-0.6.2.3-change-cabal-syntax-dep.patch b/dev-haskell/hackage-security/files/hackage-security-0.6.2.3-change-cabal-syntax-dep.patch
new file mode 100644
index 000000000000..dc26881ebdbe
--- /dev/null
+++ b/dev-haskell/hackage-security/files/hackage-security-0.6.2.3-change-cabal-syntax-dep.patch
@@ -0,0 +1,33 @@
+From b228347d62b7c69f16d1983d4c8c70f6601c7351 Mon Sep 17 00:00:00 2001
+From: hololeap <hololeap@users.noreply.github.com>
+Date: Sun, 2 Jul 2023 14:33:27 -0600
+Subject: [PATCH] Change dependency on Cabal-syntax
+
+Do not add Cabal-syntax to build-depends when the Cabal-syntax flag is
+off.
+
+This will ensure that Cabal-syntax is ignored/omitted when the flag is
+off which will prevent version conflicts with >=Cabal-syntax-3.8
+
+Signed-off-by: hololeap <hololeap@users.noreply.github.com>
+---
+ hackage-security.cabal | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/hackage-security.cabal b/hackage-security.cabal
+index 58afd57..f0463f4 100644
+--- a/hackage-security.cabal
++++ b/hackage-security.cabal
+@@ -170,8 +170,7 @@ library
+ else
+ build-depends: Cabal >= 1.14 && < 1.26
+ || >= 2.0 && < 2.6
+- || >= 3.0 && < 3.7,
+- Cabal-syntax < 3.7
++ || >= 3.0 && < 3.7
+
+ hs-source-dirs: src
+ default-language: Haskell2010
+--
+2.39.3
+
diff --git a/dev-haskell/hackage-security/hackage-security-0.6.2.3-r2.ebuild b/dev-haskell/hackage-security/hackage-security-0.6.2.3-r2.ebuild
new file mode 100644
index 000000000000..a1f898fad5cb
--- /dev/null
+++ b/dev-haskell/hackage-security/hackage-security-0.6.2.3-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.2.0.9999
+#hackport: flags: -mtl21,+use-network-uri,-Cabal-syntax
+
+CABAL_HACKAGE_REVISION=3
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
+inherit haskell-cabal
+RESTRICT="test" # Requires Cabal-3.8 or newer
+
+DESCRIPTION="Hackage security library"
+HOMEPAGE="https://github.com/haskell/hackage-security"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="+lukko"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.6.2.3-change-cabal-syntax-dep.patch"
+)
+
+CABAL_CHDEPS=(
+ '|| >= 3.0 && < 3.7' '|| >= 3.0'
+)
+
+RDEPEND="
+ >=dev-haskell/base16-bytestring-0.1.1:=[profile?] <dev-haskell/base16-bytestring-1.1:=[profile?]
+ >=dev-haskell/base64-bytestring-1.0:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?]
+ >=dev-haskell/cryptohash-sha256-0.11:=[profile?] <dev-haskell/cryptohash-sha256-0.12:=[profile?]
+ >=dev-haskell/ed25519-0.0:=[profile?] <dev-haskell/ed25519-0.1:=[profile?]
+ >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
+ >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+ >=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?]
+ >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+ >=dev-lang/ghc-8.8.1:=
+ || (
+ ( >=dev-haskell/network-2.6 <dev-haskell/network-2.9 )
+ ( >=dev-haskell/network-3.0 <dev-haskell/network-3.2 )
+ )
+ dev-haskell/network:=[profile?]
+ lukko? (
+ >=dev-haskell/lukko-0.1:=[profile?] <dev-haskell/lukko-0.2:=[profile?]
+ )
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-3.0.0.0
+"
+# test? (
+# >=dev-haskell/cabal-3.7 <dev-haskell/cabal-3.12
+# >=dev-haskell/quickcheck-2.11 <dev-haskell/quickcheck-2.15
+# >=dev-haskell/tasty-1.2 <dev-haskell/tasty-1.5
+# >=dev-haskell/tasty-hunit-0.10 <dev-haskell/tasty-hunit-0.11
+# >=dev-haskell/tasty-quickcheck-0.10 <dev-haskell/tasty-quickcheck-0.11
+# >=dev-haskell/temporary-1.2 <dev-haskell/temporary-1.4
+# dev-haskell/text
+# >=dev-haskell/unordered-containers-0.2.8.0 <dev-haskell/unordered-containers-0.3
+# >=dev-haskell/vector-0.12 <dev-haskell/vector-0.14
+# || (
+# ( >=dev-haskell/aeson-1.4 <dev-haskell/aeson-1.6 )
+# ( >=dev-haskell/aeson-2.0 <dev-haskell/aeson-2.2 )
+# )
+# )
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=-Cabal-syntax \
+ $(cabal_flag lukko lukko) \
+ --flag=-mtl21 \
+ --flag=use-network-uri
+}
diff --git a/dev-haskell/hackage-security/metadata.xml b/dev-haskell/hackage-security/metadata.xml
index 67d5d614a4f2..63d1cf7e461f 100644
--- a/dev-haskell/hackage-security/metadata.xml
+++ b/dev-haskell/hackage-security/metadata.xml
@@ -8,4 +8,8 @@
<use>
<flag name="lukko">Use @lukko@ for file-locking, otherwise use @GHC.IO.Handle.Lock@</flag>
</use>
+ <upstream>
+ <remote-id type="hackage">hackage-security</remote-id>
+ <remote-id type="github">haskell/hackage-security</remote-id>
+ </upstream>
</pkgmetadata>