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

Commits on Jun 1, 2019

  1. pythonPackages.klein: fix build/tests

    @risicle
    risicle committed Jun 1, 2019
    Copy the full SHA
    7eea576 View commit details

  2. Merge pull request #62402 from risicle/ris-klein-fix 

    pythonPackages.klein: fix build/tests
    @worldofpeace
    worldofpeace authored Jun 1, 2019
    Copy the full SHA
    c794f5e View commit details
Showing with 10 additions and 2 deletions.
  1. +10 −2 pkgs/development/python-modules/klein/default.nix
12 changes: 10 additions & 2 deletions pkgs/development/python-modules/klein/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi
{ lib, buildPythonPackage, fetchPypi, fetchpatch
, six, twisted, werkzeug, incremental
, mock }:

@@ -11,9 +11,17 @@ buildPythonPackage rec {
sha256 = "30aaf0d78a987d5dbfe0968a07367ad0c73e02823cc8eef4c54f80ab848370d0";
};

patches = [
(fetchpatch {
name = "tests-expect-werkzeug-308.patch";
url = https://github.com/twisted/klein/commit/e2a5835b83e37a2bc5faefbfe1890c529b18b9c6.patch;
sha256 = "03j0bj3l3hnf7f96rb27i4bzy1iih79ll5bcah7gybdi1wpznh8w";
})
];

propagatedBuildInputs = [ six twisted werkzeug incremental ];

checkInputs = [ mock ];
checkInputs = [ mock twisted ];

checkPhase = ''
trial klein