From 8918d77d2495baaa6b4d4d2f8dad3de3043d9946 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Oct 2022 20:45:30 +0200 Subject: [PATCH 1/3] libxcrypt: divert manpages into man output --- pkgs/development/libraries/libxcrypt/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/libxcrypt/default.nix b/pkgs/development/libraries/libxcrypt/default.nix index dc2c5d3fb6ccb..44b906f0d2f68 100644 --- a/pkgs/development/libraries/libxcrypt/default.nix +++ b/pkgs/development/libraries/libxcrypt/default.nix @@ -9,6 +9,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-npNoEfn60R28ozyhm9l8VcUus8oVkB8nreBGzHnmnoc="; }; + outputs = [ + "out" + "man" + ]; + configureFlags = [ "--enable-hashes=all" "--enable-obsolete-api=glibc" From 9c6406d20fcc8c7b9545653fcabab510b65af63b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Oct 2022 20:49:37 +0200 Subject: [PATCH 2/3] libxcrypt: add passthru tests The shadow test uses a password that is hashed with libxcrypt and the login test uses the passwd command. --- pkgs/development/libraries/libxcrypt/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libxcrypt/default.nix b/pkgs/development/libraries/libxcrypt/default.nix index 44b906f0d2f68..d5025bc38543d 100644 --- a/pkgs/development/libraries/libxcrypt/default.nix +++ b/pkgs/development/libraries/libxcrypt/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, perl }: +{ lib, stdenv, fetchurl, perl, nixosTests }: stdenv.mkDerivation rec { pname = "libxcrypt"; @@ -30,6 +30,10 @@ stdenv.mkDerivation rec { doCheck = !stdenv.hostPlatform.isMusl; + passthru.tests = { + inherit (nixosTests) login shadow; + }; + meta = with lib; { description = "Extended crypt library for descrypt, md5crypt, bcrypt, and others"; homepage = "https://github.com/besser82/libxcrypt/"; From 5f7f739887155caf7a3b2c1bde2c418334244db7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 9 Oct 2022 21:07:00 +0200 Subject: [PATCH 3/3] libxcrypt: adopt --- pkgs/development/libraries/libxcrypt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libxcrypt/default.nix b/pkgs/development/libraries/libxcrypt/default.nix index d5025bc38543d..db5f5026f2c15 100644 --- a/pkgs/development/libraries/libxcrypt/default.nix +++ b/pkgs/development/libraries/libxcrypt/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "Extended crypt library for descrypt, md5crypt, bcrypt, and others"; homepage = "https://github.com/besser82/libxcrypt/"; platforms = platforms.all; - maintainers = with maintainers; [ dottedmag ]; + maintainers = with maintainers; [ dottedmag hexa ]; license = licenses.lgpl21Plus; }; }