From 9ee6d97c2883d42f204a533a8bc1f4562df778fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 16 Sep 2020 09:32:48 +0100 Subject: gentoo resync : 16.09.2020 --- dev-haskell/c2hs/Manifest | 16 -------- dev-haskell/c2hs/c2hs-0.16.4.ebuild | 48 ---------------------- dev-haskell/c2hs/c2hs-0.16.5.ebuild | 45 -------------------- dev-haskell/c2hs/c2hs-0.17.2.ebuild | 32 --------------- dev-haskell/c2hs/c2hs-0.20.1.ebuild | 33 --------------- dev-haskell/c2hs/c2hs-0.25.2.ebuild | 40 ------------------ dev-haskell/c2hs/c2hs-0.27.1.ebuild | 40 ------------------ dev-haskell/c2hs/c2hs-0.28.3.ebuild | 40 ------------------ .../c2hs/files/c2hs-0.16.3-language-c-0.4.patch | 25 ----------- dev-haskell/c2hs/files/c2hs-0.16.4-ghc-7.6.patch | 34 --------------- 10 files changed, 353 deletions(-) delete mode 100644 dev-haskell/c2hs/c2hs-0.16.4.ebuild delete mode 100644 dev-haskell/c2hs/c2hs-0.16.5.ebuild delete mode 100644 dev-haskell/c2hs/c2hs-0.17.2.ebuild delete mode 100644 dev-haskell/c2hs/c2hs-0.20.1.ebuild delete mode 100644 dev-haskell/c2hs/c2hs-0.25.2.ebuild delete mode 100644 dev-haskell/c2hs/c2hs-0.27.1.ebuild delete mode 100644 dev-haskell/c2hs/c2hs-0.28.3.ebuild delete mode 100644 dev-haskell/c2hs/files/c2hs-0.16.3-language-c-0.4.patch delete mode 100644 dev-haskell/c2hs/files/c2hs-0.16.4-ghc-7.6.patch (limited to 'dev-haskell/c2hs') diff --git a/dev-haskell/c2hs/Manifest b/dev-haskell/c2hs/Manifest index 1000276e4574..2e1cf91596d5 100644 --- a/dev-haskell/c2hs/Manifest +++ b/dev-haskell/c2hs/Manifest @@ -1,19 +1,3 @@ -AUX c2hs-0.16.3-language-c-0.4.patch 790 BLAKE2B 73299015b4a88d4ee0fd69509e23748c1050651f6d0fad5828a5e908cc758b998421592656fe6871cdfae4982c9a3dfb95ab5a40603dc7f59b3f5277790cf734 SHA512 c7a3baacb08dd7fca8688f04e7cdd434c8a6e37c6ec98abbf1ea329842a9d4d8639b1a326fa73919f83557760d9b87c0467f2af6801408a7c6d6eb71ce85ef76 -AUX c2hs-0.16.4-ghc-7.6.patch 1412 BLAKE2B 8a9138f72fe2a59966a60128ee6bff8af317b08f09d20a0db8914da13b429201b289d7dd1f84ad385ff8546eaea2c3279e175e851533a296d1f3a19325fd2ac1 SHA512 d697baf43aa8b54abe292d7efff9907a1673b022cb2cc554ba44c3965fb1bfda979edadb46527325c431d7d727e86ce04c63c1dc235ed6b95d173d69829f24a0 -DIST c2hs-0.16.4.tar.gz 138114 BLAKE2B a8278aafa9ba27ba59b39745b4a2e169d7b32d4a3c139dc1fdcb4445cb0376beb791664c9b4790d7a11589f83c22e0fd3a4e5cb74b79fedbc0216492c8f52be8 SHA512 7dacfab1a469d6613b6acd6ebfb70efa275c4588bcaa6277aa411b90674c11ae031bb9edae6b7e648da6a1232fc6cb702af2fce5a68dd04124bf2f5ba9813329 -DIST c2hs-0.16.5.tar.gz 137294 BLAKE2B 685a8f9c98c5e0877893907cb7af9f8cd93e8559e49427bef757445547aa88c8c6dce0a81e115af5c1555ec7be67c250c088fd704cc4b96dc43c9eda68d72e37 SHA512 4ef187366da3ca33f10eb878b5f31603ebb038b9f02a6d22f284ad8212a0de2ce7f48bc1a9fe0fe94d52588594c9230ebd69cb4c17d0601b4d3326474220636b -DIST c2hs-0.17.2.tar.gz 167739 BLAKE2B 50604da33333d235639789090798fa152688d77335a2237272bf086a2a75b7fbbc6c612d16428ca94e07da66cab16fd54eec115f88c79789071f9a87e3c8e416 SHA512 19ef7a589a1700af2e2f2426b43b454ab49467a97d85c3731da77a9b163709d09e4e58b31d13c0127b807764cff7c62c2b8675cf36d91198d83a9ea9ed4c402c -DIST c2hs-0.20.1.tar.gz 184115 BLAKE2B fd55ee28918c41734096cfea50f40e1a5c56d212c4fbddce1a7bff81bead428144c232f4a7fb47dfa9d5914da78d78cb92330fd493b0facfc3f033ee96be347d SHA512 fe22257b6003d9133b7f0264c19070eee10200452f783a5c6f36eda44b96d80e5e728d91bca8349461c69de5ae93af3a9bbd67e67c30a182543ee3c79889c51a -DIST c2hs-0.25.2.tar.gz 198733 BLAKE2B 853faa19ba91a4536bed691d0eb26969dc96ef6830512441a1d14e193f084e0ae36d846bfdc160abf6d08fda0d7e9706f9c78b9be627e4c2864e3d9d2e098576 SHA512 0f3b2df55277f9f44e39270cdc6a5695dd15e8095874406de5830c2d7d45dd364abcd5eafc9323e2a76eeb6622aa7da39734995be01e7f026d8f2395803c2ef3 -DIST c2hs-0.27.1.tar.gz 205108 BLAKE2B 268ed9f95e77d292626e0fff6e1ac8334204dd1a1b7474e62746f8be444e57b1f3eb22eb2a4e46f0682c687fa01683923f22542d6b7456566f22d8ad7cb0ed81 SHA512 22894e518512a53ed23b2d6e3395918a1fdfb60180a9ec489bb7fcb70d5d870bdb37c66e9a49f07ae5babf3808e57f1d932e13cf80132ab50666c6899d55d62a -DIST c2hs-0.28.3.tar.gz 253559 BLAKE2B efc0965e955b05456385648750abeda3371cb0417c508bd8590158289d699b019d88454fd17bb7f9e49f450e581ca6367e08d958ccc1ad7ef56f8a354d33deb2 SHA512 17306b6ee41623d1c017581ed7aef6118a66c30a4698fa95d588b30ac625a6571906bb1fffecf7b86296667390d18cfe5ee2ade85098075f2ca982922b358b3a DIST c2hs-0.28.6.tar.gz 204988 BLAKE2B 89bc8c588a93728abf3411cd23631b57157721213da3a2bdf96da41aa8ee28451396995f8c7bc1bea94be050e92c81a991256f73b0bf6a8dbdf3156bcf95563e SHA512 848693ddf787244cc0f100f533030889a1efcef283f06ef609574d9cd0005679fab373172a949408ce6d4b9c97d15a56b0ec11fe39b466ad3f84aa527d2ab1c9 -EBUILD c2hs-0.16.4.ebuild 1018 BLAKE2B 953df4fad8a22fd77f2228f374f57a806126045194cda3d45c943c31b4483d7427c76c4cd06d9e4441d9bb1441130224871c74103899108cb40b9b1bc3eb4c9f SHA512 14e45bbcbda9c2516c536b13ce338661632e3f7ec74d8e63d91dcb9c16a91a70d53a0b31ee7b34196f8a577eeb69e918951f2662da58675dafb0a17ec60328e1 -EBUILD c2hs-0.16.5.ebuild 912 BLAKE2B 88ba2f71e8747242d9bbffa9fee7007bffcf1c02cb993d0a48b74c01d7690b47ad4b447672e37f4c023354599c125c9e0db8ea8e4de09818c40c6585e6b76093 SHA512 d06d124d67ff97c061c7aca253afd93b48fd8a7874c77b6f414e2167bc39ff331bf095f66289bee129add6e373caa8660d3cef1f10f148d61ae83dfc7d4ab47b -EBUILD c2hs-0.17.2.ebuild 772 BLAKE2B 8486b9b0a6dee54360afbae3e3d691a336d359ef22cd76a9233d7ad0bc1201ee708e80bdd4d71236186ecbfc411bbbb0b013f385fc329d552495e8d1103284de SHA512 cc9e9112eddf81e8eb34902ce55b9d9191fbdf46757d2b365e7eab62d7a15fa3e1e48bd6f3396ab9493be5ec1ed7bd48d8df989c420c81f8ac6e2be243aa32bd -EBUILD c2hs-0.20.1.ebuild 796 BLAKE2B 94d2381247cd632a80f6bbd128a32127b05e6f1e6dbbccc48cf0200174a4d633c948920e0e3ce622070dd76cf217a7e3c9f371f7025c0ac0b9f9dbde09feba4f SHA512 19c07ee731a89383af7c25a2b01c40799c39a2a9073035fa04900838d60e4dd0b94111898127e94b7e30db43065a39f89158e663d4b1ffab1131bb0cd608cab7 -EBUILD c2hs-0.25.2.ebuild 996 BLAKE2B 7ae6c0b2f2990d01bf6884f251ef844077314f2675ff776a6297bb84007642d6f8e67cf0124311d7fc4f1aec2a28c52df88fa689f52f2d22fd573ac2bbd5a608 SHA512 748e3375fe614a821592b57b6863a1e92111b14da4245019ec991d079b8c0a5d0a0e109c25a6ccc6634b725cf0876fa1ef0395eb62bc89ff35c19b3fb76cac45 -EBUILD c2hs-0.27.1.ebuild 996 BLAKE2B 4c20481e4275cb094e5b35a81a310af0ced621bd8b0a28710ad45ddd3242e4999bcf1d4a6be0c520e9f7c0a44003dfc2908c20456b1a3ce2cdb965efb42a98ac SHA512 6e095eb222d6728fad1a636d6363424a0aa98d9b204e0d3348e6e9b89a3b908a33602bc1c3f4c811d654d46902024d44100aa7f357ffc91688bc4f369bab7121 -EBUILD c2hs-0.28.3.ebuild 992 BLAKE2B ff8c67b6130b369dd0e569d404a4e98c14bfc01b9628da0a413a44121af312c5f30e871c0bd98a13e478739f4972511462df591a44251e59752a4d48cf8452aa SHA512 a9088ab44d4ee8e9006e0d024087cf2fbc97f6aa1450a7973063a16be3fb5ab74b7af67079dae3c9357a0965fe5e0162695f0bfd65ba22332e89dfe025cfe442 EBUILD c2hs-0.28.6.ebuild 977 BLAKE2B f912543b5b0411143f1f1534f1c2e1ee0fdb64d50ee4ed468849eba2fa635c58df0fe1872e5d7c4ee384acaaab4b47f90dddb57d6527a3e24308f72704f51048 SHA512 93b43e383b763d9acae9fbf5f3762f0012b3007dcf4e81c705a10bb7a84b336d2dc1e5275994dda95565c71d5e0e21e0bd8ac6bdc0d01b0111f62921eca4ac12 MISC metadata.xml 774 BLAKE2B 0da02d79142cc144b8bfb9096ee19c6f1715f1431ae4205e4727157ee110d1bd363cc33d59cd08436391b65ff4af5a8cd5cd0134500c1b71d0fa4f8731ea9478 SHA512 386edcd02a6773727944eff89793daaf36bc88678123ba3b047086acdf6a89743fde55ce2afbd26a26601fccf497dc477871dd01013bdf21f00ca869fe5b2a05 diff --git a/dev-haskell/c2hs/c2hs-0.16.4.ebuild b/dev-haskell/c2hs/c2hs-0.16.4.ebuild deleted file mode 100644 index 39b96a9617aa..000000000000 --- a/dev-haskell/c2hs/c2hs-0.16.4.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -# ebuild generated by hackport 0.3.9999 - -CABAL_FEATURES="bin" -inherit base haskell-cabal - -DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety" -HOMEPAGE="http://www.cse.unsw.edu.au/~chak/haskell/c2hs/" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -DEPEND=">=dev-lang/ghc-6.10.4 - >=dev-haskell/cabal-1.6 - >=dev-haskell/language-c-0.3.1.1 - =dev-libs/libxslt-1.1.2 )" -RDEPEND="dev-libs/gmp" - -PATCHES=("${FILESDIR}/${PN}"-0.16.3-language-c-0.4.patch - "${FILESDIR}/${PN}"-0.16.4-ghc-7.6.patch) - -src_compile() { - cabal_src_compile - - if use doc; then - emake -C doc - fi -} - -src_install() { - cabal_src_install - - doman "${S}/doc/man1/c2hs.1" - - if use doc; then - dohtml "${S}/doc/users_guide/"* - fi -} diff --git a/dev-haskell/c2hs/c2hs-0.16.5.ebuild b/dev-haskell/c2hs/c2hs-0.16.5.ebuild deleted file mode 100644 index b8829777f1fe..000000000000 --- a/dev-haskell/c2hs/c2hs-0.16.5.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -# ebuild generated by hackport 0.3.9999 - -CABAL_FEATURES="bin" -inherit haskell-cabal - -DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety" -HOMEPAGE="http://www.cse.unsw.edu.au/~chak/haskell/c2hs/" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc" - -DEPEND=">=dev-lang/ghc-6.10.4 - >=dev-haskell/cabal-1.6 - >=dev-haskell/language-c-0.3.1.1 - =dev-libs/libxslt-1.1.2 )" -RDEPEND="dev-libs/gmp" - -src_compile() { - cabal_src_compile - - if use doc; then - emake -C doc - fi -} - -src_install() { - cabal_src_install - - doman "${S}/doc/man1/c2hs.1" - - if use doc; then - dohtml "${S}/doc/users_guide/"* - fi -} diff --git a/dev-haskell/c2hs/c2hs-0.17.2.ebuild b/dev-haskell/c2hs/c2hs-0.17.2.ebuild deleted file mode 100644 index e5c87f41c0bc..000000000000 --- a/dev-haskell/c2hs/c2hs-0.17.2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -# ebuild generated by hackport 0.3.6.9999 - -CABAL_FEATURES="bin test-suite" -inherit haskell-cabal - -DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety" -HOMEPAGE="https://github.com/haskell/c2hs" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" -RESTRICT="test" - -RDEPEND="" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.8 - >=dev-haskell/language-c-0.4.2 =dev-lang/ghc-6.10.4 - test? ( dev-haskell/hunit - >=dev-haskell/shelly-1.0 - dev-haskell/test-framework - dev-haskell/test-framework-hunit - dev-haskell/text - >=dev-haskell/yaml-0.8 ) -" diff --git a/dev-haskell/c2hs/c2hs-0.20.1.ebuild b/dev-haskell/c2hs/c2hs-0.20.1.ebuild deleted file mode 100644 index 9be053a7c7b2..000000000000 --- a/dev-haskell/c2hs/c2hs-0.20.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -# ebuild generated by hackport 0.4.3 - -CABAL_FEATURES="bin test-suite" -inherit haskell-cabal - -DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety" -HOMEPAGE="https://github.com/haskell/c2hs" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.8 - dev-haskell/dlist - >=dev-haskell/language-c-0.4.7 =dev-lang/ghc-7.4.1 - test? ( dev-haskell/hunit - dev-haskell/test-framework - dev-haskell/test-framework-hunit - dev-haskell/transformers - >=dev-haskell/shelly-1.0 - dev-haskell/text - >=dev-haskell/yaml-0.8 ) -" diff --git a/dev-haskell/c2hs/c2hs-0.25.2.ebuild b/dev-haskell/c2hs/c2hs-0.25.2.ebuild deleted file mode 100644 index 4992d1706e3a..000000000000 --- a/dev-haskell/c2hs/c2hs-0.25.2.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -# ebuild generated by hackport 0.4.5.9999 - -CABAL_FEATURES="bin test-suite" -inherit haskell-cabal - -DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety" -HOMEPAGE="https://github.com/haskell/c2hs" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="regression" - -RDEPEND="dev-haskell/dlist:= - >=dev-haskell/language-c-0.4.7:= =dev-lang/ghc-7.4.1:= - regression? ( >=dev-haskell/shelly-1.0:= - dev-haskell/text:= - >=dev-haskell/yaml-0.8:= ) -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.8 - test? ( dev-haskell/hunit - dev-haskell/test-framework - dev-haskell/test-framework-hunit - dev-haskell/transformers - !regression? ( >=dev-haskell/shelly-1.0 - dev-haskell/text ) ) -" - -src_configure() { - haskell-cabal_src_configure \ - $(cabal_flag regression regression) -} diff --git a/dev-haskell/c2hs/c2hs-0.27.1.ebuild b/dev-haskell/c2hs/c2hs-0.27.1.ebuild deleted file mode 100644 index 7f709c6c5e34..000000000000 --- a/dev-haskell/c2hs/c2hs-0.27.1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -# ebuild generated by hackport 0.4.6.9999 - -CABAL_FEATURES="bin test-suite" -inherit haskell-cabal - -DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety" -HOMEPAGE="https://github.com/haskell/c2hs" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="regression" - -RDEPEND="dev-haskell/dlist:= - >=dev-haskell/language-c-0.4.7:= =dev-lang/ghc-7.4.1:= - regression? ( >=dev-haskell/shelly-1.0:= - dev-haskell/text:= - >=dev-haskell/yaml-0.8:= ) -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.8 - test? ( dev-haskell/hunit - dev-haskell/test-framework - dev-haskell/test-framework-hunit - dev-haskell/transformers - !regression? ( >=dev-haskell/shelly-1.0 - dev-haskell/text ) ) -" - -src_configure() { - haskell-cabal_src_configure \ - $(cabal_flag regression regression) -} diff --git a/dev-haskell/c2hs/c2hs-0.28.3.ebuild b/dev-haskell/c2hs/c2hs-0.28.3.ebuild deleted file mode 100644 index 9c09b06e13b2..000000000000 --- a/dev-haskell/c2hs/c2hs-0.28.3.ebuild +++ /dev/null @@ -1,40 +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.4.9999 - -CABAL_FEATURES="test-suite" -inherit haskell-cabal - -DESCRIPTION="C->Haskell FFI tool that gives some cross-language type safety" -HOMEPAGE="https://github.com/haskell/c2hs" -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="regression" - -RDEPEND="dev-haskell/dlist:= - >=dev-haskell/language-c-0.7.1:= =dev-lang/ghc-7.4.1:= - regression? ( >=dev-haskell/shelly-1.0:= - dev-haskell/text:= - >=dev-haskell/yaml-0.8:= ) -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.8 - test? ( dev-haskell/hunit - dev-haskell/test-framework - dev-haskell/test-framework-hunit - dev-haskell/transformers - !regression? ( >=dev-haskell/shelly-1.0 - dev-haskell/text ) ) -" - -src_configure() { - haskell-cabal_src_configure \ - $(cabal_flag regression regression) -} diff --git a/dev-haskell/c2hs/files/c2hs-0.16.3-language-c-0.4.patch b/dev-haskell/c2hs/files/c2hs-0.16.3-language-c-0.4.patch deleted file mode 100644 index cdf0fbe547d6..000000000000 --- a/dev-haskell/c2hs/files/c2hs-0.16.3-language-c-0.4.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/c2hs.cabal b/c2hs.cabal -index 89f978f..53a96e5 100644 ---- a/c2hs.cabal -+++ b/c2hs.cabal -@@ -41,7 +41,7 @@ flag base3 - - Executable c2hs - Build-Depends: base >= 2 && < 5, -- language-c >= 0.3.1.1 && < 0.4.0, -+ language-c >= 0.3.1.1 && < 0.5, - filepath - - if flag(base3) -diff --git a/src/C2HS/Gen/Bind.hs b/src/C2HS/Gen/Bind.hs -index 1fd2acc..9c25b42 100644 ---- a/src/C2HS/Gen/Bind.hs -+++ b/src/C2HS/Gen/Bind.hs -@@ -117,6 +117,7 @@ import Control.Monad (when, unless, liftM, mapAndUnzipM) - import Language.C.Data.Position - import Language.C.Data.Ident - import Language.C.Pretty -+import Language.C.Syntax.AST - import Text.PrettyPrint.HughesPJ (render) - import Data.Errors - import Data.Attributes (newAttrsOnlyPos) diff --git a/dev-haskell/c2hs/files/c2hs-0.16.4-ghc-7.6.patch b/dev-haskell/c2hs/files/c2hs-0.16.4-ghc-7.6.patch deleted file mode 100644 index e6d808bb98a5..000000000000 --- a/dev-haskell/c2hs/files/c2hs-0.16.4-ghc-7.6.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- c2hs-0.16.4-orig/src/C2HS/Config.hs 2012-11-01 08:02:48.000000000 +1100 -+++ c2hs-0.16.4/src/C2HS/Config.hs 2012-11-03 12:12:15.754353409 +1100 -@@ -1,3 +1,4 @@ -+{-# LANGUAGE CPP #-} - -- -*-haskell-*- - -- ** @configure_input@ ** - -- =========================================================================== ---- c2hs-0.16.4-orig/src/Control/StateTrans.hs 2012-11-01 08:02:48.000000000 +1100 -+++ c2hs-0.16.4/src/Control/StateTrans.hs 2012-11-03 12:12:15.755353436 +1100 -@@ -1,3 +1,4 @@ -+{-# LANGUAGE CPP, ScopedTypeVariables #-} - -- The HiPar Toolkit: state transformer routines - -- - -- Author : Manuel M. T. Chakravarty -@@ -80,6 +81,10 @@ - -- Launchbury/Peyton-Jones' texts before entering. Otherwise, - -- your mental health my be in danger. You have been warned! - -+#if !MIN_VERSION_base(4,6,0) -+import Prelude hiding (catch) -+#endif -+import Control.Exception (catch, IOException) - - -- state transformer base and its monad operations - -- ----------------------------------------------- -@@ -298,7 +303,7 @@ - ioError err - Right _a -> return state - ) -- `catch` (\err -> let -+ `catch` (\(err :: IOException) -> let - STB handler' = handler err - in - handler' bs gs) -- cgit v1.2.3