From e448c5584c1527d5e7b8f52ef9ffbc048379b15a Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Thu, 10 Apr 2025 11:22:11 +0200 Subject: [PATCH] Revert "netexec: fix eval" This reverts commit bf1c61d16adf3ba583d4bdeafa309b01a9e15edf. --- pkgs/tools/security/netexec/default.nix | 67 ++++++++++--------------- 1 file changed, 27 insertions(+), 40 deletions(-) diff --git a/pkgs/tools/security/netexec/default.nix b/pkgs/tools/security/netexec/default.nix index c8741909129e..0b7913cd8657 100644 --- a/pkgs/tools/security/netexec/default.nix +++ b/pkgs/tools/security/netexec/default.nix @@ -2,44 +2,30 @@ lib, stdenv, fetchFromGitHub, - buildPythonApplication, - pytestCheckHook, - # Deps - poetry-core, - poetry-dynamic-versioning, - aardwolf, - aioconsole, - aiosqlite, - argcomplete, - asyauth, - beautifulsoup4, - bloodhound-py, - dploot, - dsinternals, - lsassy, - masky, - minikerberos, - msgpack, - msldap, - neo4j, - paramiko, - pyasn1-modules, - pylnk3, - pynfsclient, - pypsrp, - pypykatz, - python-dateutil, - python-libnmap, - pywerview, - requests, - rich, - sqlalchemy, - termcolor, - terminaltables, - xmltodict, - impacket, + python3, }: -buildPythonApplication rec { +let + python = python3.override { + self = python; + packageOverrides = self: super: { + impacket = super.impacket.overridePythonAttrs { + version = "0.12.0.dev1-unstable-2023-11-30"; + src = fetchFromGitHub { + owner = "Pennyw0rth"; + repo = "impacket"; + rev = "d370e6359a410063b2c9c68f6572c3b5fb178a38"; + hash = "sha256-Jozn4lKAnLQ2I53+bx0mFY++OH5P4KyqVmrS5XJUY3E="; + }; + # Fix version to be compliant with Python packaging rules + postPatch = '' + substituteInPlace setup.py \ + --replace 'version="{}.{}.{}.{}{}"' 'version="{}.{}.{}"' + ''; + }; + }; + }; +in +python.pkgs.buildPythonApplication rec { pname = "netexec"; version = "1.3.0"; pyproject = true; @@ -64,12 +50,12 @@ buildPythonApplication rec { --replace-fail '{ git = "https://github.com/Pennyw0rth/NfsClient" }' '"*"' ''; - build-system = [ + build-system = with python.pkgs; [ poetry-core poetry-dynamic-versioning ]; - dependencies = [ + dependencies = with python.pkgs; [ aardwolf aioconsole aiosqlite @@ -79,6 +65,7 @@ buildPythonApplication rec { bloodhound-py dploot dsinternals + impacket lsassy masky minikerberos @@ -102,7 +89,7 @@ buildPythonApplication rec { xmltodict ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = with python.pkgs; [ pytestCheckHook ]; # Tests no longer works out-of-box with 1.3.0 doCheck = false;