From 185db04300fad7188e574880feddd954cd691d4a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Jan 2024 10:54:36 +0100 Subject: [PATCH 1/2] websploit: refactor --- pkgs/tools/security/websploit/default.nix | 25 +++++++++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/websploit/default.nix b/pkgs/tools/security/websploit/default.nix index b8db06427f86..71bde35175b2 100644 --- a/pkgs/tools/security/websploit/default.nix +++ b/pkgs/tools/security/websploit/default.nix @@ -1,18 +1,25 @@ -{ lib, buildPythonApplication, fetchFromGitHub -, requests, scapy }: +{ lib +, fetchFromGitHub +, python3 +}: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "websploit"; version = "4.0.4"; + pyproject = true; src = fetchFromGitHub { owner = "f4rih"; - repo = pname; - rev = version; + repo = "websploit"; + rev = "refs/tags/${version}"; sha256 = "LpDfJmH2FbL37Fk86CAC/bxFqM035DBN6c6FPfGpaIw="; }; - propagatedBuildInputs = [ + nativeBuildInputs = with python3.pkgs; [ + setuptools + ]; + + propagatedBuildInputs = with python3.pkgs; [ requests scapy ]; @@ -20,10 +27,16 @@ buildPythonApplication rec { # Project has no tests doCheck = false; + pythonImportsCheck = [ + "websploit" + ]; + meta = with lib; { description = "A high level MITM framework"; homepage = "https://github.com/f4rih/websploit"; + changelog = "https://github.com/f4rih/websploit/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ emilytrau ]; + mainProgram = "websploit"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d156a6715ea..56588b7bef47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36362,7 +36362,7 @@ with pkgs; stdenv = if stdenv.cc.isClang then gccStdenv else stdenv; }; - websploit = python3Packages.callPackage ../tools/security/websploit { }; + websploit = callPackage ../tools/security/websploit { }; webssh = with python3Packages; toPythonApplication webssh; From 0b44e534a38f6ef294740ae6d925f320ef4e6dc7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Jan 2024 10:58:02 +0100 Subject: [PATCH 2/2] websploit: move to pkgs/by-name --- .../websploit/default.nix => by-name/we/websploit/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/security/websploit/default.nix => by-name/we/websploit/package.nix} (100%) diff --git a/pkgs/tools/security/websploit/default.nix b/pkgs/by-name/we/websploit/package.nix similarity index 100% rename from pkgs/tools/security/websploit/default.nix rename to pkgs/by-name/we/websploit/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56588b7bef47..ec87980dd1d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36362,8 +36362,6 @@ with pkgs; stdenv = if stdenv.cc.isClang then gccStdenv else stdenv; }; - websploit = callPackage ../tools/security/websploit { }; - webssh = with python3Packages; toPythonApplication webssh; webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {