summaryrefslogtreecommitdiff
path: root/dev-haskell
diff options
context:
space:
mode:
Diffstat (limited to 'dev-haskell')
-rw-r--r--dev-haskell/abstract-deque/abstract-deque-0.3.ebuild2
-rw-r--r--dev-haskell/abstract-deque/files/abstract-deque-0.3-atomic-primops.patch12
-rw-r--r--dev-haskell/comonad/comonad-5.0.6.ebuild15
-rw-r--r--dev-haskell/comonad/metadata.xml18
-rw-r--r--dev-haskell/persistent/metadata.xml6
-rw-r--r--dev-haskell/persistent/persistent-2.10.5.2.ebuild7
-rw-r--r--dev-haskell/wai-app-static/wai-app-static-3.1.7.2-r1.ebuild (renamed from dev-haskell/wai-app-static/wai-app-static-3.1.7.2.ebuild)9
-rw-r--r--dev-haskell/wai-extra/Manifest2
-rw-r--r--dev-haskell/wai-extra/wai-extra-3.1.4.1.ebuild (renamed from dev-haskell/wai-extra/wai-extra-3.0.31.ebuild)8
-rw-r--r--dev-haskell/yesod-core/Manifest2
-rw-r--r--dev-haskell/yesod-core/yesod-core-1.6.18.8.ebuild (renamed from dev-haskell/yesod-core/yesod-core-1.6.18.7.ebuild)0
11 files changed, 41 insertions, 40 deletions
diff --git a/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild b/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild
index 540860f98763..74ca8d523ded 100644
--- a/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild
+++ b/dev-haskell/abstract-deque/abstract-deque-0.3.ebuild
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.8
"
+PATCHES=("${FILESDIR}"/${P}-atomic-primops.patch)
+
src_configure() {
haskell-cabal_src_configure \
$(cabal_flag usecas usecas)
diff --git a/dev-haskell/abstract-deque/files/abstract-deque-0.3-atomic-primops.patch b/dev-haskell/abstract-deque/files/abstract-deque-0.3-atomic-primops.patch
new file mode 100644
index 000000000000..83d408fc7fe4
--- /dev/null
+++ b/dev-haskell/abstract-deque/files/abstract-deque-0.3-atomic-primops.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/750206
+--- a/Data/Concurrent/Deque/Reference.hs
++++ b/Data/Concurrent/Deque/Reference.hs
+@@ -27,7 +27,7 @@ import Data.IORef
+
+ #ifdef USE_CAS
+ #warning "abstract-deque: reference implementation using CAS..."
+-import Data.CAS (atomicModifyIORefCAS)
++import Data.Atomics (atomicModifyIORefCAS)
+ -- Toggle these and compare performance:
+ modify = atomicModifyIORefCAS
+ _is_using_CAS = True
diff --git a/dev-haskell/comonad/comonad-5.0.6.ebuild b/dev-haskell/comonad/comonad-5.0.6.ebuild
index 553ea56cb38e..a7adcec857d8 100644
--- a/dev-haskell/comonad/comonad-5.0.6.ebuild
+++ b/dev-haskell/comonad/comonad-5.0.6.ebuild
@@ -3,7 +3,8 @@
EAPI=7
-# ebuild generated by hackport 0.6.1.9999
+# ebuild generated by hackport 0.6.6.9999
+#hackport: flags: +distributive,+containers
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
@@ -15,25 +16,25 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
-IUSE="+containers +distributive +test-doctests"
+IUSE="+test-doctests"
RESTRICT=test # broken on USE=doc
-RDEPEND=">=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?]
+RDEPEND=">=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
+ >=dev-haskell/semigroups-0.16.2:=[profile?] <dev-haskell/semigroups-1:=[profile?]
>=dev-haskell/tagged-0.7:=[profile?] <dev-haskell/tagged-1:=[profile?]
>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
>=dev-lang/ghc-7.8.2:=
- distributive? ( >=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?] )
"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.18.1.3
>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
- test? ( test-doctests? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17 ) )
+ test? ( test-doctests? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.18 ) )
"
src_configure() {
haskell-cabal_src_configure \
- $(cabal_flag containers containers) \
- $(cabal_flag distributive distributive) \
+ --flag=containers \
+ --flag=distributive \
$(cabal_flag test-doctests test-doctests)
}
diff --git a/dev-haskell/comonad/metadata.xml b/dev-haskell/comonad/metadata.xml
index 006ccc544a21..6b5e0f255558 100644
--- a/dev-haskell/comonad/metadata.xml
+++ b/dev-haskell/comonad/metadata.xml
@@ -6,23 +6,7 @@
<name>Gentoo Haskell</name>
</maintainer>
<use>
- <flag name="test-doctests">
- Run the doctests test suite
- </flag>
- <flag name="containers">
- You can disable the use of the `containers` package
- using `-f-containers`. Disabing this is an unsupported configuration, but it
- may be useful for accelerating builds in sandboxes for expert users.
- </flag>
- <flag name="distributive">
- You can disable the use of the `distributive`
- package using `-f-distributive`. Disabling this is an unsupported
- configuration, but it may be useful for accelerating builds in sandboxes for
- expert users. If disabled we will not supply instances of `Distributive`
- </flag>
+ <flag name="test-doctests">Run the doctests test suite</flag>
</use>
- <upstream>
- <remote-id type="github">ekmett/comonad</remote-id>
- </upstream>
<origin>gentoo-staging</origin>
</pkgmetadata>
diff --git a/dev-haskell/persistent/metadata.xml b/dev-haskell/persistent/metadata.xml
index 379765cb2e0c..bd664ac1426b 100644
--- a/dev-haskell/persistent/metadata.xml
+++ b/dev-haskell/persistent/metadata.xml
@@ -5,11 +5,5 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <longdescription>
- This library provides just the general interface and helper functions. You must use a specific backend in order to make this useful.
- </longdescription>
- <use>
- <flag name="nooverlap">Use OverlappingInstances only for String. Only developers should use this.</flag>
- </use>
<origin>gentoo-staging</origin>
</pkgmetadata>
diff --git a/dev-haskell/persistent/persistent-2.10.5.2.ebuild b/dev-haskell/persistent/persistent-2.10.5.2.ebuild
index c2eb4b4262cc..8d61a278b2a5 100644
--- a/dev-haskell/persistent/persistent-2.10.5.2.ebuild
+++ b/dev-haskell/persistent/persistent-2.10.5.2.ebuild
@@ -3,7 +3,8 @@
EAPI=7
-# ebuild generated by hackport 0.6.4.9999
+# ebuild generated by hackport 0.6.6.9999
+#hackport: flags: -nooverlap
CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
@@ -15,7 +16,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
-IUSE="nooverlap"
+IUSE=""
RDEPEND=">=dev-haskell/aeson-1.0:=[profile?]
dev-haskell/attoparsec:=[profile?]
@@ -45,5 +46,5 @@ DEPEND="${RDEPEND}
src_configure() {
haskell-cabal_src_configure \
- $(cabal_flag nooverlap nooverlap)
+ --flag=-nooverlap
}
diff --git a/dev-haskell/wai-app-static/wai-app-static-3.1.7.2.ebuild b/dev-haskell/wai-app-static/wai-app-static-3.1.7.2-r1.ebuild
index b122e00e7f0c..d29aea060d12 100644
--- a/dev-haskell/wai-app-static/wai-app-static-3.1.7.2.ebuild
+++ b/dev-haskell/wai-app-static/wai-app-static-3.1.7.2-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND=">=dev-haskell/blaze-html-0.5:=[profile?]
>=dev-haskell/unix-compat-0.2:=[profile?]
>=dev-haskell/unordered-containers-0.2:=[profile?]
>=dev-haskell/wai-3.0:=[profile?] <dev-haskell/wai-3.3:=[profile?]
- >=dev-haskell/wai-extra-3.0:=[profile?] <dev-haskell/wai-extra-3.1:=[profile?]
+ >=dev-haskell/wai-extra-3.0:=[profile?] <dev-haskell/wai-extra-3.2:=[profile?]
>=dev-haskell/warp-3.0.11:=[profile?] <dev-haskell/warp-3.4:=[profile?]
>=dev-haskell/zlib-0.5:=[profile?]
>=dev-lang/ghc-7.8.2:=
@@ -44,6 +44,13 @@ DEPEND="${RDEPEND}
dev-haskell/temporary )
"
+src_prepare() {
+ default
+
+ cabal_chdeps \
+ 'wai-extra >= 3.0 && < 3.1' 'wai-extra >= 3.0'
+}
+
src_configure() {
haskell-cabal_src_configure \
$(cabal_flag print print)
diff --git a/dev-haskell/wai-extra/Manifest b/dev-haskell/wai-extra/Manifest
index 098458f7b5dc..83fc723e2f31 100644
--- a/dev-haskell/wai-extra/Manifest
+++ b/dev-haskell/wai-extra/Manifest
@@ -1 +1 @@
-DIST wai-extra-3.0.31.tar.gz 63975 BLAKE2B e705142e48bac00d13d9ec42ecc02a646a081e69a5996794db34bea77b193dccfe9de2f9b89518b234adf226cfc79765c1d8eabcf7c990494e0d206f6a8de080 SHA512 71635f9acc44ffd19b76d7f1a5e43fa079dffe6e447be1c9df4b491cf96c226346788eb773923cf702d44d4620f2a5e7478be1c625b4c2332b9bed7e6e5391d2
+DIST wai-extra-3.1.4.1.tar.gz 67063 BLAKE2B d75f1425cf4c75596adb65c152c954a6005b085f3a290d7dea279a4417d85e359f6948fc8282cee63f2057b4dfe3e33b7a364667544c925582024e4255e71462 SHA512 c33b513bd6e627361007f285167235535ac4065e7198749c14d05cfcd89c5017b54896064c64ffdda9875d6363b684b9beed4098fdbefaba1058045ba3245af5
diff --git a/dev-haskell/wai-extra/wai-extra-3.0.31.ebuild b/dev-haskell/wai-extra/wai-extra-3.1.4.1.ebuild
index c4c729cde5bb..c923228ad142 100644
--- a/dev-haskell/wai-extra/wai-extra-3.0.31.ebuild
+++ b/dev-haskell/wai-extra/wai-extra-3.1.4.1.ebuild
@@ -28,6 +28,7 @@ RDEPEND="dev-haskell/aeson:=[profile?]
>=dev-haskell/fast-logger-2.4.5:=[profile?]
>=dev-haskell/http-types-0.7:=[profile?]
dev-haskell/http2:=[profile?]
+ dev-haskell/hunit:=[profile?]
dev-haskell/iproute:=[profile?]
>=dev-haskell/network-2.6.1.0:=[profile?]
>=dev-haskell/old-locale-1.0.0.2:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
@@ -41,13 +42,12 @@ RDEPEND="dev-haskell/aeson:=[profile?]
>=dev-haskell/wai-logger-2.3.2:=[profile?]
dev-haskell/word8:=[profile?]
dev-haskell/zlib:=[profile?]
- >=dev-lang/ghc-7.10.1:=
+ >=dev-lang/ghc-8.2.1:=
examples? ( dev-haskell/warp:=[profile?] )
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.22.2.0
- test? ( >=dev-haskell/hspec-1.3
- dev-haskell/hunit )
+ >=dev-haskell/cabal-2.0.0.2
+ test? ( >=dev-haskell/hspec-1.3 )
"
src_configure() {
diff --git a/dev-haskell/yesod-core/Manifest b/dev-haskell/yesod-core/Manifest
index 7a6daa51ab59..5702a1c1f6ff 100644
--- a/dev-haskell/yesod-core/Manifest
+++ b/dev-haskell/yesod-core/Manifest
@@ -1 +1 @@
-DIST yesod-core-1.6.18.7.tar.gz 100141 BLAKE2B 0d00fffcc4371868f02ec5ec1fe4f5af15369f62b7bf88562e8c092b3988824cbbe26defd574f2514d23fca983f81cc951b75f564213f568d244069e352cc198 SHA512 fde155df74588d2eb9824e0f423b666228a1b681a83c4f30e194c8816667cd6e4fefb7cddcd66f6ff2ca745ad3ef8daee439a133b017d8583167b54a698a12a1
+DIST yesod-core-1.6.18.8.tar.gz 100016 BLAKE2B 117535cc875be850011b357ebf3bb89e6d854870cefe26e20001e70b93247d85a3bd190e2f889626819f8bc80211b2c64b5d8dac7e9606229ed07c03d8926c2e SHA512 1774281bf8de190995360bcf461adc46b65bac5fa2200aada0b511f73b3bc7bab8365fa4737b4de4723481f7b76c0cb440d68b118c15c46e3d455ea9126bffa7
diff --git a/dev-haskell/yesod-core/yesod-core-1.6.18.7.ebuild b/dev-haskell/yesod-core/yesod-core-1.6.18.8.ebuild
index 8398bc10dcff..8398bc10dcff 100644
--- a/dev-haskell/yesod-core/yesod-core-1.6.18.7.ebuild
+++ b/dev-haskell/yesod-core/yesod-core-1.6.18.8.ebuild
generated by cgit v1.3.1 (git 2.54.0) at 2026-06-01 22:54:52 +0000