From 7b8c48444d561b3d32b2d2bd1de9ab79e60cc69b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 2 Apr 2019 11:07:52 -0700 Subject: [PATCH 1/2] python37Packages.pyscard: 1.9.7 -> 1.9.8 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 a15342e17fa..7fdacc5d03a 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchPypi, buildPythonPackage, swig, pcsclite, PCSC }: buildPythonPackage rec { - version = "1.9.7"; + version = "1.9.8"; pname = "pyscard"; src = fetchPypi { inherit pname version; - sha256 = "412c74c83e7401566e9d3d7b8b5ca965e74582a1f33179b3c1fabf1da73ebf80"; + sha256 = "15fh00z1an6r5j7hrz3jlq0rb3jygwf3x4jcwsa008bv8vpcg7gm"; }; postPatch = '' From f26e88df7a88c9584ccf2fc5d9ef7eac34ccc5ca Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 6 Apr 2019 18:03:28 -0400 Subject: [PATCH 2/2] pythonPackages.pyscard: fix darwin tests --- pkgs/development/python-modules/pyscard/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix index 7fdacc5d03a..bab8e502b9c 100644 --- a/pkgs/development/python-modules/pyscard/default.nix +++ b/pkgs/development/python-modules/pyscard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, swig, pcsclite, PCSC }: +{ stdenv, fetchPypi, fetchpatch, buildPythonPackage, swig, pcsclite, PCSC }: buildPythonPackage rec { version = "1.9.8"; @@ -16,6 +16,15 @@ buildPythonPackage rec { NIX_CFLAGS_COMPILE = "-isystem ${stdenv.lib.getDev pcsclite}/include/PCSC/"; + patches = [ + # Fixes darwin tests + # See: https://github.com/LudovicRousseau/pyscard/issues/77 + (fetchpatch { + url = "https://github.com/LudovicRousseau/pyscard/commit/62e675028086c75656444cc21d563d9f08ebf8e7.patch"; + sha256 = "1lr55npcpc8j750vf7vaisqyk18d5f00l7nii2lvawg4sssjaaf7"; + }) + ]; + propagatedBuildInputs = [ pcsclite ]; buildInputs = stdenv.lib.optional stdenv.isDarwin PCSC; nativeBuildInputs = [ swig ];