Gentoo Archives: gentoo-commits

From: "Jakov Smolić" <jsmolic@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, dev-haskell/stack/files/, dev-haskell/stack/
Date: Thu, 29 Sep 2022 08:02:04
Message-Id: 1664438376.f81369cb21bc6792878ffae32a245fcb42b988b7.jsmolic@gentoo
1 commit: f81369cb21bc6792878ffae32a245fcb42b988b7
2 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 29 07:59:32 2022 +0000
4 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 29 07:59:36 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f81369cb
7
8 dev-haskell/stack: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/682976
11 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
12
13 dev-haskell/stack/Manifest | 1 -
14 .../stack-2.5.1.1-disable-network-tests.patch | 22 ----
15 dev-haskell/stack/metadata.xml | 22 ----
16 dev-haskell/stack/stack-2.7.6_pre20220421.ebuild | 120 ---------------------
17 profiles/package.mask | 1 -
18 5 files changed, 166 deletions(-)
19
20 diff --git a/dev-haskell/stack/Manifest b/dev-haskell/stack/Manifest
21 deleted file mode 100644
22 index 6e58c879d1c9..000000000000
23 --- a/dev-haskell/stack/Manifest
24 +++ /dev/null
25 @@ -1 +0,0 @@
26 -DIST stack-dcf7bb31815c7505e809a1707909832e02614501.tar.gz 692782 BLAKE2B 75cebf81e57c33bd694f5b3ee99e6eeb61b185f2a92a41f4bf5c6433de356d6bc5e79995ed5564146abbc549d83b6ffcceece1304a9ed7edafb63dfdb75b26cc SHA512 defe35a301decb950ea5aaa595e1f3b49aaeadbd0ff81f1b22e9967b35f5ce5a934e102aa87049d4bfb40df58ca0180f1788dfc2a987c5b0ad56437b4d49eab7
27
28 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
29 deleted file mode 100644
30 index d3890d16af9a..000000000000
31 --- a/dev-haskell/stack/files/stack-2.5.1.1-disable-network-tests.patch
32 +++ /dev/null
33 @@ -1,22 +0,0 @@
34 -diff --git a/src/test/Stack/ConfigSpec.hs b/src/test/Stack/ConfigSpec.hs
35 -index 0b1b93f..d047d86 100644
36 ---- a/src/test/Stack/ConfigSpec.hs
37 -+++ b/src/test/Stack/ConfigSpec.hs
38 -@@ -183,7 +183,7 @@ spec = beforeAll setup $ do
39 - boptsReconfigure `shouldBe` True
40 - boptsCabalVerbose `shouldBe` True
41 -
42 -- it "finds the config file in a parent directory" $ inTempDir $ do
43 -+ xit "finds the config file in a parent directory" $ inTempDir $ do
44 - writeFile "package.yaml" "name: foo"
45 - writeFile (toFilePath stackDotYaml) sampleConfig
46 - parentDir <- getCurrentDirectory >>= parseAbsDir
47 -@@ -194,7 +194,7 @@ spec = beforeAll setup $ do
48 - bc <- runRIO config $ withBuildConfig ask
49 - view projectRootL bc `shouldBe` parentDir
50 -
51 -- it "respects the STACK_YAML env variable" $ inTempDir $ do
52 -+ xit "respects the STACK_YAML env variable" $ inTempDir $ do
53 - withSystemTempDir "config-is-here" $ \dir -> do
54 - let stackYamlFp = toFilePath (dir </> stackDotYaml)
55 - writeFile stackYamlFp sampleConfig
56
57 diff --git a/dev-haskell/stack/metadata.xml b/dev-haskell/stack/metadata.xml
58 deleted file mode 100644
59 index cf86fa7b9a08..000000000000
60 --- a/dev-haskell/stack/metadata.xml
61 +++ /dev/null
62 @@ -1,22 +0,0 @@
63 -<?xml version="1.0" encoding="UTF-8"?>
64 -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
65 -<pkgmetadata>
66 - <maintainer type="project">
67 - <email>haskell@g.o</email>
68 - <name>Gentoo Haskell</name>
69 - </maintainer>
70 - <longdescription>
71 - Please see the documentation at &lt;https://docs.haskellstack.org&gt;
72 - for usage information.
73 -
74 - If building a 'stack' executable for distribution, please download the
75 - source code from &lt;https://github.com/commercialhaskell/stack/releases&gt;
76 - and build it using Stack itself in order to ensure identical behaviour
77 - to official binaries. This package on Hackage is provided for convenience
78 - and bootstrapping purposes.
79 -
80 - Note that the API for the library is not currently stable, and may
81 - change significantly, even between minor releases. It is
82 - currently only intended for use by the executable.
83 - </longdescription>
84 -</pkgmetadata>
85
86 diff --git a/dev-haskell/stack/stack-2.7.6_pre20220421.ebuild b/dev-haskell/stack/stack-2.7.6_pre20220421.ebuild
87 deleted file mode 100644
88 index dba4ac39a16a..000000000000
89 --- a/dev-haskell/stack/stack-2.7.6_pre20220421.ebuild
90 +++ /dev/null
91 @@ -1,120 +0,0 @@
92 -# Copyright 1999-2022 Gentoo Authors
93 -# Distributed under the terms of the GNU General Public License v2
94 -
95 -EAPI=8
96 -
97 -# ebuild generated by hackport 0.7.1.1.9999
98 -#hackport: flags: -disable-git-info,-hide-dependency-versions,-integration-tests,-static,-supported-build,-developer-mode
99 -
100 -CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
101 -inherit haskell-cabal
102 -
103 -DESCRIPTION="The Haskell Tool Stack"
104 -HOMEPAGE="https://haskellstack.org"
105 -
106 -# hololeap <hololeap@××××××××××.com> (2022-04-21)
107 -# Current released version (2.7.5) has issues with Cabal-3.4,
108 -# use latest upstream HEAD which has fixes.
109 -REPO_URI="https://github.com/commercialhaskell/stack"
110 -COMMIT="dcf7bb31815c7505e809a1707909832e02614501"
111 -BRANCH="master"
112 -SRC_URI="${REPO_URI}/archive/${COMMIT}.tar.gz -> ${PN}-${COMMIT}.tar.gz"
113 -S="${WORKDIR}/${PN}-${COMMIT}"
114 -CABAL_FILE="${S}/${PN}.cabal"
115 -
116 -LICENSE="BSD"
117 -SLOT="0/${PV}"
118 -KEYWORDS="~amd64 ~x86"
119 -
120 -PATCHES=( "${FILESDIR}/${PN}-2.5.1.1-disable-network-tests.patch" )
121 -
122 -RDEPEND="dev-haskell/aeson:=[profile?]
123 - dev-haskell/annotated-wl-pprint:=[profile?]
124 - dev-haskell/ansi-terminal:=[profile?]
125 - dev-haskell/async:=[profile?]
126 - dev-haskell/attoparsec:=[profile?]
127 - dev-haskell/base64-bytestring:=[profile?]
128 - dev-haskell/cabal:=[profile?]
129 - dev-haskell/casa-client:=[profile?]
130 - dev-haskell/casa-types:=[profile?]
131 - dev-haskell/colour:=[profile?]
132 - dev-haskell/conduit:=[profile?]
133 - dev-haskell/conduit-extra:=[profile?]
134 - dev-haskell/cryptonite:=[profile?]
135 - dev-haskell/cryptonite-conduit:=[profile?]
136 - dev-haskell/echo:=[profile?]
137 - dev-haskell/extra:=[profile?]
138 - dev-haskell/file-embed:=[profile?]
139 - dev-haskell/filelock:=[profile?]
140 - dev-haskell/fsnotify:=[profile?]
141 - dev-haskell/generic-deriving:=[profile?]
142 - dev-haskell/githash:=[profile?]
143 - dev-haskell/hackage-security:=[profile?]
144 - dev-haskell/hashable:=[profile?]
145 - dev-haskell/hi-file-parser:=[profile?]
146 - dev-haskell/hpack:=[profile?]
147 - dev-haskell/http-client:=[profile?]
148 - dev-haskell/http-client-tls:=[profile?]
149 - dev-haskell/http-conduit:=[profile?]
150 - dev-haskell/http-download:=[profile?]
151 - dev-haskell/http-types:=[profile?]
152 - dev-haskell/memory:=[profile?]
153 - dev-haskell/microlens:=[profile?]
154 - dev-haskell/mintty:=[profile?]
155 - dev-haskell/mono-traversable:=[profile?]
156 - dev-haskell/mustache:=[profile?]
157 - dev-haskell/neat-interpolation:=[profile?]
158 - dev-haskell/network-uri:=[profile?]
159 - dev-haskell/open-browser:=[profile?]
160 - >=dev-haskell/optparse-applicative-0.14.3.0:=[profile?]
161 - dev-haskell/optparse-simple:=[profile?]
162 - >=dev-haskell/pantry-0.5.3:=[profile?]
163 - dev-haskell/path:=[profile?]
164 - dev-haskell/path-io:=[profile?]
165 - dev-haskell/persistent:=[profile?]
166 - dev-haskell/persistent-sqlite:=[profile?]
167 - dev-haskell/persistent-template:=[profile?]
168 - dev-haskell/primitive:=[profile?]
169 - dev-haskell/project-template:=[profile?]
170 - dev-haskell/retry:=[profile?]
171 - >=dev-haskell/rio-0.1.21.0:=[profile?]
172 - >=dev-haskell/rio-prettyprint-0.1.1.0:=[profile?]
173 - dev-haskell/semigroups:=[profile?]
174 - dev-haskell/split:=[profile?]
175 - dev-haskell/stm:=[profile?]
176 - dev-haskell/streaming-commons:=[profile?]
177 - dev-haskell/tar:=[profile?]
178 - dev-haskell/temporary:=[profile?]
179 - dev-haskell/text-metrics:=[profile?]
180 - dev-haskell/th-reify-many:=[profile?]
181 - dev-haskell/tls:=[profile?]
182 - dev-haskell/typed-process:=[profile?]
183 - dev-haskell/unicode-transforms:=[profile?]
184 - dev-haskell/unix-compat:=[profile?]
185 - dev-haskell/unliftio:=[profile?]
186 - dev-haskell/unordered-containers:=[profile?]
187 - dev-haskell/vector:=[profile?]
188 - dev-haskell/yaml:=[profile?]
189 - dev-haskell/zip-archive:=[profile?]
190 - dev-haskell/zlib:=[profile?]
191 - >=dev-lang/ghc-8.10.1:=
192 -"
193 -DEPEND="${RDEPEND}
194 - >=dev-haskell/cabal-3.2.0.0
195 - test? (
196 - dev-haskell/hspec
197 - dev-haskell/quickcheck
198 - dev-haskell/raw-strings-qq
199 - dev-haskell/smallcheck
200 - )
201 -"
202 -
203 -src_configure() {
204 - haskell-cabal_src_configure \
205 - --flag=-developer-mode \
206 - --flag=-disable-git-info \
207 - --flag=-hide-dependency-versions \
208 - --flag=-integration-tests \
209 - --flag=-static \
210 - --flag=-supported-build
211 -}
212
213 diff --git a/profiles/package.mask b/profiles/package.mask
214 index 319896bf4ed0..97bf1d1aea0e 100644
215 --- a/profiles/package.mask
216 +++ b/profiles/package.mask
217 @@ -257,7 +257,6 @@ dev-haskell/parser-combinators
218 dev-haskell/megaparsec-tests
219 dev-haskell/hspec-megaparsec
220 dev-haskell/neat-interpolation
221 -dev-haskell/stack
222
223 # hololeap <hololeap@××××××××××.com> (2022-08-21)
224 # doctest-parallel does not currently work with Setup.hs (used internally by