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: f618cfbf4544
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6f61113415bb
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 30, 2020

  1. python3Packages.gunicorn: add setuptools 

    (cherry picked from commit 353c83a)
    @DavHau
    Jonathan Ringer authored and DavHau committed Jan 30, 2020
    Copy the full SHA
    24a0d1d View commit details

Commits on Jan 31, 2020

  1. Merge pull request #78727 from DavHau/nixos-19.09-bugfix-gunicorn 

    python3Packages.gunicorn: add setuptools
    @marsam
    marsam authored Jan 31, 2020

    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
    6f61113 View commit details
Showing with 14 additions and 4 deletions.
  1. +14 −4 pkgs/development/python-modules/gunicorn/default.nix
18 changes: 14 additions & 4 deletions pkgs/development/python-modules/gunicorn/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{ stdenv, buildPythonPackage, fetchPypi
, pytest, mock, pytestcov, coverage }:
, coverage
, mock
, pytest
, pytestcov
, setuptools
}:

buildPythonPackage rec {
pname = "gunicorn";
@@ -10,16 +15,21 @@ buildPythonPackage rec {
sha256 = "fa2662097c66f920f53f70621c6c58ca4a3c4d3434205e608e121b5b3b71f4f3";
};

propagatedBuildInputs = [ setuptools ];

checkInputs = [ pytest mock pytestcov coverage ];

prePatch = ''
substituteInPlace requirements_test.txt --replace "==" ">=" \
--replace "coverage>=4.0,<4.4" "coverage"
'';

# Test failures but patch does not apply cleanly
# https://github.com/benoitc/gunicorn/commit/f38f717539b1b7296720805b8ae3969c3509b9c1
doCheck = false;
# better than no tests
checkPhase = ''
$out/bin/gunicorn --help > /dev/null
'';

pythonImportsCheck = [ "gunicorn" ];

meta = with stdenv.lib; {
homepage = https://pypi.python.org/pypi/gunicorn;