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: 6a66392d9adf
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2413b2ac8713
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 26, 2019

  1. python.pkgs.pytest-mock: 1.10.1 -> 1.10.2

    Robert Schütz committed Mar 26, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: 06121D366FE9435C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bd6d607 View commit details

  2. python.pkgs.pytest-faulthandler: fix build 

    fallout of #54182
    Robert Schütz committed Mar 26, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: 06121D366FE9435C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2413b2a View commit details
Showing with 3 additions and 3 deletions.
  1. +1 −1 pkgs/development/python-modules/pytest-faulthandler/default.nix
  2. +2 −2 pkgs/development/python-modules/pytest-mock/default.nix
2 changes: 1 addition & 1 deletion pkgs/development/python-modules/pytest-faulthandler/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ buildPythonPackage rec {
sha256 = "bf8634c3fd6309ef786ec03b913a5366163fdb094ebcfdebc35626400d790e0d";
};

buildInputs = [ setuptools_scm pytest ];
nativeBuildInputs = [ setuptools_scm pytest ];
checkInputs = [ pytest-mock ];
propagatedBuildInputs = lib.optional (pythonOlder "3.0") faulthandler;

4 changes: 2 additions & 2 deletions pkgs/development/python-modules/pytest-mock/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,11 @@

buildPythonPackage rec {
pname = "pytest-mock";
version = "1.10.1";
version = "1.10.2";

src = fetchPypi {
inherit pname version;
sha256 = "4d0d06d173eecf172703219a71dbd4ade0e13904e6bbce1ce660e2e0dc78b5c4";
sha256 = "cbec53e7cb0f2b57275220cb4f2822093ac89e486095555105ffe1a4e2f11df4";
};

propagatedBuildInputs = lib.optional (!isPy3k) mock;