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

Commits on Mar 19, 2019

  1. python.pkgs.simpleparse: fix build 

    (cherry picked from commit 5c52dcf)
    Robert Schütz committed Mar 19, 2019
    Copy the full SHA
    ab98ab4 View commit details

  2. python.pkgs.pycares: 2.4.0 -> 3.0.0 

    (cherry picked from commit 99cd4a1)
    Robert Schütz committed Mar 19, 2019
    Copy the full SHA
    789b88a View commit details

  3. python.pkgs.aiodns: 1.2.0 -> 2.0.0 

    (cherry picked from commit fc172b3)
    Robert Schütz committed Mar 19, 2019
    Copy the full SHA
    9cc637a View commit details

  4. python.pkgs.msrest: 0.6.2 -> 0.6.4 

    (cherry picked from commit fcf74c6)
    Robert Schütz committed Mar 19, 2019
    Copy the full SHA
    5d15bf5 View commit details

  5. python.pkgs.msrest: cleanup 

    I accidentally pushed fcf74c6 in a premature state.

(cherry picked from commit 0cbe2fa)
    Robert Schütz committed Mar 19, 2019
    Copy the full SHA
    fe76cf8 View commit details
11 changes: 6 additions & 5 deletions pkgs/development/python-modules/aiodns/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
{ stdenv, buildPythonPackage, fetchPypi
, isPy33, isPy27, isPyPy, python, pycares, typing, asyncio, trollius }:
{ stdenv, buildPythonPackage, fetchPypi, pythonOlder
, isPy27, isPyPy, python, pycares, typing, trollius }:

buildPythonPackage rec {
pname = "aiodns";
version = "1.2.0";
version = "2.0.0";

src = fetchPypi {
inherit pname version;
sha256 = "d67e14b32176bcf3ff79b5d47c466011ce4adeadfa264f7949da1377332a0449";
sha256 = "815fdef4607474295d68da46978a54481dd1e7be153c7d60f9e72773cd38d77d";
};

propagatedBuildInputs = with stdenv.lib; [ pycares typing ]
propagatedBuildInputs = with stdenv.lib; [ pycares ]
++ optional (pythonOlder "3.7") typing
++ optional (isPy27 || isPyPy) trollius;

checkPhase = ''
43 changes: 32 additions & 11 deletions pkgs/development/python-modules/msrest/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,46 @@
{ pkgs
{ lib
, buildPythonPackage
, fetchPypi
, python
, certifi
, fetchFromGitHub
, pythonAtLeast
, requests
, requests_oauthlib
, typing
, isodate
, certifi
, aiohttp
, aiodns
, pytest
, httpretty
, trio
}:

buildPythonPackage rec {
version = "0.6.2";
version = "0.6.4";
pname = "msrest";

src = fetchPypi {
inherit pname version;
sha256 = "0icklfjaagk0j9iwq897avmqhwwmgs7c5yy5jw3ppdqz6h0sm38v";
# no tests in PyPI tarball
# see https://github.com/Azure/msrest-for-python/pull/152
src = fetchFromGitHub {
owner = "Azure";
repo = "msrest-for-python";
rev = "v${version}";
sha256 = "0ilrc06qq0dw4qqzq1dq2vs6nymc39h19w52dwcyawwfalalnjzi";
};

propagatedBuildInputs = [ certifi requests_oauthlib typing isodate ];
propagatedBuildInputs = [
requests requests_oauthlib isodate certifi
# optional
aiohttp aiodns
];

checkInputs = [ pytest httpretty ]
++ lib.optional (pythonAtLeast "3.5") trio;

# Deselected tests require network access
checkPhase = ''
pytest tests/ -k "not test_conf_async_trio_requests"
'';

meta = with pkgs.lib; {
meta = with lib; {
description = "The runtime library 'msrest' for AutoRest generated Python clients.";
homepage = "https://azure.microsoft.com/en-us/develop/python/";
license = licenses.mit;
18 changes: 13 additions & 5 deletions pkgs/development/python-modules/pycares/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,29 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, pkgs
, python
, c-ares
, cffi
}:

buildPythonPackage rec {
pname = "pycares";
version = "2.4.0";
version = "3.0.0";

src = fetchPypi {
inherit pname version;
sha256 = "15pwsxsj1nr33n6x2918bfbzdnqv1qkwd2d5jgvxsm81zxnvgk0f";
sha256 = "b253f5dcaa0ac7076b79388a3ac80dd8f3bd979108f813baade40d3a9b8bf0bd";
};

propagatedBuildInputs = [ pkgs.c-ares ];
buildInputs = [ c-ares ];

# No tests included
propagatedBuildInputs = [ cffi ];

checkPhase = ''
${python.interpreter} tests/tests.py
'';

# requires network access
doCheck = false;

meta = with stdenv.lib; {
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/simpleparse/default.nix
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,8 @@ buildPythonPackage rec {
disabled = isPy3k || isPyPy;

src = fetchPypi {
inherit pname version;
pname = "SimpleParse";
inherit version;
sha256 = "18ccdc249bb550717af796af04a7d50aef523368901f64036a48eee5daca149d";
};