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

format agora.cabal, flake.nix

Browse source
This commit is contained in:
Emily Martins 2022-04-15 13:41:07 +02:00
parent fccac702b8
commit 476bf48649
2 changed files with 25 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
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

38
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;
@ -120,16 +122,18 @@
inherit (plutarch.tools) fourmolu; inherit (plutarch.tools) fourmolu;
}) })
fourmolu; fourmolu;
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
fourmolu pkgs'.haskellPackages.cabal-fmt
pkgs'.haskell.packages."${ghcVersion}".hlint pkgs'.nixpkgs-fmt
]; fourmolu
} '' pkgs'.haskell.packages."${ghcVersion}".hlint
];
} ''
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
@ -138,7 +142,8 @@
find -name '*.hs' -not -path './dist*/*' -not -path './haddock/*' | xargs hlint find -name '*.hs' -not -path './dist*/*' -not -path './haddock/*' | xargs hlint
mkdir $out mkdir $out
''; '';
in { in
{
project = perSystem projectFor; project = perSystem projectFor;
flake = perSystem (system: (projectFor system).flake { }); flake = perSystem (system: (projectFor system).flake { });
@ -152,9 +157,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
''); '');