From 4c299a8e7aa5bce74340c72df1cbf2b4b290696d Mon Sep 17 00:00:00 2001 From: Jens Nolte <git@queezle.net> Date: Sun, 5 Sep 2021 22:05:59 +0200 Subject: [PATCH] Update quasar (adds Quasar module for common imports) --- example/Main.hs | 2 +- flake.lock | 12 ++++++------ src/Quasar/Wayland/Client.hs | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example/Main.hs b/example/Main.hs index 7ab5caf..84d9dea 100644 --- a/example/Main.hs +++ b/example/Main.hs @@ -1,7 +1,7 @@ module Main (main) where +import Quasar import Quasar.Prelude -import Quasar.ResourceManager import Quasar.Wayland.Client main :: IO () diff --git a/flake.lock b/flake.lock index 745d7c2..eb0c391 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ }, "locked": { "host": "git.c3pb.de", - "lastModified": 1630808878, - "narHash": "sha256-y9l8bgqc7/0SlRqn8D2TjsASMjg8wW9LLjtA1dH7Ke0=", + "lastModified": 1630872274, + "narHash": "sha256-L2dkMWK+SszwKtlRLCs+VCpo5khVefLjy/lrhfaR2g4=", "owner": "jens", "repo": "quasar", - "rev": "c7bcce3769c08bbf3275e8826da9071412cf937a", + "rev": "0d1aff4f6d57d45c58e42f212c073dce614ef78b", "type": "gitlab" }, "original": { @@ -44,11 +44,11 @@ }, "locked": { "host": "git.c3pb.de", - "lastModified": 1630863475, - "narHash": "sha256-UzQsfGN/sJyRDQk0Nxgi5tkNDQkOtgzTGem2N6AHKfE=", + "lastModified": 1630872307, + "narHash": "sha256-NXgboGykYc2j3sxcp03lDwEBxvOEYd+zh9XF9SzoWA0=", "owner": "jens", "repo": "quasar-network", - "rev": "754e86cc745045d02150f95052a9042e3c1fcae1", + "rev": "199326fcd66af72a0b2eab18e5a33696ae5a1132", "type": "gitlab" }, "original": { diff --git a/src/Quasar/Wayland/Client.hs b/src/Quasar/Wayland/Client.hs index 762732b..3d055a8 100644 --- a/src/Quasar/Wayland/Client.hs +++ b/src/Quasar/Wayland/Client.hs @@ -6,13 +6,13 @@ module Quasar.Wayland.Client ( import Control.Monad.Catch import Network.Socket qualified as Socket import Network.Socket (Socket) -import Quasar.Disposable +import Quasar import Quasar.Prelude -import Quasar.ResourceManager import System.Environment (getEnv, lookupEnv) import System.FilePath ((</>), isRelative) import Text.Read (readEither) + data WaylandClient = WaylandClient { socket :: Socket, resourceManager :: ResourceManager -- GitLab