Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8a6e7487fb49
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3709ab3b48e9
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 14, 2020

  1. pythonPackages.pyscard: Fix build on Darwin 

    The previously provided patch is still necessary,
as nix python reports an old version of macOS
that has the bug, when in fact modern macOS
does not have the misspelling.

The patch has been upstreamed, so we take it
to fix 1.9.9 in anticipation of the next release.

(cherry picked from commit 44fd570)
    @kevingriffin @risicle
    kevingriffin authored and risicle committed Sep 14, 2020
    Copy the full SHA
    13d38bf View commit details

  2. Merge pull request #97980 from risicle/ris-pyscard-darwin-199-fix-20.03 

    [20.03] pythonPackages.pyscard: Fix build on Darwin
    @risicle
    risicle authored Sep 14, 2020
    Copy the full SHA
    3709ab3 View commit details
Showing with 16 additions and 23 deletions.
  1. +16 −1 pkgs/development/python-modules/pyscard/default.nix
  2. +0 −22 pkgs/development/python-modules/pyscard/ignore-macos-bug.patch
17 changes: 16 additions & 1 deletion pkgs/development/python-modules/pyscard/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchPypi, buildPythonPackage, swig, pcsclite, PCSC }:
{ stdenv, fetchPypi, fetchpatch, buildPythonPackage, swig, pcsclite, PCSC }:

let
# Package does not support configuring the pcsc library.
@@ -30,6 +30,21 @@ 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
# Building with python from nix on macOS version 10.13 or
# greater still causes this issue to occur.
patches = optionals withApplePCSC [
(fetchpatch {
url = "https://github.com/LudovicRousseau/pyscard/commit/945e9c4cd4036155691f6ce9706a84283206f2ef.patch";
sha256 = "19n8w1wzn85zywr6xf04d8nfg7sgzjyvxp1ccp3rgfr4mcc36plc";
})
];

propagatedBuildInputs = if withApplePCSC then [ PCSC ] else [ pcsclite ];
nativeBuildInputs = [ swig ];

22 changes: 0 additions & 22 deletions pkgs/development/python-modules/pyscard/ignore-macos-bug.patch
View file

This file was deleted.