Skip to content

Commit b19117f

Browse files
maoemaoe
authored
Merge pull request #103 from maoe/macos-fixes
Stop using gtk-mac-integration and fix broken CI
2 parents 4ee9bb9 + dd1638c commit b19117f

File tree

6 files changed

+74
-133
lines changed

6 files changed

+74
-133
lines changed

‎.travis.yml‎

Lines changed: 44 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# This Travis job script has been generated by a script via
22
#
3-
# haskell-ci 'threadscope.cabal' '--apt' 'libgtk2.0-dev' '--osx' '8.6.5' '--osx' '8.8.1' '--travis-patches' '.travis/osx.patch' '--travis-patches' '.travis/deploy.patch' '--travis-patches' '.travis/allow-failrues.patch'
3+
# haskell-ci 'threadscope.cabal' '--apt' 'libgtk2.0-dev' '--osx' '8.6.5' '--osx' '8.8.2' '--travis-patches' '.travis/deploy.patch' '--travis-patches' '.travis/osx.patch'
44
#
55
# For more information, see https://github.com/haskell-CI/haskell-ci
66
#
7-
# version: 0.9.20191126
7+
# version: 0.9.20200225
88
#
99
version: ~> 1.0
1010
language: c
@@ -30,8 +30,8 @@ before_cache:
3030
- rm -rfv $CABALHOME/packages/head.hackage
3131
jobs:
3232
include:
33-
- compiler: ghc-8.8.1
34-
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.1","cabal-install-3.0","libgtk2.0-dev"]}}
33+
- compiler: ghc-8.8.2
34+
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.2","cabal-install-3.0","libgtk2.0-dev"]}}
3535
os: linux
3636
- compiler: ghc-8.6.5
3737
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.6.5","cabal-install-3.0","libgtk2.0-dev"]}}
@@ -42,19 +42,16 @@ jobs:
4242
- compiler: ghc-8.2.2
4343
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.2.2","cabal-install-3.0","libgtk2.0-dev"]}}
4444
os: linux
45-
- compiler: ghc-8.8.1
46-
addons: {"homebrew": {"packages":["gtk+", "gtk-mac-integration"]}}
45+
- compiler: ghc-8.8.2
46+
addons: {"homebrew": {"packages":["gcc@9", "gtk+", "gtk-mac-integration", "python3"], "update": true}}
4747
env: PKG_CONFIG_PATH=/usr/local/opt/libffi/lib/pkgconfig
4848
os: osx
49-
osx_image: xcode11
49+
osx_image: xcode11.3
5050
- compiler: ghc-8.6.5
51-
addons: {"homebrew": {"packages":["gtk+", "gtk-mac-integration"]}}
51+
addons: {"homebrew": {"packages":["gcc@9", "gtk+", "gtk-mac-integration", "python3"], "update": true}}
5252
env: PKG_CONFIG_PATH=/usr/local/opt/libffi/lib/pkgconfig
5353
os: osx
54-
osx_image: xcode11
55-
allow_failures:
56-
- compiler: ghc-8.8.1
57-
os: linux
54+
osx_image: xcode11.3
5855
before_install:
5956
- HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
6057
- WITHCOMPILER="-w $HC"
@@ -70,57 +67,31 @@ before_install:
7067
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then HC=$HOME/.ghc-install/ghc/bin/$TRAVIS_COMPILER; WITHCOMPILER="-w $HC"; HCPKG=${HC/ghc/ghc-pkg}; CABAL=$HOME/.ghc-install/ghc/bin/cabal; fi
7168
- "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
7269
- echo $HCNUMVER
73-
- CABAL="$CABAL -vnormal+nowrap+markoutput"
70+
- CABAL="$CABAL -vnormal+nowrap"
7471
- set -o pipefail
75-
- |
76-
echo 'function blue(s) { printf "\033[0;34m" s "\033[0m " }' >> .colorful.awk
77-
echo 'BEGIN { state = "output"; }' >> .colorful.awk
78-
echo '/^-----BEGIN CABAL OUTPUT-----$/ { state = "cabal" }' >> .colorful.awk
79-
echo '/^-----END CABAL OUTPUT-----$/ { state = "output" }' >> .colorful.awk
80-
echo '!/^(-----BEGIN CABAL OUTPUT-----|-----END CABAL OUTPUT-----)/ {' >> .colorful.awk
81-
echo ' if (state == "cabal") {' >> .colorful.awk
82-
echo ' print blue($0)' >> .colorful.awk
83-
echo ' } else {' >> .colorful.awk
84-
echo ' print $0' >> .colorful.awk
85-
echo ' }' >> .colorful.awk
86-
echo '}' >> .colorful.awk
87-
- cat .colorful.awk
88-
- |
89-
color_cabal_output () {
90-
awk -f $TOP/.colorful.awk
91-
}
92-
- echo text | color_cabal_output
93-
install:
94-
- ${CABAL} --version
95-
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
9672
- TEST=--enable-tests
9773
- BENCH=--enable-benchmarks
9874
- HEADHACKAGE=false
9975
- rm -f $CABALHOME/config
10076
- |
101-
echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
102-
echo "remote-build-reporting: anonymous" >> $CABALHOME/config
103-
echo "write-ghc-environment-files: always" >> $CABALHOME/config
104-
echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
105-
echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
106-
echo "world-file: $CABALHOME/world" >> $CABALHOME/config
107-
echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
108-
echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
109-
echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
110-
echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
111-
echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
112-
echo "install-dirs user" >> $CABALHOME/config
113-
echo " prefix: $CABALHOME" >> $CABALHOME/config
114-
echo "repository hackage.haskell.org" >> $CABALHOME/config
115-
echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
116-
echo " secure: True" >> $CABALHOME/config
117-
echo " key-threshold: 3" >> $CABALHOME/config
118-
echo " root-keys:" >> $CABALHOME/config
119-
echo " fe331502606802feac15e514d9b9ea83fee8b6ffef71335479a2e68d84adc6b0" >> $CABALHOME/config
120-
echo " 1ea9ba32c526d1cc91ab5e5bd364ec5e9e8cb67179a471872f6e26f0ae773d42" >> $CABALHOME/config
121-
echo " 2c6c3627bd6c982990239487f1abd02e08a02e6cf16edb105a8012d444d870c3" >> $CABALHOME/config
122-
echo " 0a5c7ea47cd1b15f01f5f51a33adda7e655bc0f0b0615baa8e271f4c3351e21d" >> $CABALHOME/config
123-
echo " 51f0161b906011b52c6613376b1ae937670da69322113a246a09f807c62f6921" >> $CABALHOME/config
77+
echo "verbose: normal +nowrap +markoutput" >> $CABALHOME/config
78+
echo "remote-build-reporting: anonymous" >> $CABALHOME/config
79+
echo "write-ghc-environment-files: always" >> $CABALHOME/config
80+
echo "remote-repo-cache: $CABALHOME/packages" >> $CABALHOME/config
81+
echo "logs-dir: $CABALHOME/logs" >> $CABALHOME/config
82+
echo "world-file: $CABALHOME/world" >> $CABALHOME/config
83+
echo "extra-prog-path: $CABALHOME/bin" >> $CABALHOME/config
84+
echo "symlink-bindir: $CABALHOME/bin" >> $CABALHOME/config
85+
echo "installdir: $CABALHOME/bin" >> $CABALHOME/config
86+
echo "build-summary: $CABALHOME/logs/build.log" >> $CABALHOME/config
87+
echo "store-dir: $CABALHOME/store" >> $CABALHOME/config
88+
echo "install-dirs user" >> $CABALHOME/config
89+
echo " prefix: $CABALHOME" >> $CABALHOME/config
90+
echo "repository hackage.haskell.org" >> $CABALHOME/config
91+
echo " url: http://hackage.haskell.org/" >> $CABALHOME/config
92+
install:
93+
- ${CABAL} --version
94+
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
12495
- |
12596
echo "program-default-options" >> $CABALHOME/config
12697
echo " ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
@@ -132,25 +103,21 @@ install:
132103
- touch cabal.project
133104
- |
134105
echo "packages: ." >> cabal.project
106+
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then cp cabal.project.osx cabal.project; fi
135107
- |
136108
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(threadscope)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
137-
- |
138-
if [ "$TRAVIS_OS_NAME" = "osx" ]; then
139-
echo 'constraints: gtk +have-quartz-gtk' >> cabal.project
140-
echo 'allow-newer: Cabal, gtk-mac-integration:gtk' >> cabal.project
141-
fi
142109
- cat cabal.project || true
143110
- cat cabal.project.local || true
144111
- if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
145-
- ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH} | color_cabal_output
112+
- ${CABAL} v2-freeze $WITHCOMPILER ${TEST} ${BENCH}
146113
- "cat cabal.project.freeze | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
147114
- rm cabal.project.freeze
148-
- ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all | color_cabal_output
149-
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all | color_cabal_output
115+
- ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} --dep -j2 all
116+
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks --dep -j2 all
150117
script:
151118
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
152119
# Packaging...
153-
- ${CABAL} v2-sdist all | color_cabal_output
120+
- ${CABAL} v2-sdist all
154121
# Unpacking...
155122
- mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
156123
- cd ${DISTDIR} || false
@@ -163,27 +130,29 @@ script:
163130
- |
164131
echo "packages: ${PKGDIR_threadscope}" >> cabal.project
165132
- |
133+
if [ "$TRAVIS_OS_NAME" = "osx" ]; then
134+
echo "constraints: gtk +have-quartz-gtk" >> cabal.project
135+
echo "package *" >> cabal.project
136+
echo " gcc-location: gcc-9" >> cabal.project
137+
echo "program-locations" >> cabal.project
138+
echo " gcc-location: gcc-9" >> cabal.project
139+
fi
166140
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(threadscope)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
167-
- |
168-
if [ "$TRAVIS_OS_NAME" = "osx" ]; then
169-
echo 'constraints: gtk +have-quartz-gtk' >> cabal.project
170-
echo 'allow-newer: Cabal, gtk-mac-integration:gtk' >> cabal.project
171-
fi
172141
- cat cabal.project || true
173142
- cat cabal.project.local || true
174143
# Building...
175144
# this builds all libraries and executables (without tests/benchmarks)
176-
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
145+
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
177146
# Building with tests and benchmarks...
178147
# build & run tests, build benchmarks
179-
- ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all | color_cabal_output
148+
- ${CABAL} v2-build $WITHCOMPILER ${TEST} ${BENCH} all
180149
# cabal check...
181150
- (cd ${PKGDIR_threadscope} && ${CABAL} -vnormal check)
182151
# Building without installed constraints for packages in global-db...
183152
- rm -f cabal.project.local
184-
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all | color_cabal_output
153+
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all
185154

