Update hlint (+ fix lints)

myme · May 9, 2024 · 5a8d802 · 5a8d802
2 parents ddc643c + f7290ee
commit 5a8d802
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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