travis: Allow newer Cabal and gtk-mac-integration:gtk for macOS

Author: maoe

.travis.yml

@@ -69,7 +69,7 @@ before_install:
   - CABALHOME=$HOME/.cabal
   - export PATH="$CABALHOME/bin:$PATH"
   - TOP=$(pwd)
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then curl https://haskell.futurice.com/haskell-on-macos.py | python3 - --make-dirs --install-dir=$HOME/.ghc-install --cabal-alias=head install cabal-install-head ${TRAVIS_COMPILER}; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then curl https://haskell.futurice.com/haskell-on-macos.py | python3 - --make-dirs --install-dir=$HOME/.ghc-install --cabal-alias=3.0.0.0 install cabal-install-3.0.0.0 ${TRAVIS_COMPILER}; fi
   - 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
   - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
   - echo $HCNUMVER
@@ -138,7 +138,10 @@ install:
   - |
   - "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"
   - |
-    if [ "$TRAVIS_OS_NAME" = "osx" ]; then echo 'constraints: gtk +have-quartz-gtk' >> cabal.project; fi
+    if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+      echo 'constraints: gtk +have-quartz-gtk' >> cabal.project
+      echo 'allow-newer: Cabal, gtk-mac-integration:gtk' >> cabal.project
+    fi
   - cat cabal.project || true
   - cat cabal.project.local || true
   - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
@@ -165,7 +168,10 @@ script:
   - |
   - "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"
   - |
-    if [ "$TRAVIS_OS_NAME" = "osx" ]; then echo 'constraints: gtk +have-quartz-gtk' >> cabal.project; fi
+   if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+     echo 'constraints: gtk +have-quartz-gtk' >> cabal.project
+     echo 'allow-newer: Cabal, gtk-mac-integration:gtk' >> cabal.project
+   fi
   - cat cabal.project || true
   - cat cabal.project.local || true
   # Building...

.travis/osx.patch

@@ -20,21 +20,34 @@ index 8d435cb..a8af409 100644
  before_install:
    - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
    - WITHCOMPILER="-w $HC"
-@@ -133,6 +137,8 @@ install:
-     echo "packages: ." >> cabal.project
+@@ -69,7 +69,7 @@ before_install:
+   - CABALHOME=$HOME/.cabal
+   - export PATH="$CABALHOME/bin:$PATH"
+   - TOP=$(pwd)
+-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then curl https://haskell.futurice.com/haskell-on-macos.py | python3 - --make-dirs --install-dir=$HOME/.ghc-install --cabal-alias=head install cabal-install-head ${TRAVIS_COMPILER}; fi
++  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then curl https://haskell.futurice.com/haskell-on-macos.py | python3 - --make-dirs --install-dir=$HOME/.ghc-install --cabal-alias=3.0.0.0 install cabal-install-3.0.0.0 ${TRAVIS_COMPILER}; fi
+   - 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
+   - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
+   - echo $HCNUMVER
+@@ -138,5 +138,10 @@ install:
    - |
    - "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"
 +  - |
-+    if [ "$TRAVIS_OS_NAME" = "osx" ]; then echo 'constraints: gtk +have-quartz-gtk' >> cabal.project; fi
++    if [ "$TRAVIS_OS_NAME" = "osx" ]; then
++      echo 'constraints: gtk +have-quartz-gtk' >> cabal.project
++      echo 'allow-newer: Cabal, gtk-mac-integration:gtk' >> cabal.project
++    fi
    - cat cabal.project || true
    - cat cabal.project.local || true
    - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
-@@ -158,6 +164,8 @@ script:
-     echo "packages: ${PKGDIR_threadscope}" >> cabal.project
+@@ -167,5 +178,10 @@ script:
    - |
    - "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"
 +  - |
-+    if [ "$TRAVIS_OS_NAME" = "osx" ]; then echo 'constraints: gtk +have-quartz-gtk' >> cabal.project; fi
++   if [ "$TRAVIS_OS_NAME" = "osx" ]; then
++     echo 'constraints: gtk +have-quartz-gtk' >> cabal.project
++     echo 'allow-newer: Cabal, gtk-mac-integration:gtk' >> cabal.project
++   fi
    - cat cabal.project || true
    - cat cabal.project.local || true
    # Building...