Sulkta-OSS/agora
3
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Formatting

Browse source
This commit is contained in:
Jack Hodgkinson 2022-04-12 13:46:40 +01:00
parent 4f1f195af7
commit a9df050af7
2 changed files with 27 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
agora.cabal
View file

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

40
flake.nix
View file

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