[fix] remove dependency on experimental feature flakes

at the request of flokli
wireapp · Dec 13, 2023 · 269886f · 269886f
1 parent 931df62
commit 269886f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/.envrc b/.envrc
@@ -13,11 +13,11 @@ store_paths=$(echo "$nix_files" | xargs nix-store --add ./nix)
 layout_dir=$(direnv_layout_dir)
 env_dir=./.env
 
-export NIX_CONFIG='extra-experimental-features = nix-command flakes'
+export NIX_CONFIG='extra-experimental-features = nix-command'
 
 [[ -d "$layout_dir" ]] || mkdir -p "$layout_dir"
 
-if [[ ! -d "$env_dir" || ! -d "./.env-hs-run" || ! -f "$layout_dir/nix-rebuild" || "$store_paths" != $(< "$layout_dir/nix-rebuild" ) ]]; then
+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
@@ -26,8 +26,6 @@ if [[ ! -d "$env_dir" || ! -d "./.env-hs-run" || ! -f "$layout_dir/nix-rebuild"
   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-hs-run
   echo "$store_paths" > "$layout_dir/nix-rebuild"
 fi
 

diff --git a/hack/bin/.envrc b/hack/bin/.envrc
diff --git a/hack/bin/bombon.hs b/hack/bin/bombon.hs
@@ -1,4 +1,4 @@
-#!/usr/bin/env -S nix -Lv run github:wireapp/ghc-flakr/ecb1f45f1549e06c92d71164e305ce501eb0e36e
+#!/usr/bin/env -S nix -Lv run github:wireapp/ghc-flakr/ecb1f45f1549e06c92d71164e305ce501eb0e36e --extra-experimental-features flakes
 {-# LANGUAGE BlockArguments #-}
 {-# LANGUAGE ImportQualifiedPost #-}
 {-# LANGUAGE OverloadedStrings #-}