From ef2fe80e0228d4d7ebe7b8647441640ee8a475b4 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Sat, 6 Jul 2024 12:54:21 +0200 Subject: [PATCH] Update deps, disable repa dependent, add Haskell CI for GHC 8.0 - 9.10 Package `repa` is not currently maintained, so we disable `gloss-raster` and all examples needing this or `repa` directly. The `bytestring` bound is relaxed again to `>= 0.10` so as to allow to build with GHC 8 stackage snapshots. Unmaintained `source-repository this` sections are removed (anyway just feature bloat in cabal). --- .github/workflows/haskell-ci.yml | 273 +++++++++++++++++ .gitignore | 8 +- cabal.haskell-ci | 5 + cabal.project | 8 + gloss-algorithms/gloss-algorithms.cabal | 23 +- gloss-examples/gloss-examples.cabal | 373 +++++++++++++----------- gloss-raster/gloss-raster.cabal | 7 +- gloss-rendering/gloss-rendering.cabal | 23 +- gloss/gloss.cabal | 23 +- stack-8.4.yaml | 2 +- stack-8.6.yaml | 3 +- stack-8.8.yaml | 7 + stack-9.0.yaml | 7 + stack-9.2.yaml | 10 + stack-9.4.yaml | 10 + stack-9.6.yaml | 10 + stack-9.8.yaml | 10 + 17 files changed, 592 insertions(+), 210 deletions(-) create mode 100644 .github/workflows/haskell-ci.yml create mode 100644 cabal.haskell-ci create mode 100644 cabal.project create mode 100644 stack-8.8.yaml create mode 100644 stack-9.0.yaml create mode 100644 stack-9.2.yaml create mode 100644 stack-9.4.yaml create mode 100644 stack-9.6.yaml create mode 100644 stack-9.8.yaml diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml new file mode 100644 index 00000000..2dfd98fa --- /dev/null +++ b/.github/workflows/haskell-ci.yml @@ -0,0 +1,273 @@ +# This GitHub workflow config has been generated by a script via +# +# haskell-ci 'github' 'cabal.project' +# +# To regenerate the script (for example after adjusting tested-with) run +# +# haskell-ci regenerate +# +# For more information, see https://github.com/andreasabel/haskell-ci +# +# version: 0.19.20240703 +# +# REGENDATA ("0.19.20240703",["github","cabal.project"]) +# +name: Haskell-CI +on: + push: + branches: + - master + pull_request: + branches: + - master +jobs: + linux: + name: Haskell-CI - Linux - ${{ matrix.compiler }} + runs-on: ubuntu-20.04 + timeout-minutes: + 60 + container: + image: buildpack-deps:jammy + continue-on-error: ${{ matrix.allow-failure }} + strategy: + matrix: + include: + - compiler: ghc-9.10.1 + compilerKind: ghc + compilerVersion: 9.10.1 + setup-method: ghcup + allow-failure: false + - compiler: ghc-9.8.2 + compilerKind: ghc + compilerVersion: 9.8.2 + setup-method: ghcup + allow-failure: false + - compiler: ghc-9.6.6 + compilerKind: ghc + compilerVersion: 9.6.6 + setup-method: ghcup + allow-failure: false + - compiler: ghc-9.4.8 + compilerKind: ghc + compilerVersion: 9.4.8 + setup-method: ghcup + allow-failure: false + - compiler: ghc-9.2.8 + compilerKind: ghc + compilerVersion: 9.2.8 + setup-method: ghcup + allow-failure: false + - compiler: ghc-9.0.2 + compilerKind: ghc + compilerVersion: 9.0.2 + setup-method: ghcup + allow-failure: false + - compiler: ghc-8.10.7 + compilerKind: ghc + compilerVersion: 8.10.7 + setup-method: ghcup + allow-failure: false + - compiler: ghc-8.8.4 + compilerKind: ghc + compilerVersion: 8.8.4 + setup-method: ghcup + allow-failure: false + - compiler: ghc-8.6.5 + compilerKind: ghc + compilerVersion: 8.6.5 + setup-method: ghcup + allow-failure: false + - compiler: ghc-8.4.4 + compilerKind: ghc + compilerVersion: 8.4.4 + setup-method: ghcup + allow-failure: false + - compiler: ghc-8.2.2 + compilerKind: ghc + compilerVersion: 8.2.2 + setup-method: ghcup + allow-failure: false + - compiler: ghc-8.0.2 + compilerKind: ghc + compilerVersion: 8.0.2 + setup-method: ghcup + allow-failure: false + fail-fast: false + steps: + - name: apt + run: | + apt-get update + apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 libnuma-dev + mkdir -p "$HOME/.ghcup/bin" + curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.0 > "$HOME/.ghcup/bin/ghcup" + chmod a+x "$HOME/.ghcup/bin/ghcup" + "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) + "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + apt-get update + apt-get install -y freeglut3-dev libgmp-dev + env: + HCKIND: ${{ matrix.compilerKind }} + HCNAME: ${{ matrix.compiler }} + HCVER: ${{ matrix.compilerVersion }} + - name: Set PATH and environment variables + run: | + echo "$HOME/.cabal/bin" >> $GITHUB_PATH + echo "LANG=C.UTF-8" >> "$GITHUB_ENV" + echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV" + echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV" + HCDIR=/opt/$HCKIND/$HCVER + HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER") + HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#') + HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#') + echo "HC=$HC" >> "$GITHUB_ENV" + echo "HCPKG=$HCPKG" >> "$GITHUB_ENV" + echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV" + echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" + HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))') + echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV" + echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" + echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV" + echo "HEADHACKAGE=false" >> "$GITHUB_ENV" + echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV" + echo "GHCJSARITH=0" >> "$GITHUB_ENV" + env: + HCKIND: ${{ matrix.compilerKind }} + HCNAME: ${{ matrix.compiler }} + HCVER: ${{ matrix.compilerVersion }} + - name: env + run: | + env + - name: write cabal config + run: | + mkdir -p $CABAL_DIR + cat >> $CABAL_CONFIG <> $CABAL_CONFIG < cabal-plan.xz + echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c - + xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan + rm -f cabal-plan.xz + chmod a+x $HOME/.cabal/bin/cabal-plan + cabal-plan --version + - name: checkout + uses: actions/checkout@v4 + with: + path: source + - name: initial cabal.project for sdist + run: | + touch cabal.project + echo "packages: $GITHUB_WORKSPACE/source/gloss" >> cabal.project + echo "packages: $GITHUB_WORKSPACE/source/gloss-algorithms" >> cabal.project + echo "packages: $GITHUB_WORKSPACE/source/gloss-rendering" >> cabal.project + echo "packages: $GITHUB_WORKSPACE/source/gloss-examples" >> cabal.project + cat cabal.project + - name: sdist + run: | + mkdir -p sdist + $CABAL sdist all --output-dir $GITHUB_WORKSPACE/sdist + - name: unpack + run: | + mkdir -p unpacked + find sdist -maxdepth 1 -type f -name '*.tar.gz' -exec tar -C $GITHUB_WORKSPACE/unpacked -xzvf {} \; + - name: generate cabal.project + run: | + PKGDIR_gloss="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/gloss-[0-9.]*')" + echo "PKGDIR_gloss=${PKGDIR_gloss}" >> "$GITHUB_ENV" + PKGDIR_gloss_algorithms="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/gloss-algorithms-[0-9.]*')" + echo "PKGDIR_gloss_algorithms=${PKGDIR_gloss_algorithms}" >> "$GITHUB_ENV" + PKGDIR_gloss_rendering="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/gloss-rendering-[0-9.]*')" + echo "PKGDIR_gloss_rendering=${PKGDIR_gloss_rendering}" >> "$GITHUB_ENV" + PKGDIR_gloss_examples="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/gloss-examples-[0-9.]*')" + echo "PKGDIR_gloss_examples=${PKGDIR_gloss_examples}" >> "$GITHUB_ENV" + rm -f cabal.project cabal.project.local + touch cabal.project + touch cabal.project.local + echo "packages: ${PKGDIR_gloss}" >> cabal.project + echo "packages: ${PKGDIR_gloss_algorithms}" >> cabal.project + echo "packages: ${PKGDIR_gloss_rendering}" >> cabal.project + echo "packages: ${PKGDIR_gloss_examples}" >> cabal.project + if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package gloss" >> cabal.project ; fi + if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi + if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package gloss-algorithms" >> cabal.project ; fi + if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi + if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package gloss-rendering" >> cabal.project ; fi + if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi + if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package gloss-examples" >> cabal.project ; fi + if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi + cat >> cabal.project <> cabal.project.local + cat cabal.project + cat cabal.project.local + - name: dump install plan + run: | + $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all + cabal-plan + - name: restore cache + uses: actions/cache/restore@v4 + with: + key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} + path: ~/.cabal/store + restore-keys: ${{ runner.os }}-${{ matrix.compiler }}- + - name: install dependencies + run: | + $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all + $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dependencies-only -j2 all + - name: build w/o tests + run: | + $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all + - name: build + run: | + $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always + - name: cabal check + run: | + cd ${PKGDIR_gloss} || false + ${CABAL} -vnormal check + cd ${PKGDIR_gloss_algorithms} || false + ${CABAL} -vnormal check + cd ${PKGDIR_gloss_rendering} || false + ${CABAL} -vnormal check + cd ${PKGDIR_gloss_examples} || false + ${CABAL} -vnormal check + - name: haddock + run: | + if [ $((HCNUMVER >= 80600)) -ne 0 ] ; then $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all ; fi + - name: unconstrained build + run: | + rm -f cabal.project.local + $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all + - name: save cache + uses: actions/cache/save@v4 + if: always() + with: + key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} + path: ~/.cabal/store diff --git a/.gitignore b/.gitignore index 21f35f00..7edc0ef4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,8 @@ .DS_Store -.stack-work -/stack.yaml -dist -dist-newstyle +.stack-work/ +stack*.yaml.lock +dist/ +dist-newstyle/ *.o *.hi Main \ No newline at end of file diff --git a/cabal.haskell-ci b/cabal.haskell-ci new file mode 100644 index 00000000..5027fce9 --- /dev/null +++ b/cabal.haskell-ci @@ -0,0 +1,5 @@ +branches: master + +apt: libgmp-dev freeglut3-dev + +haddock: >= 8.6 diff --git a/cabal.project b/cabal.project new file mode 100644 index 00000000..3341f8a9 --- /dev/null +++ b/cabal.project @@ -0,0 +1,8 @@ +packages: + gloss + gloss-algorithms + gloss-rendering + gloss-examples + +-- 2024-07-06: Disable gloss-raster since repa is not maintained. +-- gloss-raster diff --git a/gloss-algorithms/gloss-algorithms.cabal b/gloss-algorithms/gloss-algorithms.cabal index f1633d20..a43960bf 100644 --- a/gloss-algorithms/gloss-algorithms.cabal +++ b/gloss-algorithms/gloss-algorithms.cabal @@ -14,22 +14,31 @@ Description: Data structures and algorithms for working with 2D graphics. Synopsis: - Data structures and algorithms for working with 2D graphics. + Data structures and algorithms for working with 2D graphics + +tested-with: + GHC == 9.10.1 + GHC == 9.8.2 + GHC == 9.6.6 + GHC == 9.4.8 + GHC == 9.2.8 + GHC == 9.0.2 + GHC == 8.10.7 + GHC == 8.8.4 + GHC == 8.6.5 + GHC == 8.4.4 + GHC == 8.2.2 + GHC == 8.0.2 source-repository head type: git location: https://github.com/benl23x5/gloss -source-repository this - type: git - tag: v1.12.0.0 - location: https://github.com/benl23x5/gloss - Library Build-Depends: base >= 4.8 && < 5 , ghc-prim - , containers >= 0.5 && < 0.7 + , containers >= 0.5 && < 0.8 , gloss == 1.13.* Default-Language: diff --git a/gloss-examples/gloss-examples.cabal b/gloss-examples/gloss-examples.cabal index 18655d0f..c92e5d9b 100644 --- a/gloss-examples/gloss-examples.cabal +++ b/gloss-examples/gloss-examples.cabal @@ -17,6 +17,20 @@ Description: Synopsis: Examples using the gloss library +tested-with: + GHC == 9.10.1 + GHC == 9.8.2 + GHC == 9.6.6 + GHC == 9.4.8 + GHC == 9.2.8 + GHC == 9.0.2 + GHC == 8.10.7 + GHC == 8.8.4 + GHC == 8.6.5 + GHC == 8.4.4 + GHC == 8.2.2 + GHC == 8.0.2 + Flag llvm Description: Compile via LLVM. This produces much better object code but your GHC needs to have been built against the LLVM compiler. @@ -27,18 +41,13 @@ source-repository head type: git location: https://github.com/benl23x5/gloss -source-repository this - type: git - tag: v1.13.0.2 - location: https://github.com/benl23x5/gloss - Executable gloss-bitmap Main-is: Main.hs hs-source-dirs: picture/Bitmap Build-depends: base >= 4.8 && < 5 - , bytestring >= 0.10 && < 0.12 - , bmp == 1.2.* + , bytestring >= 0.10 && < 0.13 + , bmp >= 1.1 && < 1.3 , gloss == 1.13.* Default-Language: @@ -61,7 +70,7 @@ Executable gloss-boids Build-depends: base >= 4.8 && < 5 - , random == 1.2.* + , random >= 1.1 && < 1.3 , gloss == 1.13.* Default-Language: @@ -98,7 +107,7 @@ Executable gloss-color Build-depends: base >= 4.8 && < 5 , gloss == 1.13.* - , vector >= 0.11 && < 0.13 + , vector >= 0.11 && < 0.14 Default-Language: Haskell2010 @@ -120,9 +129,9 @@ Executable gloss-conway Build-depends: base >= 4.8 && < 5 - , random == 1.2.* + , random >= 1.1 && < 1.3 , gloss == 1.13.* - , vector >= 0.11 && < 0.13 + , vector >= 0.11 && < 0.14 Default-Language: Haskell2010 @@ -182,7 +191,7 @@ Executable gloss-eden Build-depends: base >= 4.8 && < 5 , gloss == 1.13.* - , random == 1.2.* + , random >= 1.1 && < 1.3 Default-Language: Haskell2010 @@ -260,7 +269,7 @@ Executable gloss-lifespan Build-depends: base >= 4.8 && < 5 , gloss == 1.13.* - , random == 1.2.* + , random >= 1.1 && < 1.3 Default-Language: Haskell2010 @@ -329,7 +338,7 @@ Executable gloss-styrene Build-depends: base >= 4.8 && < 5 - , containers >= 0.5 && < 0.7 + , containers >= 0.5 && < 0.8 , ghc-prim , gloss == 1.13.* @@ -376,7 +385,7 @@ Executable gloss-visibility Build-depends: base >= 4.8 && < 5 , gloss == 1.13.* - , vector >= 0.11 && < 0.13 + , vector >= 0.11 && < 0.14 Default-Language: Haskell2010 @@ -406,68 +415,72 @@ Executable gloss-zen -rtsopts -Executable gloss-crystal - Main-is: Main.hs - hs-source-dirs: raster/Crystal +-- 2024-07-06: gloss-raster is disabled since repa is not maintained. +-- +-- Executable gloss-crystal +-- Main-is: Main.hs +-- hs-source-dirs: raster/Crystal - Build-depends: - base >= 4.8 && < 5 - , gloss == 1.13.* - , gloss-raster == 1.13.* +-- Build-depends: +-- base >= 4.8 && < 5 +-- , gloss == 1.13.* +-- , gloss-raster == 1.13.* - Default-Language: - Haskell2010 +-- Default-Language: +-- Haskell2010 - ghc-options: - -Wall - -threaded - -rtsopts - -eventlog - -O2 - -fmax-simplifier-iterations=20 - -fsimplifier-phases=3 - -fno-liberate-case - -funfolding-use-threshold1000 - -funfolding-keeness-factor1000 +-- ghc-options: +-- -Wall +-- -threaded +-- -rtsopts +-- -eventlog +-- -O2 +-- -fmax-simplifier-iterations=20 +-- -fsimplifier-phases=3 +-- -fno-liberate-case +-- -funfolding-use-threshold1000 +-- -funfolding-keeness-factor1000 - if flag(llvm) - ghc-options: - -fllvm - -optlo-O3 +-- if flag(llvm) +-- ghc-options: +-- -fllvm +-- -optlo-O3 -Executable gloss-ray - Main-is: Main.hs - hs-source-dirs: raster/Ray +-- 2024-07-06: Disable gloss-ray since repa is not maintained. +-- +-- Executable gloss-ray +-- Main-is: Main.hs +-- hs-source-dirs: raster/Ray - other-modules: - Light - Object - Trace - Vec3 - World +-- other-modules: +-- Light +-- Object +-- Trace +-- Vec3 +-- World - Build-depends: - base >= 4.8 && < 5 - , repa == 3.4.* - , repa-io == 3.4.* - , gloss == 1.13.* - , gloss-raster == 1.13.* +-- Build-depends: +-- base >= 4.8 && < 5 +-- , repa == 3.4.* +-- , repa-io == 3.4.* +-- , gloss == 1.13.* +-- , gloss-raster == 1.13.* - Default-Language: - Haskell2010 +-- Default-Language: +-- Haskell2010 - ghc-options: - -Wall - -threaded - -rtsopts - -eventlog - -O2 - -fmax-simplifier-iterations=20 - -fsimplifier-phases=3 - -fno-liberate-case - -funfolding-use-threshold1000 - -funfolding-keeness-factor1000 +-- ghc-options: +-- -Wall +-- -threaded +-- -rtsopts +-- -eventlog +-- -O2 +-- -fmax-simplifier-iterations=20 +-- -fsimplifier-phases=3 +-- -fno-liberate-case +-- -funfolding-use-threshold1000 +-- -funfolding-keeness-factor1000 if flag(llvm) ghc-options: @@ -475,66 +488,70 @@ Executable gloss-ray -optlo-O3 -Executable gloss-pulse - Main-is: Main.hs - hs-source-dirs: raster/Pulse +-- 2024-07-06: gloss-raster is disabled since repa is not maintained. +-- +-- Executable gloss-pulse +-- Main-is: Main.hs +-- hs-source-dirs: raster/Pulse - Build-depends: - base >= 4.8 && < 5 - , gloss == 1.13.* - , gloss-raster == 1.13.* +-- Build-depends: +-- base >= 4.8 && < 5 +-- , gloss == 1.13.* +-- , gloss-raster == 1.13.* - ghc-options: - -Wall - -threaded - -rtsopts - -eventlog - -O2 - -fmax-simplifier-iterations=20 - -fsimplifier-phases=3 - -fno-liberate-case - -funfolding-use-threshold1000 - -funfolding-keeness-factor1000 +-- ghc-options: +-- -Wall +-- -threaded +-- -rtsopts +-- -eventlog +-- -O2 +-- -fmax-simplifier-iterations=20 +-- -fsimplifier-phases=3 +-- -fno-liberate-case +-- -funfolding-use-threshold1000 +-- -funfolding-keeness-factor1000 - Default-Language: - Haskell2010 +-- Default-Language: +-- Haskell2010 - if flag(llvm) - ghc-options: - -fllvm - -optlo-O3 +-- if flag(llvm) +-- ghc-options: +-- -fllvm +-- -optlo-O3 -Executable gloss-wave - Main-is: Main.hs - hs-source-dirs: raster/Wave +-- 2024-07-06: gloss-raster is disabled since repa is not maintained. +-- +-- Executable gloss-wave +-- Main-is: Main.hs +-- hs-source-dirs: raster/Wave - Build-depends: - base >= 4.8 && < 5 - , ghc-prim - , gloss == 1.13.* - , gloss-raster == 1.13.* - , vector >= 0.11 && < 0.13 +-- Build-depends: +-- base >= 4.8 && < 5 +-- , ghc-prim +-- , gloss == 1.13.* +-- , gloss-raster == 1.13.* +-- , vector >= 0.11 && < 0.14 - Default-Language: - Haskell2010 +-- Default-Language: +-- Haskell2010 - ghc-options: - -Wall - -threaded - -rtsopts - -eventlog - -O2 - -fmax-simplifier-iterations=20 - -fsimplifier-phases=3 - -fno-liberate-case - -funfolding-use-threshold1000 - -funfolding-keeness-factor1000 +-- ghc-options: +-- -Wall +-- -threaded +-- -rtsopts +-- -eventlog +-- -O2 +-- -fmax-simplifier-iterations=20 +-- -fsimplifier-phases=3 +-- -fno-liberate-case +-- -funfolding-use-threshold1000 +-- -funfolding-keeness-factor1000 - if flag(llvm) - ghc-options: - -fllvm - -optlo-O3 +-- if flag(llvm) +-- ghc-options: +-- -fllvm +-- -optlo-O3 -- Disabled on 8/11/2016 as the linear solver is taking too long to build. @@ -570,72 +587,76 @@ Executable gloss-wave -Executable gloss-snow - Main-is: Main.hs - hs-source-dirs: raster/Snow +-- 2024-07-06: Disable gloss-ray since repa is not maintained. +-- +-- Executable gloss-snow +-- Main-is: Main.hs +-- hs-source-dirs: raster/Snow - Build-depends: - base >= 4.8 && < 5 - , gloss-raster == 1.13.* - , random == 1.2.* - , repa == 3.4.* - , repa-algorithms == 3.4.* +-- Build-depends: +-- base >= 4.8 && < 5 +-- , gloss-raster == 1.13.* +-- , random >= 1.1 && < 1.3 +-- , repa == 3.4.* +-- , repa-algorithms == 3.4.* - Default-Language: - Haskell2010 +-- Default-Language: +-- Haskell2010 - ghc-options: - -Wall - -threaded - -rtsopts - -eventlog - -O2 - -fmax-simplifier-iterations=20 - -fsimplifier-phases=3 - -fno-liberate-case - -funfolding-use-threshold1000 - -funfolding-keeness-factor1000 +-- ghc-options: +-- -Wall +-- -threaded +-- -rtsopts +-- -eventlog +-- -O2 +-- -fmax-simplifier-iterations=20 +-- -fsimplifier-phases=3 +-- -fno-liberate-case +-- -funfolding-use-threshold1000 +-- -funfolding-keeness-factor1000 - if flag(llvm) - ghc-options: - -fllvm - -optlo-O3 +-- if flag(llvm) +-- ghc-options: +-- -fllvm +-- -optlo-O3 -Executable gloss-mandel - Main-is: Main.hs - hs-source-dirs: raster/Mandel +-- 2024-07-06: Disable gloss-ray since repa is not maintained. +-- +-- Executable gloss-mandel +-- Main-is: Main.hs +-- hs-source-dirs: raster/Mandel - other-modules: - Solver +-- other-modules: +-- Solver - Build-depends: - base >= 4.8 && < 5 - , gloss-raster == 1.13.* - , repa-algorithms == 3.4.* - , repa-io == 3.4.* - , gloss == 1.13.* - , repa == 3.4.* +-- Build-depends: +-- base >= 4.8 && < 5 +-- , gloss-raster == 1.13.* +-- , repa-algorithms == 3.4.* +-- , repa-io == 3.4.* +-- , gloss == 1.13.* +-- , repa == 3.4.* - Default-Language: - Haskell2010 +-- Default-Language: +-- Haskell2010 - ghc-options: - -Wall - -threaded - -rtsopts - -eventlog - -O2 - -fmax-simplifier-iterations=20 - -fsimplifier-phases=3 - -fno-liberate-case - -funfolding-use-threshold1000 - -funfolding-keeness-factor1000 +-- ghc-options: +-- -Wall +-- -threaded +-- -rtsopts +-- -eventlog +-- -O2 +-- -fmax-simplifier-iterations=20 +-- -fsimplifier-phases=3 +-- -fno-liberate-case +-- -funfolding-use-threshold1000 +-- -funfolding-keeness-factor1000 - if flag(llvm) - ghc-options: - -fllvm - -optlo-O3 +-- if flag(llvm) +-- ghc-options: +-- -fllvm +-- -optlo-O3 Executable gloss-graph @@ -644,8 +665,8 @@ Executable gloss-graph Build-depends: base >= 4.8 && < 5 - , containers >= 0.5 && < 0.7 - , random == 1.2.* + , containers >= 0.5 && < 0.8 + , random >= 1.1 && < 1.3 , gloss == 1.13.* Default-Language: @@ -664,8 +685,8 @@ Executable gloss-gravity Build-depends: base >= 4.8 && < 5 - , containers >= 0.5 && < 0.7 - , random == 1.2.* + , containers >= 0.5 && < 0.8 + , random >= 1.1 && < 1.3 , gloss == 1.13.* Default-Language: diff --git a/gloss-raster/gloss-raster.cabal b/gloss-raster/gloss-raster.cabal index 63e0fd48..0892051f 100644 --- a/gloss-raster/gloss-raster.cabal +++ b/gloss-raster/gloss-raster.cabal @@ -26,15 +26,10 @@ source-repository head type: git location: https://github.com/benl23x5/gloss -source-repository this - type: git - tag: v1.13.0.2 - location: https://github.com/benl23x5/gloss - Library Build-Depends: base >= 4.8 && < 5 - , containers >= 0.5 && < 0.7 + , containers >= 0.5 && < 0.8 , ghc-prim , gloss == 1.13.* , gloss-rendering == 1.13.* diff --git a/gloss-rendering/gloss-rendering.cabal b/gloss-rendering/gloss-rendering.cabal index 07df1d8e..7e374232 100644 --- a/gloss-rendering/gloss-rendering.cabal +++ b/gloss-rendering/gloss-rendering.cabal @@ -13,13 +13,22 @@ description: don't do any window management. If you want gloss to setup your window as well then use the plain @gloss@ package. -source-repository head - type: git - location: https://github.com/benl23x5/gloss +tested-with: + GHC == 9.10.1 + GHC == 9.8.2 + GHC == 9.6.6 + GHC == 9.4.8 + GHC == 9.2.8 + GHC == 9.0.2 + GHC == 8.10.7 + GHC == 8.8.4 + GHC == 8.6.5 + GHC == 8.4.4 + GHC == 8.2.2 + GHC == 8.0.2 -source-repository this +source-repository head type: git - tag: v1.12.0.0 location: https://github.com/benl23x5/gloss library @@ -39,8 +48,8 @@ library build-depends: base >= 4.8 && < 5 , bmp == 1.2.* - , bytestring == 0.11.* - , containers >= 0.5 && < 0.7 + , bytestring >= 0.10 && < 0.13 + , containers >= 0.5 && < 0.8 , GLUT == 2.7.* , OpenGL >= 2.12 && < 3.1 diff --git a/gloss/gloss.cabal b/gloss/gloss.cabal index e77744f9..88bb9343 100644 --- a/gloss/gloss.cabal +++ b/gloss/gloss.cabal @@ -18,13 +18,22 @@ Description: Synopsis: Painless 2D vector graphics, animations and simulations. -source-repository head - type: git - location: https://github.com/benl23x5/gloss +tested-with: + GHC == 9.10.1 + GHC == 9.8.2 + GHC == 9.6.6 + GHC == 9.4.8 + GHC == 9.2.8 + GHC == 9.0.2 + GHC == 8.10.7 + GHC == 8.8.4 + GHC == 8.6.5 + GHC == 8.4.4 + GHC == 8.2.2 + GHC == 8.0.2 -source-repository this +source-repository head type: git - tag: v1.13.0.0 location: https://github.com/benl23x5/gloss Flag GLUT @@ -40,8 +49,8 @@ Library base >= 4.8 && < 5 , ghc-prim , bmp == 1.2.* - , bytestring == 0.11.* - , containers >= 0.5 && < 0.7 + , bytestring >= 0.10 && < 0.13 + , containers >= 0.5 && < 0.8 , gloss-rendering == 1.13.* , GLUT == 2.7.* , OpenGL >= 2.12 && < 3.1 diff --git a/stack-8.4.yaml b/stack-8.4.yaml index 8f7cb7d5..a0b59706 100644 --- a/stack-8.4.yaml +++ b/stack-8.4.yaml @@ -1,7 +1,7 @@ # For more information, see: http://docs.haskellstack.org/en/stable/yaml_configuration.html # vim: nospell -resolver: lts-12.11 +resolver: lts-12.26 packages: - gloss diff --git a/stack-8.6.yaml b/stack-8.6.yaml index 16d1ce58..fa47d2fa 100644 --- a/stack-8.6.yaml +++ b/stack-8.6.yaml @@ -1,7 +1,7 @@ # For more information, see: https://github.com/commercialhaskell/stack/blob/release/doc/yaml_configuration.md # vim: nospell -resolver: nightly-2018-10-06 +resolver: lts-14.27 packages: - gloss @@ -35,4 +35,3 @@ packages: # Extra directories used by stack for building # extra-include-dirs: [/path/to/dir] # extra-lib-dirs: [/path/to/dir] - diff --git a/stack-8.8.yaml b/stack-8.8.yaml new file mode 100644 index 00000000..d542e6e0 --- /dev/null +++ b/stack-8.8.yaml @@ -0,0 +1,7 @@ +resolver: lts-16.31 + +packages: +- gloss +- gloss-algorithms +- gloss-examples +- gloss-rendering diff --git a/stack-9.0.yaml b/stack-9.0.yaml new file mode 100644 index 00000000..469fdd15 --- /dev/null +++ b/stack-9.0.yaml @@ -0,0 +1,7 @@ +resolver: lts-19.33 + +packages: +- gloss +- gloss-algorithms +- gloss-examples +- gloss-rendering diff --git a/stack-9.2.yaml b/stack-9.2.yaml new file mode 100644 index 00000000..faff1290 --- /dev/null +++ b/stack-9.2.yaml @@ -0,0 +1,10 @@ +resolver: lts-20.26 + +packages: +- gloss +- gloss-algorithms +- gloss-examples +- gloss-rendering + +# 2024-07-06: Disable gloss-raster since repa is not maintained. +# - gloss-raster diff --git a/stack-9.4.yaml b/stack-9.4.yaml new file mode 100644 index 00000000..c9d3510f --- /dev/null +++ b/stack-9.4.yaml @@ -0,0 +1,10 @@ +resolver: lts-21.25 + +packages: +- gloss +- gloss-algorithms +- gloss-examples +- gloss-rendering + +# 2024-07-06: Disable gloss-raster since repa is not maintained. +# - gloss-raster diff --git a/stack-9.6.yaml b/stack-9.6.yaml new file mode 100644 index 00000000..8286e92c --- /dev/null +++ b/stack-9.6.yaml @@ -0,0 +1,10 @@ +resolver: lts-22.28 + +packages: +- gloss +- gloss-algorithms +- gloss-examples +- gloss-rendering + +# 2024-07-06: Disable gloss-raster since repa is not maintained. +# - gloss-raster diff --git a/stack-9.8.yaml b/stack-9.8.yaml new file mode 100644 index 00000000..9c0f8d09 --- /dev/null +++ b/stack-9.8.yaml @@ -0,0 +1,10 @@ +resolver: nightly-2024-07-05 + +packages: +- gloss +- gloss-algorithms +- gloss-examples +- gloss-rendering + +# 2024-07-06: Disable gloss-raster since repa is not maintained. +# - gloss-raster