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

Commits on Oct 3, 2019

  1. pythonPackages.bleach: add implicit setuptools dependency

    @elohmeier
    elohmeier authored and Jon committed Oct 3, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    31c4f79 View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 pkgs/development/python-modules/bleach/default.nix
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/bleach/default.nix
View file
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
, pytestrunner
, six
, html5lib
, setuptools
}:

buildPythonPackage rec {
@@ -17,7 +18,7 @@ buildPythonPackage rec {
};

checkInputs = [ pytest pytestrunner ];
propagatedBuildInputs = [ six html5lib ];
propagatedBuildInputs = [ six html5lib setuptools ];

postPatch = ''
substituteInPlace setup.py --replace ",<3dev" ""