186-
# REGENDATA ("0.9.20191126",["threadscope.cabal","--apt","libgtk2.0-dev","--osx","8.6.5","--osx","8.8.1","--travis-patches",".travis/osx.patch","--travis-patches",".travis/deploy.patch","--travis-patches",".travis/allow-failrues.patch"])
155+
# REGENDATA ("0.9.20200225",["threadscope.cabal","--apt","libgtk2.0-dev","--osx","8.6.5","--osx","8.8.2","--travis-patches",".travis/deploy.patch","--travis-patches",".travis/osx.patch"])
187156
# EOF
188157

189158
before_deploy:

‎.travis/osx.patch‎

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ index 8d435cb..a8af409 100644
55
@@ -49,11 +49,15 @@ jobs:
66
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-7.10.2","cabal-install-3.0","libgtk2.0-dev"]}}
77
os: linux
8-
- compiler: ghc-8.8.1
9-
- addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.1","cabal-install-3.0","libgtk2.0-dev"]}}
10-
+ addons: {"homebrew": {"packages":["gtk+", "gtk-mac-integration"]}}
8+
- compiler: ghc-8.8.2
9+
- addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.2","cabal-install-3.0","libgtk2.0-dev"]}}
10+
+ addons: {"homebrew": {"packages":["gcc@9", "gtk+", "gtk-mac-integration", "python3"], "update": true}}
1111
+ env: PKG_CONFIG_PATH=/usr/local/opt/libffi/lib/pkgconfig
1212
os: osx
13-
+ osx_image: xcode11
13+
+ osx_image: xcode11.3
1414
- compiler: ghc-8.6.5
1515
- addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.6.5","cabal-install-3.0","libgtk2.0-dev"]}}
16-
+ addons: {"homebrew": {"packages":["gtk+", "gtk-mac-integration"]}}
16+
+ addons: {"homebrew": {"packages":["gcc@9", "gtk+", "gtk-mac-integration", "python3"], "update": true}}
1717
+ env: PKG_CONFIG_PATH=/usr/local/opt/libffi/lib/pkgconfig
1818
os: osx
19-
+ osx_image: xcode11
19+
+ osx_image: xcode11.3
2020
before_install:
2121
- HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
2222
- WITHCOMPILER="-w $HC"
@@ -29,25 +29,20 @@ index 8d435cb..a8af409 100644
2929
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then HC=$HOME/.ghc-install/ghc/bin/$TRAVIS_COMPILER; WITHCOMPILER="-w $HC"; HCPKG=${HC/ghc/ghc-pkg}; CABAL=$HOME/.ghc-install/ghc/bin/cabal; fi
3030
- "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
3131
- echo $HCNUMVER
32-
@@ -138,5 +138,10 @@ install:
32+
@@ -103,6 +103,7 @@ install:
33+
- touch cabal.project
34+
- |
35+
echo "packages: ." >> cabal.project
36+
+ - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cp cabal.project.osx cabal.project; fi
3337
- |
3438
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(threadscope)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
35-
+ - |
36-
+ if [ "$TRAVIS_OS_NAME" = "osx" ]; then
37-
+ echo 'constraints: gtk +have-quartz-gtk' >> cabal.project
38-
+ echo 'allow-newer: Cabal, gtk-mac-integration:gtk' >> cabal.project
39-
+ fi
4039
- cat cabal.project || true
41-
- cat cabal.project.local || true
42-
- if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
43-
@@ -167,5 +178,10 @@ script:
40+
@@ -124,7 +124,7 @@ script:
41+
- touch cabal.project
4442
- |
43+
echo "packages: ${PKGDIR_threadscope}" >> cabal.project
44+
- - |
45+
+ - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cp ${PKGDIR_threadscope}/cabal.project.osx cabal.project; fi
4546
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | (grep -vE -- '^(threadscope)$' || true) | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
46-
+ - |
47-
+ if [ "$TRAVIS_OS_NAME" = "osx" ]; then
48-
+ echo 'constraints: gtk +have-quartz-gtk' >> cabal.project
49-
+ echo 'allow-newer: Cabal, gtk-mac-integration:gtk' >> cabal.project
50-
+ fi
5147
- cat cabal.project || true
5248
- cat cabal.project.local || true
53-
# Building...

