Skip to content

Commit 513857a

Browse files
authored
Update fourmolu, ghcid and hls. Update haskellNix and iohkNix flakes (#3742)
* Update fourmolu, ghcid and hls. Update haskellNix and iohkNix flakes * Fourmalize with 0.14.0.0 version
1 parent bcec198 commit 513857a

File tree

4 files changed

+92
-51
lines changed

4 files changed

+92
-51
lines changed

.github/workflows/haskell.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,9 @@ jobs:
142142

143143
- name: Install fourmolu
144144
run: |
145+
FOURMOLU_VERSION="0.14.0.0"
145146
mkdir -p "$HOME/.local/bin"
146-
curl -sL https://github.com/fourmolu/fourmolu/releases/download/v0.13.1.0/fourmolu-0.13.1.0-linux-x86_64 -o "$HOME/.local/bin/fourmolu"
147+
curl -sL "https://github.com/fourmolu/fourmolu/releases/download/v${FOURMOLU_VERSION}/fourmolu-${FOURMOLU_VERSION}-linux-x86_64" -o "$HOME/.local/bin/fourmolu"
147148
chmod a+x "$HOME/.local/bin/fourmolu"
148149
echo "$HOME/.local/bin" >> $GITHUB_PATH
149150

flake.lock

Lines changed: 85 additions & 45 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,13 @@
9797
shell.tools =
9898
{
9999
cabal = "3.10.1.0";
100-
ghcid = "0.8.8";
100+
ghcid = "0.8.9";
101101
}
102102
// lib.optionalAttrs (config.compiler-nix-name == defaultCompiler) {
103103
# tools that work only with default compiler
104-
fourmolu = "0.13.1.0";
104+
fourmolu = "0.14.0.0";
105105
hlint = "3.6.1";
106-
haskell-language-server = { src = nixpkgs.haskell-nix.sources."hls-2.0"; };
106+
haskell-language-server = { src = nixpkgs.haskell-nix.sources."hls-2.2"; };
107107
};
108108

109109
# and from nixpkgs or other inputs

libs/small-steps/src/Control/Provenance.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ putM s = ProvM (modifyMState (const s))
153153
-- a BlackBox. This ensures that provenance cannot be used in the
154154
-- non-provenance part of the computation.
155155
getM :: Monad m => ProvM s m (BlackBox s)
156-
getM = ProvM (do m <- get; case m of { SNothing -> pure NoBox; SJust t -> pure (Box t) })
156+
getM = ProvM (do m <- get; case m of SNothing -> pure NoBox; SJust t -> pure (Box t))
157157
{-# INLINE getM #-}
158158

159159
-- | Modify the provenance if collecting provenance, otherwise do nothing.
@@ -248,7 +248,7 @@ updateWithBlackBox _ NoBox _ = pure ()
248248
-- 2) The map does not contain the key
249249
-- 3) The value at the key has the wrong type.
250250
pull :: forall t m. (Monad m, Typeable t) => Text -> Prov m (BlackBox t)
251-
pull key = ProvM (do m <- get; case findM key m of { SNothing -> pure NoBox; SJust t -> pure (Box t) })
251+
pull key = ProvM (do m <- get; case findM key m of SNothing -> pure NoBox; SJust t -> pure (Box t))
252252
{-# INLINE pull #-}
253253

254254
-- | Return a String representation of the current provenance store.

0 commit comments

Comments
 (0)