From 02e1ddd11c3c645977e74549b7b5ba5f0c40c7ed Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 May 2022 16:52:11 +0200 Subject: [PATCH 1/2] python310Packages.pyfzf: init at 0.3.1 --- .../python-modules/pyfzf/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/pyfzf/default.nix diff --git a/pkgs/development/python-modules/pyfzf/default.nix b/pkgs/development/python-modules/pyfzf/default.nix new file mode 100644 index 00000000000..3578f863fa4 --- /dev/null +++ b/pkgs/development/python-modules/pyfzf/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fzf +, pythonOlder +}: + +buildPythonPackage rec { + pname = "pyfzf"; + version = "0.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "nk412"; + repo = pname; + rev = version; + hash = "sha256-w+ZjQGFd/lR2TiTHc2uQSJXORmzJJZXsr9BO4PIw/Co="; + }; + + propagatedBuildInputs = [ + fzf + ]; + + pythonImportsCheck = [ + "pyfzf" + ]; + + # Module has no tests + doCheck = false; + + meta = with lib; { + description = "Wrapper for fzf"; + homepage = "https://github.com/nk412/pyfzf"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0ed03be8d5e..e9f377f5858 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7232,6 +7232,10 @@ in { pyfxa = callPackage ../development/python-modules/pyfxa { }; + pyfzf = callPackage ../development/python-modules/pyfzf { + inherit (pkgs) fzf; + }; + pygal = callPackage ../development/python-modules/pygal { }; pygame = callPackage ../development/python-modules/pygame { From fc8976aa7800b64bf69e1448ca506f8f19ff7c74 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 19 May 2022 17:06:46 +0200 Subject: [PATCH 2/2] arsenal: 1.0.2 -> 1.1.0 --- pkgs/tools/security/arsenal/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/arsenal/default.nix b/pkgs/tools/security/arsenal/default.nix index cd927715d2e..62dd9a59866 100644 --- a/pkgs/tools/security/arsenal/default.nix +++ b/pkgs/tools/security/arsenal/default.nix @@ -5,19 +5,22 @@ python3.pkgs.buildPythonApplication rec { pname = "arsenal"; - version = "1.0.2"; + version = "1.1.0"; + format = "setuptools"; src = fetchFromGitHub { owner = "Orange-Cyberdefense"; repo = "arsenal"; rev = version; - sha256 = "sha256-RZxGSrtEa3hAtowD2lUb9BgwpSWlYo90fU9nDvUfoAk="; + sha256 = "sha256-NbNXyR5aNKvRJU9JWGk/ndwU1bhNgDOdcRqBkAY9nPA="; }; propagatedBuildInputs = with python3.pkgs; [ libtmux docutils + pyfzf pyperclip + pyyaml ]; # Project has no tests