diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2019-07-04 19:12:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-04 19:12:37 -0500 |
| commit | 8cced8017924086752a8fe47841c4a413a64e3b7 (patch) | |
| tree | cca1f898f45743d99371e968239447db847f91e9 /pkgs/development/compilers | |
| parent | cc631b7277d340cd2100ce5de6727d6bb4591395 (diff) | |
| parent | 022ddc17a7bd3991cee9554ad6f3a678098108d2 (diff) | |
| download | nixpkgs-8cced8017924086752a8fe47841c4a413a64e3b7.tar nixpkgs-8cced8017924086752a8fe47841c4a413a64e3b7.tar.gz nixpkgs-8cced8017924086752a8fe47841c4a413a64e3b7.tar.bz2 nixpkgs-8cced8017924086752a8fe47841c4a413a64e3b7.tar.lz nixpkgs-8cced8017924086752a8fe47841c4a413a64e3b7.tar.xz nixpkgs-8cced8017924086752a8fe47841c4a413a64e3b7.tar.zst nixpkgs-8cced8017924086752a8fe47841c4a413a64e3b7.zip | |
Merge pull request #63776 from sifmelcara/update/solc-0.5.10
solc: 0.5.9 -> 0.5.10
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/solc/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/development/compilers/solc/patches/shared-libs-install.patch | 4 |
2 files changed, 10 insertions, 13 deletions
diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index cf59b2c1761..941f92fd322 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, fetchFromGitHub, boost, cmake, ncurses, python2 +{ stdenv, fetchzip, boost, cmake, ncurses, python2 , z3Support ? true, z3 ? null }: @@ -6,9 +6,6 @@ assert z3Support -> z3 != null; assert z3Support -> stdenv.lib.versionAtLeast z3.version "4.6.0"; let - version = "0.5.9"; - rev = "c68bc34e9466ef22326dd9072d557c56160e9092"; - sha256 = "1b611piwnwiwk4dcvn2qm4wjb9msa385lpx81y3k669ga3ip9rkc"; jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz; jsoncpp = fetchzip { url = jsoncppURL; @@ -16,20 +13,20 @@ let }; buildSharedLibs = stdenv.hostPlatform.isLinux; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { + name = "solc-${version}"; + version = "0.5.10"; - src = fetchFromGitHub { - owner = "ethereum"; - 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 ]; postPatch = '' - touch prerelease.txt - echo >commit_hash.txt "${rev}" substituteInPlace cmake/jsoncpp.cmake \ --replace "${jsoncppURL}" ${jsoncpp} ''; diff --git a/pkgs/development/compilers/solc/patches/shared-libs-install.patch b/pkgs/development/compilers/solc/patches/shared-libs-install.patch index e106c9bbb74..382d49599c7 100644 --- a/pkgs/development/compilers/solc/patches/shared-libs-install.patch +++ b/pkgs/development/compilers/solc/patches/shared-libs-install.patch @@ -49,8 +49,8 @@ index 0bdec4b4..e876177e 100644 +++ b/libsolidity/CMakeLists.txt @@ -29,6 +29,7 @@ endif() - add_library(solidity ${sources} ${headers}) - target_link_libraries(solidity PUBLIC yul evmasm langutil devcore ${Boost_FILESYSTEM_LIBRARY} ${Boost_SYSTEM_LIBRARY}) + add_library(solidity ${sources} ${z3_SRCS} ${cvc4_SRCS}) + target_link_libraries(solidity PUBLIC yul evmasm langutil devcore Boost::boost Boost::filesystem Boost::system) +install(TARGETS solidity LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) if (${Z3_FOUND}) |