From 386855c4d1ef509c1fd32abd721589c81669613b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 23 Oct 2023 08:35:49 +0100 Subject: gentoo auto-resync : 23:10:2023 - 08:35:49 --- dev-haskell/typed-process/Manifest | 7 ++- .../files/typed-process-0.2.10.1-smp-flag.patch | 62 ++++++++++++++++++++++ dev-haskell/typed-process/metadata.xml | 4 ++ .../typed-process/typed-process-0.2.10.1-r1.ebuild | 44 +++++++++++++++ .../typed-process/typed-process-0.2.6.0.ebuild | 2 +- 5 files changed, 116 insertions(+), 3 deletions(-) create mode 100644 dev-haskell/typed-process/files/typed-process-0.2.10.1-smp-flag.patch create mode 100644 dev-haskell/typed-process/typed-process-0.2.10.1-r1.ebuild (limited to 'dev-haskell/typed-process') diff --git a/dev-haskell/typed-process/Manifest b/dev-haskell/typed-process/Manifest index e80f1df19a76..9d08daaffdef 100644 --- a/dev-haskell/typed-process/Manifest +++ b/dev-haskell/typed-process/Manifest @@ -1,3 +1,6 @@ +AUX typed-process-0.2.10.1-smp-flag.patch 1827 BLAKE2B d1e11f019b4c5561bf02acc9781043eec7cbf45bb0a2e43d0435e469c477107d9a3f522110fbd0279e1e5e0530095f9a133954ae1bae65ca51748c97d607161f SHA512 7db980cc76f2882a91bcdca4409583eeba8a26f1a062ffe870b1041a9353125238f89e9c04871e09ea1e7253b1923e4414b87360f5c7cbe322776c8209b65cb1 +DIST typed-process-0.2.10.1.tar.gz 18264 BLAKE2B eef9769f018bd8702656b6d151fa1148b1991ca9d877b507542327881576dd5297ebac0d8b86d9f305d734e3f07413a7a23f8160752b34d896e2386026347aad SHA512 07ab11cc1554aeaf8980df5fbe105de71282424365be9e26e94b7cbad344d3d0d9d54fc492615e32ec0e6d3064a72c7996be03e7fbb81136df366511d7bd606d DIST typed-process-0.2.6.0.tar.gz 17363 BLAKE2B 033c1da191fcf10ca36b1215303793d26b3435e7241ee07e4c3389a9892be496779f70ae62b6bbad7f07704866473e16d4f15bfb6f22efa41243cba6ad72e941 SHA512 a40b8db4ef2179273943a3aab0200891bd3dffe584bcd51037ddf9cebae88d4d95292883a745a0c31900c7bf2eebe2c71175fbb86dc470b60660b443f8b1e3e0 -EBUILD typed-process-0.2.6.0.ebuild 773 BLAKE2B e68b3ff4473eda03c4ebb9f9eb264761d224eace6b46402654261e215059dce5044f601664e6302987ca23fdc60476495a091f818a962197cdd7e75960671b24 SHA512 58e06de35aa6548a627ddf324b815c170838ef13dd2bba63b7612d7938e52a7fe7b47244c49a905521f3fb3f28f0d8da60b4f1d1d248cd14e7811e2bc076a190 -MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4 +EBUILD typed-process-0.2.10.1-r1.ebuild 939 BLAKE2B d08e1750afd1f1b4b537a8b057dc41d41f501a707661757278aef10d026d11f84bf8451554203c2917ccebb2e1a28b68a2dcbd14cddbc3a458da06d23d2698ef SHA512 bbef956a2bdec69db69a834ca4059c015201c682495208a9f3c9ea1ee1e1c5645ae1b7416dcad37a1137e4806fd30d2f128d3e7ddaca522ddb2a9d934e33d565 +EBUILD typed-process-0.2.6.0.ebuild 773 BLAKE2B 6c51fc0e329ad10f33c31a4bcb6303c0ae163f3c1200b38fcae62acca4316f8705f12264001770486e5888df4b1df92d46009b8677bd88d1010a865b5adf96a9 SHA512 ff1ff7b7c1ab7e9dea5ccc9362e4a71827d219f4327fa31131f34a8a8fa16d7539adb1ec649c3a80781953348227a1d928c8fa998b42a3c2d2511aa674f43f16 +MISC metadata.xml 387 BLAKE2B 7590b8fbf7631de0c6aa41383800cc5968e180d73f49355401149d0a8e777a8dc15343a0276079ef27cba5cc97a66b1bc42a2b4e833d27feef5d0e47c1c203eb SHA512 4cc5817bc7764d2d11d74b18c9ce34dd2e0d8dd9ac0ea0a4d7487792231bf96e64769dad760ee93aeb9b06af6875f61e38f6a1ceea000de9b99bdde596420cb5 diff --git a/dev-haskell/typed-process/files/typed-process-0.2.10.1-smp-flag.patch b/dev-haskell/typed-process/files/typed-process-0.2.10.1-smp-flag.patch new file mode 100644 index 000000000000..fca0ea238d4c --- /dev/null +++ b/dev-haskell/typed-process/files/typed-process-0.2.10.1-smp-flag.patch @@ -0,0 +1,62 @@ +From: hololeap +Signed-off-by: hololeap +Bug: https://github.com/fpco/typed-process/pull/60 + +This flag will toggle the use of some ghc-options in the typed-process-test +test suite. It is set to default: True. + +This is needed for tests to run on some GHC builds which do not support SMP. + +diff -urN typed-process-0.2.10.1/typed-process.cabal typed-process-0.2.10.1-r1/typed-process.cabal +--- typed-process-0.2.10.1/typed-process.cabal 2022-10-28 09:12:23.834918081 -0600 ++++ typed-process-0.2.10.1-r1/typed-process.cabal 2022-10-28 09:12:42.724917857 -0600 +@@ -1,6 +1,6 @@ + cabal-version: 1.12 + +--- This file has been generated from package.yaml by hpack version 0.34.4. ++-- This file has been generated from package.yaml by hpack version 0.35.0. + -- + -- see: https://github.com/sol/hpack + +@@ -24,6 +24,11 @@ + type: git + location: https://github.com/fpco/typed-process + ++flag smp ++ description: Use flags that depend on GHC supporting a multicore runtime (tests only) ++ manual: True ++ default: True ++ + library + exposed-modules: + System.Process.Typed +@@ -40,9 +45,9 @@ + , stm + , transformers + , unliftio-core ++ default-language: Haskell2010 + if os(windows) + cpp-options: -DWINDOWS +- default-language: Haskell2010 + + test-suite typed-process-test + type: exitcode-stdio-1.0 +@@ -52,7 +57,6 @@ + Paths_typed_process + hs-source-dirs: + test +- ghc-options: -threaded -rtsopts -with-rtsopts=-N + build-depends: + async >=2.0 + , base >=4.12 && <5 +@@ -66,6 +70,10 @@ + , typed-process + , unliftio-core + default-language: Haskell2010 ++ if flag(smp) ++ ghc-options: -threaded -rtsopts -with-rtsopts=-N ++ else ++ ghc-options: -threaded + + test-suite typed-process-test-single-threaded + type: exitcode-stdio-1.0 diff --git a/dev-haskell/typed-process/metadata.xml b/dev-haskell/typed-process/metadata.xml index 937381521944..c387243a2d03 100644 --- a/dev-haskell/typed-process/metadata.xml +++ b/dev-haskell/typed-process/metadata.xml @@ -5,4 +5,8 @@ haskell@gentoo.org Gentoo Haskell + + typed-process + fpco/typed-process + diff --git a/dev-haskell/typed-process/typed-process-0.2.10.1-r1.ebuild b/dev-haskell/typed-process/typed-process-0.2.10.1-r1.ebuild new file mode 100644 index 000000000000..3f70890a31fa --- /dev/null +++ b/dev-haskell/typed-process/typed-process-0.2.10.1-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ebuild generated by hackport 0.8.0.0.9999 + +CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite" +inherit ghc-package haskell-cabal + +DESCRIPTION="Run external processes, with strong typing of streams" +HOMEPAGE="https://github.com/fpco/typed-process" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" + +PATCHES=( + "${FILESDIR}/${PN}-0.2.10.1-smp-flag.patch" +) + +RDEPEND=" + >=dev-haskell/async-2.0:=[profile?] + dev-haskell/stm:=[profile?] + dev-haskell/unliftio-core:=[profile?] + >=dev-lang/ghc-8.6.3:= +" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-2.4.0.1 + test? ( dev-haskell/base64-bytestring + dev-haskell/hspec + dev-haskell/temporary ) +" + +src_configure() { + if ghc-supports-smp; then + local smp_flag=smp + else + local smp_flag=-smp + fi + + haskell-cabal_src_configure \ + --flag="${smp_flag}" +} diff --git a/dev-haskell/typed-process/typed-process-0.2.6.0.ebuild b/dev-haskell/typed-process/typed-process-0.2.6.0.ebuild index 9db68ee966be..0a8ace7c48a5 100644 --- a/dev-haskell/typed-process/typed-process-0.2.6.0.ebuild +++ b/dev-haskell/typed-process/typed-process-0.2.6.0.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 # ebuild generated by hackport 0.6.9999 -- cgit v1.2.3