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

Commits on Oct 11, 2019

  1. python3Packages.diff-match-patch: fix build 

    Rather than using autodiscovery, the checkPhase should import
`__init__.py` from `diff_match_patch.tests to execute all relevant
tests. Otherwise several python2-related tests are executed in a py3 env
and break the build.

See also: https://hydra.nixos.org/build/102482273

(cherry picked from commit b6237fb)
    @Ma27
    Ma27 committed Oct 11, 2019
    Copy the full SHA
    45e2f83 View commit details
Showing with 5 additions and 1 deletion.
  1. +5 −1 pkgs/development/python-modules/diff-match-patch/default.nix
6 changes: 5 additions & 1 deletion pkgs/development/python-modules/diff-match-patch/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ lib, buildPythonPackage, fetchPypi }:
{ lib, buildPythonPackage, fetchPypi, python }:

buildPythonPackage rec {
pname = "diff-match-patch";
@@ -14,4 +14,8 @@ buildPythonPackage rec {
inherit pname version;
sha256 = "a809a996d0f09b9bbd59e9bbd0b71eed8c807922512910e05cbd3f9480712ddb";
};

checkPhase = ''
${python.interpreter} -m unittest -v diff_match_patch.tests
'';
}