8a76b67 · streamly · git.iko.soy

git.iko.soy/streamly

Remove streamly-core from extra-source files

commit8a76b6730a3687292f45bcc12ce00dc802b6eec1 authorRanjeet Kumar Ranjan <ranjeetr@composewell.com> dateWed 28 Sep 2022, 14:59 (4 years ago) parent2c84b4d

6 files changed+25−148

compare with master

unifiedsplit

.circleci/config.yml+4−2 .github/workflows/haskell.yml+9−8 .packcheck.ignore+2 cabal.project.902−23 cabal.project.streamly+10 streamly.cabal−115

.circleci/config.yml+4−2

@@ -59,7 +59,7 @@ env: &env

5959 # If you have not committed packcheck.sh in your repo at PACKCHECK

6060 # then it is automatically pulled from this URL.

6161 PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"

62− PACKCHECK_GITHUB_COMMIT: "35efa99b2082d13722b8a0183ac6455df98e91b9"

62+ PACKCHECK_GITHUB_COMMIT: "a302772c8f3791c477edd1764b82f8d1f5b22fdf"

6363

6464executors:

6565 amd64-executor:

@@ -150,6 +150,7 @@ jobs:

150150 DISABLE_TEST: "yes"

151151 DISABLE_BENCH: "yes"

152152 DISABLE_DIST_CHECKS: "yes"

153+ DISABLE_SDIST_BUILD: "yes"

153154 command: |

154155 apt-get install -y ghc-8.10.4

155156 apt-get install -y cabal-install-3.4

@@ -385,8 +386,9 @@ jobs:

385386 - run:

386387 name: Hlint src

387388 environment:

388− BUILD: cabal-v2

389+ BUILD: hlint

389390 HLINT_OPTIONS: lint

391+ DISABLE_SDIST_BUILD: "yes"

390392 HLINT_TARGETS: core/src src test benchmark

391393 command: |

392394 bash -c "$PACKCHECK $BUILD" || exit 1

.github/workflows/haskell.yml+9−8

@@ -41,7 +41,7 @@ jobs:

4141 # packcheck location and revision

4242 PACKCHECK_LOCAL_PATH: "./packcheck.sh"

4343 PACKCHECK_GITHUB_URL: "https://raw.githubusercontent.com/composewell/packcheck"

44− PACKCHECK_GITHUB_COMMIT: "075e13ab716c67d2110db4905ae42b0280af046d"

44+ PACKCHECK_GITHUB_COMMIT: "a302772c8f3791c477edd1764b82f8d1f5b22fdf"

4545

4646 # Pull token from "secrets" setting of the github repo

4747 COVERALLS_TOKEN: ${{ secrets.COVERALLS_TOKEN }}

@@ -55,7 +55,7 @@ jobs:

5555 matrix:

5656 # The order is important to optimize fail-fast.

5757 name:

58− - 8.10.7-sdist-fusion-inspection-Werror

58+ - 8.10.7-fusion-inspection-Werror

5959 - 9.2.4-docspec

6060 # - 8.10.7-coverage

6161

@@ -93,14 +93,14 @@ jobs:

9393 doctest: "y"

9494 cabal_version: 3.6.2.0

9595 cabal_project: cabal.project

96+ disable_sdist_build: "y"

9697 ignore_error: false

9798 - name: 9.0.2

9899 ghc_version: 9.0.2

99100 runner: ubuntu-latest

100101 build: cabal

101102 cabal_version: 3.6.2.0

102− cabal_project: cabal.project.902

103− disable_sdist_build: "y"

103+ cabal_project: cabal.project.streamly

104104 ignore_error: true

105105 - name: 8.10.7-sdist-stack

106106 runner: ubuntu-latest

@@ -125,12 +125,13 @@ jobs:

125125 # coverage: "y"

126126 # cabal_version: 3.6.2.0

127127 # ignore_error: false

128− - name: 8.10.7-sdist-fusion-inspection-Werror

128+ - name: 8.10.7-fusion-inspection-Werror

129129 ghc_version: 8.10.7

130130 runner: ubuntu-latest

131131 build: cabal

132132 cabal_version: 3.6.2.0

133133 cabal_project: cabal.project.Werror

134+ disable_sdist_build: "y"

134135 cabal_build_options: "--flag fusion-plugin --flag inspection"

135136 ignore_error: false

136137 - name: 8.8.4-sdist-fusion

@@ -138,7 +139,7 @@ jobs:

138139 runner: ubuntu-latest

139140 build: cabal

140141 cabal_version: 3.6.2.0

141− cabal_project: cabal.project

142+ cabal_project: cabal.project.streamly

142143 cabal_build_options: "--flag fusion-plugin"

143144 ignore_error: false

144145 - name: 8.6.5-sdist-no-fusion-unoptimized

@@ -146,7 +147,7 @@ jobs:

146147 runner: ubuntu-latest

147148 build: cabal

148149 cabal_version: 3.6.2.0

149− cabal_project: cabal.project

150+ cabal_project: cabal.project.streamly

150151 cabal_build_options: "--flag no-fusion --flag -opt"

151152 ignore_error: false

