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:
Seungheon Oh 2022-04-21 19:03:14 -05:00
parent df8baf4f4f
commit 11a10bd4ec
2 changed files with 34 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
agora.cabal
View file

@ -152,13 +152,13 @@ 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.AuthorityToken
Spec.Effect.TreasuryWithdrawal Spec.Effect.TreasuryWithdrawal
Spec.Sample.Effect.TreasuryWithdrawal
Spec.Model.MultiSig Spec.Model.MultiSig
Spec.Sample.Effect.TreasuryWithdrawal
Spec.Sample.Stake Spec.Sample.Stake
Spec.Stake Spec.Stake
Spec.Util Spec.Util
Spec.AuthorityToken
build-depends: agora build-depends: agora

56
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
@ -139,20 +143,23 @@
mkdir $out mkdir $out
''; '';
in { in
{
project = perSystem projectFor; project = perSystem projectFor;
flake = perSystem (system: (projectFor system).flake { }); flake = perSystem (system: (projectFor system).flake { });
packages = perSystem (system: packages = perSystem (system:
self.flake.${system}.packages // { self.flake.${system}.packages // {
haddock = let haddock =
agora-doc = self.flake.${system}.packages."agora:lib:agora".doc; let
pkgs = nixpkgsFor system; agora-doc = self.flake.${system}.packages."agora:lib:agora".doc;
in pkgs.runCommand "haddock-merge" { } '' pkgs = nixpkgsFor system;
cd ${self} in
mkdir $out pkgs.runCommand "haddock-merge" { } ''
cp -r ${agora-doc}/share/doc/* $out cd ${self}
''; mkdir $out
cp -r ${agora-doc}/share/doc/* $out
'';
}); });
# Define what we want to test # Define what we want to test
@ -163,9 +170,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
''); '');