solc: 0.5.12 -> 0.5.15
Also removes patchset for shared library use, since usage of this feature was rare and maintenance costly. See https://github.com/NixOS/nixpkgs/pull/39852#issuecomment-568474864 for a discussion.
This commit is contained in:
@@ -7,26 +7,23 @@ assert z3Support -> z3 != null && stdenv.lib.versionAtLeast z3.version "4.6.0";
|
||||
assert cvc4Support -> cvc4 != null && cln != null && gmp != null;
|
||||
|
||||
let
|
||||
jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.8.4.tar.gz;
|
||||
jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.9.2.tar.gz;
|
||||
jsoncpp = fetchzip {
|
||||
url = jsoncppURL;
|
||||
sha256 = "1z0gj7a6jypkijmpknis04qybs1hkd04d1arr3gy89lnxmp6qzlm";
|
||||
sha256 = "037d1b1qdmn3rksmn1j71j26bv4hkjv7sn7da261k853xb5899sg";
|
||||
};
|
||||
buildSharedLibs = stdenv.hostPlatform.isLinux;
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
|
||||
pname = "solc";
|
||||
version = "0.5.12";
|
||||
version = "0.5.15";
|
||||
|
||||
# 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 = "0b9m9jhdz5lgrhrkngj1xnggxp1f6z8pzh29acsz3298l77kfk3z";
|
||||
sha256 = "1nfvsaci5ja5ss603z04197wndwkvcq9nm5mdab1kpdr91djxh2y";
|
||||
};
|
||||
|
||||
patches = stdenv.lib.optionals buildSharedLibs [ ./patches/shared-libs-install.patch ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace cmake/jsoncpp.cmake \
|
||||
--replace "${jsoncppURL}" ${jsoncpp}
|
||||
@@ -34,8 +31,6 @@ stdenv.mkDerivation rec {
|
||||
|
||||
cmakeFlags = [
|
||||
"-DBoost_USE_STATIC_LIBS=OFF"
|
||||
] ++ stdenv.lib.optionals buildSharedLibs [
|
||||
"-DBUILD_SHARED_LIBS=ON"
|
||||
] ++ stdenv.lib.optionals (!z3Support) [
|
||||
"-DUSE_Z3=OFF"
|
||||
] ++ stdenv.lib.optionals (!cvc4Support) [
|
||||
@@ -74,8 +69,6 @@ stdenv.mkDerivation rec {
|
||||
popd
|
||||
'';
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Compiler for Ethereum smart contract language Solidity";
|
||||
homepage = https://github.com/ethereum/solidity;
|
||||
|
||||
Reference in New Issue
Block a user