Skip to content

Commit bdabda4

Browse files
authored
[fix] remove dependency on experimental feature flakes (#3778)
at the request of flokli
1 parent f795d50 commit bdabda4

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

.envrc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ store_paths=$(echo "$nix_files" | xargs nix-store --add ./nix)
1313
layout_dir=$(direnv_layout_dir)
1414
env_dir=./.env
1515

16-
export NIX_CONFIG='extra-experimental-features = nix-command flakes'
16+
export NIX_CONFIG='extra-experimental-features = nix-command'
1717

1818
[[ -d "$layout_dir" ]] || mkdir -p "$layout_dir"
1919

20-
if [[ ! -d "$env_dir" || ! -d "./.env-hs-run" || ! -f "$layout_dir/nix-rebuild" || "$store_paths" != $(< "$layout_dir/nix-rebuild" ) ]]; then
20+
if [[ ! -d "$env_dir" || ! -f "$layout_dir/nix-rebuild" || "$store_paths" != $(< "$layout_dir/nix-rebuild" ) ]]; then
2121
bcmd=nix
2222
if command -v nom &> /dev/null; then
2323
if [[ "${USE_NOM}" != "0" ]]; then
@@ -26,8 +26,6 @@ if [[ ! -d "$env_dir" || ! -d "./.env-hs-run" || ! -f "$layout_dir/nix-rebuild"
2626
fi
2727
echo "🔧 Building environment"
2828
$bcmd build -f nix wireServer.devEnv -Lv --out-link ./.env
29-
echo "🔧 Building hs-run"
30-
$bcmd build github:wireapp/ghc-flakr -Lv --out-link ./.env-hs-run
3129
echo "$store_paths" > "$layout_dir/nix-rebuild"
3230
fi
3331

hack/bin/.envrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

hack/bin/bombon.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env -S nix -Lv run github:wireapp/ghc-flakr/ecb1f45f1549e06c92d71164e305ce501eb0e36e
1+
#!/usr/bin/env -S nix -Lv run github:wireapp/ghc-flakr/ecb1f45f1549e06c92d71164e305ce501eb0e36e --extra-experimental-features flakes
22
{-# LANGUAGE BlockArguments #-}
33
{-# LANGUAGE ImportQualifiedPost #-}
44
{-# LANGUAGE OverloadedStrings #-}

0 commit comments

Comments
 (0)