Skip to content

Commit

Permalink
chore(nix): resolve flake and direnv compatibility issues
Browse files Browse the repository at this point in the history
  • Loading branch information
jbcaron committed Dec 23, 2024
1 parent 34d629c commit 84c99ec
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 54 deletions.
8 changes: 1 addition & 7 deletions .envrc
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Next release

- chore(nix): resolve flake and direnv compatibility issues
- feat: block resource cap removed from the pending tick
- fix: replace class hash issue resolved + gas fees issue resolved
- fix: trim hash of eth state was failing with 0x0
Expand Down
58 changes: 12 additions & 46 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
];
Expand Down

0 comments on commit 84c99ec

Please sign in to comment.