aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Rahm <rahm@google.com>2024-03-15 11:20:47 -0600
committerJosh Rahm <rahm@google.com>2024-03-15 11:24:36 -0600
commite4df00c6c6d6ec67cb748343b9f86ce7cea793b9 (patch)
tree991080635362868d0888005bc025b0c36a8358c3
parent8707a1def309ea689ecf5b324656f43c4560eeb6 (diff)
downloadwetterhorn-e4df00c6c6d6ec67cb748343b9f86ce7cea793b9.tar.gz
wetterhorn-e4df00c6c6d6ec67cb748343b9f86ce7cea793b9.tar.bz2
wetterhorn-e4df00c6c6d6ec67cb748343b9f86ce7cea793b9.zip
Version bump
-rw-r--r--package.yaml4
-rw-r--r--src/Wetterhorn/Layout/Full.hs2
-rw-r--r--src/Wetterhorn/StackSet.hs5
-rw-r--r--stack.yaml4
4 files changed, 10 insertions, 5 deletions
diff --git a/package.yaml b/package.yaml
index 213a904..48f839a 100644
--- a/package.yaml
+++ b/package.yaml
@@ -33,7 +33,7 @@ dependencies:
- mtl
- bytestring
- containers
-- data-default
+- data-default-class
- transformers
- monad-loops
@@ -69,7 +69,7 @@ executables:
- -shared
- -dynamic
- -no-hs-main
- - -lHSrts-1.0.2-ghc9.4.7
+ - -lHSrts-1.0.2-ghc9.6.4
- -O3
cc-options:
- -g3
diff --git a/src/Wetterhorn/Layout/Full.hs b/src/Wetterhorn/Layout/Full.hs
index 240b719..b7e4d91 100644
--- a/src/Wetterhorn/Layout/Full.hs
+++ b/src/Wetterhorn/Layout/Full.hs
@@ -1,7 +1,7 @@
module Wetterhorn.Layout.Full where
import Data.Data (Typeable)
-import Data.Default
+import Data.Default.Class
import Wetterhorn.Constraints
import Wetterhorn.Core.W
import Wetterhorn.StackSet
diff --git a/src/Wetterhorn/StackSet.hs b/src/Wetterhorn/StackSet.hs
index 22005a4..86d1b8e 100644
--- a/src/Wetterhorn/StackSet.hs
+++ b/src/Wetterhorn/StackSet.hs
@@ -1,8 +1,11 @@
module Wetterhorn.StackSet where
+import Control.Monad (void)
+import Data.Monoid (First(..))
import Control.Monad.Identity
-import Control.Monad.Writer (First (..), MonadWriter (tell), execWriter)
+import Control.Monad.Writer (MonadWriter (tell), execWriter)
import Data.Maybe (isJust, mapMaybe)
+import Data.Maybe (isJust)
-- | The root datastructure for holding the state of the windows.
data StackSet s sd t l a = StackSet
diff --git a/stack.yaml b/stack.yaml
index 65ff04b..b66ae37 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -8,7 +8,9 @@
# A snapshot resolver dictates the compiler version and the set of packages
# to be used for project dependencies. For example:
#
-resolver: lts-21.21
+resolver: lts-22.12
+# ghc-9.6.4
+# lts-21.21
# resolver: nightly-2023-09-24
# resolver: ghc-9.6.2
#