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
42
pkgs/development/python-modules/django-compat/default.nix
Normal file
42
pkgs/development/python-modules/django-compat/default.nix
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
{ lib, buildPythonPackage, fetchFromGitHub, python,
|
||||
django, six
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "django-compat";
|
||||
version = "1.0.15";
|
||||
|
||||
# the pypi packages don't include everything required for the tests
|
||||
src = fetchFromGitHub {
|
||||
owner = "arteria";
|
||||
repo = "django-compat";
|
||||
rev = "v${version}";
|
||||
sha256 = "1pr6v38ahrsvxlgmcx69s4b5q5082f44gzi4h3c32sccdc4pwqxp";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./fix-tests.diff
|
||||
];
|
||||
|
||||
checkPhase = ''
|
||||
runHook preCheck
|
||||
|
||||
# to convince the tests to run against the installed package, not the source directory, we extract the
|
||||
# tests directory from it then dispose of the actual source
|
||||
mv compat/tests .
|
||||
rm -r compat
|
||||
substituteInPlace runtests.py --replace compat.tests tests
|
||||
${python.interpreter} runtests.py
|
||||
|
||||
runHook postCheck
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ django six ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Forward and backwards compatibility layer for Django 1.4, 1.7, 1.8, 1.9, 1.10 and 1.11";
|
||||
homepage = "https://github.com/arteria/django-compat";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ ris ];
|
||||
};
|
||||
}
|
||||
56
pkgs/development/python-modules/django-compat/fix-tests.diff
Normal file
56
pkgs/development/python-modules/django-compat/fix-tests.diff
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
diff -ur a/compat/tests/settings.py b/compat/tests/settings.py
|
||||
--- a/compat/tests/settings.py 2020-03-06 15:32:07.548482597 +0100
|
||||
+++ b/compat/tests/settings.py 2020-03-06 22:19:25.422934249 +0100
|
||||
@@ -16,11 +16,12 @@
|
||||
'django.contrib.admin',
|
||||
'django.contrib.auth',
|
||||
'django.contrib.contenttypes',
|
||||
+ 'django.contrib.messages',
|
||||
'compat',
|
||||
'compat.tests.test_app',
|
||||
]
|
||||
|
||||
-MIDDLEWARE_CLASSES = (
|
||||
+MIDDLEWARE = (
|
||||
'django.contrib.sessions.middleware.SessionMiddleware',
|
||||
'django.middleware.common.CommonMiddleware',
|
||||
'django.middleware.csrf.CsrfViewMiddleware',
|
||||
@@ -43,6 +44,7 @@
|
||||
'django.template.context_processors.i18n',
|
||||
'django.template.context_processors.tz',
|
||||
'django.template.context_processors.request',
|
||||
+ 'django.contrib.messages.context_processors.messages',
|
||||
],
|
||||
'loaders': [
|
||||
'django.template.loaders.filesystem.Loader',
|
||||
diff -ur a/compat/tests/test_compat.py b/compat/tests/test_compat.py
|
||||
--- a/compat/tests/test_compat.py 2020-03-06 15:32:07.548482597 +0100
|
||||
+++ b/compat/tests/test_compat.py 2020-03-06 15:37:39.202835075 +0100
|
||||
@@ -9,7 +9,7 @@
|
||||
from django.core.serializers.json import DjangoJSONEncoder
|
||||
from django.test import TestCase, SimpleTestCase
|
||||
from django.test.client import RequestFactory
|
||||
-from django.contrib.auth.views import logout
|
||||
+from django.contrib.auth.views import auth_logout
|
||||
try:
|
||||
from django.urls import NoReverseMatch
|
||||
except ImportError:
|
||||
@@ -103,7 +103,7 @@
|
||||
Tests that passing a view name to ``resolve_url`` will result in the
|
||||
URL path mapping to that view name.
|
||||
"""
|
||||
- resolved_url = resolve_url(logout)
|
||||
+ resolved_url = resolve_url(auth_logout)
|
||||
self.assertEqual('/accounts/logout/', resolved_url)
|
||||
|
||||
'''
|
||||
diff -ur a/compat/tests/urls.py b/compat/tests/urls.py
|
||||
--- a/compat/tests/urls.py 2020-03-06 15:32:07.548482597 +0100
|
||||
+++ b/compat/tests/urls.py 2020-03-06 15:34:25.962377799 +0100
|
||||
@@ -2,5 +2,5 @@
|
||||
from django.contrib.auth import views
|
||||
|
||||
urlpatterns = [
|
||||
- url(r'^accounts/logout/$', views.logout, name='logout'),
|
||||
+ url(r'^accounts/logout/$', views.auth_logout, name='logout'),
|
||||
]
|
||||
Loading…
Add table
Add a link
Reference in a new issue