From 48faedc336be05f258c33f31313fcbedc0ca43c8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 22 Jun 2020 20:23:29 +0200
Subject: [PATCH] python3Packages.diceware: expose as library

---
 .../python-modules}/diceware/default.nix               | 10 +++++-----
 pkgs/top-level/all-packages.nix                        |  2 +-
 pkgs/top-level/python-packages.nix                     |  2 ++
 3 files changed, 8 insertions(+), 6 deletions(-)
 rename pkgs/{tools/security => development/python-modules}/diceware/default.nix (86%)

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 { };