From 96dbefc4ef62795784d5156efda39c075807668a Mon Sep 17 00:00:00 2001 From: Emily Martins Date: Fri, 15 Apr 2022 13:41:07 +0200 Subject: [PATCH] format agora.cabal, flake.nix --- agora.cabal | 6 +++--- flake.nix | 38 ++++++++++++++++++++++---------------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/agora.cabal b/agora.cabal index 046a5c8..4c447e0 100644 --- a/agora.cabal +++ b/agora.cabal @@ -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 diff --git a/flake.nix b/flake.nix index 81393b0..20ceebb 100644 --- a/flake.nix +++ b/flake.nix @@ -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; @@ -120,16 +122,18 @@ inherit (plutarch.tools) fourmolu; }) fourmolu; - in pkgs.runCommand "format-check" { - nativeBuildInputs = [ - pkgs'.git - pkgs'.fd - pkgs'.haskellPackages.cabal-fmt - pkgs'.nixpkgs-fmt - fourmolu - pkgs'.haskell.packages."${ghcVersion}".hlint - ]; - } '' + in + pkgs.runCommand "format-check" + { + nativeBuildInputs = [ + pkgs'.git + pkgs'.fd + pkgs'.haskellPackages.cabal-fmt + pkgs'.nixpkgs-fmt + fourmolu + pkgs'.haskell.packages."${ghcVersion}".hlint + ]; + } '' export LC_CTYPE=C.UTF-8 export LC_ALL=C.UTF-8 export LANG=C.UTF-8 @@ -138,7 +142,8 @@ find -name '*.hs' -not -path './dist*/*' -not -path './haddock/*' | xargs hlint mkdir $out ''; - in { + in + { project = perSystem projectFor; flake = perSystem (system: (projectFor system).flake { }); @@ -152,9 +157,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 '');