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

Commits on Mar 19, 2019

  1. python.pkgs.msrest: fix build on python2

    Robert Schütz committed Mar 19, 2019
    Copy the full SHA
    d338fc1 View commit details
Showing with 9 additions and 5 deletions.
  1. +9 −5 pkgs/development/python-modules/msrest/default.nix
14 changes: 9 additions & 5 deletions pkgs/development/python-modules/msrest/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, pythonAtLeast
, isPy3k
, requests
, requests_oauthlib
, isodate
, certifi
, enum34
, typing
, aiohttp
, aiodns
, pytest
, httpretty
, mock
, futures
, trio
}:

@@ -28,12 +32,12 @@ buildPythonPackage rec {

propagatedBuildInputs = [
requests requests_oauthlib isodate certifi
# optional
aiohttp aiodns
];
] ++ lib.optionals (!isPy3k) [ enum34 typing ]
++ lib.optionals isPy3k [ aiohttp aiodns ];

checkInputs = [ pytest httpretty ]
++ lib.optional (pythonAtLeast "3.5") trio;
++ lib.optionals (!isPy3k) [ mock futures ]
++ lib.optional isPy3k trio;

# Deselected tests require network access
checkPhase = ''