Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ab6d08132dae
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b70664a645de
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on May 29, 2018

  1. python: CherryPy: 14.0.0 -> 14.0.1 

    (cherry picked from commit 762c93c)
    @FRidh @xeji
    FRidh authored and xeji committed May 29, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Moredread André-Patrick Bubel
    GPG key ID: 28925CBA8869FF29
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2c26bc6 View commit details

  2. python.pkgs.cherrypy: clean up checkInputs 

    (cherry picked from commit a141b15)
    @xeji
    Robert Schütz authored and xeji committed May 29, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Moredread André-Patrick Bubel
    GPG key ID: 28925CBA8869FF29
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b70664a View commit details
Showing with 4 additions and 5 deletions.
  1. +4 −5 pkgs/development/python-modules/cherrypy/default.nix
9 changes: 4 additions & 5 deletions pkgs/development/python-modules/cherrypy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
{ lib, buildPythonPackage, fetchPypi
, cheroot, portend, routes, six
, setuptools_scm
, backports_unittest-mock, codecov, coverage, objgraph, pathpy, pytest, pytest-sugar, pytestcov
, backports_unittest-mock, objgraph, pathpy, pytest, pytestcov
}:

buildPythonPackage rec {
name = "${pname}-${version}";
pname = "CherryPy";
version = "14.0.0";
version = "14.0.1";

src = fetchPypi {
inherit pname version;
sha256 = "5f5ee020d6547a8d452b3560775ca2374ffe2ff8c0aec1b272e93b6af80d850e";
sha256 = "721d09bbeedaf5b3493e9e644ae9285d776ea7f16b1d4a0a5aaec7c0d22e5074";
};

propagatedBuildInputs = [ cheroot portend routes six ];

buildInputs = [ setuptools_scm ];

checkInputs = [ backports_unittest-mock codecov coverage objgraph pathpy pytest pytest-sugar pytestcov ];
checkInputs = [ backports_unittest-mock objgraph pathpy pytest pytestcov ];

checkPhase = ''
LANG=en_US.UTF-8 pytest