From 3ef6ee8fa92d974cad7cce19765b83e1b78ce575 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Aug 2024 21:30:42 +0000 Subject: [PATCH 1/3] pwntools: 4.12.0 -> 4.13.0 --- pkgs/development/python-modules/pwntools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index 6ab1dedd83fa..f3f03d407c20 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -30,12 +30,12 @@ let in buildPythonPackage rec { pname = "pwntools"; - version = "4.12.0"; + version = "4.13.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-MgKFvZJmFS/bo7gd46MeYaJQdmRVB6ONhfNOGxWZjrE="; + hash = "sha256-HVyiU4PsEPtk4o0ULB2Gj5HqHFOpPTUx0wFdgwgo08M="; }; postPatch = '' From 4ffaf69204fc6d05bc15ce679a472280d4b6e218 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 17 Aug 2024 23:19:43 +0900 Subject: [PATCH 2/3] pwntools: adopt pypa build --- .../python-modules/pwntools/default.nix | 43 +++++++++++-------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index f3f03d407c20..8f3b7fc44043 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -4,24 +4,27 @@ buildPythonPackage, debugger, fetchPypi, - mako, - packaging, - pysocks, - pygments, - ropgadget, capstone, colored-traceback, + intervaltree, + mako, + packaging, paramiko, - pip, psutil, pyelftools, + pygments, pyserial, + pysocks, python-dateutil, requests, + ropgadget, rpyc, - tox, + setuptools, + six, + sortedcontainers, unicorn, - intervaltree, + unix-ar, + zstandard, installShellFiles, }: @@ -31,7 +34,7 @@ in buildPythonPackage rec { pname = "pwntools"; version = "4.13.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit pname version; @@ -46,25 +49,31 @@ buildPythonPackage rec { nativeBuildInputs = [ installShellFiles ]; + build-system = [ setuptools ]; + + pythonRemoveDeps = [ "pip" ]; + propagatedBuildInputs = [ - mako - packaging - pysocks - pygments - ropgadget capstone colored-traceback + intervaltree + mako + packaging paramiko - pip psutil pyelftools + pygments pyserial + pysocks python-dateutil requests + ropgadget rpyc - tox + six + sortedcontainers unicorn - intervaltree + unix-ar + zstandard ]; doCheck = false; # no setuptools tests for the package From a469859267f9068125a1d81f54787ec65432d648 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sat, 17 Aug 2024 23:23:57 +0900 Subject: [PATCH 3/3] pwntools: add pythonImportsCheck --- pkgs/development/python-modules/pwntools/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index 8f3b7fc44043..390c65120854 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -87,6 +87,8 @@ buildPythonPackage rec { makeWrapper "${debugger}/bin/${debuggerName}" "$out/bin/pwntools-gdb" ''; + pythonImportsCheck = [ "pwn" ]; + meta = with lib; { description = "CTF framework and exploit development library"; homepage = "https://pwntools.com";