From 20545ee13618e0dba0c67d418188f998263d26f2 Mon Sep 17 00:00:00 2001 From: Artur Cygan Date: Wed, 6 Jan 2021 21:09:46 +0100 Subject: [PATCH 1/2] python3Packages.crytic-compile: 0.1.9 -> 0.1.12 --- .../development/python-modules/crytic-compile/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/crytic-compile/default.nix b/pkgs/development/python-modules/crytic-compile/default.nix index 936db1081b6a..95f2effc045a 100644 --- a/pkgs/development/python-modules/crytic-compile/default.nix +++ b/pkgs/development/python-modules/crytic-compile/default.nix @@ -6,6 +6,10 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; + patchPhase = '' + substituteInPlace setup.py --replace 'version="0.1.11",' 'version="${version}",' + ''; + src = fetchFromGitHub { owner = "crytic"; repo = "crytic-compile"; @@ -21,7 +25,7 @@ buildPythonPackage rec { meta = with lib; { description = "Abstraction layer for smart contract build systems"; homepage = "https://github.com/crytic/crytic-compile"; - license = licenses.agpl3; - maintainers = with maintainers; [ SuperSandro2000 ]; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ SuperSandro2000 arturcygan ]; }; } From 52f4e5127bc28ffc5b1bc989edf0057f4f26783c Mon Sep 17 00:00:00 2001 From: Artur Cygan Date: Wed, 6 Jan 2021 21:10:40 +0100 Subject: [PATCH 2/2] python3Packages.slither-analyzer: 0.6.14 -> 0.7.0 --- .../python-modules/slither-analyzer/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/slither-analyzer/default.nix b/pkgs/development/python-modules/slither-analyzer/default.nix index deb12817a7bd..0b320e790221 100644 --- a/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/pkgs/development/python-modules/slither-analyzer/default.nix @@ -1,5 +1,7 @@ -{ lib, buildPythonPackage, fetchPypi, makeWrapper, pythonOlder -, crytic-compile, prettytable, setuptools, solc +{ lib, stdenv, buildPythonPackage, fetchPypi, makeWrapper, pythonOlder +, crytic-compile, prettytable, setuptools +# solc is currently broken on Darwin, default to false +, solc, withSolc ? !stdenv.isDarwin }: buildPythonPackage rec { @@ -19,7 +21,7 @@ buildPythonPackage rec { nativeBuildInputs = [ makeWrapper ]; propagatedBuildInputs = [ crytic-compile prettytable setuptools ]; - postFixup = '' + postFixup = lib.optionalString withSolc '' wrapProgram $out/bin/slither \ --prefix PATH : "${lib.makeBinPath [ solc ]}" ''; @@ -32,7 +34,7 @@ buildPythonPackage rec { contract details, and provides an API to easily write custom analyses. ''; homepage = "https://github.com/trailofbits/slither"; - license = licenses.agpl3; - maintainers = [ maintainers.asymmetric ]; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ asymmetric arturcygan ]; }; }