pkcs11-provider: 1.1 -> 1.2.0

This commit is contained in:
Morgan Jones
2026-03-09 00:49:29 -07:00
parent fe92e82ede
commit ce4ff91c91
+12 -8
View File
@@ -24,14 +24,14 @@ let
in
stdenv.mkDerivation (finalAttrs: {
pname = "pkcs11-provider";
version = "1.1";
version = "1.2.0";
src = fetchFromGitHub {
owner = "latchset";
owner = "openssl-projects";
repo = "pkcs11-provider";
tag = "v${finalAttrs.version}";
fetchSubmodules = true;
hash = "sha256-QXEwDl6pk8G5ba8lD4uYw2QuD3qS/sgd1od8crHct2s=";
hash = "sha256-rymH/0otZ553lKqfdTRR5ttNsom9A3ObNNxptqB/eno=";
};
buildInputs = [
@@ -54,9 +54,11 @@ stdenv.mkDerivation (finalAttrs: {
gnutls
openssl.bin
expect
valgrind
pkcs11ProviderPython3
]
++ lib.optionals stdenv.hostPlatform.isLinux [
valgrind
]
++ lib.optionals stdenv.hostPlatform.isx86_64 [
# softokn and kryoptic are OK; softhsm is pretty flaky.
# This fails with a `pkcs11-provider:softhsm / tls - FAIL - exit status 1`.
@@ -69,12 +71,11 @@ stdenv.mkDerivation (finalAttrs: {
KRYOPTIC = "${lib.getLib kryoptic}/lib";
};
# Fix a typo in the Kryoptic test (remove this in v1.2).
# Need to search $KRYOPTIC for the path to the actual Kryoptic library.
postPatch = ''
patchShebangs --build .
substituteInPlace tests/kryoptic-init.sh \
--replace-fail /usr/local/lib/kryoptic "\\''${KRYOPTIC}" \
--replace-fail "libkryoptic_pkcs11so" libkryoptic_pkcs11.so
--replace-fail /usr/local/lib/kryoptic "\\''${KRYOPTIC}"
'';
preInstall = ''
@@ -92,12 +93,15 @@ stdenv.mkDerivation (finalAttrs: {
# Frequently fails due to a race condition.
enableParallelInstalling = false;
# Tests bind to localhost.
__darwinAllowLocalNetworking = true;
doCheck = true;
passthru.updateScript = nix-update-script {
extraArgs = [
"--version-regex"
"v(\\d\\.\\d)"
"v(\\d+\\.\\d+\\.\\d+)"
];
};