public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

p11-kit: 0.23.14 -> 0.23.15 (#54750)

Browse Source 
* p11-kit: 0.23.14 -> 0.23.15
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/p11-kit/versions

* p11-kit: refactor 0.23.14 -> 0.23.15
+ add upstream patch to avoid breaking Chromium
+ add upstream patch to fix JKS tests
+ refresh meta (homepage, descriptions, license)
This commit is contained in:
R. RyanTM 2019-05-13 14:28:31 -07:00 committed by Renaud
parent c3dc58b016
commit c739b09d85
1 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
pkgs/development/libraries/p11-kit/default.nix
View File

@ -1,22 +1,36 @@
{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, libiconv { stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, which
, libffi, libtasn1 }: , gettext, libffi, libiconv, libtasn1
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "p11-kit-${version}"; pname = "p11-kit";
version = "0.23.14"; version = "0.23.15";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "p11-glue"; owner = "p11-glue";
repo = "p11-kit"; repo = pname;
rev = version; rev = version;
sha256 = "0zmrw1ciybhnxjlsfb07wnf11ak5vrmy8y8fnz3mwm8v3w8dzlvw"; sha256 = "0kf7zz2cvd6j09qkff3rl3wfisva82ia1z9h8bmy4ifwkv4yl9fv";
}; };
patches = [
(fetchpatch {
# https://github.com/p11-glue/p11-kit/issues/212
url = "https://github.com/p11-glue/p11-kit/commit/2a474e1fe8f4bd8b4ed7622e5cf3b2718a202562.patch";
sha256 = "13wi32hpzilvzxn57crn79h88q38jm2fzd5zxj4wnhv9dhwqr6lg";
})
(fetchpatch {
# https://github.com/p11-glue/p11-kit/issues/220
url = "https://github.com/p11-glue/p11-kit/commit/e2170b295992cb7fdf115227a78028ac3780619f.patch";
sha256 = "0433d8drfxaabsxwkkl4kr0jx8jr2l3a9ar11szipd9jwvrqnyr7";
})
];
outputs = [ "out" "dev"]; outputs = [ "out" "dev"];
outputBin = "dev"; outputBin = "dev";
nativeBuildInputs = [ autoreconfHook which pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig which ];
buildInputs = [ libffi libtasn1 libiconv ]; buildInputs = [ gettext libffi libiconv libtasn1 ];
autoreconfPhase = '' autoreconfPhase = ''
NOCONFIGURE=1 ./autogen.sh NOCONFIGURE=1 ./autogen.sh
@ -26,16 +40,23 @@ stdenv.mkDerivation rec {
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--localstatedir=/var" "--localstatedir=/var"
"--without-trust-paths" "--without-trust-paths"
]; ]; # TODO: store trust anchors in a directory common to Nix and NixOS
enableParallelBuilding = true;
doCheck = true;
installFlags = [ "exampledir=\${out}/etc/pkcs11" ]; installFlags = [ "exampledir=\${out}/etc/pkcs11" ];
doInstallCheck = false; # probably a bug in this derivation
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://p11-glue.freedesktop.org/; description = "Library for loading and sharing PKCS#11 modules";
longDescription = ''
Provides a way to load and enumerate PKCS#11 modules.
Provides a standard configuration setup for installing
PKCS#11 modules in such a way that they're discoverable.
'';
homepage = https://p11-glue.github.io/p11-glue/p11-kit.html;
platforms = platforms.all; platforms = platforms.all;
license = licenses.mit; license = licenses.bsd3;
}; };
} }