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

Merge pull request #69831 from r-ryantm/auto-update/python3.7-pyscard

Browse Source 
python37Packages.pyscard: 1.9.8 -> 1.9.9
This commit is contained in:
Mario Rodas 2019-09-28 10:33:02 -05:00 committed by GitHub
commit 1f56d679f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/python-modules/pyscard/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchPypi, fetchpatch, buildPythonPackage, swig, pcsclite, PCSC }: { stdenv, fetchPypi, buildPythonPackage, swig, pcsclite, PCSC }:
let let
# Package does not support configuring the pcsc library. # Package does not support configuring the pcsc library.
@ -9,12 +9,12 @@ let
in in
buildPythonPackage rec { buildPythonPackage rec {
version = "1.9.8"; version = "1.9.9";
pname = "pyscard"; pname = "pyscard";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "15fh00z1an6r5j7hrz3jlq0rb3jygwf3x4jcwsa008bv8vpcg7gm"; sha256 = "082cjkbxadaz2jb4rbhr0mkrirzlqyqhcf3r823qb0q1k50ybgg6";
}; };
postPatch = if withApplePCSC then '' postPatch = if withApplePCSC then ''
@ -30,14 +30,6 @@ buildPythonPackage rec {
NIX_CFLAGS_COMPILE = optionalString (! withApplePCSC) NIX_CFLAGS_COMPILE = optionalString (! withApplePCSC)
"-I ${getDev pcsclite}/include/PCSC"; "-I ${getDev pcsclite}/include/PCSC";
# The error message differs depending on the macOS host version.
# Since Nix reports a constant host version, but proxies to the
# underlying library, it's not possible to determine the correct
# expected error message. This patch allows both errors to be
# accepted.
# See: https://github.com/LudovicRousseau/pyscard/issues/77
patches = optionals withApplePCSC [ ./ignore-macos-bug.patch ];
propagatedBuildInputs = if withApplePCSC then [ PCSC ] else [ pcsclite ]; propagatedBuildInputs = if withApplePCSC then [ PCSC ] else [ pcsclite ];
nativeBuildInputs = [ swig ]; nativeBuildInputs = [ swig ];