From 5b787fd860ab40521bbdfb9854426dc76afe94cd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 1 Nov 2024 20:58:03 +0100 Subject: [PATCH] evillimiter: modernize --- .../ev/evillimiter/package.nix} | 40 +++++++++---------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 18 insertions(+), 24 deletions(-) rename pkgs/{tools/networking/evillimiter/default.nix => by-name/ev/evillimiter/package.nix} (63%) diff --git a/pkgs/tools/networking/evillimiter/default.nix b/pkgs/by-name/ev/evillimiter/package.nix similarity index 63% rename from pkgs/tools/networking/evillimiter/default.nix rename to pkgs/by-name/ev/evillimiter/package.nix index a96151a3355f..9f4fb0bfc2f4 100644 --- a/pkgs/tools/networking/evillimiter/default.nix +++ b/pkgs/by-name/ev/evillimiter/package.nix @@ -1,28 +1,26 @@ -{ lib -, buildPythonApplication -, fetchFromGitHub -, colorama -, iproute2 -, iptables -, netaddr -, netifaces -, scapy -, terminaltables -, tqdm +{ + lib, + fetchFromGitHub, + iproute2, + iptables, + python3Packages, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "evillimiter"; version = "1.5.0"; + pyproject = true; src = fetchFromGitHub { owner = "bitbrute"; - repo = pname; - rev = "v${version}"; - sha256 = "1l0acd4a36wzz1gyc6mcw3zpagyi2mc425c6d4c6anq3jxwm3847"; + repo = "evillimiter"; + rev = "refs/tags/v${version}"; + hash = "sha256-h6BReZcDW2UYaYYVQVgV0T91/+CsGuZf+J+boUhjCtA="; }; - propagatedBuildInputs = [ + build-system = with python3Packages; [ setuptools-scm ]; + + dependencies = with python3Packages; [ colorama iproute2 iptables @@ -33,14 +31,11 @@ buildPythonApplication rec { tqdm ]; - # no tests present + # Project has no tests doCheck = false; - pythonImportsCheck = [ "evillimiter.evillimiter" ]; - - meta = with lib; { + meta = with lib; { description = "Tool that monitors, analyzes and limits the bandwidth"; - mainProgram = "evillimiter"; longDescription = '' A tool to monitor, analyze and limit the bandwidth (upload/download) of devices on your local network without physical or administrative access. @@ -48,7 +43,8 @@ buildPythonApplication rec { bandwidth of hosts on the network. ''; homepage = "https://github.com/bitbrute/evillimiter"; - license = with licenses; [ mit ]; + license = licenses.mit; maintainers = with maintainers; [ fab ]; + mainProgram = "evillimiter"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a060ec069721..13e2c5a9939e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7328,8 +7328,6 @@ with pkgs; eventstat = callPackage ../os-specific/linux/eventstat { }; - evillimiter = python3Packages.callPackage ../tools/networking/evillimiter { }; - evtest = callPackage ../applications/misc/evtest { }; evtest-qt = libsForQt5.callPackage ../applications/misc/evtest-qt { };