From 0bffe0f435420ec4e14e8bc6065beac6f31be734 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Wed, 19 Jun 2024 12:37:07 -0400 Subject: [PATCH 1/2] django-soft-delete: init at 1.0.13 --- .../django-soft-delete/default.nix | 31 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/django-soft-delete/default.nix diff --git a/pkgs/development/python-modules/django-soft-delete/default.nix b/pkgs/development/python-modules/django-soft-delete/default.nix new file mode 100644 index 000000000000..05f2ebeb1c27 --- /dev/null +++ b/pkgs/development/python-modules/django-soft-delete/default.nix @@ -0,0 +1,31 @@ +{ + lib, + buildPythonPackage, + fetchPypi, + django, + setuptools, +}: + +buildPythonPackage rec { + pname = "django-soft-delete"; + version = "1.0.13"; + pyproject = true; + + src = fetchPypi { + inherit pname version; + hash = "sha256-RDwApUwG0jb/iAbDJgJD13XMU2WB1zd8J4UICxBBzh0="; + }; + + dependencies = [ django ]; + + build-system = [ setuptools ]; + + # No tests + doCheck = false; + + meta = { + description = "Soft delete models, managers, queryset for Django"; + homepage = "https://github.com/san4ezy/django_softdelete"; + license = lib.licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 42562f4c3244..fc2cfcc62070 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3395,6 +3395,8 @@ self: super: with self; { django-sites = callPackage ../development/python-modules/django-sites { }; + django-soft-delete = callPackage ../development/python-modules/django-soft-delete { }; + django-statici18n = callPackage ../development/python-modules/django-statici18n { }; django-storages = callPackage ../development/python-modules/django-storages { }; From 56ad583131f72664c696e56a5acf0a23673f342c Mon Sep 17 00:00:00 2001 From: Pyrox Date: Wed, 19 Jun 2024 12:37:20 -0400 Subject: [PATCH 2/2] paperless-ngx: 2.9.0 -> 2.10.1 --- pkgs/applications/office/paperless-ngx/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index a46498a0f001..cb380c8c2193 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -24,13 +24,13 @@ }: let - version = "2.9.0"; + version = "2.10.1"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-7dcZbuz3yi0sND6AEqIwIo9byeZheOpIAhmBpOW5lhU="; + hash = "sha256-M1S5ebdpw11Ot4h4xvbk/rbJxXom2dZ5Of+6eOlBIuE="; }; # subpath installation is broken with uvicorn >= 0.26 @@ -86,7 +86,7 @@ let cd src-ui ''; - npmDepsHash = "sha256-gLEzifZK8Ok1SOo3YIIV5pTx4cbedQh025VqkodYrYQ="; + npmDepsHash = "sha256-zmlYwlH2cnGbbKf6jt5zBLh0Iv3C9/xN0iA4xVetRNE="; nativeBuildInputs = [ pkg-config @@ -150,6 +150,7 @@ python.pkgs.buildPythonApplication rec { django-filter django-guardian django-multiselectfield + django-soft-delete djangorestframework djangorestframework-guardian2 drf-writable-nested @@ -165,7 +166,7 @@ python.pkgs.buildPythonApplication rec { ocrmypdf pathvalidate pdf2image - psycopg2 + psycopg python-dateutil python-dotenv python-gnupg