From 939eb59714e74d40626d639d21bfb137325c132d Mon Sep 17 00:00:00 2001 From: qvalentin Date: Tue, 21 Jan 2025 21:04:50 +0100 Subject: [PATCH 1/2] docs: add note about stack lts --- backend/stack.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/stack.yaml b/backend/stack.yaml index 5383a0f..e142431 100644 --- a/backend/stack.yaml +++ b/backend/stack.yaml @@ -14,8 +14,9 @@ # Use the latest resolver that uses the same ghc version # as build for nixos # this way we can use prebuild binaries for hls -#resolver: nightly-2022-11-12 -#resolver: ghc-9.2.4 +# go to +# https://www.stackage.org/ +# and select the lts that is matching you hls version resolver: lts-22.43 # # The location of a snapshot can be provided as a file or url. Stack assumes From 1a44dae5804a515524750bef960f763aa4df9eff Mon Sep 17 00:00:00 2001 From: qvalentin Date: Tue, 21 Jan 2025 21:21:21 +0100 Subject: [PATCH 2/2] minor fix --- backend/shell.nix | 2 ++ backend/src/State/RoomsState.hs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/backend/shell.nix b/backend/shell.nix index 7e83bc2..a24dad2 100644 --- a/backend/shell.nix +++ b/backend/shell.nix @@ -5,6 +5,8 @@ pkgs.mkShell { haskell-language-server stack stylish-haskell + + libnotify ]; } diff --git a/backend/src/State/RoomsState.hs b/backend/src/State/RoomsState.hs index af7e40b..f42eff1 100644 --- a/backend/src/State/RoomsState.hs +++ b/backend/src/State/RoomsState.hs @@ -62,7 +62,7 @@ roomStateDiffInOpenRooms newData = do current <- getRoomDataState let newRooms = filter roomNotEmpty $ filter (\newRoom -> isNothing $ find (sameName newRoom) current) newData - let oldRooms = filter (\newRoom -> isJust $ find (sameName newRoom) current) newData + let oldRooms = filter roomNotEmpty $ filter (\oldRoom -> isNothing $ find (sameName oldRoom) newData) current return (newRooms, oldRooms)