diff --git a/.envrc b/.envrc index a8b29ed74b..058133b3db 100644 --- a/.envrc +++ b/.envrc @@ -16,13 +16,16 @@ env_dir=./.env [[ -d "$layout_dir" ]] || mkdir -p "$layout_dir" if [[ ! -d "$env_dir" || ! -f "$layout_dir/nix-rebuild" || "$store_paths" != $(< "$layout_dir/nix-rebuild" ) ]]; then + bcmd=nix if command -v nom &> /dev/null; then if [[ "${USE_NOM}" != "0" ]]; then - nom build -f nix wireServer.devEnv --out-link ./.env + bcmd=nom fi - else - nix build -f nix wireServer.devEnv -Lv --out-link ./.env fi + echo "🔧 Building environment" + $bcmd build -f nix wireServer.devEnv -Lv --out-link ./.env + echo "🔧 Building hs-run" + $bcmd build github:wireapp/ghc-flakr -Lv --out-link ./.env echo "$store_paths" > "$layout_dir/nix-rebuild" fi diff --git a/changelog.d/5-internal/add-ghc-flakr b/changelog.d/5-internal/add-ghc-flakr new file mode 100644 index 0000000000..43c8c2cf08 --- /dev/null +++ b/changelog.d/5-internal/add-ghc-flakr @@ -0,0 +1 @@ +adds a new executable, hs-run, to quickly run haskell scripts diff --git a/hack/bin/.envrc b/hack/bin/.envrc new file mode 100644 index 0000000000..f8a82b5abd --- /dev/null +++ b/hack/bin/.envrc @@ -0,0 +1 @@ +use flake github:wireapp/ghc-flakr -Lv