public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Vladimír Čunát
2020-10-28 18:48:18 +01:00
parent 8c9bb91c34 05f6de94cf
commit 31839c352e
542 changed files with 6691 additions and 3486 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+16 -6
View File
@@ -1597,7 +1597,13 @@ in {
distutils_extra = callPackage ../development/python-modules/distutils_extra { };
django_2_2 = callPackage ../development/python-modules/django/2_2.nix { };
django = self.django_2;
# Current LTS
django_2 = callPackage ../development/python-modules/django/2.nix { };
# Current latest
django_3 = callPackage ../development/python-modules/django/3.nix { };
django-allauth = callPackage ../development/python-modules/django-allauth { };
@@ -1656,8 +1662,6 @@ in {
django-logentry-admin = callPackage ../development/python-modules/django-logentry-admin { };
django_lts = self.django_2_2;
django-mailman3 = callPackage ../development/python-modules/django-mailman3 { };
django_modelcluster = callPackage ../development/python-modules/django_modelcluster { };
@@ -1704,8 +1708,6 @@ in {
django-sampledatahelper = callPackage ../development/python-modules/django-sampledatahelper { };
django = self.django_lts;
django-sesame = callPackage ../development/python-modules/django-sesame { };
django_silk = callPackage ../development/python-modules/django_silk { };
@@ -2570,7 +2572,7 @@ in {
grappelli_safe = callPackage ../development/python-modules/grappelli_safe { };
graspy = callPackage ../development/python-modules/graspy { };
graspologic = callPackage ../development/python-modules/graspologic { };
greatfet = callPackage ../development/python-modules/greatfet { };
@@ -4498,6 +4500,8 @@ in {
pims = callPackage ../development/python-modules/pims { };
pinboard = callPackage ../development/python-modules/pinboard { };
pint = callPackage ../development/python-modules/pint { };
pip = callPackage ../development/python-modules/pip { };
@@ -6513,6 +6517,8 @@ in {
setuptools-lint = callPackage ../development/python-modules/setuptools-lint { };
setuptools-rust = callPackage ../development/python-modules/setuptools-rust { };
setuptools_scm = callPackage ../development/python-modules/setuptools_scm { };
setuptools-scm-git-archive = callPackage ../development/python-modules/setuptools-scm-git-archive { };
@@ -6636,6 +6642,8 @@ in {
smugpy = callPackage ../development/python-modules/smugpy { };
snack = toPythonModule (pkgs.newt.override { inherit (self) python; });
snakebite = callPackage ../development/python-modules/snakebite { };
snakeviz = callPackage ../development/python-modules/snakeviz { };
@@ -7810,6 +7818,8 @@ in {
zigpy-zigate = callPackage ../development/python-modules/zigpy-zigate { };
zigpy-znp = callPackage ../development/python-modules/zigpy-znp { };
zimports = callPackage ../development/python-modules/zimports { };
zipfile36 = callPackage ../development/python-modules/zipfile36 { };