From 019eaad22d5b34d9628e01565b491aa0d94081a8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 28 Sep 2019 04:50:26 -0700 Subject: [PATCH 1/2] python37Packages.pyscard: 1.9.8 -> 1.9.9 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.7-pyscard/versions --- pkgs/development/python-modules/pyscard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index 06e2690c111..1ea5830c62b 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -9,12 +9,12 @@ let in buildPythonPackage rec { - version = "1.9.8"; + version = "1.9.9"; pname = "pyscard"; src = fetchPypi { inherit pname version; - sha256 = "15fh00z1an6r5j7hrz3jlq0rb3jygwf3x4jcwsa008bv8vpcg7gm"; + sha256 = "082cjkbxadaz2jb4rbhr0mkrirzlqyqhcf3r823qb0q1k50ybgg6"; }; postPatch = if withApplePCSC then '' From be620532dbd986021d59f288ed29ae341ff65b0b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 28 Sep 2019 09:51:11 -0500 Subject: [PATCH 2/2] python37Packages.pyscard: remove darwin version patch fixed upstream https://github.com/LudovicRousseau/pyscard/commit/62e675028086c75656444cc21d563d9f08ebf8e7 --- pkgs/development/python-modules/pyscard/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index 1ea5830c62b..ddd8b0ce295 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, fetchpatch, buildPythonPackage, swig, pcsclite, PCSC }: +{ stdenv, fetchPypi, buildPythonPackage, swig, pcsclite, PCSC }: let # Package does not support configuring the pcsc library. @@ -30,14 +30,6 @@ buildPythonPackage rec { NIX_CFLAGS_COMPILE = optionalString (! withApplePCSC) "-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 ]; nativeBuildInputs = [ swig ];