From 5a9ae7aafa4da2900e49e3798b8d8b135494f864 Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Thu, 10 Jul 2025 19:15:43 +0200 Subject: [PATCH 1/2] arsenal: modernize --- pkgs/by-name/ar/arsenal/package.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ar/arsenal/package.nix b/pkgs/by-name/ar/arsenal/package.nix index 1c15265cb443..2f589ddaa4fd 100644 --- a/pkgs/by-name/ar/arsenal/package.nix +++ b/pkgs/by-name/ar/arsenal/package.nix @@ -2,17 +2,18 @@ lib, fetchFromGitHub, python3, + versionCheckHook, }: python3.pkgs.buildPythonApplication rec { pname = "arsenal"; version = "1.1.0"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "Orange-Cyberdefense"; repo = "arsenal"; - rev = version; + tag = version; sha256 = "sha256-NbNXyR5aNKvRJU9JWGk/ndwU1bhNgDOdcRqBkAY9nPA="; }; @@ -28,18 +29,18 @@ python3.pkgs.buildPythonApplication rec { pyyaml ]; - # Project has no tests - doCheck = false; + nativeCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; pythonImportsCheck = [ "arsenal" ]; - meta = with lib; { + meta = { description = "Tool to generate commands for security and network tools"; homepage = "https://github.com/Orange-Cyberdefense/arsenal"; - license = with licenses; [ gpl3Only ]; - maintainers = with maintainers; [ fab ]; + license = with lib.licenses; [ gpl3Only ]; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "arsenal"; }; } From ce17acbab3d51cde3d5bd184efa604c5e5730dab Mon Sep 17 00:00:00 2001 From: Amadej Kastelic Date: Thu, 10 Jul 2025 19:16:30 +0200 Subject: [PATCH 2/2] arsenal: 1.1.0 -> 1.2.7 --- pkgs/by-name/ar/arsenal/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ar/arsenal/package.nix b/pkgs/by-name/ar/arsenal/package.nix index 2f589ddaa4fd..09a79fca6808 100644 --- a/pkgs/by-name/ar/arsenal/package.nix +++ b/pkgs/by-name/ar/arsenal/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "arsenal"; - version = "1.1.0"; + version = "1.2.7"; pyproject = true; src = fetchFromGitHub { owner = "Orange-Cyberdefense"; repo = "arsenal"; tag = version; - sha256 = "sha256-NbNXyR5aNKvRJU9JWGk/ndwU1bhNgDOdcRqBkAY9nPA="; + sha256 = "sha256-C8DEB/xojU7vGvmeBF+PBD6KWMaJgwa7PpRS5+YzQ6c="; }; build-system = with python3.pkgs; [