diff options
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/solc/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/compilers/solc/default.nix | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/development/compilers/solc/default.nix b/nixpkgs/pkgs/development/compilers/solc/default.nix index cf59b2c17613..941f92fd322e 100644 --- a/nixpkgs/pkgs/development/compilers/solc/default.nix +++ b/nixpkgs/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} ''; |