diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix index b0cd94ad313bc..cc442228c98f2 100644 --- a/pkgs/by-name/pr/pretix/package.nix +++ b/pkgs/by-name/pr/pretix/package.nix @@ -2,6 +2,7 @@ lib, buildNpmPackage, fetchFromGitHub, + fetchpatch, fetchPypi, libredirect, nodejs, @@ -84,6 +85,10 @@ python.pkgs.buildPythonApplication rec { pyproject = true; patches = [ + (fetchpatch { + url = "https://github.com/pretix/pretix/commit/d765a89139b2b28fa82145fb6f7e213ad46c086b.patch"; + hash = "sha256-we1TKu3mxsM3CEP5aCsdb3XGlYXbfa0hGWgjrljylKU="; + }) # Discover pretix.plugin entrypoints during build and add them into # INSTALLED_APPS, so that their static files are collected. ./plugin-build.patch diff --git a/pkgs/development/python-modules/django-lasuite/default.nix b/pkgs/development/python-modules/django-lasuite/default.nix index 6df392cf28645..87cac29392f6d 100644 --- a/pkgs/development/python-modules/django-lasuite/default.nix +++ b/pkgs/development/python-modules/django-lasuite/default.nix @@ -82,5 +82,6 @@ buildPythonPackage rec { changelog = "https://github.com/suitenumerique/django-lasuite/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ soyouzpanda ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix index f8b4577aa08bb..b915ae89d2f95 100644 --- a/pkgs/development/python-modules/djangorestframework/default.nix +++ b/pkgs/development/python-modules/djangorestframework/default.nix @@ -27,14 +27,14 @@ buildPythonPackage (finalAttrs: { pname = "djangorestframework"; - version = "3.16.1"; + version = "3.17.1"; pyproject = true; src = fetchFromGitHub { owner = "encode"; repo = "django-rest-framework"; tag = finalAttrs.version; - hash = "sha256-kjviZFuGt/x0RSc7wwl/+SeYQ5AGuv0e7HMhAmu4IgY="; + hash = "sha256-hDAtICtVFeEXRgR5Shb0IdVlLkpf/TBDWw+2cOLJTfw="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/drf-flex-fields/default.nix b/pkgs/development/python-modules/drf-flex-fields/default.nix index 5309cd8119088..51788ad9ea879 100644 --- a/pkgs/development/python-modules/drf-flex-fields/default.nix +++ b/pkgs/development/python-modules/drf-flex-fields/default.nix @@ -39,7 +39,10 @@ buildPythonPackage rec { hash = "sha256-+9ToxCEIDpsA+BK8Uk0VueVjoId41/S93+a716EGvCU="; }; - patches = [ ./django4-compat.patch ]; + patches = [ + ./django4-compat.patch + ./drf-3.17-compat.patch + ]; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/drf-flex-fields/drf-3.17-compat.patch b/pkgs/development/python-modules/drf-flex-fields/drf-3.17-compat.patch new file mode 100644 index 0000000000000..789f5bbb08a02 --- /dev/null +++ b/pkgs/development/python-modules/drf-flex-fields/drf-3.17-compat.patch @@ -0,0 +1,23 @@ +Upstream-Status: Submitted [https://github.com/rsinger86/drf-flex-fields/pull/146] + +diff --git a/rest_flex_fields/filter_backends.py b/rest_flex_fields/filter_backends.py +index 5eba44d..1f6461c 100644 +--- a/rest_flex_fields/filter_backends.py ++++ b/rest_flex_fields/filter_backends.py +@@ -4,7 +4,16 @@ from django.core.exceptions import FieldDoesNotExist + from django.db import models + from django.db.models import QuerySet +-from rest_framework.compat import coreapi, coreschema ++try: ++ from rest_framework.compat import coreapi, coreschema ++except ImportError: ++ try: ++ import coreapi ++ import coreschema ++ except ImportError: ++ coreapi = None ++ coreschema = None ++ + from rest_framework.filters import BaseFilterBackend + from rest_framework.request import Request + from rest_framework.viewsets import GenericViewSet