chore(nix): Update dependencies. (#1204)

hackworthltd · Feb 6, 2024 · a56f186 · a56f186 · github-actions · Feb 6, 2024
2 parents d8be16b + dd036ec
commit a56f186
Show file tree

Hide file tree

Showing 4 changed files with 110 additions and 53 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -10,7 +10,9 @@
     flake-compat.url = "github:edolstra/flake-compat";
     flake-compat.flake = false;
 
-    pre-commit-hooks-nix.url = "github:cachix/pre-commit-hooks.nix";
+    # Pin pre-commit-hooks because newer versions need `cljfmt`, which
+    # isn't included in the current haskell.nix nixpkgs pin.
+    pre-commit-hooks-nix.url = "github:cachix/pre-commit-hooks.nix/9d3d7e18c6bc4473d7520200d4ddab12f8402d38";
 
     flake-parts.url = "github:hercules-ci/flake-parts";
 

diff --git a/primer/src/Primer/Questions.hs b/primer/src/Primer/Questions.hs
@@ -120,7 +120,7 @@ generateNameTyAvoiding ::
 -- It doesn't really make sense to ask for a term variable (Left) here, but
 -- it doesn't harm to support it
 generateNameTyAvoiding avoiding tk z =
-  uniquifyMany <$> ((Set.fromList avoiding <>) <$> getAvoidSetTy z) <*> baseNames tk
+  (uniquifyMany . (Set.fromList avoiding <>) <$> getAvoidSetTy z) <*> baseNames tk
 
 baseNames ::
   MonadReader Cxt m =>

diff --git a/primer/test/Tests/Action/Available.hs b/primer/test/Tests/Action/Available.hs
@@ -718,8 +718,8 @@ toProgAction l a (def, loc, action) = do
         let opts'' =
               opts' <> case free of
                 Available.FreeNone -> []
-                Available.FreeVarName -> [(OptGen,) . (\t -> Available.Option t Nothing False) <$> (unName <$> genName)]
-                Available.FreeInt -> [(OptGen,) . (\t -> Available.Option t Nothing False) <$> (show <$> genInt)]
+                Available.FreeVarName -> [((OptGen,) . (\t -> Available.Option t Nothing False)) . unName <$> genName]
+                Available.FreeInt -> [((OptGen,) . (\t -> Available.Option t Nothing False)) . show <$> genInt]
                 Available.FreeChar -> [(OptGen,) . (\t -> Available.Option t Nothing False) . T.singleton <$> genChar]
         case opts'' of
           [] -> pure NoOfferedOpts