Skip to content

fix(foundry): Update it to a recent version and make it compile with recent nixpkgs #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 10, 2024
Merged

fix(foundry): Update it to a recent version and make it compile with recent nixpkgs #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5daa908
build(direnv): Upgrade `nix-direnv` to 3.0.6
PetarKirov Oct 6, 2024
761bccc
build: update nixpkgs-unstable input
PetarKirov Sep 19, 2024
29865ce
foundry: 0688b5a -> 2acca4e3
PetarKirov Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .envrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
if ! has nix_direnv_version || ! nix_direnv_version 2.2.0; then
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.0/direnvrc" "sha256-5EwyKnkJNQeXrRkYbwwRBcXbibosCJqyIUuz9Xq+LRc="
if ! has nix_direnv_version || ! nix_direnv_version 3.0.6; then
source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.6/direnvrc" "sha256-RYcUJaRMf8oF5LznDrlCXbkOQrywm0HDv1VjYGaJGdM="
fi
nix_direnv_watch_file ./flake-shell.nix

use flake
8 changes: 4 additions & 4 deletions flake.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# packages
nixpkgs.url = "github:nixos/nixpkgs/24.05";
nixpkgs-2311.url = "github:nixos/nixpkgs/23.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
nixpkgs-unstable.url = "github:nixos/nixpkgs?branch=nixpkgs-unstable&rev=99dc8785f6a0adac95f5e2ab05cc2e1bf666d172";

foundry-nix = {
url = "github:shazow/foundry.nix/monthly";
Expand Down
21 changes: 7 additions & 14 deletions pkgs/foundry/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "foundry";
version = "nightly-${builtins.substring 0 7 src.rev}";
version = "2acca4e379793539db80e032d76ffe0110298b";

src = fetchFromGitHub {
owner = "foundry-rs";
repo = "foundry";
rev = "0688b5ad19a637303c038d1a66aec62a73713e20";
hash = "sha256-OIsUzJVNcb2nVCYU/BdGGGICEg9Cr9LXc8zzN2JSb8g=";
rev = "nightly-fe${version}";
hash = "sha256-saC0XF4iBNXn9BxYlt1e8WB4t3NXptEFaREKgFsPMs0=";
};

cargoLock = {
lockFile = "${src}/Cargo.lock";
outputHashes = {
"alloy-consensus-0.1.0" = "sha256-rHDLt0N6VIAlg2EKEdF0S2S8XqJebRlIB7owyGQ04aA=";
"ethers-2.0.11" = "sha256-ySrCZOiqOcDVH5T7gbimK6Bu7A2OCcU64ZL1RfFPrBc=";
"revm-3.5.0" = "sha256-gdDJq2ZyIkMhTgMNz45YJXnopF/xxt3CaSd/eYSDGcY=";
"revm-inspectors-0.1.0" = "sha256-mH6On3cjKLT14S+5dxB1G5lcf5PBtz0KcusMxOtRRWA=";
};
};
cargoHash = "sha256-nfuyl36awAlDnqQmSjKXE/yQ99Asl357S0i8Zn+0WAA=";

env = {
# Make svm-rs use local release list rather than fetching from non-reproducible URL.
Expand Down Expand Up @@ -69,10 +61,11 @@ rustPlatform.buildRustPackage rec {
doCheck = false;

meta = with lib; {
description = "A portable, modular toolkit for Ethereum application development written in Rust.";
homepage = "https://github.com/foundry-rs/foundry";
description = "Foundry is a blazing fast, portable and modular toolkit for Ethereum application development written in Rust";
homepage = "https://github.com/foundry-rs/foundry/";
license = with licenses; [asl20 mit];
maintainers = with maintainers; [mitchmindtree];
mainProgram = "foundry";
# For now, solc binaries are only built for x86_64.
# Track darwin-aarch64 here:
# https://github.com/ethereum/solidity/issues/12291
Expand Down