152153 - name: 8.6.5-sdist-debug-unoptimized

@@ -154,7 +155,7 @@ jobs:

154155 runner: ubuntu-latest

155156 build: cabal

156157 cabal_version: 3.6.2.0

157− cabal_project: cabal.project

158+ cabal_project: cabal.project.streamly

158159 cabal_build_options: "--flag debug --flag -opt"

159160 ignore_error: false

160161

.packcheck.ignore+2

@@ -25,6 +25,7 @@ cabal.project.packdiff

2525cabal.project.Werror

2626cabal.project.Werror-nocode

2727cabal.project.902

28+cabal.project.streamly

2829default.nix

2930examples/README.md

3031hie.yaml

@@ -33,3 +34,4 @@ targets/default.nix

3334targets/cabal.project

3435test/test-runner/default.nix

3536test/test-runner/cabal.project

37+core/

cabal.project.902deleted−23

@@ -1,23 +0,0 @@

1−packages: streamly.cabal

2− , core/streamly-core.cabal

3− , test/streamly-tests.cabal

4− , benchmark/streamly-benchmarks.cabal

5− , docs/streamly-docs.cabal

6−

7−package base-orphans

8− ghc-options: -optlm "--unresolved-symbols=ignore-all"

9−

10−package heaps

11− ghc-options: -optlm "--unresolved-symbols=ignore-all"

12−

13−package network

14− ghc-options: -optlm "--unresolved-symbols=ignore-all"

15−

16−package HUnit

17− ghc-options: -optlm "--unresolved-symbols=ignore-all"

18−

19−package colour

20− ghc-options: -optlm "--unresolved-symbols=ignore-all"

21−

22−package clock

23− ghc-options: -optlm "--unresolved-symbols=ignore-all"

cabal.project.streamlynew file+10

@@ -0,0 +1,10 @@

1+packages: streamly.cabal

2+ , test/streamly-tests.cabal

3+ , benchmark/streamly-benchmarks.cabal

4+ , docs/streamly-docs.cabal

6+source-repository-package

7+ type: git

8+ location: https://github.com/composewell/streamly

9+ tag: master

10+ subdir: core

streamly.cabal−115

@@ -123,121 +123,6 @@ extra-source-files:

123123 benchmark/Streamly/Benchmark/Unicode/data/English.txt

124124 benchmark/Streamly/Benchmark/Unicode/data/Korean.txt

125125

126− -- Include streamly-core when packaging

127− -- This is temporary as we will soon break this package out

128− core/configure

129− core/configure.ac

130− core/src/assert.hs

131− core/src/config.h.in

132− core/src/inline.hs

133− core/src/Streamly/Internal/Data/Array/ArrayMacros.h

134− core/src/Streamly/Internal/Data/Time/Clock/config-clock.h

135− core/src/Streamly/Internal/BaseCompat.hs

136− core/src/Streamly/Internal/Control/Exception.hs

137− core/src/Streamly/Internal/Control/Monad.hs

138− core/src/Streamly/Internal/Control/ForkIO.hs

139− core/src/Streamly/Internal/Data/Cont.hs

140− core/src/Streamly/Internal/System/IO.hs

141− core/src/Streamly/Internal/Data/IsMap.hs

142− core/src/Streamly/Internal/Data/Tuple/Strict.hs

143− core/src/Streamly/Internal/Data/Maybe/Strict.hs

144− core/src/Streamly/Internal/Data/Either/Strict.hs

145− core/src/Streamly/Internal/Control/Concurrent.hs

146− core/src/Streamly/Internal/Control/ForkLifted.hs

147− core/src/Streamly/Internal/Data/IOFinalizer.hs

148− core/src/Streamly/Internal/Data/Time/TimeSpec.hsc

149− core/src/Streamly/Internal/Data/Time/Units.hs

150− core/src/Streamly/Internal/Data/Time/Clock/Type.hsc

151− core/src/Streamly/Internal/Data/Time/Clock.hs

152− core/src/Streamly/Internal/Data/SVar/Type.hs

153− core/src/Streamly/Internal/Data/Stream/StreamK/Type.hs

154− core/src/Streamly/Internal/Data/Fold/Step.hs

155− core/src/Streamly/Internal/Data/Refold/Type.hs

156− core/src/Streamly/Internal/Data/Fold/Type.hs

157− core/src/Streamly/Internal/Data/Stream/StreamD/Step.hs

158− core/src/Streamly/Internal/Data/Stream/StreamD/Type.hs

159− core/src/Streamly/Internal/Data/Stream/StreamDK/Type.hs

160− core/src/Streamly/Internal/Data/Unfold/Type.hs

161− core/src/Streamly/Internal/Data/Producer/Type.hs

162− core/src/Streamly/Internal/Data/Producer.hs

163− core/src/Streamly/Internal/Data/Producer/Source.hs

164− core/src/Streamly/Internal/Data/Parser/ParserK/Type.hs

165− core/src/Streamly/Internal/Data/Parser/ParserD/Type.hs

166− core/src/Streamly/Internal/Data/Pipe/Type.hs

167− core/src/Streamly/Internal/Data/Unboxed.hs

