Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pkcs11-provider: 0.5 -> 0.6 #362992

Merged
merged 2 commits into from
Dec 10, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 48 additions & 11 deletions pkgs/by-name/pk/pkcs11-provider/package.nix
Original file line number Diff line number Diff line change
@@ -1,26 +1,60 @@
{ lib, stdenv, fetchFromGitHub
, openssl, nss, p11-kit
, opensc, gnutls, expect
, meson, ninja, pkg-config
, nix-update-script
{
lib,
stdenv,
fetchFromGitHub,
openssl,
nss,
p11-kit,
opensc,
gnutls,
expect,
which,
meson,
ninja,
pkg-config,
valgrind,
python3,
nix-update-script,
}:

let
pkcs11ProviderPython3 = python3.withPackages (pythonPkgs: with pythonPkgs; [ six ]);
in
stdenv.mkDerivation rec {
pname = "pkcs11-provider";
version = "0.5";
version = "0.6";

src = fetchFromGitHub {
owner = "latchset";
repo = "pkcs11-provider";
rev = "v${version}";
hash = "sha256-ii2xQPBgqIjrAP27qTQR9IXbEGZcc79M/cYzFwcAajQ=";
fetchSubmodules = true;
hash = "sha256-wYqmxxAzraaVR2+mbsRfgyvD/tapn8UOO0UzBX2ZJH4=";
};

buildInputs = [ openssl nss p11-kit ];
nativeBuildInputs = [ meson ninja pkg-config ];
buildInputs = [
openssl
nss
p11-kit
];
nativeBuildInputs = [
meson
ninja
pkg-config
which
];

# don't add SoftHSM to here: https://github.com/openssl/openssl/issues/22508
nativeCheckInputs = [ p11-kit.bin opensc nss.tools gnutls openssl.bin expect ];
nativeCheckInputs = [
p11-kit.bin
opensc
nss.tools
gnutls
openssl.bin
expect
valgrind
pkcs11ProviderPython3
];

postPatch = ''
patchShebangs --build .
Expand All @@ -44,7 +78,10 @@ stdenv.mkDerivation rec {
doCheck = true;

passthru.updateScript = nix-update-script {
extraArgs = [ "--version-regex" "v(\d\.\d)"];
extraArgs = [
"--version-regex"
"v(\d\.\d)"
];
};

meta = with lib; {
Expand Down
Loading