Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2018-10-17 08:36:28 +02:00
347 changed files with 8824 additions and 5155 deletions

View File

@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "Django";
version = "1.11.15";
version = "1.11.16";
disabled = pythonOlder "2.7";
src = fetchurl {
url = "http://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz";
sha256 = "0h2sl02x2mxr3rl3dy750pzm5kvmx77116fys8rrgw164kc3b0mi";
sha256 = "14apywfi8mfy50xh07cagp24kx9mlqfzfq4f60klz90ng328q9i9";
};
patches = stdenv.lib.optionals withGdal [

View File

@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "Django";
version = "2.0.8";
version = "2.0.9";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "12z3b9v0zl7w9bm5sl7dpkk5w35ypalizfmnaj9jac41k8vfmbk8";
sha256 = "0sgx548zp5xf8dajiamdskbrphssiyajhgbw8iza6b68mda4bnfn";
};
patches = stdenv.lib.optionals withGdal [

View File

@@ -6,13 +6,13 @@
buildPythonPackage rec {
pname = "Django";
version = "2.1.1";
version = "2.1.2";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "0b7p6d77xqs2hdq2k1amqgbr3050zn5i8asz5w2lxajqnvb1rk71";
sha256 = "0ibbs76pzy8zd47yviljrp1s66fmbf5b62fixayaznj7pdzavg7g";
};
patches = stdenv.lib.optionals withGdal [