From 862dc6ce979e888ff1efc0478393fe068208a915 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 1 Dec 2023 11:15:28 -0300 Subject: [PATCH 1/2] passwdqc: init at 2.0.3 --- pkgs/by-name/pa/passwdqc/package.nix | 57 ++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 pkgs/by-name/pa/passwdqc/package.nix diff --git a/pkgs/by-name/pa/passwdqc/package.nix b/pkgs/by-name/pa/passwdqc/package.nix new file mode 100644 index 000000000000..4250595cf0c2 --- /dev/null +++ b/pkgs/by-name/pa/passwdqc/package.nix @@ -0,0 +1,57 @@ +{ lib +, stdenv +, fetchFromGitHub +, libxcrypt +, pam +, pkg-config +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "passwdqc"; + version = "2.0.3"; + + src = fetchFromGitHub { + owner = "openwall"; + repo = "passwdqc"; + rev = "v${finalAttrs.version}"; + hash = "sha256-EgPeccqS+DDDMBVMc4bd70EMnXFuyglftxuqoaYHwNY="; + }; + + outputs = [ "out" "man" ]; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libxcrypt + pam + ]; + + strictDeps = true; + + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + + installFlags = [ + # Yet another software that does not use GNUInstallDirs Convention... + "BINDIR=$(out)/bin" + "CONFDIR=$(out)/etc" + "DEVEL_LIBDIR=$(out)/lib" + "INCLUDEDIR=$(out)/include" + "LOCALEDIR=$(out)/share/locale" + "MANDIR=$(man)/man" + "PKGCONFIGDIR=$(out)/lib/pkgconfig" + "SECUREDIR=$(out)/lib/security" + "SHARED_LIBDIR=$(out)/lib" + "SHARED_LIBDIR_REL=$(out)/lib" + ]; + + meta = { + homepage = "https://www.openwall.com/passwdqc/"; + description = "Passphrase strength checking and enforcement"; + license = with lib.licenses; [ bsd3 ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; + mainProgram = "passwdqc"; + platforms = lib.platforms.unix; + }; +}) From 8b5666c133a59ec7d90d6ace277f7b0e677b651a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 1 Dec 2023 11:16:47 -0300 Subject: [PATCH 2/2] passwdqc: Darwin-specific upstream patch --- pkgs/by-name/pa/passwdqc/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/pa/passwdqc/package.nix b/pkgs/by-name/pa/passwdqc/package.nix index 4250595cf0c2..f70076243fbb 100644 --- a/pkgs/by-name/pa/passwdqc/package.nix +++ b/pkgs/by-name/pa/passwdqc/package.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , libxcrypt , pam , pkg-config @@ -17,6 +18,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-EgPeccqS+DDDMBVMc4bd70EMnXFuyglftxuqoaYHwNY="; }; + patches = [ + (fetchpatch { + name = "0001-fix-solaris-macos-builds.patch"; + url = "https://github.com/openwall/passwdqc/commit/fbf38229857f3d1982aa305c20da5e1ea0195b3e.patch"; + hash = "sha256-FaEWROHwFzd4ZTeKyPvuAr9vcgnHEv8MhERblIU8JC4="; + }) + ]; + outputs = [ "out" "man" ]; nativeBuildInputs = [ @@ -42,6 +51,7 @@ stdenv.mkDerivation (finalAttrs: { "MANDIR=$(man)/man" "PKGCONFIGDIR=$(out)/lib/pkgconfig" "SECUREDIR=$(out)/lib/security" + "SECUREDIR_DARWIN=$(out)/lib/security" "SHARED_LIBDIR=$(out)/lib" "SHARED_LIBDIR_REL=$(out)/lib" ];