diff --git a/app/current-output.hs b/app/current-output.hs index 6272f3e..151707b 100644 --- a/app/current-output.hs +++ b/app/current-output.hs @@ -22,7 +22,7 @@ module Main (main) where -- _NET_DESKTOP_VIEWPORT -- 3) Find the name of the xrandr output whose position matches that from (2) -import Data.Maybe (catMaybes, maybe) +import Data.Maybe import Graphics.X11.Types import Graphics.X11.Xlib diff --git a/app/rofi-dev.hs b/app/rofi-dev.hs index 482402a..b3cc037 100644 --- a/app/rofi-dev.hs +++ b/app/rofi-dev.hs @@ -15,11 +15,11 @@ import Bitwarden.Internal import Control.Monad import Control.Monad.Reader +import Data.Aeson import Data.List import Data.List.Split (splitOn) import qualified Data.Map as M import Data.Maybe -import qualified Data.Text as T import qualified Data.Vector as V import Data.Yaml @@ -264,7 +264,7 @@ data ProtoAction a = ProtoAction a (RofiMountIO ()) defaultTries :: Integer defaultTries = 2 -(.:&) :: FromJSON a => Object -> T.Text -> Parser (V.Vector a) +(.:&) :: FromJSON a => Object -> Key -> Parser (V.Vector a) (.:&) o t = o .:? t .!= V.empty data MountConfig = MountConfig diff --git a/stack.yaml b/stack.yaml index f5b329d..53c538a 100644 --- a/stack.yaml +++ b/stack.yaml @@ -17,7 +17,7 @@ # # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml -resolver: lts-14.12 +resolver: lts-19.17 # User packages to be built. # Various formats can be used as shown in the example below. diff --git a/stack.yaml.lock b/stack.yaml.lock index a311fe3..9648c3f 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -6,7 +6,7 @@ packages: [] snapshots: - completed: - size: 545658 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/14/12.yaml - sha256: 26b807457213126d26b595439d705dc824dbb7618b0de6b900adc2bf6a059406 - original: lts-14.12 + size: 619161 + url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/19/17.yaml + sha256: 7f47507fd037228a8d23cf830f5844e1f006221acebdd7cb49f2f5fb561e0546 + original: lts-19.17