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: 8a530a0bab1f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a88976d2222f
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Sep 2, 2019

  1. pythonPackages.uvloop: 0.12.2 -> 0.13.0 (#67735) 

    * As mentioned in #67492
the build was broken after an update of openssl versions.

* Fixes a flake8 unit-test case that requires a flake8 config
which is not shipped with the distribution.

* Fixes build on darwin.
    @d-goldin @disassembler
    d-goldin authored and disassembler committed Sep 2, 2019
    Copy the full SHA
    a88976d View commit details
Showing with 16 additions and 4 deletions.
  1. +13 −3 pkgs/development/python-modules/uvloop/default.nix
  2. +3 −1 pkgs/top-level/python-packages.nix
16 changes: 13 additions & 3 deletions pkgs/development/python-modules/uvloop/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,33 @@
{ lib
, stdenv
, buildPythonPackage
, fetchPypi
, pyopenssl
, libuv
, psutil
, isPy27
, CoreServices
, ApplicationServices
}:

buildPythonPackage rec {
pname = "uvloop";
version = "0.12.2";
version = "0.13.0";
disabled = isPy27;

src = fetchPypi {
inherit pname version;
sha256 = "c48692bf4587ce281d641087658eca275a5ad3b63c78297bbded96570ae9ce8f";
sha256 = "0blcnrd5vky2k1m1p1skx4516dr1jx76yyb0c6fi82si6mqd0b4l";
};

buildInputs = [ libuv ];
buildInputs = [
libuv
] ++ lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];

postPatch = ''
# Removing code linting tests, which we don't care about
rm tests/test_sourcecode.py
'';

checkInputs = [ pyopenssl psutil ];

4 changes: 3 additions & 1 deletion pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -1239,7 +1239,9 @@ in {

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

uvloop = callPackage ../development/python-modules/uvloop { };
uvloop = callPackage ../development/python-modules/uvloop {
inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices CoreServices;
};

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