Skip to content
This repository has been archived by the owner on Dec 2, 2024. It is now read-only.

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
koslambrou committed Jun 21, 2023
1 parent 469a84f commit bc28019
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 54 deletions.
12 changes: 6 additions & 6 deletions __std__/cells/plutus-apps/devshells/plutus-apps-shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ inputs.std.lib.dev.mkShell {
category = "general commands";
help = "Checker for editorconfig conformance";
}
{
package = cell.packages.fix-fourmolu;
category = "haskell";
help = "Run fourmolu on all haskell files in-place";
}
# {
# package = cell.packages.fix-fourmolu;
# category = "haskell";
# help = "Run fourmolu on all haskell files in-place";
# }
{
package = cell.packages.fix-cabal-fmt;
category = "haskell";
Expand Down Expand Up @@ -102,7 +102,7 @@ inputs.std.lib.dev.mkShell {
cell.packages.hie-bios
cell.packages.sphinx-toolchain
cell.packages.hlint
cell.packages.fourmolu
# cell.packages.fourmolu
cell.packages.haskell-language-server-wrapper
cell.packages.cabal-install
cell.packages.cabal-fmt
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cell.library.pkgs.haskell-nix.cabalProject' {
# b) Pull out the tools themselves from the HLS project so we can use
# them elsewhere
cabalProjectLocal = ''
constraints: fourmolu==0.8.2.0, hlint==3.4.1
constraints: hlint==3.4.1
'';

src = inputs.haskell-language-server;
Expand Down
4 changes: 2 additions & 2 deletions __std__/cells/plutus-apps/packages/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@

cabal-fmt = import ./cabal-fmt.nix block;

fourmolu = import ./fourmolu.nix block;
# fourmolu = import ./fourmolu.nix block;

fix-cabal-fmt = import ./fix-cabal-fmt.nix block;

fix-fourmolu = import ./fix-fourmolu.nix block;
# fix-fourmolu = import ./fix-fourmolu.nix block;

fix-png-optimization = import ./fix-png-optimization.nix block;

Expand Down
31 changes: 16 additions & 15 deletions __std__/cells/plutus-apps/packages/fix-fourmolu.nix
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
{ inputs, cell }:

cell.library.pkgs.writeShellApplication {
# cell.library.pkgs.writeShellApplication {

name = "fix-fourmolu";
# name = "fix-fourmolu";

runtimeInputs = [
cell.library.pkgs.fd
cell.packages.fourmolu
];
# runtimeInputs = [
# cell.library.pkgs.fd
# cell.packages.fourmolu
# ];

text = ''
fd \
--extension hs \
--exclude 'dist-newstyle/*' \
--exclude 'dist/*' \
--exclude '.stack-work/*' \
--exec bash -c "fourmolu -iq {}"
'';
}
# text = ''
# fd \
# --extension hs \
# --exclude 'dist-newstyle/*' \
# --exclude 'dist/*' \
# --exclude '.stack-work/*' \
# --exec bash -c "fourmolu -iq {}"
# '';
# }
{}
22 changes: 0 additions & 22 deletions __std__/cells/plutus-apps/packages/fix-stylish-haskell.nix

This file was deleted.

3 changes: 2 additions & 1 deletion __std__/cells/plutus-apps/packages/fourmolu.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@
#
# To prevent this issue, we explicitly pin the fourmolu version to the one provided by HLS in
# ../library/haskell-language-server-project.nix. See the note there for a similar explanation.
cell.library.haskell-language-server-project.hsPkgs.fourmolu.components.exes.fourmolu
# cell.library.haskell-language-server-project.hsPkgs.fourmolu.components.exes.fourmolu
{}
5 changes: 0 additions & 5 deletions __std__/cells/plutus-apps/packages/stylish-haskell.nix

This file was deleted.

2 changes: 1 addition & 1 deletion cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repository cardano-haskell-packages
c00aae8461a256275598500ea0e187588c35a5d5d7454fb57eac18d9edb86a56
d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee

index-state: 2023-06-21T00:00:00Z
index-state: 2023-05-11T00:00:00Z

-- See CONTRIBUTING.adoc for how to update index-state
-- , hackage.haskell.org 2023-06-21T00:00:00Z
Expand Down
2 changes: 1 addition & 1 deletion nix/pkgs/haskell/extra.nix
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ let
# b) Pull out the tools themselves from the HLS project so we can use
# them elsewhere
cabalProjectLocal = ''
constraints: fourmolu==0.8.2.0, hlint==3.4.1
constraints: stylish-haskell==0.13.0.0, hlint==3.2.8
'';

src = sources.haskell-language-server;
Expand Down

0 comments on commit bc28019

Please sign in to comment.