From fbf323b6fd7a4ce3c0550e7e2aa1aef68b661935 Mon Sep 17 00:00:00 2001 From: Lev Livnev Date: Fri, 23 Aug 2019 11:37:02 +0100 Subject: [PATCH 1/2] solc: 0.5.10 -> 0.5.11 --- pkgs/development/compilers/solc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 941f92fd322e..17ac4fca7468 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -16,12 +16,12 @@ in stdenv.mkDerivation rec { name = "solc-${version}"; - version = "0.5.10"; + version = "0.5.11"; # 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"; + sha256 = "0679s5pqbfy7fgpb4f3ppgj8iafxb64g046v8vhp29mf3dsdcnyl"; }; patches = stdenv.lib.optionals buildSharedLibs [ ./patches/shared-libs-install.patch ]; From 917ce8e48f79bf15364968f66177b48ad2a82580 Mon Sep 17 00:00:00 2001 From: Lev Livnev Date: Fri, 23 Aug 2019 18:18:52 +0100 Subject: [PATCH 2/2] solc: build with cvc4 support n.b. that cvc4 support is required for the tests to pass --- pkgs/development/compilers/solc/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 17ac4fca7468..f34283938326 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,9 +1,10 @@ { stdenv, fetchzip, boost, cmake, ncurses, python2 -, z3Support ? true, z3 ? null +, z3Support ? true, z3 ? null, cvc4Support ? true, cvc4 ? null +, cln ? null, gmp ? null }: -assert z3Support -> z3 != null; -assert z3Support -> stdenv.lib.versionAtLeast z3.version "4.6.0"; +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; @@ -37,10 +38,14 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=ON" ] ++ stdenv.lib.optionals (!z3Support) [ "-DUSE_Z3=OFF" + ] ++ stdenv.lib.optionals (!cvc4Support) [ + "-DUSE_CVC4=OFF" ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost ] ++ stdenv.lib.optionals z3Support [ z3 ]; + buildInputs = [ boost ] + ++ stdenv.lib.optionals z3Support [ z3 ] + ++ stdenv.lib.optionals cvc4Support [ cvc4 cln gmp ]; checkInputs = [ ncurses python2 ]; # Test fails on darwin for unclear reason