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

Commits on Oct 31, 2019

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

    @ajs124
    ajs124 authored and Jon committed Oct 31, 2019
    Copy the full SHA
    03ec5e7 View commit details
Showing with 7 additions and 12 deletions.
  1. +7 −12 pkgs/development/python-modules/cherrypy/default.nix
19 changes: 7 additions & 12 deletions pkgs/development/python-modules/cherrypy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -7,29 +7,24 @@

buildPythonPackage rec {
pname = "cherrypy";
version = "18.1.2";
version = "18.3.0";

disabled = !isPy3k;

src = fetchPypi {
pname = "CherryPy";
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.
# ref: https://github.com/cherrypy/cherrypy/pull/1791
# ref: https://github.com/cherrypy/cherrypy/pull/1820
patches = [
(fetchpatch {
name = "pytest5-1.patch";
url = "https://github.com/cherrypy/cherrypy/commit/96b34dfea7853b0189bc0a3878b6ddff0d4e505c.patch";
sha256 = "0zy53mahffgkpd844118b42lsk5lkjmig70d60x1i46w6gnr61mi";
})
(fetchpatch {
name = "pytest5-2.patch";
url = "https://github.com/cherrypy/cherrypy/commit/14c12d2420a4b3765bb241250bd186e93b2f25eb.patch";
sha256 = "0ihcz7b5myn923rq5665b98pz52hnf6fcys2y2inf23r3i07scyz";
name = "test_HTTP11_Timeout.patch";
url = "https://github.com/cherrypy/cherrypy/commit/88d21630f68090c56d07000cabb6df4f1b612a71.patch";
sha256 = "1i6a3qs3ijyd9rgsxb8axigkzdlmr5sl3ljif9rvn0d90211bzwh";
})
];