Formatting

This commit is contained in:
Jack Hodgkinson 2022-04-12 13:46:40 +01:00
parent 41177213a1
commit 3c818f436f
2 changed files with 27 additions and 21 deletions

View file

@ -122,13 +122,13 @@ library
import: lang, deps
exposed-modules:
Agora.AuthorityToken
Agora.Effect
Agora.Governor
Agora.MultiSig
Agora.Proposal
Agora.SafeMoney
Agora.Stake
Agora.Effect
Agora.Treasury
Agora.Governor
Agora.Proposal
other-modules:
Agora.Utils
@ -151,8 +151,8 @@ test-suite agora-test
main-is: Spec.hs
hs-source-dirs: agora-test
other-modules:
Spec.Model.Treasury
Spec.Model.MultiSig
Spec.Model.Treasury
Spec.Sample.Stake
Spec.Sample.Treasury
Spec.Stake

View file

@ -50,8 +50,10 @@
projectFor = system:
let pkgs = nixpkgsFor system;
in let pkgs' = nixpkgsFor' system;
in (nixpkgsFor system).haskell-nix.cabalProject' {
in
let pkgs' = nixpkgsFor' system;
in
(nixpkgsFor system).haskell-nix.cabalProject' {
src = ./.;
compiler-nix-name = ghcVersion;
inherit (plutarch) cabalProjectLocal;
@ -115,17 +117,19 @@
let
pkgs = nixpkgsFor system;
pkgs' = nixpkgsFor' system;
in pkgs.runCommand "format-check" {
nativeBuildInputs = [
pkgs'.git
pkgs'.fd
pkgs'.haskellPackages.cabal-fmt
pkgs'.nixpkgs-fmt
(pkgs.haskell-nix.tools ghcVersion {
inherit (plutarch.tools) fourmolu;
}).fourmolu
];
} ''
in
pkgs.runCommand "format-check"
{
nativeBuildInputs = [
pkgs'.git
pkgs'.fd
pkgs'.haskellPackages.cabal-fmt
pkgs'.nixpkgs-fmt
(pkgs.haskell-nix.tools ghcVersion {
inherit (plutarch.tools) fourmolu;
}).fourmolu
];
} ''
export LC_CTYPE=C.UTF-8
export LC_ALL=C.UTF-8
export LANG=C.UTF-8
@ -133,7 +137,8 @@
make format_check || (echo " Please run 'make format'" ; exit 1)
mkdir $out
'';
in {
in
{
project = perSystem projectFor;
flake = perSystem (system: (projectFor system).flake { });
@ -147,9 +152,10 @@
agora-test = self.flake.${system}.packages."agora:test:agora-test";
});
check = perSystem (system:
(nixpkgsFor system).runCommand "combined-test" {
checksss = builtins.attrValues self.checks.${system};
} ''
(nixpkgsFor system).runCommand "combined-test"
{
checksss = builtins.attrValues self.checks.${system};
} ''
echo $checksss
touch $out
'');