diff options
| author | Alexey Shmalko <rasen.dubi@gmail.com> | 2016-09-18 14:43:07 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-18 14:43:07 +0300 |
| commit | 19898d8284399fc9e297ad58eedba3f3abac8d9c (patch) | |
| tree | ed49144d59394ef57676a8a7097d2f4ccdd2edc2 /pkgs/development/libraries | |
| parent | 01e44ac1f9af1d42ee9b5000426b780f2a03c948 (diff) | |
| parent | ea1caf92725f72c8cb1a0f68c54fe7e6a6f41e8f (diff) | |
| download | nixpkgs-19898d8284399fc9e297ad58eedba3f3abac8d9c.tar nixpkgs-19898d8284399fc9e297ad58eedba3f3abac8d9c.tar.gz nixpkgs-19898d8284399fc9e297ad58eedba3f3abac8d9c.tar.bz2 nixpkgs-19898d8284399fc9e297ad58eedba3f3abac8d9c.tar.lz nixpkgs-19898d8284399fc9e297ad58eedba3f3abac8d9c.tar.xz nixpkgs-19898d8284399fc9e297ad58eedba3f3abac8d9c.tar.zst nixpkgs-19898d8284399fc9e297ad58eedba3f3abac8d9c.zip | |
Merge pull request #18650 from Ericson2314/openvpn-pkcs11
pkcs11-helper: git rev -> 1.11, openvpn w/ pkcs11-helper support
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/pkcs11helper/default.nix | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index fa373a7e97f..9094eca26e5 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -1,22 +1,21 @@ -{ stdenv, fetchurl, pkgconfig, openssl, autoreconfHook }: +{ stdenv, fetchFromGitHub, pkgconfig, openssl, autoreconfHook }: -let - rev = "5d412bad60"; -in stdenv.mkDerivation rec { - name = "pkcs11-helper-20121123-${rev}"; + name = "pkcs11-helper-${version}"; + version = "1.11"; - src = fetchurl { - url = "https://github.com/alonbl/pkcs11-helper/tarball/${rev}"; - name = "${name}.tar.gz"; - sha256 = "1mih6mha39yr5s5m18lg4854qc105asgnwmjw7f95kgmzni62kxp"; + src = fetchFromGitHub { + owner = "OpenSC"; + repo = "pkcs11-helper"; + rev = "${name}"; + sha256 = "1bfsmy9w2qf7avvs3rsc1ycqczzzw0j2wsqkd2fj4dc1fqzigq2q"; }; buildInputs = [ pkgconfig openssl autoreconfHook ]; meta = with stdenv.lib; { homepage = https://www.opensc-project.org/opensc/wiki/pkcs11-helper; - license = with licenses; [ "BSD" gpl2 ]; + license = with licenses; [ bsd3 gpl2 ]; description = "Library that simplifies the interaction with PKCS#11 providers"; platforms = platforms.unix; }; |