From 6baad9c5fae4a7b8ea07376a0be52443eaa488fa Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Sat, 7 Oct 2023 09:25:58 -0400 Subject: Environment fixes on beryllium Getting beryllium setup with the omnirepo showed that a few things needed fixed. --- Biz/Bild.nix | 7 +++++++ Biz/Ide/hooks/pre-commit.bash | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'Biz') diff --git a/Biz/Bild.nix b/Biz/Bild.nix index 9647983..409a0bc 100644 --- a/Biz/Bild.nix +++ b/Biz/Bild.nix @@ -130,15 +130,22 @@ in nixpkgs // { bild = rec { name = "bizdev"; # this should just be dev tools buildInputs = with nixpkgs.pkgs; [ + bat + bc bild black ctags + fd figlet + fzf git gitlint + jq lolcat nixpkgs.haskell.packages.${constants.ghcCompiler}.fast-tags ormolu + ripgrep + tree wemux ]; shellHook = '' diff --git a/Biz/Ide/hooks/pre-commit.bash b/Biz/Ide/hooks/pre-commit.bash index 2b4575c..560eee7 100755 --- a/Biz/Ide/hooks/pre-commit.bash +++ b/Biz/Ide/hooks/pre-commit.bash @@ -8,9 +8,9 @@ for ns in ${changed[@]} do version=$(${CODEROOT:?}/Biz/Ide/version $ns) - if (( $version == -1 )); then + if [[ $version -eq -1 ]]; then echo "info: version: $ns: deleted" - elif (( $version < 1 )); then + elif [[ $version -lt 1 ]]; then echo "fail: version: $ns: $version" exit 1 else -- cgit v1.2.3