From 2fedb9734d017eb5081524ed53b73dc5584cfc73 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Fri, 29 Oct 2021 09:45:27 -0400
Subject: [PATCH 1/3] mkpasswd: Fix complaining about missing pkg-config

Before, when building, would output multiple times:

> sh: line 1: pkg-config: command not found
---
 pkgs/tools/security/mkpasswd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix
index e001239f3136..c884c2790006 100644
--- a/pkgs/tools/security/mkpasswd/default.nix
+++ b/pkgs/tools/security/mkpasswd/default.nix
@@ -1,11 +1,11 @@
-{ lib, stdenv, whois, perl }:
+{ lib, stdenv, whois, perl, pkg-config }:
 
 stdenv.mkDerivation {
   name = "mkpasswd-${whois.version}";
 
   src = whois.src;
 
-  nativeBuildInputs = [ perl ];
+  nativeBuildInputs = [ perl pkg-config ];
 
   preConfigure = whois.preConfigure;
   buildPhase = "make mkpasswd";

From bbf70ca393f9c2e3029b6a875b9aafbe23c7ea77 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Fri, 29 Oct 2021 09:46:24 -0400
Subject: [PATCH 2/3] mkpasswd: Include support for more hash methods

(Before) Available methods:
sha512crypt     SHA-512
sha256crypt     SHA-256
md5crypt        MD5
descrypt        standard 56 bit DES-based crypt(3)

(After) Available methods:
yescrypt        Yescrypt
gost-yescrypt   GOST Yescrypt
scrypt          scrypt
bcrypt          bcrypt
bcrypt-a        bcrypt (obsolete $2a$ version)
sha512crypt     SHA-512
sha256crypt     SHA-256
sunmd5          SunMD5
md5crypt        MD5
bsdicrypt       BSDI extended DES-based crypt(3)
descrypt        standard 56 bit DES-based crypt(3)
nt              NT-Hash
---
 pkgs/tools/security/mkpasswd/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix
index c884c2790006..23a8f5d4fbd7 100644
--- a/pkgs/tools/security/mkpasswd/default.nix
+++ b/pkgs/tools/security/mkpasswd/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, whois, perl, pkg-config }:
+{ lib, stdenv, whois, libxcrypt, perl, pkg-config }:
 
 stdenv.mkDerivation {
   name = "mkpasswd-${whois.version}";
@@ -6,6 +6,7 @@ stdenv.mkDerivation {
   src = whois.src;
 
   nativeBuildInputs = [ perl pkg-config ];
+  buildInputs = [ libxcrypt ];
 
   preConfigure = whois.preConfigure;
   buildPhase = "make mkpasswd";

From 365f3a591876b6748756b810c693f6c6d4a23e50 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Fri, 29 Oct 2021 12:27:58 -0400
Subject: [PATCH 3/3] mkpasswd: Prefer inherit

---
 pkgs/tools/security/mkpasswd/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix
index 23a8f5d4fbd7..6064a80d6cd5 100644
--- a/pkgs/tools/security/mkpasswd/default.nix
+++ b/pkgs/tools/security/mkpasswd/default.nix
@@ -1,14 +1,14 @@
 { lib, stdenv, whois, libxcrypt, perl, pkg-config }:
 
 stdenv.mkDerivation {
-  name = "mkpasswd-${whois.version}";
-
-  src = whois.src;
+  pname = "mkpasswd";
+  inherit (whois) version;
+  inherit (whois) src;
 
   nativeBuildInputs = [ perl pkg-config ];
   buildInputs = [ libxcrypt ];
 
-  preConfigure = whois.preConfigure;
+  inherit (whois) preConfigure;
   buildPhase = "make mkpasswd";
   installPhase = "make install-mkpasswd";