lol

pkcs11-provider: 0.5 -> 0.6 (#362992)

authored by

Jörg Thalheim and committed by
GitHub
f08f60b8 79eac16f

+48 -11
+48 -11
pkgs/by-name/pk/pkcs11-provider/package.nix
··· 1 - { lib, stdenv, fetchFromGitHub 2 - , openssl, nss, p11-kit 3 - , opensc, gnutls, expect 4 - , meson, ninja, pkg-config 5 - , nix-update-script 1 + { 2 + lib, 3 + stdenv, 4 + fetchFromGitHub, 5 + openssl, 6 + nss, 7 + p11-kit, 8 + opensc, 9 + gnutls, 10 + expect, 11 + which, 12 + meson, 13 + ninja, 14 + pkg-config, 15 + valgrind, 16 + python3, 17 + nix-update-script, 6 18 }: 7 19 20 + let 21 + pkcs11ProviderPython3 = python3.withPackages (pythonPkgs: with pythonPkgs; [ six ]); 22 + in 8 23 stdenv.mkDerivation rec { 9 24 pname = "pkcs11-provider"; 10 - version = "0.5"; 25 + version = "0.6"; 11 26 12 27 src = fetchFromGitHub { 13 28 owner = "latchset"; 14 29 repo = "pkcs11-provider"; 15 30 rev = "v${version}"; 16 - hash = "sha256-ii2xQPBgqIjrAP27qTQR9IXbEGZcc79M/cYzFwcAajQ="; 31 + fetchSubmodules = true; 32 + hash = "sha256-wYqmxxAzraaVR2+mbsRfgyvD/tapn8UOO0UzBX2ZJH4="; 17 33 }; 18 34 19 - buildInputs = [ openssl nss p11-kit ]; 20 - nativeBuildInputs = [ meson ninja pkg-config ]; 35 + buildInputs = [ 36 + openssl 37 + nss 38 + p11-kit 39 + ]; 40 + nativeBuildInputs = [ 41 + meson 42 + ninja 43 + pkg-config 44 + which 45 + ]; 21 46 22 47 # don't add SoftHSM to here: https://github.com/openssl/openssl/issues/22508 23 - nativeCheckInputs = [ p11-kit.bin opensc nss.tools gnutls openssl.bin expect ]; 48 + nativeCheckInputs = [ 49 + p11-kit.bin 50 + opensc 51 + nss.tools 52 + gnutls 53 + openssl.bin 54 + expect 55 + valgrind 56 + pkcs11ProviderPython3 57 + ]; 24 58 25 59 postPatch = '' 26 60 patchShebangs --build . ··· 44 78 doCheck = true; 45 79 46 80 passthru.updateScript = nix-update-script { 47 - extraArgs = [ "--version-regex" "v(\d\.\d)"]; 81 + extraArgs = [ 82 + "--version-regex" 83 + "v(\d\.\d)" 84 + ]; 48 85 }; 49 86 50 87 meta = with lib; {