commit:     f5d897fcb516793657a9f1ed0efd83094ec72e1b
Author:     Jack Todaro <solpeth <AT> posteo <DOT> org>
AuthorDate: Sun Jul 24 00:12:18 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 24 01:07:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5d897fc

dev-haskell/stack: add 2.7.6_pre20220421

Signed-off-by: Jack Todaro <solpeth <AT> posteo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-haskell/stack/Manifest                         |   1 +
 .../stack-2.5.1.1-disable-network-tests.patch      |  22 ++++
 dev-haskell/stack/metadata.xml                     |   7 +-
 dev-haskell/stack/stack-2.7.6_pre20220421.ebuild   | 120 +++++++++++++++++++++
 4 files changed, 145 insertions(+), 5 deletions(-)

diff --git a/dev-haskell/stack/Manifest b/dev-haskell/stack/Manifest
index 5a39280ee928..e935321675f8 100644
--- a/dev-haskell/stack/Manifest
+++ b/dev-haskell/stack/Manifest
@@ -1 +1,2 @@
 DIST stack-2.3.3.tar.gz 572406 BLAKE2B 
4b88614ede72ea3704e3bfad433a7931860c1c098bb65aeabca46d3abc5364ea132b8a7f0f559f1b07463d4b753b5501081841fa388a5d817389d91371214236
 SHA512 
cb93e3bcb8f92e01f374806f07f366ca318d66e3b7bd3cfa3fe3b72dce954d2bb371f51e3f79fca8aec19d1d3adef370bb09237bf29340a1bc851a9a103d77a3
+DIST stack-dcf7bb31815c7505e809a1707909832e02614501.tar.gz 692782 BLAKE2B 
75cebf81e57c33bd694f5b3ee99e6eeb61b185f2a92a41f4bf5c6433de356d6bc5e79995ed5564146abbc549d83b6ffcceece1304a9ed7edafb63dfdb75b26cc
 SHA512 
defe35a301decb950ea5aaa595e1f3b49aaeadbd0ff81f1b22e9967b35f5ce5a934e102aa87049d4bfb40df58ca0180f1788dfc2a987c5b0ad56437b4d49eab7

diff --git a/dev-haskell/stack/files/stack-2.5.1.1-disable-network-tests.patch 
b/dev-haskell/stack/files/stack-2.5.1.1-disable-network-tests.patch
new file mode 100644
index 000000000000..d3890d16af9a
--- /dev/null
+++ b/dev-haskell/stack/files/stack-2.5.1.1-disable-network-tests.patch
@@ -0,0 +1,22 @@
+diff --git a/src/test/Stack/ConfigSpec.hs b/src/test/Stack/ConfigSpec.hs
+index 0b1b93f..d047d86 100644
+--- a/src/test/Stack/ConfigSpec.hs
++++ b/src/test/Stack/ConfigSpec.hs
+@@ -183,7 +183,7 @@ spec = beforeAll setup $ do
+       boptsReconfigure `shouldBe` True
+       boptsCabalVerbose `shouldBe` True
+ 
+-    it "finds the config file in a parent directory" $ inTempDir $ do
++    xit "finds the config file in a parent directory" $ inTempDir $ do
+       writeFile "package.yaml" "name: foo"
+       writeFile (toFilePath stackDotYaml) sampleConfig
+       parentDir <- getCurrentDirectory >>= parseAbsDir
+@@ -194,7 +194,7 @@ spec = beforeAll setup $ do
+         bc <- runRIO config $ withBuildConfig ask
+         view projectRootL bc `shouldBe` parentDir
+ 
+-    it "respects the STACK_YAML env variable" $ inTempDir $ do
++    xit "respects the STACK_YAML env variable" $ inTempDir $ do
+       withSystemTempDir "config-is-here" $ \dir -> do
+         let stackYamlFp = toFilePath (dir </> stackDotYaml)
+         writeFile stackYamlFp sampleConfig

diff --git a/dev-haskell/stack/metadata.xml b/dev-haskell/stack/metadata.xml
index ca426bb23b02..cf86fa7b9a08 100644
--- a/dev-haskell/stack/metadata.xml
+++ b/dev-haskell/stack/metadata.xml
@@ -5,19 +5,16 @@
                <email>hask...@gentoo.org</email>
                <name>Gentoo Haskell</name>
        </maintainer>
-       <use>
-               <flag name="developer-mode">By default, should extra developer 
information be output?</flag>
-       </use>
        <longdescription>
                Please see the documentation at 
&lt;https://docs.haskellstack.org&gt;
                for usage information.
-               
+
                If building a 'stack' executable for distribution, please 
download the
                source code from 
&lt;https://github.com/commercialhaskell/stack/releases&gt;
                and build it using Stack itself in order to ensure identical 
behaviour
                to official binaries.  This package on Hackage is provided for 
convenience
                and bootstrapping purposes.
-               
+
                Note that the API for the library is not currently stable, and 
may
                change significantly, even between minor releases. It is
                currently only intended for use by the executable.

