solc: 0.5.15 -> 0.6.8

This commit is contained in:
Francois-Rene Rideau 2020-05-15 04:36:26 -04:00
parent ad17c01f93
commit 46b3eca5fd

View File

@ -1,4 +1,4 @@
{ stdenv, fetchzip, boost, cmake, ncurses, python2 { stdenv, fetchzip, boost, cmake, ncurses, python3, coreutils
, z3Support ? true, z3 ? null, cvc4Support ? true, cvc4 ? null , z3Support ? true, z3 ? null, cvc4Support ? true, cvc4 ? null
, cln ? null, gmp ? null , cln ? null, gmp ? null
}: }:
@ -16,12 +16,12 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "solc"; pname = "solc";
version = "0.5.15"; version = "0.6.8";
# upstream suggests avoid using archive generated by github # upstream suggests avoid using archive generated by github
src = fetchzip { src = fetchzip {
url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz"; url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz";
sha256 = "1nfvsaci5ja5ss603z04197wndwkvcq9nm5mdab1kpdr91djxh2y"; sha256 = "1nxds6c10hjqjjk893qw2yljws57li0xigbf3ih85y8y6d587ph0";
}; };
postPatch = '' postPatch = ''
@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
buildInputs = [ boost ] buildInputs = [ boost ]
++ stdenv.lib.optionals z3Support [ z3 ] ++ stdenv.lib.optionals z3Support [ z3 ]
++ stdenv.lib.optionals cvc4Support [ cvc4 cln gmp ]; ++ stdenv.lib.optionals cvc4Support [ cvc4 cln gmp ];
checkInputs = [ ncurses python2 ]; checkInputs = [ ncurses python3 ];
# Test fails on darwin for unclear reason # Test fails on darwin for unclear reason
doCheck = stdenv.hostPlatform.isLinux; doCheck = stdenv.hostPlatform.isLinux;
@ -56,13 +56,7 @@ stdenv.mkDerivation rec {
pushd .. pushd ..
# IPC tests need aleth avaliable, so we disable it # IPC tests need aleth avaliable, so we disable it
sed -i "s/IPC_ENABLED=true/IPC_ENABLED=false\nIPC_FLAGS=\"--no-ipc\"/" ./scripts/tests.sh sed -i "s/IPC_ENABLED=true/IPC_ENABLED=false\nIPC_FLAGS=\"--no-ipc\"/" ./scripts/tests.sh
for i in ./scripts/*.sh; do for i in ./scripts/*.sh ./scripts/*.py ./test/*.sh; do
patchShebangs "$i"
done
for i in ./scripts/*.py; do
patchShebangs "$i"
done
for i in ./test/*.sh; do
patchShebangs "$i" patchShebangs "$i"
done done
TERM=xterm ./scripts/tests.sh TERM=xterm ./scripts/tests.sh