chore(nix): resolve flake and direnv compatibility issues (#439)

Co-authored-by: Trantorian1 <[email protected]>
madara-alliance · Dec 31, 2024 · ce9b96f · ce9b96f
1 parent d1526dd
commit ce9b96f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 54 deletions.
diff --git a/.envrc b/.envrc
@@ -1,9 +1,3 @@
 # Madara envrc
 
-# If lorri exists, better try it first.
-if has lorri; then
-    eval "$(lorri direnv)"
-else
-    # Otherwise fall back to pure nix
-    use nix
-fi
+use flake
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Next release
 
+- chore(nix): resolve flake and direnv compatibility issues
 - fix: Gateway path fix
 - fix: instrumentation code
 - feat: block resource cap removed from the pending tick

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -21,13 +21,14 @@
             openssl
             pkg-config
             protobuf
+            nodePackages.prettier
+            taplo-cli
           ];
 
           buildInputs = with pkgs; [
             rustToolchain
             clang
             rocksdb
-            alsaLib
           ] ++ lib.optionals stdenv.isDarwin [
             darwin.apple_sdk.frameworks.Security
           ];