uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
52
pkgs/development/python-modules/django/3.nix
Normal file
52
pkgs/development/python-modules/django/3.nix
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, substituteAll
|
||||
, geos
|
||||
, gdal
|
||||
, asgiref
|
||||
, pytz
|
||||
, sqlparse
|
||||
, pythonOlder
|
||||
, withGdal ? false
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django";
|
||||
version = "3.2.13";
|
||||
|
||||
disabled = pythonOlder "3.7";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "Django";
|
||||
inherit version;
|
||||
sha256 = "sha256-bZNJegqb9roOCxopzM3EDvv8dilyVbEwmzqISmiOxLY=";
|
||||
};
|
||||
|
||||
patches = lib.optional withGdal
|
||||
(substituteAll {
|
||||
src = ./django_3_set_geos_gdal_lib.patch;
|
||||
inherit geos;
|
||||
inherit gdal;
|
||||
extension = stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
});
|
||||
|
||||
propagatedBuildInputs = [
|
||||
asgiref
|
||||
pytz
|
||||
sqlparse
|
||||
];
|
||||
|
||||
# too complicated to setup
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "django" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "A high-level Python Web framework";
|
||||
homepage = "https://www.djangoproject.com/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ georgewhewell ];
|
||||
};
|
||||
}
|
||||
107
pkgs/development/python-modules/django/4.nix
Normal file
107
pkgs/development/python-modules/django/4.nix
Normal file
|
|
@ -0,0 +1,107 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, pythonOlder
|
||||
, substituteAll
|
||||
|
||||
# patched in
|
||||
, geos
|
||||
, gdal
|
||||
, withGdal ? false
|
||||
|
||||
# propagated
|
||||
, asgiref
|
||||
, backports-zoneinfo
|
||||
, sqlparse
|
||||
|
||||
# tests
|
||||
, aiosmtpd
|
||||
, argon2-cffi
|
||||
, bcrypt
|
||||
, docutils
|
||||
, geoip2
|
||||
, jinja2
|
||||
, python-memcached
|
||||
, numpy
|
||||
, pillow
|
||||
, pylibmc
|
||||
, pymemcache
|
||||
, python
|
||||
, pytz
|
||||
, pywatchman
|
||||
, pyyaml
|
||||
, redis
|
||||
, selenium
|
||||
, tblib
|
||||
, tzdata
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "Django";
|
||||
version = "4.0.5";
|
||||
format = "pyproject";
|
||||
|
||||
disabled = pythonOlder "3.8";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
hash = "sha256-90MaXecneWbzeFVXw5KEMzR9mYweZFkyRQE3iikeWqs=";
|
||||
};
|
||||
|
||||
patches = lib.optional withGdal
|
||||
(substituteAll {
|
||||
src = ./django_4_set_geos_gdal_lib.patch;
|
||||
geos = geos;
|
||||
gdal = gdal;
|
||||
extension = stdenv.hostPlatform.extensions.sharedLibrary;
|
||||
});
|
||||
|
||||
propagatedBuildInputs = [
|
||||
asgiref
|
||||
sqlparse
|
||||
] ++ lib.optionals (pythonOlder "3.9") [
|
||||
backports-zoneinfo
|
||||
];
|
||||
|
||||
# Fails to import asgiref in ~200 tests
|
||||
# ModuleNotFoundError: No module named 'asgiref'
|
||||
doCheck = false;
|
||||
|
||||
checkInputs = [
|
||||
aiosmtpd
|
||||
argon2-cffi
|
||||
asgiref
|
||||
bcrypt
|
||||
docutils
|
||||
geoip2
|
||||
jinja2
|
||||
python-memcached
|
||||
numpy
|
||||
pillow
|
||||
pylibmc
|
||||
pymemcache
|
||||
pytz
|
||||
pywatchman
|
||||
pyyaml
|
||||
redis
|
||||
selenium
|
||||
tblib
|
||||
tzdata
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
${python.interpreter} tests/runtests.py
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "A high-level Python Web framework that encourages rapid development and clean, pragmatic design.";
|
||||
homepage = "https://www.djangoproject.com";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ hexa ];
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
diff -Nur a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py
|
||||
--- a/django/contrib/gis/gdal/libgdal.py 2020-07-09 22:34:05.330568948 +0100
|
||||
+++ b/django/contrib/gis/gdal/libgdal.py 2020-07-09 22:35:08.679095615 +0100
|
||||
@@ -14,7 +14,7 @@
|
||||
from django.conf import settings
|
||||
lib_path = settings.GDAL_LIBRARY_PATH
|
||||
except (AttributeError, ImportError, ImproperlyConfigured, OSError):
|
||||
- lib_path = None
|
||||
+ lib_path = "@gdal@/lib/libgdal@extension@"
|
||||
|
||||
if lib_path:
|
||||
lib_names = None
|
||||
diff -Nur a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py
|
||||
--- a/django/contrib/gis/geos/libgeos.py 2020-07-09 22:34:05.331568941 +0100
|
||||
+++ b/django/contrib/gis/geos/libgeos.py 2020-07-09 22:36:24.863526276 +0100
|
||||
@@ -24,7 +24,7 @@
|
||||
from django.conf import settings
|
||||
lib_path = settings.GEOS_LIBRARY_PATH
|
||||
except (AttributeError, ImportError, ImproperlyConfigured, OSError):
|
||||
- lib_path = None
|
||||
+ lib_path = "@geos@/lib/libgeos_c@extension@"
|
||||
|
||||
# Setting the appropriate names for the GEOS-C library.
|
||||
if lib_path:
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
diff --git a/django/contrib/gis/gdal/libgdal.py b/django/contrib/gis/gdal/libgdal.py
|
||||
index 05b5732..91fafee 100644
|
||||
--- a/django/contrib/gis/gdal/libgdal.py
|
||||
+++ b/django/contrib/gis/gdal/libgdal.py
|
||||
@@ -14,7 +14,7 @@ try:
|
||||
from django.conf import settings
|
||||
lib_path = settings.GDAL_LIBRARY_PATH
|
||||
except (AttributeError, ImportError, ImproperlyConfigured, OSError):
|
||||
- lib_path = None
|
||||
+ lib_path = "@gdal@/lib/libgdal@extension@"
|
||||
|
||||
if lib_path:
|
||||
lib_names = None
|
||||
diff --git a/django/contrib/gis/geos/libgeos.py b/django/contrib/gis/geos/libgeos.py
|
||||
index 2cdb5d3..fac2d04 100644
|
||||
--- a/django/contrib/gis/geos/libgeos.py
|
||||
+++ b/django/contrib/gis/geos/libgeos.py
|
||||
@@ -24,7 +24,7 @@ def load_geos():
|
||||
from django.conf import settings
|
||||
lib_path = settings.GEOS_LIBRARY_PATH
|
||||
except (AttributeError, ImportError, ImproperlyConfigured, OSError):
|
||||
- lib_path = None
|
||||
+ lib_path = "@geos@/lib/libgeos_c@extension@"
|
||||
|
||||
# Setting the appropriate names for the GEOS-C library.
|
||||
if lib_path:
|
||||
Loading…
Add table
Add a link
Reference in a new issue