From f9e3ff8fc565ee15c9dee18b4912b817a502f056 Mon Sep 17 00:00:00 2001 From: Martin Myrseth Date: Thu, 9 May 2024 09:59:59 +0200 Subject: [PATCH 1/2] github: Try install hlint from cabal Too old `hlint` provided by `apt`. --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 66860e0..a5f631c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,7 +28,7 @@ jobs: - name: Install packages run: | sudo apt-get update - sudo apt-get install hlint hpack + sudo apt-get install hpack - name: Hpack run: hpack @@ -54,6 +54,7 @@ jobs: - name: Install dependencies run: | cabal update + cabal install hlint cabal build --only-dependencies --enable-tests --enable-benchmarks - name: Hlint From f7290eedb2831615729ca69a12390abaac6d1686 Mon Sep 17 00:00:00 2001 From: Martin Myrseth Date: Thu, 9 May 2024 10:18:11 +0200 Subject: [PATCH 2/2] hlint: Apply functor law --- src/Nixon/Config/JSON.hs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Nixon/Config/JSON.hs b/src/Nixon/Config/JSON.hs index 6135ace..83d040c 100644 --- a/src/Nixon/Config/JSON.hs +++ b/src/Nixon/Config/JSON.hs @@ -40,15 +40,14 @@ empty = instance FromJSON Config where parseJSON = withObject "Config" $ \v -> - Config - <$> (maybe [] (fmap fromText) <$> v .:? "bin_dirs") - <*> v .:? "exact_match" - <*> v .:? "ignore_case" + (Config . maybe [] (fmap fromText) <$> (v .:? "bin_dirs")) + <*> (v .:? "exact_match") + <*> (v .:? "ignore_case") <*> (maybe [] (fmap fromText) <$> v .:? "project_dirs") <*> (maybe [] (fmap mkptype) <$> v .:? "project_types") - <*> v .:? "use_direnv" - <*> v .:? "use_nix" - <*> v .:? "terminal" + <*> (v .:? "use_direnv") + <*> (v .:? "use_nix") + <*> (v .:? "terminal") newtype JsonProjectType = JsonProjectType ProjectType