Skip to content
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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d8d06d1cec86
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7f5f4ac31fe2
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jan 16, 2021

  1. pythonPackages.uamqp: Fix build on darwin

    @SuperSandro2000
    SuperSandro2000 committed Jan 16, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    SamirHafez Samir Hafez
    GPG key ID: 95806A3539FE7066
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5c4843d View commit details

  2. Merge pull request #109538 from SuperSandro2000/uamqp-darwin 

    pythonPackages.uamqp: Fix build on darwin
    @Mic92
    Mic92 authored Jan 16, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7f5f4ac View commit details
Showing with 24 additions and 7 deletions.
  1. +21 −5 pkgs/development/python-modules/uamqp/default.nix
  2. +3 −2 pkgs/top-level/python-packages.nix
26 changes: 21 additions & 5 deletions pkgs/development/python-modules/uamqp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
{ lib, buildPythonPackage, fetchPypi, isPy3k
{ stdenv
, lib
, buildPythonPackage
, fetchPypi
, fetchpatch
, isPy3k
, certifi
, CFNetwork
, cmake
, enum34
, openssl
, Security
, six
, stdenv
, CFNetwork
, CoreFoundation
, Security
}:

buildPythonPackage rec {
@@ -18,14 +23,25 @@ buildPythonPackage rec {
sha256 = "sha256-zDUFe/yMCThn+qJqDekMrUHEf1glGxBw4pioExLLoqg=";
};

patches = [
(fetchpatch {
url = "https://github.com/Azure/azure-c-shared-utility/commit/52ab2095649b5951e6af77f68954209473296983.patch";
sha256 = "06pxhdpkv94pv3lhj1vy0wlsqsdznz485bvg3zafj67r55g40lhd";
stripLen = "2";
extraPrefix = "src/vendor/azure-uamqp-c/deps/azure-c-shared-utility/";
})
];

buildInputs = [
openssl
certifi
six
] ++ lib.optionals (!isPy3k) [
enum34
] ++ lib.optionals stdenv.isDarwin [
CFNetwork Security
CoreFoundation
CFNetwork
Security
];

dontUseCmakeConfigure = true;
5 changes: 3 additions & 2 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -7799,8 +7799,9 @@ in {

tzlocal = callPackage ../development/python-modules/tzlocal { };

uamqp =
callPackage ../development/python-modules/uamqp { inherit (pkgs.darwin.apple_sdk.frameworks) CFNetwork Security; };
uamqp = callPackage ../development/python-modules/uamqp {
inherit (pkgs.darwin.apple_sdk.frameworks) CFNetwork CoreFoundation Security;
};

ua-parser = callPackage ../development/python-modules/ua-parser { };