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

Commits on Dec 4, 2018

  1. Revert "python: pyjwt: fix build" 

    This reverts commit bcf736b.

28cdb6e fixed the issue with pytest-3.9.0.
    @hedning
    hedning committed Dec 4, 2018

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    4361e50 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/development/python-modules/pyjwt/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/pyjwt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ lib, buildPythonPackage, fetchPypi
, cryptography, ecdsa
, pytestrunner, pytestcov, pytest_37 }:
, pytestrunner, pytestcov, pytest }:

buildPythonPackage rec {
pname = "PyJWT";
@@ -13,7 +13,7 @@ buildPythonPackage rec {

propagatedBuildInputs = [ cryptography ecdsa ];

checkInputs = [ pytestrunner pytestcov pytest_37 ];
checkInputs = [ pytestrunner pytestcov pytest ];

# pytest 3.9.0 changed behavior of deprecated_call, see release notes
postPatch = ''