Merge remote-tracking branch 'upstream/master' into staging

2018-05-23 16:00:04 -04:00
parent 89e196d971 78319bd948
commit d7144e708b
24 changed files with 803 additions and 1241 deletions
--- a/pkgs/development/python-modules/django/1_11.nix
+++ b/pkgs/development/python-modules/django/1_11.nix
@@ -6,13 +6,13 @@

 buildPythonPackage rec {
  pname = "Django";
-  version = "1.11.12";
+  version = "1.11.13";

  disabled = pythonOlder "2.7";

  src = fetchurl {
    url = "http://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz";
-    sha256 = "1szjha338grhf9dq0wpbrqwvak597shsx474pm5j67kn09xqqfad";
+    sha256 = "19d4c1rlbhmbvbxvskvqjb2aw4dnf2cqi1hhdh11ykdy1a7gxba6";
  };

  patches = stdenv.lib.optionals withGdal [