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

Commits on Sep 11, 2019

  1. python-django-haystack: add missing 'setuptools' to propagatedBuildIn… 

    …puts

As a side-effect of f7e28bf, the build
no longer propagated 'setuptools', which is a run-time dependency. See
#68314 for further details.

Fixes #68479.
    @peti
    peti committed Sep 11, 2019
    Copy the full SHA
    b57f25a View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/development/python-modules/django-haystack/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/django-haystack/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ lib, buildPythonPackage, fetchPypi
, setuptools_scm, django, dateutil, whoosh, pysolr
, setuptools, setuptools_scm, django, dateutil, whoosh, pysolr
, coverage, mock, nose, geopy, requests }:

buildPythonPackage rec {
@@ -12,7 +12,7 @@ buildPythonPackage rec {
};

checkInputs = [ pysolr whoosh dateutil geopy coverage nose mock coverage requests ];
propagatedBuildInputs = [ django ];
propagatedBuildInputs = [ django setuptools ];
nativeBuildInputs = [ setuptools_scm ];

postPatch = ''