public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #63776 from sifmelcara/update/solc-0.5.10 

solc: 0.5.9 -> 0.5.10
This commit is contained in:
Mario Rodas 2019-07-04 19:12:37 -05:00 committed by GitHub
parent cc631b7277 022ddc17a7
commit 8cced80179
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/compilers/solc/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchzip, fetchFromGitHub, boost, cmake, ncurses, python2 { stdenv, fetchzip, boost, cmake, ncurses, python2
, z3Support ? true, z3 ? null , z3Support ? true, z3 ? null
}: }:
@ -6,9 +6,6 @@ assert z3Support -> z3 != null;
assert z3Support -> stdenv.lib.versionAtLeast z3.version "4.6.0"; assert z3Support -> stdenv.lib.versionAtLeast z3.version "4.6.0";
let let
version = "0.5.9";
rev = "c68bc34e9466ef22326dd9072d557c56160e9092";
sha256 = "1b611piwnwiwk4dcvn2qm4wjb9msa385lpx81y3k669ga3ip9rkc";
jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz; jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz;
jsoncpp = fetchzip { jsoncpp = fetchzip {
url = jsoncppURL; url = jsoncppURL;
@ -16,20 +13,20 @@ let
}; };
buildSharedLibs = stdenv.hostPlatform.isLinux; buildSharedLibs = stdenv.hostPlatform.isLinux;
in in
stdenv.mkDerivation { stdenv.mkDerivation rec {
name = "solc-${version}";
src = fetchFromGitHub { name = "solc-${version}";
owner = "ethereum"; version = "0.5.10";
repo = "solidity";
inherit rev sha256; # upstream suggests avoid using archive generated by github
src = fetchzip {
url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz";
sha256 = "1ns562h8blvv32lz462rf5835fs2hgn698mvi6ss5y7ar6k5y5xw";
}; };
patches = stdenv.lib.optionals buildSharedLibs [ ./patches/shared-libs-install.patch ]; patches = stdenv.lib.optionals buildSharedLibs [ ./patches/shared-libs-install.patch ];
postPatch = '' postPatch = ''
touch prerelease.txt
echo >commit_hash.txt "${rev}"
substituteInPlace cmake/jsoncpp.cmake \ substituteInPlace cmake/jsoncpp.cmake \
--replace "${jsoncppURL}" ${jsoncpp} --replace "${jsoncppURL}" ${jsoncpp}
''; '';

4
pkgs/development/compilers/solc/patches/shared-libs-install.patch
View File

@ -49,8 +49,8 @@ index 0bdec4b4..e876177e 100644
+++ b/libsolidity/CMakeLists.txt +++ b/libsolidity/CMakeLists.txt
@@ -29,6 +29,7 @@ endif() @@ -29,6 +29,7 @@ endif()
add_library(solidity ${sources} ${headers}) add_library(solidity ${sources} ${z3_SRCS} ${cvc4_SRCS})
target_link_libraries(solidity PUBLIC yul evmasm langutil devcore ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}) target_link_libraries(solidity PUBLIC yul evmasm langutil devcore Boost::boost Boost::filesystem Boost::system)
+install(TARGETS solidity LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +install(TARGETS solidity LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
if (${Z3_FOUND}) if (${Z3_FOUND})