Skip to content

Bump nixpkgs #248

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
arcz merged 2 commits into from
Jul 10, 2023
Merged

Bump nixpkgs #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04ca2af
Bump nixpkgs
arcz Apr 17, 2023
354a7a6
Fix random-contract-concrete-call test
arcz Jul 10, 2023
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
2 changes: 1 addition & 1 deletion .github/scripts/install-libsecp256k1.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -eux -o pipefail

## The following script builds and installs libsecp256k1 to ~/.local/lib

INSTALL_VERSION=0.3.0
INSTALL_VERSION=0.3.2

if [[ "$(uname -s)" =~ ^MSYS_NT.* ]]; then
echo "This script is only meant to run on Windows under MSYS2"
Expand Down
53 changes: 27 additions & 26 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.

13 changes: 5 additions & 8 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
inputs = {
flake-utils.url = "github:numtide/flake-utils";
nixpkgs.url = "github:nixos/nixpkgs";
# nixpkgs with working solc
nixpkgs-solc.url = "github:nixos/nixpkgs/1b71def42b74811323de2df52f180b795ec506fc";
foundry.url = "github:shazow/foundry.nix/monthly";
flake-compat = {
url = "github:edolstra/flake-compat";
Expand All @@ -21,14 +19,13 @@
};
};

outputs = { self, nixpkgs, nixpkgs-solc, flake-utils, solidity, ethereum-tests, foundry, ... }:
outputs = { self, nixpkgs, flake-utils, solidity, ethereum-tests, foundry, ... }:
flake-utils.lib.eachDefaultSystem (system:
let
pkgs = nixpkgs.legacyPackages.${system};
solc' = nixpkgs-solc.legacyPackages.${system}.solc;
testDeps = with pkgs; [
go-ethereum
solc'
solc
z3
cvc5
git
Expand Down Expand Up @@ -70,7 +67,7 @@
]).overrideAttrs(final: prev: {
HEVM_SOLIDITY_REPO = solidity;
HEVM_ETHEREUM_TESTS_REPO = ethereum-tests;
DAPP_SOLC = "${solc'}/bin/solc";
DAPP_SOLC = "${pkgs.solc}/bin/solc";
});

# wrapped binary for use on systems with nix available. ensures all
Expand All @@ -81,7 +78,7 @@
buildInputs = [ makeWrapper ];
postBuild = ''
wrapProgram $out/bin/hevm \
--prefix PATH : "${lib.makeBinPath ([ bash coreutils git solc' z3 cvc5 ])}"
--prefix PATH : "${lib.makeBinPath ([ bash coreutils git solc z3 cvc5 ])}"
'';
};

Expand Down Expand Up @@ -157,7 +154,7 @@
# NOTE: hacks for bugged cabal new-repl
LD_LIBRARY_PATH = libraryPath;
HEVM_SOLIDITY_REPO = solidity;
DAPP_SOLC = "${solc'}/bin/solc";
DAPP_SOLC = "${pkgs.solc}/bin/solc";
HEVM_ETHEREUM_TESTS_REPO = ethereum-tests;
shellHook = lib.optionalString stdenv.isDarwin ''
export DYLD_LIBRARY_PATH="${libraryPath}";
Expand Down
1 change: 0 additions & 1 deletion test/EVM/Test/Tracing.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,6 @@ data EVMToolOutput =
EVMToolOutput
{ output :: ByteStringS
, gasUsed :: W256
, time :: Integer
} deriving (Generic, Show)

instance JSON.FromJSON EVMToolOutput
Expand Down