Merge pull request #224385 from wegank/tandoor-recipes-fix

tandoor-recipes: fix build
This commit is contained in:
Weijia Wang 2023-04-07 14:23:48 +03:00 committed by GitHub
commit 252eaa411b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 0 deletions

View file

@ -1,12 +1,25 @@
{ callPackage { callPackage
, nixosTests , nixosTests
, python3 , python3
, fetchFromGitHub
}: }:
let let
python = python3.override { python = python3.override {
packageOverrides = self: super: { packageOverrides = self: super: {
django = super.django_4; django = super.django_4;
django-crispy-forms = super.django-crispy-forms.overridePythonAttrs (_: rec {
version = "1.14.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "django-crispy-forms";
repo = "django-crispy-forms";
rev = "refs/tags/${version}";
hash = "sha256-NZ2lWxsQHc7Qc4HDoWgjJTZ/bJHmjpBf3q1LVLtzA+8=";
};
});
# Tests are incompatible with Django 4 # Tests are incompatible with Django 4
django-js-reverse = super.django-js-reverse.overridePythonAttrs (_: { django-js-reverse = super.django-js-reverse.overridePythonAttrs (_: {
doCheck = false; doCheck = false;

View file

@ -2,6 +2,7 @@
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, django , django
, setuptools
, pytestCheckHook , pytestCheckHook
, pytest-django , pytest-django
}: }:
@ -9,6 +10,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "django-crispy-forms"; pname = "django-crispy-forms";
version = "2.0"; version = "2.0";
format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "django-crispy-forms"; owner = "django-crispy-forms";
@ -19,6 +21,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [ propagatedBuildInputs = [
django django
setuptools
]; ];
# FIXME: RuntimeError: Model class source.crispy_forms.tests.forms.CrispyTestModel doesn't declare an explicit app_label and isn't in an application in INSTALLED_APPS. # FIXME: RuntimeError: Model class source.crispy_forms.tests.forms.CrispyTestModel doesn't declare an explicit app_label and isn't in an application in INSTALLED_APPS.