diff --git a/dev-haskell/stack/stack-2.7.6_pre20220421.ebuild 
b/dev-haskell/stack/stack-2.7.6_pre20220421.ebuild
new file mode 100644
index 000000000000..dba4ac39a16a
--- /dev/null
+++ b/dev-haskell/stack/stack-2.7.6_pre20220421.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.1.9999
+#hackport: flags: 
-disable-git-info,-hide-dependency-versions,-integration-tests,-static,-supported-build,-developer-mode
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="The Haskell Tool Stack"
+HOMEPAGE="https://haskellstack.org";
+
+# hololeap <holol...@protonmail.com> (2022-04-21)
+# Current released version (2.7.5) has issues with Cabal-3.4,
+# use latest upstream HEAD which has fixes.
+REPO_URI="https://github.com/commercialhaskell/stack";
+COMMIT="dcf7bb31815c7505e809a1707909832e02614501"
+BRANCH="master"
+SRC_URI="${REPO_URI}/archive/${COMMIT}.tar.gz -> ${PN}-${COMMIT}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
+CABAL_FILE="${S}/${PN}.cabal"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+
+PATCHES=( "${FILESDIR}/${PN}-2.5.1.1-disable-network-tests.patch" )
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+       dev-haskell/annotated-wl-pprint:=[profile?]
+       dev-haskell/ansi-terminal:=[profile?]
+       dev-haskell/async:=[profile?]
+       dev-haskell/attoparsec:=[profile?]
+       dev-haskell/base64-bytestring:=[profile?]
+       dev-haskell/cabal:=[profile?]
+       dev-haskell/casa-client:=[profile?]
+       dev-haskell/casa-types:=[profile?]
+       dev-haskell/colour:=[profile?]
+       dev-haskell/conduit:=[profile?]
+       dev-haskell/conduit-extra:=[profile?]
+       dev-haskell/cryptonite:=[profile?]
+       dev-haskell/cryptonite-conduit:=[profile?]
+       dev-haskell/echo:=[profile?]
+       dev-haskell/extra:=[profile?]
+       dev-haskell/file-embed:=[profile?]
+       dev-haskell/filelock:=[profile?]
+       dev-haskell/fsnotify:=[profile?]
+       dev-haskell/generic-deriving:=[profile?]
+       dev-haskell/githash:=[profile?]
+       dev-haskell/hackage-security:=[profile?]
+       dev-haskell/hashable:=[profile?]
+       dev-haskell/hi-file-parser:=[profile?]
+       dev-haskell/hpack:=[profile?]
+       dev-haskell/http-client:=[profile?]
+       dev-haskell/http-client-tls:=[profile?]
+       dev-haskell/http-conduit:=[profile?]
+       dev-haskell/http-download:=[profile?]
+       dev-haskell/http-types:=[profile?]
+       dev-haskell/memory:=[profile?]
+       dev-haskell/microlens:=[profile?]
+       dev-haskell/mintty:=[profile?]
+       dev-haskell/mono-traversable:=[profile?]
+       dev-haskell/mustache:=[profile?]
+       dev-haskell/neat-interpolation:=[profile?]
+       dev-haskell/network-uri:=[profile?]
+       dev-haskell/open-browser:=[profile?]
+       >=dev-haskell/optparse-applicative-0.14.3.0:=[profile?]
+       dev-haskell/optparse-simple:=[profile?]
+       >=dev-haskell/pantry-0.5.3:=[profile?]
+       dev-haskell/path:=[profile?]
+       dev-haskell/path-io:=[profile?]
+       dev-haskell/persistent:=[profile?]
+       dev-haskell/persistent-sqlite:=[profile?]
+       dev-haskell/persistent-template:=[profile?]
+       dev-haskell/primitive:=[profile?]
+       dev-haskell/project-template:=[profile?]
+       dev-haskell/retry:=[profile?]
+       >=dev-haskell/rio-0.1.21.0:=[profile?]
+       >=dev-haskell/rio-prettyprint-0.1.1.0:=[profile?]
+       dev-haskell/semigroups:=[profile?]
+       dev-haskell/split:=[profile?]
+       dev-haskell/stm:=[profile?]
+       dev-haskell/streaming-commons:=[profile?]
+       dev-haskell/tar:=[profile?]
+       dev-haskell/temporary:=[profile?]
+       dev-haskell/text-metrics:=[profile?]
+       dev-haskell/th-reify-many:=[profile?]
+       dev-haskell/tls:=[profile?]
+       dev-haskell/typed-process:=[profile?]
+       dev-haskell/unicode-transforms:=[profile?]
+       dev-haskell/unix-compat:=[profile?]
+       dev-haskell/unliftio:=[profile?]
+       dev-haskell/unordered-containers:=[profile?]
+       dev-haskell/vector:=[profile?]
+       dev-haskell/yaml:=[profile?]
+       dev-haskell/zip-archive:=[profile?]
+       dev-haskell/zlib:=[profile?]
+       >=dev-lang/ghc-8.10.1:=
+"
+DEPEND="${RDEPEND}
+       >=dev-haskell/cabal-3.2.0.0
+       test? (
+               dev-haskell/hspec
+               dev-haskell/quickcheck
+               dev-haskell/raw-strings-qq
+               dev-haskell/smallcheck
+       )
+"
+
+src_configure() {
+       haskell-cabal_src_configure \
+               --flag=-developer-mode \
+               --flag=-disable-git-info \
+               --flag=-hide-dependency-versions \
+               --flag=-integration-tests \
+               --flag=-static \
+               --flag=-supported-build
+}

Reply via email to