From d48876c9b8f67bbadbe927ad8d828a35ec723559 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sat, 7 Dec 2024 16:28:48 -0800
Subject: [PATCH 1/2] pkcs11-provider: 0.5 -> 0.6

---
 pkgs/by-name/pk/pkcs11-provider/package.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/pk/pkcs11-provider/package.nix b/pkgs/by-name/pk/pkcs11-provider/package.nix
index 334431587708..ea5000d1df84 100644
--- a/pkgs/by-name/pk/pkcs11-provider/package.nix
+++ b/pkgs/by-name/pk/pkcs11-provider/package.nix
@@ -1,26 +1,30 @@
 { lib, stdenv, fetchFromGitHub
 , openssl, nss, p11-kit
-, opensc, gnutls, expect
-, meson, ninja, pkg-config
+, 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 ];
+  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 .

From 45f439bd7ef484820afa08e363c468619f924d3e Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sat, 7 Dec 2024 16:40:01 -0800
Subject: [PATCH 2/2] pkcs11-provider: nixfmt

---
 pkgs/by-name/pk/pkcs11-provider/package.nix | 51 +++++++++++++++++----
 1 file changed, 42 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/pk/pkcs11-provider/package.nix b/pkgs/by-name/pk/pkcs11-provider/package.nix
index ea5000d1df84..f27bd11a934d 100644
--- a/pkgs/by-name/pk/pkcs11-provider/package.nix
+++ b/pkgs/by-name/pk/pkcs11-provider/package.nix
@@ -1,8 +1,20 @@
-{ lib, stdenv, fetchFromGitHub
-, openssl, nss, p11-kit
-, opensc, gnutls, expect, which
-, meson, ninja, pkg-config, valgrind, python3
-, nix-update-script
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  openssl,
+  nss,
+  p11-kit,
+  opensc,
+  gnutls,
+  expect,
+  which,
+  meson,
+  ninja,
+  pkg-config,
+  valgrind,
+  python3,
+  nix-update-script,
 }:
 
 let
@@ -20,11 +32,29 @@ stdenv.mkDerivation rec {
     hash = "sha256-wYqmxxAzraaVR2+mbsRfgyvD/tapn8UOO0UzBX2ZJH4=";
   };
 
-  buildInputs = [ openssl nss p11-kit ];
-  nativeBuildInputs = [ meson ninja pkg-config which ];
+  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 valgrind pkcs11ProviderPython3 ];
+  nativeCheckInputs = [
+    p11-kit.bin
+    opensc
+    nss.tools
+    gnutls
+    openssl.bin
+    expect
+    valgrind
+    pkcs11ProviderPython3
+  ];
 
   postPatch = ''
     patchShebangs --build .
@@ -48,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; {