diff --git a/pkgs/tools/security/diceware/default.nix b/pkgs/development/python-modules/diceware/default.nix similarity index 86% rename from pkgs/tools/security/diceware/default.nix rename to pkgs/development/python-modules/diceware/default.nix index f32d63cfc10..8e35eabfb0d 100644 --- a/pkgs/tools/security/diceware/default.nix +++ b/pkgs/development/python-modules/diceware/default.nix @@ -1,10 +1,10 @@ -{ lib -, python3Packages +{ lib, buildPythonPackage, fetchPypi +, pytestrunner +, setuptools +, coverage, pytest }: -with python3Packages; - -buildPythonApplication rec { +buildPythonPackage rec { pname = "diceware"; version = "0.9.6"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ff31fa43dbc..30c81e06d09 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26779,7 +26779,7 @@ in simplehttp2server = callPackage ../servers/simplehttp2server { }; - diceware = callPackage ../tools/security/diceware { }; + diceware = with python3Packages; toPythonApplication diceware; xml2rfc = with python3Packages; toPythonApplication xml2rfc; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 95c3fabc059..56becb6b559 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -645,6 +645,8 @@ in { dkimpy = callPackage ../development/python-modules/dkimpy { }; + diceware = callPackage ../development/python-modules/diceware { }; + dictionaries = callPackage ../development/python-modules/dictionaries { }; diff_cover = callPackage ../development/python-modules/diff_cover { };