public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python3.pkgs.cherrypy: 18.1.2 -> 18.3.0 and fix tests

Browse Source
This commit is contained in:
ajs124 2019-10-30 00:26:32 +01:00 committed by Jon
parent 015d3202e9
commit 03ec5e7e15
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/development/python-modules/cherrypy/default.nix
View File

@ -7,29 +7,24 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "cherrypy"; pname = "cherrypy";
version = "18.1.2"; version = "18.3.0";
disabled = !isPy3k; disabled = !isPy3k;
src = fetchPypi { src = fetchPypi {
pname = "CherryPy"; pname = "CherryPy";
inherit version; inherit version;
sha256 = "1w3hpsg7q8shdmscmbqk00w90lcw3brary7wl1a56k5h7nx33pj8"; sha256 = "0q6cs4vrv0rwim4byxfizrlp4h6hmwg3n4baz0ga66vvgiz6hgk8";
}; };
# Remove patches once 96b34df and 14c12d2 # Remove patches once 88d2163 and 713f672
# become part of a release - they're currently only present in master. # become part of a release - they're currently only present in master.
# ref: https://github.com/cherrypy/cherrypy/pull/1791 # ref: https://github.com/cherrypy/cherrypy/pull/1820
patches = [ patches = [
(fetchpatch { (fetchpatch {
name = "pytest5-1.patch"; name = "test_HTTP11_Timeout.patch";
url = "https://github.com/cherrypy/cherrypy/commit/96b34dfea7853b0189bc0a3878b6ddff0d4e505c.patch"; url = "https://github.com/cherrypy/cherrypy/commit/88d21630f68090c56d07000cabb6df4f1b612a71.patch";
sha256 = "0zy53mahffgkpd844118b42lsk5lkjmig70d60x1i46w6gnr61mi"; sha256 = "1i6a3qs3ijyd9rgsxb8axigkzdlmr5sl3ljif9rvn0d90211bzwh";
})
(fetchpatch {
name = "pytest5-2.patch";
url = "https://github.com/cherrypy/cherrypy/commit/14c12d2420a4b3765bb241250bd186e93b2f25eb.patch";
sha256 = "0ihcz7b5myn923rq5665b98pz52hnf6fcys2y2inf23r3i07scyz";
}) })
]; ];