From eeb810d943dd451a2e6c3928f189bd3cce19c1e6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Jul 2021 23:13:59 +0200 Subject: [PATCH 1/8] python3Packages.archinfo: 9.0.8761 -> 9.0.9031 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 580b05b82ade..60c3e8905b59 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.8761"; + version = "9.0.9031"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mdry5JQIW1b2p9a+c6RfHE6HYs54WKFofPkzFCgpUXg="; + sha256 = "sha256-pzBMyw5FwQV1FyhvOxUq39s96p0KKSrkEvJzhJQdS4E="; }; checkInputs = [ From a12662eba86a5f5d77c24fe55e8e8618d32bbc6f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Jul 2021 23:14:02 +0200 Subject: [PATCH 2/8] python3Packages.ailment: 9.0.8761 -> 9.0.9031 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 961a6cff1960..a6c99e72c0ad 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.8761"; + version = "9.0.9031"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UAtVWh3BBZZmU5+BR0+2B+rivzR4E7bZK1ro1uKngtE="; + sha256 = "sha256-xyNTcGTGH8030CJif6an+kDZIfOUVDMiRhFamVajAzk="; }; propagatedBuildInputs = [ pyvex ]; From bc4acb5bb05c35eab0c2a81a18f2f31b982d3ecf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Jul 2021 23:14:05 +0200 Subject: [PATCH 3/8] python3Packages.pyvex: 9.0.8761 -> 9.0.9031 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index b2f43db50cf9..d021b6b06d3c 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.8761"; + version = "9.0.9031"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3aLpMiOJfgELfnpqTyXAL6Uofbm4UW4VRRsYzTTAofg="; + sha256 = "sha256-bl6bWv4c+tlaWcxrYCiljC9C+wAZZVyk+1O0rlb4kxA="; }; postPatch = lib.optionalString stdenv.isDarwin '' From c36a4169cf5ce22aae96b05173b9ddcb132dd3bb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Jul 2021 23:14:07 +0200 Subject: [PATCH 4/8] python3Packages.claripy: 9.0.8761 -> 9.0.9031 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index d8257f446d15..2c25d258e579 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.8761"; + version = "9.0.9031"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MEG6J7FBjufFqvmfV+LTtgDJb8eZuUrDq4am/mnYCZI="; + sha256 = "sha256-UCmt2Vm8OWyKa0fmPlGuvzaFddUWs6quavUgIZasoJg="; }; # Use upstream z3 implementation From 700bcad84d58043dadcd8249aa1bfabba156d163 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Jul 2021 23:14:10 +0200 Subject: [PATCH 5/8] python3Packages.cle: 9.0.8761 -> 9.0.9031 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 87091509fb0d..d6731260937d 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.8761"; + version = "9.0.9031"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cJpwtAX2cck/SoTfm8G93Imyyqn1B2Izkxk9O7WtRrk="; + sha256 = "sha256-+9aW7J8FXuKtU20dpqnoj37McPxzbkjKuYZIO8QeFF0="; }; propagatedBuildInputs = [ From 202cd8e94b5dfa656687f9b8483bdfcce866bee5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 13 Jul 2021 23:14:16 +0200 Subject: [PATCH 6/8] python3Packages.angrop: 9.0.8761 -> 9.0.9031 --- pkgs/development/python-modules/angrop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index aa6f72eae54f..e5ab1954276b 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.8761"; + version = "9.0.9031"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-M/4kEESL9OH4KyPgsrlVzm54OtU28pDox5qtV7Up2ew="; + sha256 = "sha256-3q/3iFR0FFOcvgmNVXtgi1Spu5xfXNJFy+QoIh8amOY="; }; propagatedBuildInputs = [ From 9c1c556dcf5659185c597b8d726b92eba9823f04 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 14 Jul 2021 22:51:38 +0200 Subject: [PATCH 7/8] python3Packages.nampa: init at 1.0 --- .../python-modules/nampa/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/nampa/default.nix diff --git a/pkgs/development/python-modules/nampa/default.nix b/pkgs/development/python-modules/nampa/default.nix new file mode 100644 index 000000000000..9f572d141c70 --- /dev/null +++ b/pkgs/development/python-modules/nampa/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, future +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "nampa"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "thebabush"; + repo = pname; + rev = version; + sha256 = "14b6xjm497wrfw4kv24zhsvz2l6zknvx36w8i754hfwz3s3fsl6a"; + }; + + propagatedBuildInputs = [ + future + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + # https://github.com/thebabush/nampa/pull/13 + substituteInPlace setup.py \ + --replace "0.1.1" "${version}" + ''; + + pythonImportsCheck = [ "nampa" ]; + + meta = with lib; { + description = "Python implementation of the FLIRT technology"; + homepage = "https://github.com/thebabush/nampa"; + license = licenses.lgpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 78db6b3db5c9..eec04d0e32b2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4674,6 +4674,8 @@ in { names = callPackage ../development/python-modules/names { }; + nampa = callPackage ../development/python-modules/nampa { }; + nanoleaf = callPackage ../development/python-modules/nanoleaf { }; nanomsg-python = callPackage ../development/python-modules/nanomsg-python { From 8a80d96506f666575c08d86e41830300f9dff43c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 14 Jul 2021 22:53:35 +0200 Subject: [PATCH 8/8] python3Packages.angr: 9.0.8761 -> 9.0.9031 --- pkgs/development/python-modules/angr/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 092d3a53e941..285a125a7257 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -13,6 +13,7 @@ , GitPython , itanium_demangler , mulpyplexer +, nampa , networkx , progressbar2 , protobuf @@ -42,14 +43,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.8761"; + version = "9.0.9031"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-vPqCezHYJP3ue3/J/Pni9jPvSJ+om7nAVgPTU6z5xBE="; + sha256 = "sha256-qWAz9SHfQU0cdk4yVekJn5OIDPJPbi63CDdlHDq1Opw="; }; propagatedBuildInputs = [ @@ -65,6 +66,7 @@ buildPythonPackage rec { GitPython itanium_demangler mulpyplexer + nampa networkx progressbar2 protobuf @@ -83,7 +85,13 @@ buildPythonPackage rec { doCheck = false; # See http://angr.io/api-doc/ - pythonImportsCheck = [ "angr" "claripy" "cle" "pyvex" "archinfo" ]; + pythonImportsCheck = [ + "angr" + "claripy" + "cle" + "pyvex" + "archinfo" + ]; meta = with lib; { description = "Powerful and user-friendly binary analysis platform";