‎GUI/App.hs‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
{-# LANGUAGE CPP #-}
2-
{-# LANGUAGE TemplateHaskell #-}
3-
41
-------------------------------------------------------------------------------
52
-- | Module : GUI.App
63
--
@@ -9,33 +6,9 @@
96

107
module GUI.App (initApp) where
118

12-
-- Mac OS X-specific GTK imports
13-
#if defined(darwin_HOST_OS)
14-
import qualified Graphics.UI.Gtk as Gtk
15-
import qualified Graphics.UI.Gtk.OSX as OSX
16-
import GUI.DataFiles (loadLogo)
17-
#endif
18-
199
-------------------------------------------------------------------------------
2010

21-
#if defined(darwin_HOST_OS)
22-
23-
-- | Initialize application
24-
-- Perform Mac OS X-specific application initialization
25-
initApp :: IO ()
26-
initApp = do
27-
app <- OSX.applicationNew
28-
menuBar <- Gtk.menuBarNew
29-
OSX.applicationSetMenuBar app menuBar
30-
logo <- $loadLogo
31-
OSX.applicationSetDockIconPixbuf app logo
32-
OSX.applicationReady app
33-
34-
#else
35-
3611
-- | Initialize application
3712
-- Perform application initialization for non-Mac OS X platforms
3813
initApp :: IO ()
3914
initApp = return ()
40-
41-
#endif

‎appveyor.yml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@ environment:
88
global:
99
APPVEYOR_SAVE_CACHE_ON_ERROR: true
1010
CABOPTS: "--store-dir=c:/SR --http-transport=plain-http"
11-
# C_INCLUDE_PATH: "c:/msys64/mingw64/include"
12-
# LIBRARY_PATH: "c:/msys64/mingw64/lib;c:/msys64/mingw64/bin"
1311
matrix:
14-
- GHCVER: "8.0.2"
12+
- GHCVER: "8.8.2"
13+
- GHCVER: "8.6.5"
14+
- GHCVER: "8.4.4"
1515
- GHCVER: "8.2.2"
16-
- GHCVER: "8.4.3"
1716

1817
cache:
1918
- "c:/SR"
@@ -35,12 +34,11 @@ build_script:
3534

3635
test_script:
3736
- "cabal %CABOPTS% new-build -j1 -vnormal+nowrap all"
38-
#- "cabal %CABOPTS% new-test -j1 -vnormal+nowrap all"
3937

4038
after_test:
4139
- bash -c "cp -v $(find -name threadscope.exe) ./threadscope.exe"
4240
- 7z a threadscope.windows.%PLATFORM%.ghc-%GHCVER%.zip threadscope.exe
43-
- ps: "Push-AppveyorArtifact threadscope.windows.$($env:PLATFORM).zip"
41+
- ps: "Push-AppveyorArtifact threadscope.windows.$($env:PLATFORM).ghc-$($env:GHCVER).zip"
4442

4543
deploy:
4644
- provider: GitHub
@@ -50,4 +48,4 @@ deploy:
5048
release: $(appveyor_repo_tag_name)
5149
on:
5250
appveyor_repo_tag: true
53-
GHCVER: "8.4.3"
51+
GHCVER: "8.8.2"

‎cabal.project.osx‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
packages: .
2+
constraints: gtk +have-quartz-gtk
3+
4+
package *
5+
gcc-location: gcc-9
6+
7+
program-locations
8+
gcc-location: gcc-9

‎threadscope.cabal‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Extra-source-files: include/windows_cconv.h
3838
Tested-with: GHC == 8.2.2
3939
GHC == 8.4.4
4040
GHC == 8.6.5
41-
GHC == 8.8.1
41+
GHC == 8.8.2
4242

4343
source-repository head
4444
type: git
@@ -64,8 +64,6 @@ Executable threadscope
6464
file-embed < 0.1,
6565
template-haskell < 2.16,
6666
temporary >= 1.1 && < 1.4
67-
if os(osx)
68-
build-depends: gtk-mac-integration < 0.4
6967

7068
include-dirs: include
7169
Extensions: RecordWildCards, NamedFieldPuns, BangPatterns, PatternGuards

0 commit comments

Comments
 (0)