From 6dcba74af6aa44ef662499070a6c36c8a7c56a3d Mon Sep 17 00:00:00 2001 From: Daniel Brockman Date: Wed, 12 Jul 2017 15:21:35 +0300 Subject: [PATCH 1/3] solc: 0.4.12 -> 0.4.13 --- pkgs/development/compilers/solc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 6ace7d96be8..c2b1413b482 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchzip, fetchgit, boost, cmake }: let - version = "0.4.12"; - rev = "194ff033ae44944ac59aa7bd3da89ba94ec5893c"; - sha256 = "0gkg3nay0625qmhxxxax1d1c4dl554ri3pkwd12qfg6g1w6j04w7"; + version = "0.4.13"; + rev = "0fb4cb1ab9bb4b6cc72e28cc5a1753ad14781f14"; + sha256 = "0rhrm0bmk5s2358j40yx7dzr1938q17dchzflrxw6y7yvkhscxrm"; jsoncppURL = https://github.com/open-source-parsers/jsoncpp/archive/1.7.7.tar.gz; jsoncpp = fetchzip { url = jsoncppURL; From 442d04d1dde24a628fd2427926724219a5c4dc6b Mon Sep 17 00:00:00 2001 From: Mikael Brockman Date: Mon, 10 Jul 2017 17:10:45 +0300 Subject: [PATCH 2/3] solc: make sure to use dynamic Boost libs For some reason the default options enable static Boost libs on Darwin, but that doesn't work for us. --- pkgs/development/compilers/solc/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index c2b1413b482..24bd7d4f517 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -27,6 +27,9 @@ stdenv.mkDerivation { --replace '${jsoncppURL}' ${jsoncpp} substituteInPlace cmake/EthCompilerSettings.cmake \ --replace 'add_compile_options(-Werror)' "" + substituteInPlace cmake/EthDependencies.cmake \ + --replace 'set(Boost_USE_STATIC_LIBS ON)' \ + 'set(Boost_USE_STATIC_LIBS OFF)' ''; buildInputs = [ boost cmake ]; From cbc54299b36e7faf5687e8c613123c7a0cc8b16f Mon Sep 17 00:00:00 2001 From: Daniel Brockman Date: Wed, 12 Jul 2017 16:43:29 +0300 Subject: [PATCH 3/3] solc: build on both linux and darwin --- pkgs/development/compilers/solc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index 24bd7d4f517..714f06d0b53 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation { longDescription = "This package also includes `lllc', the LLL compiler."; homepage = https://github.com/ethereum/solidity; license = stdenv.lib.licenses.gpl3; + platforms = with stdenv.lib.platforms; linux ++ darwin; maintainers = [ stdenv.lib.maintainers.dbrock ]; inherit version; };