From ea36b975abb14bde0fbd11a58ad7768680e5823d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 6 Aug 2018 22:24:24 +0200 Subject: [PATCH] pythonPackages.asana: 0.7.0 -> 0.7.1 (#44561) Also fixed the package build from https://hydra.nixos.org/build/78900949. `requests_oauthlib` seems to work fine at version 1.0 with `asana`, so rather than creating our own override for `asana` it's fine to use 1.0 and patch `setup.py`. --- pkgs/development/python-modules/asana/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index 2fbe4932beda..19140925595b 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -4,22 +4,21 @@ buildPythonPackage rec { pname = "asana"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "asana"; repo = "python-asana"; rev = "v${version}"; - sha256 = "0786y3wxqxxhsb0kkpx4bfzif3dhvv3dmm6vnq58iyj94862kpxf"; + sha256 = "0vmpy4j1n54gkkg0l8bhw0xf4yby5kqzxnsv07cjc2w38snj5vy1"; }; checkInputs = [ pytest responses ]; propagatedBuildInputs = [ requests requests_oauthlib six ]; - patchPhase = '' - echo > requirements.txt - sed -i "s/requests~=2.9.1/requests >=2.9.1/" setup.py - sed -i "s/requests_oauthlib~=0.6.1/requests_oauthlib >=0.6.1/" setup.py + postPatch = '' + substituteInPlace setup.py \ + --replace "requests_oauthlib >= 0.8.0, == 0.8.*" "requests_oauthlib>=0.8.0<2.0" ''; checkPhase = ''