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

Commits on May 24, 2018

  1. python.pkgs.openid: init at 2.2.5/3.1.0

    @globin
    globin committed May 24, 2018
    7
    Copy the full SHA
    2e41891 View commit details

  2. python.pkgs.django-allauth: init at 0.36.0

    @globin
    globin committed May 24, 2018
    2

    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
    6b29b2c View commit details

  3. python.pkgs.django-gravatar2: init at 1.4.2

    @globin
    globin committed May 24, 2018
    Copy the full SHA
    e243993 View commit details
32 changes: 32 additions & 0 deletions pkgs/development/python-modules/django-allauth/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, requests, requests_oauthlib
, django, python-openid, mock, coverage }:

buildPythonPackage rec {
pname = "django-allauth";
name = "${pname}-${version}";
version = "0.36.0";

# no tests on PyPI
src = fetchFromGitHub {
owner = "pennersr";
repo = pname;
rev = version;
sha256 = "1c863cmd521j6cwpyd50jxz5y62fdschrhm15jfqihicyr9imjan";
};

propagatedBuildInputs = [ requests requests_oauthlib django python-openid ];

checkInputs = [ coverage mock ];

doCheck = false;
checkPhase = ''
cd $NIX_BUILD_TOP/$sourceRoot
coverage run manage.py test allauth
'';

meta = with stdenv.lib; {
description = "Integrated set of Django applications addressing authentication, registration, account management as well as 3rd party (social) account authentication";
homepage = https://www.intenct.nl/projects/django-allauth;
license = licenses.mit;
};
}
20 changes: 20 additions & 0 deletions pkgs/development/python-modules/django-gravatar2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{ stdenv, buildPythonPackage, fetchPypi }:

buildPythonPackage rec {
pname = "django-gravatar2";
name = "${pname}-${version}";
version = "1.4.2";

src = fetchPypi {
inherit pname version;
sha256 = "1qsv40xywbqsf4mkrmsswrpzqd7nfljxpfiim9an2z3dykn5rka6";
};

doCheck = false;

meta = with stdenv.lib; {
description = "Essential Gravatar support for Django";
homepage = https://github.com/twaddington/django-gravatar;
license = licenses.mit;
};
}
20 changes: 20 additions & 0 deletions pkgs/development/python-modules/python-openid/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{ stdenv, buildPythonPackage, fetchPypi }:

buildPythonPackage rec {
pname = "python-openid";
name = "${pname}-${version}";
version = "2.2.5";

src = fetchPypi {
inherit pname version;
sha256 = "1vvhxlghjan01snfdc4k7ykd80vkyjgizwgg9bncnin8rqz1ricj";
};

doCheck = false;

meta = with stdenv.lib; {
description = "OpenID support for modern servers and consumers";
homepage = http://github.com/openid/python-openid;
license = licenses.asl20;
};
}
22 changes: 22 additions & 0 deletions pkgs/development/python-modules/python3-openid/default.nix
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{ stdenv, buildPythonPackage, fetchPypi, defusedxml }:

buildPythonPackage rec {
pname = "python3-openid";
name = "${pname}-${version}";
version = "3.1.0";

src = fetchPypi {
inherit pname version;
sha256 = "00l5hrjh19740w00b3fnsqldnla41wbr2rics09dl4kyd1fkd3b2";
};

propagatedBuildInputs = [ defusedxml ];

doCheck = false;

meta = with stdenv.lib; {
description = "OpenID support for modern servers and consumers";
homepage = http://github.com/necaris/python3-openid;
license = licenses.asl20;
};
}
8 changes: 8 additions & 0 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -408,6 +408,10 @@ in {

pytest-tornado = callPackage ../development/python-modules/pytest-tornado { };

python-openid = callPackage (if isPy3k
then ../development/python-modules/python3-openid
else ../development/python-modules/python-openid) { };

python-sql = callPackage ../development/python-modules/python-sql { };

python-stdnum = callPackage ../development/python-modules/python-stdnum { };
@@ -4709,6 +4713,8 @@ in {
};
};

django-allauth = callPackage ../development/python-modules/django-allauth { };

django_appconf = callPackage ../development/python-modules/django_appconf { };

django_colorful = buildPythonPackage rec {
@@ -4776,6 +4782,8 @@ in {

django_extensions = callPackage ../development/python-modules/django-extensions { };

django-gravatar2 = callPackage ../development/python-modules/django-gravatar2 { };

django_guardian = callPackage ../development/python-modules/django_guardian { };

django-ipware = callPackage ../development/python-modules/django-ipware { };