168− core/src/Streamly/Internal/Data/IORef/Unboxed.hs

169− core/src/Streamly/Internal/Data/Array/Unboxed/Mut/Type.hs

170− core/src/Streamly/Internal/Data/Array/Unboxed/Mut.hs

171− core/src/Streamly/Internal/Data/Array/Unboxed/Type.hs

172− core/src/Streamly/Internal/Data/Array/Mut/Type.hs

173− core/src/Streamly/Internal/Data/Stream/StreamD/Generate.hs

174− core/src/Streamly/Internal/Data/Stream/StreamD/Eliminate.hs

175− core/src/Streamly/Internal/Data/Stream/StreamD/Nesting.hs

176− core/src/Streamly/Internal/Data/Stream/StreamD/Transform.hs

177− core/src/Streamly/Internal/Data/Stream/StreamD/Exception.hs

178− core/src/Streamly/Internal/Data/Stream/StreamD/Lift.hs

179− core/src/Streamly/Internal/Data/Stream/StreamD.hs

180− core/src/Streamly/Internal/Data/Stream/StreamDK.hs

181− core/src/Streamly/Internal/Data/Stream/Common.hs

182− core/src/Streamly/Internal/Data/Parser/ParserD/Tee.hs

183− core/src/Streamly/Internal/Data/Parser/ParserD.hs

184− core/src/Streamly/Internal/Data/Unfold.hs

185− core/src/Streamly/Internal/Data/Unfold/Enumeration.hs

186− core/src/Streamly/Internal/Data/Fold/Tee.hs

187− core/src/Streamly/Internal/Data/Fold.hs

188−

189− core/src/Streamly/Internal/Data/Parser.hs

190− core/src/Streamly/Internal/Data/Pipe.hs

191− core/src/Streamly/Internal/Data/Stream.hs

192− core/src/Streamly/Internal/Data/Stream/Bottom.hs

193− core/src/Streamly/Internal/Data/Stream/Eliminate.hs

194− core/src/Streamly/Internal/Data/Stream/Enumerate.hs

195− core/src/Streamly/Internal/Data/Stream/Exception.hs

196− core/src/Streamly/Internal/Data/Stream/Expand.hs

197− core/src/Streamly/Internal/Data/Stream/Generate.hs

198− core/src/Streamly/Internal/Data/Stream/Lift.hs

199− core/src/Streamly/Internal/Data/Stream/Reduce.hs

200− core/src/Streamly/Internal/Data/Stream/Top.hs

201− core/src/Streamly/Internal/Data/Stream/Transform.hs

202− core/src/Streamly/Internal/Data/Stream/Type.hs

203− core/src/Streamly/Internal/Data/Stream/Zip.hs

204− core/src/Streamly/Internal/Data/List.hs

205− core/src/Streamly/Internal/Data/Array.hs

206− core/src/Streamly/Internal/Data/Array/Unboxed.hs

207− core/src/Streamly/Internal/Data/Array/Unboxed/Stream.hs

208− core/src/Streamly/Internal/Data/Array/Unboxed/Mut/Stream.hs

209− core/src/Streamly/Internal/Data/Array/Unboxed/Stream/Fold.hs

210− core/src/Streamly/Internal/Data/Ring/Unboxed.hs

211− core/src/Streamly/Internal/Data/Ring.hs

212− core/src/Streamly/Internal/Data/Stream/StreamK.hs

213− core/src/Streamly/Data/Stream.hs

214− core/src/Streamly/Data/Fold.hs

215− core/src/Streamly/Data/Fold/Tee.hs

216− core/src/Streamly/Data/Parser.hs

217− core/src/Streamly/Data/Unfold.hs

218− core/src/Streamly/Internal/Data/Fold/Window.hs

219− core/src/Streamly/Data/Unbox.hs

220− core/src/Streamly/Data/Array.hs

221− core/src/Streamly/Data/Array/Unboxed.hs

222− core/src/Streamly/Data/Array/Unboxed/Mut.hs

223− core/src/Streamly/FileSystem/Handle.hs

224− core/src/Streamly/Internal/Data/Binary/Decode.hs

225− core/src/Streamly/Internal/Data/Time/Clock/Darwin.c

226− core/src/Streamly/Internal/Data/Time/Clock/Windows.c

227− core/src/Streamly/Internal/FileSystem/Handle.hs

228− core/src/Streamly/Internal/Unicode/Array/Char.hs

229− core/src/Streamly/Internal/Unicode/Char/Parser.hs

230− core/src/Streamly/Internal/Unicode/Stream.hs

231− core/src/Streamly/Internal/Unicode/String.hs

232− core/src/Streamly/Unicode/Parser.hs

233− core/src/Streamly/Unicode/Stream.hs

234− core/src/Streamly/Unicode/String.hs

235− core/src/Streamly/Console/Stdio.hs

236− core/src/Streamly/Internal/Console/Stdio.hs

237− core/streamly-core.cabal

238− core/jsbits/clock.js

239− core/Setup.hs

240−

241126extra-doc-files:

242127 CONTRIBUTING.md

243128 CHANGELOG.md