Address compiler warning

lehins · Dec 15, 2024 · 5c604a3 · 5c604a3
1 parent a8c5f1c
commit 5c604a3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -53,8 +53,8 @@ jobs:
           - { os: MacOS-13,       resolver: lts-12,  ghc: "8.4.4"  }
           - { os: MacOS-13,       resolver: lts-14,  ghc: "8.6.5"  }
           - { os: MacOS-13,       resolver: lts-16,  ghc: "8.8.4"  }
-          - { os: MacOS-latest,   resolver: lts-18,  ghc: "8.10.7" }
-          - { os: MacOS-latest,   resolver: lts-19,  ghc: "9.0.2"  }
+          - { os: MacOS-13,       resolver: lts-18,  ghc: "8.10.7" }
+          - { os: MacOS-13,       resolver: lts-19,  ghc: "9.0.2"  }
           - { os: MacOS-latest,   resolver: lts-20,  ghc: "9.2.8"  }
           - { os: MacOS-latest,   resolver: lts-21,  ghc: "9.4.8"  }
           - { os: MacOS-latest,   resolver: lts-22,  ghc: "9.6.6"  }
@@ -72,9 +72,9 @@ jobs:
       id: setup-haskell-cabal
       name: Setup Haskell
       with:
-        ghc-version: ${{ matrix.ghc }}
+        ghc-version: ${{ (matrix.resolver == 'lts-9' || matrix.resolver == 'lts-11') && '' || matrix.ghc }}
         enable-stack: true
-        stack-version: 'latest'
+        stack-version: ${{ (matrix.resolver == 'lts-9' || matrix.resolver == 'lts-11') && '2.15.5' || 'latest' }}
 
     - name: Cache
       id: cache

diff --git a/Color/src/Graphics/Color/Algebra.hs b/Color/src/Graphics/Color/Algebra.hs
@@ -33,9 +33,11 @@ module Graphics.Color.Algebra
 
 import Data.Typeable
 import Foreign.Ptr
-import Control.Applicative
 import Foreign.Storable
 import Graphics.Color.Algebra.Elevator
+#if MIN_VERSION_base(4,10,0) && !MIN_VERSION_base(4,14,0)
+import Control.Applicative (liftA2)
+#endif
 
 
 --------

diff --git a/stack/ghc-8.8.4.yaml.lock b/stack/ghc-8.8.4.yaml.lock
@@ -83,7 +83,7 @@ packages:
     hackage: scheduler-1.4.2.1@sha256:26fb16ccf5f41ee9144f8c77a5228163968543ae5cc8242c761e69ff8f579e07,2863
 snapshots:
 - completed:
-    sha256: 95f014df58d0679b1c4a2b7bf2b652b61da8d30de5f571abb0d59015ef678646
-    size: 509471
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/12/26.yaml
-  original: lts-12.26
+    sha256: 637fb77049b25560622a224845b7acfe81a09fdb6a96a3c75997a10b651667f6
+    size: 534126
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/16/31.yaml
+  original: lts-16.31