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

Commits on Mar 15, 2019

  1. python.pkgs.django_guardian: simplify expression 

    (cherry picked from commit 6e49276)
    Robert Schütz committed Mar 15, 2019
    Copy the full SHA
    283f72a View commit details

  2. python.pkgs.django_guardian: broken on Python 2.7 

    See django-guardian/django-guardian#605.

(cherry picked from commit 9905de7)
    Robert Schütz committed Mar 15, 2019
    Copy the full SHA
    7bb2b0c View commit details
Showing with 4 additions and 8 deletions.
  1. +4 −8 pkgs/development/python-modules/django_guardian/default.nix
12 changes: 4 additions & 8 deletions pkgs/development/python-modules/django_guardian/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, python, fetchPypi
{ stdenv, buildPythonPackage, fetchPypi, isPy3k
, django_environ, mock, django, six
, pytest, pytestrunner, pytest-django, setuptools_scm
, pytest, pytestrunner, pytest-django
}:
buildPythonPackage rec {
pname = "django-guardian";
@@ -12,16 +12,12 @@ buildPythonPackage rec {
};

checkInputs = [ pytest pytestrunner pytest-django django_environ mock ];
buildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ django six ];

checkPhase = ''
${python.interpreter} nix_run_setup test --addopts="--ignore build"
'';
propagatedBuildInputs = [ django ];

meta = with stdenv.lib; {
description = "Per object permissions for Django";
homepage = https://github.com/django-guardian/django-guardian;
license = [ licenses.mit licenses.bsd2 ];
broken = !isPy3k; # https://github.com/django-guardian/django-guardian/pull/605
};
}