From 9fcf26cd2d72a1e4ec98b26b10cd3a4672daf1cc Mon Sep 17 00:00:00 2001 From: Defelo Date: Thu, 22 May 2025 17:07:23 +0200 Subject: [PATCH 1/3] python313Packages.django-ninja-cursor-pagination: init at 0.1.0 --- .../default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/python-modules/django-ninja-cursor-pagination/default.nix diff --git a/pkgs/development/python-modules/django-ninja-cursor-pagination/default.nix b/pkgs/development/python-modules/django-ninja-cursor-pagination/default.nix new file mode 100644 index 000000000000..fe6d7fdcf040 --- /dev/null +++ b/pkgs/development/python-modules/django-ninja-cursor-pagination/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatch-vcs, + hatchling, + django, + django-ninja, + pytestCheckHook, + pytest-django, +}: + +buildPythonPackage { + pname = "django-ninja-cursor-pagination"; + version = "0.1.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "kitware-resonant"; + repo = "django-ninja-cursor-pagination"; + rev = "2cc22187885b9a12956530a00e554c7a6012de63"; + hash = "sha256-uZ+l/s70A8UG/HlSLIXW4r2WFM0Jj1Ep7fGoNdH9P5M="; + }; + + build-system = [ + hatch-vcs + hatchling + ]; + + dependencies = [ + django + django-ninja + ]; + + nativeCheckInputs = [ + pytestCheckHook + pytest-django + ]; + + meta = { + description = "Django Ninja extension for cursor-based pagination"; + homepage = "https://github.com/kitware-resonant/django-ninja-cursor-pagination"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ defelo ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f43159224541..e250e400b0fc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3831,6 +3831,10 @@ self: super: with self; { django-ninja = callPackage ../development/python-modules/django-ninja { }; + django-ninja-cursor-pagination = + callPackage ../development/python-modules/django-ninja-cursor-pagination + { }; + django-oauth-toolkit = callPackage ../development/python-modules/django-oauth-toolkit { }; django-organizations = callPackage ../development/python-modules/django-organizations { }; From 29f7024e91bf509e7f21a5eb1c9b300fa31b1358 Mon Sep 17 00:00:00 2001 From: Defelo Date: Thu, 22 May 2025 17:36:05 +0200 Subject: [PATCH 2/3] python313Packages.django-postgres-partition: init at 0.1.1 --- .../django-postgres-partition/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/django-postgres-partition/default.nix diff --git a/pkgs/development/python-modules/django-postgres-partition/default.nix b/pkgs/development/python-modules/django-postgres-partition/default.nix new file mode 100644 index 000000000000..faf3774871e1 --- /dev/null +++ b/pkgs/development/python-modules/django-postgres-partition/default.nix @@ -0,0 +1,40 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + setuptools, + django_5_2, + psycopg, + python-dateutil, +}: + +buildPythonPackage rec { + pname = "django-postgres-partition"; + version = "0.1.1"; + pyproject = true; + + src = fetchPypi { + inherit version; + pname = "django_postgres_partition"; + hash = "sha256-KUrgnfUXWyRerW4dqtVZO9bu5jHYnHcVOIg97w695RU="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + django_5_2 + psycopg + python-dateutil + ]; + + doCheck = false; # pypi version doesn't ship with tests + + pythonImportsCheck = [ "psql_partition" ]; + + meta = { + description = "Partition support for django, based on django-postgres-extra"; + homepage = "https://gitlab.com/burke-software/django-postgres-partition"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ defelo ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e250e400b0fc..2e9db8a07ccd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3863,6 +3863,8 @@ self: super: with self; { django-polymorphic = callPackage ../development/python-modules/django-polymorphic { }; + django-postgres-partition = callPackage ../development/python-modules/django-postgres-partition { }; + django-postgresql-netfields = callPackage ../development/python-modules/django-postgresql-netfields { }; From 92057c24448afcec363da90dd58162bd0fad72a0 Mon Sep 17 00:00:00 2001 From: Defelo Date: Thu, 22 May 2025 16:51:56 +0200 Subject: [PATCH 3/3] glitchtip: 4.2.10 -> 5.0.1 --- pkgs/by-name/gl/glitchtip/frontend.nix | 6 +++--- pkgs/by-name/gl/glitchtip/package.nix | 21 ++++++++++++++++++--- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/gl/glitchtip/frontend.nix b/pkgs/by-name/gl/glitchtip/frontend.nix index 34a157cec600..2f075b546bde 100644 --- a/pkgs/by-name/gl/glitchtip/frontend.nix +++ b/pkgs/by-name/gl/glitchtip/frontend.nix @@ -9,18 +9,18 @@ buildNpmPackage (finalAttrs: { pname = "glitchtip-frontend"; - version = "4.2.10"; + version = "5.0.1"; src = fetchFromGitLab { owner = "glitchtip"; repo = "glitchtip-frontend"; tag = "v${finalAttrs.version}"; - hash = "sha256-6ZOwAP6VB/uBrV6Yjc9jvzTNdfInekbLO/9PO57S9X8="; + hash = "sha256-mqwPCp7C5n2fOE8kgUnW3SYuuaY8ZkJtuhYXP4HevnM="; }; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; - hash = "sha256-uEyET3y8LfjTasaJ+Hl206/Q7ov69mA7oNa0mhgcUEQ="; + hash = "sha256-Jzwarti+WwKecWn3fPcF9LV+mbU22rgiTP7mslyoqRk="; }; postPatch = '' diff --git a/pkgs/by-name/gl/glitchtip/package.nix b/pkgs/by-name/gl/glitchtip/package.nix index 83fe0368f370..b39900869faa 100644 --- a/pkgs/by-name/gl/glitchtip/package.nix +++ b/pkgs/by-name/gl/glitchtip/package.nix @@ -3,6 +3,7 @@ python313, fetchFromGitLab, fetchFromGitHub, + fetchPypi, rustPlatform, callPackage, stdenv, @@ -14,7 +15,19 @@ let python = python313.override { self = python; packageOverrides = final: prev: { - django = final.django_5; + django = final.django_5_2; + django-csp = prev.django-csp.overridePythonAttrs rec { + version = "4.0"; + src = fetchPypi { + inherit version; + pname = "django_csp"; + hash = "sha256-snAQu3Ausgo9rTKReN8rYaK4LTOLcPvcE8OjvShxKDM="; + }; + }; + django-ninja-cursor-pagination = prev.django-ninja-cursor-pagination.overridePythonAttrs { + # checks are failing with django 5 + doCheck = false; + }; symbolic = prev.symbolic.overridePythonAttrs rec { version = "10.2.1"; src = fetchFromGitHub { @@ -55,7 +68,9 @@ let django-import-export django-ipware django-ninja + django-ninja-cursor-pagination django-organizations + django-postgres-partition django-prometheus django-redis django-storages @@ -87,14 +102,14 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glitchtip"; - version = "4.2.10"; + version = "5.0.1"; pyproject = true; src = fetchFromGitLab { owner = "glitchtip"; repo = "glitchtip-backend"; tag = "v${finalAttrs.version}"; - hash = "sha256-EGk/mhDlqGrJm/j5rTKeKRkJ/fRTspwtPJ+5OHwplfM="; + hash = "sha256-vfsuJn6lpaesK40nqCdJMCDiaaqS1EdZdvgmy9jPuo8="; }; propagatedBuildInputs = pythonPackages;