Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: df56b344d7ae
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1101ef4daeff
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Dec 26, 2019

  1. 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 #39852 (comment)
for a discussion.
    @asymmetric
    asymmetric committed Dec 26, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    4b45638 View commit details

Commits on Jan 6, 2020

  1. Merge pull request #76276 from dapphub/solc-0.5.15 

    solc: 0.5.12 -> 0.5.15
    @domenkozar
    domenkozar authored Jan 6, 2020

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    1101ef4 View commit details
Showing with 4 additions and 82 deletions.
  1. +4 −11 pkgs/development/compilers/solc/default.nix
  2. +0 −71 pkgs/development/compilers/solc/patches/shared-libs-install.patch
15 changes: 4 additions & 11 deletions pkgs/development/compilers/solc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,35 +7,30 @@ 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}
'';

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;
71 changes: 0 additions & 71 deletions pkgs/development/compilers/solc/patches/shared-libs-install.patch
View file

This file was deleted.