git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #87872 from fare-patches/ethereum

Ethereum updates

commit13356e330195f6c80f14657c183b775d8ddd3295 authoradisbladis <adisbladis@gmail.com> dateSat 16 May 2020, 10:25 (7 years ago) parente5415d146b3eca
2 files changed+8−14
pkgs/applications/blockchains/go-ethereum.nix+3−3 pkgs/development/compilers/solc/default.nix+5−11
pkgs/applications/blockchains/go-ethereum.nix+3−3
@@ -2,13 +2,13 @@
22
33buildGoModule rec {
44 pname = "go-ethereum";
5− version = "1.9.13";
5+ version = "1.9.14";
66
77 src = fetchFromGitHub {
88 owner = "ethereum";
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "1yqqflp73yvjy6bp05xd1nv5fc6p1nx7g4spbssxf3ws96pdh425";
11+ sha256 = "0vqsx4q7jn6vhmrm9kkk810d5nvnmyb6bni38ynkxcwlrp3qs6v2";
1212 };
1313
1414 usb = fetchFromGitHub {
@@ -18,7 +18,7 @@ buildGoModule rec {
1818 sha256 = "0asd5fz2rhzkjmd8wjgmla5qmqyz4jaa6qf0n2ycia16jsck6wc2";
1919 };
2020
21− vendorSha256 = "12aw8b8ci7nssidh1yz8d2hk43csdacq5jca9y70rjakpl3zndsz";
21+ vendorSha256 = "01mbmc8qlp08127dlmcqz0viasmg7mrzqzmyw21an69sabcr112n";
2222
2323 overrideModAttrs = (_: {
2424 postBuild = ''
pkgs/development/compilers/solc/default.nix+5−11
@@ -1,4 +1,4 @@
1−{ stdenv, fetchzip, boost, cmake, ncurses, python2
1+{ stdenv, fetchzip, boost, cmake, ncurses, python3, coreutils
22, z3Support ? true, z3 ? null, cvc4Support ? true, cvc4 ? null
33, cln ? null, gmp ? null
44}:
@@ -16,12 +16,12 @@ in
1616stdenv.mkDerivation rec {
1717
1818 pname = "solc";
19− version = "0.5.15";
19+ version = "0.6.8";
2020
2121 # upstream suggests avoid using archive generated by github
2222 src = fetchzip {
2323 url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz";
24− sha256 = "1nfvsaci5ja5ss603z04197wndwkvcq9nm5mdab1kpdr91djxh2y";
24+ sha256 = "1nxds6c10hjqjjk893qw2yljws57li0xigbf3ih85y8y6d587ph0";
2525 };
2626
2727 postPatch = ''
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
4141 buildInputs = [ boost ]
4242 ++ stdenv.lib.optionals z3Support [ z3 ]
4343 ++ stdenv.lib.optionals cvc4Support [ cvc4 cln gmp ];
44− checkInputs = [ ncurses python2 ];
44+ checkInputs = [ ncurses python3 ];
4545
4646 # Test fails on darwin for unclear reason
4747 doCheck = stdenv.hostPlatform.isLinux;
@@ -56,13 +56,7 @@ stdenv.mkDerivation rec {
5656 pushd ..
5757 # IPC tests need aleth avaliable, so we disable it
5858 sed -i "s/IPC_ENABLED=true/IPC_ENABLED=false\nIPC_FLAGS=\"--no-ipc\"/" ./scripts/tests.sh
59− for i in ./scripts/*.sh; do
60− patchShebangs "$i"
61− done
62− for i in ./scripts/*.py; do
63− patchShebangs "$i"
64− done
65− for i in ./test/*.sh; do
59+ for i in ./scripts/*.sh ./scripts/*.py ./test/*.sh; do
6660 patchShebangs "$i"
6761 done
6862 TERM=xterm ./scripts/tests.sh