Merge pull request #29674 from dapphub/solc-0-4-17

solc: v0.4.16 -> v0.4.17
This commit is contained in:
Joachim F 2017-09-23 12:01:01 +00:00 committed by GitHub
commit 6cd2ebc1d1

View file

@ -1,9 +1,9 @@
{ stdenv, fetchzip, fetchgit, boost, cmake, z3 }: { stdenv, fetchzip, fetchgit, boost, cmake, z3 }:
let let
version = "0.4.16"; version = "0.4.17";
rev = "d7661dd97460250b4e1127b9e7ea91e116143780"; rev = "bdeb9e52a2211510644fb53df93fb98258b40a65";
sha256 = "1fd69pdhkkkvbkrxipkck1icpqkpdskjzar48a1yzdsx3l8s4lil"; sha256 = "1x6q2rlq6gxggidgsy6li7m4phwr1hcfi65pq9yimz64ddqfiira";
jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz; jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz;
jsoncpp = fetchzip { jsoncpp = fetchzip {
url = jsoncppURL; url = jsoncppURL;
@ -23,7 +23,7 @@ stdenv.mkDerivation {
patchPhase = '' patchPhase = ''
echo >commit_hash.txt '${rev}' echo >commit_hash.txt '${rev}'
echo >prerelease.txt echo >prerelease.txt
substituteInPlace deps/jsoncpp.cmake \ substituteInPlace cmake/jsoncpp.cmake \
--replace '${jsoncppURL}' ${jsoncpp} --replace '${jsoncppURL}' ${jsoncpp}
substituteInPlace cmake/EthCompilerSettings.cmake \ substituteInPlace cmake/EthCompilerSettings.cmake \
--replace 'add_compile_options(-Werror)' "" --replace 'add_compile_options(-Werror)' ""