nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 13:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging-20.09' into release-20.09

Browse Source
This commit is contained in:
Vladimír Čunát
2021-05-11 20:49:26 +02:00
parent 6e83cfb005 456ee571dd
commit 99ba06d51b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/django/2_2.nix → pkgs/development/python-modules/django/2.nix
View File

@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "Django";
version = "2.2.20";
version = "2.2.22";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "0r3a6gbhwngxl172yy6n0sq5knibl2vxc0wbk1g8licfbzfgjs95";
sha256 = "db2214db1c99017cbd971e58824e6f424375154fe358afc30e976f5b99fc6060";
};
patches = stdenv.lib.optional withGdal

2
pkgs/top-level/python-packages.nix
View File

@@ -1563,7 +1563,7 @@ in {
distutils_extra = callPackage ../development/python-modules/distutils_extra { };
django_2_2 = callPackage ../development/python-modules/django/2_2.nix { };
django_2_2 = callPackage ../development/python-modules/django/2.nix { };
django-allauth = callPackage ../development/python-modules/django-allauth { };