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 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