Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

paperless-ngx: 2.12.1 -> 2.13.2 -> 2.13.4 #352231

Merged
merged 3 commits into from
Nov 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 29 additions & 8 deletions pkgs/applications/office/paperless-ngx/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
}:

let
version = "2.12.1";
version = "2.13.4";

src = fetchFromGitHub {
owner = "paperless-ngx";
repo = "paperless-ngx";
rev = "refs/tags/v${version}";
hash = "sha256-txqwVGLUel74ObCqwMWSqa4Nd2eDRf0SqAIes5tlMDg=";
hash = "sha256-db8omhyngvenAgfGGpMAhGkgqGug/sv7AL1G+sniM/c=";
};

# subpath installation is broken with uvicorn >= 0.26
Expand All @@ -40,6 +40,27 @@ let
python = python3.override {
self = python;
packageOverrides = final: prev: {
django = prev.django_5;

# TODO: drop after https://github.com/NixOS/nixpkgs/pull/306556 or similar got merged
django-allauth = prev.django-allauth.overridePythonAttrs ({ src, nativeCheckInputs, ... }: let
version = "65.0.2";
in {
inherit version;
src = src.override {
rev = "refs/tags/${version}";
hash = "sha256-GvYdExkNuySrg8ERnWOJxucFe5HVdPAcHfRNeqiVS7M=";
};

nativeCheckInputs = nativeCheckInputs ++ [ prev.fido2 ];
});

django-extensions = prev.django-extensions.overridePythonAttrs (_: {
# fails with: TypeError: 'class Meta' got invalid attribute(s): index_together
# probably because of django_5 but it is the latest version available and used like that in paperless-ngx
doCheck = false;
});

# tesseract5 may be overwritten in the paperless module and we need to propagate that to make the closure reduction effective
ocrmypdf = prev.ocrmypdf.override { tesseract = tesseract5; };

Expand Down Expand Up @@ -76,7 +97,7 @@ let
cd src-ui
'';

npmDepsHash = "sha256-hb2z2cPMTN5bHtUldTR5Mvgo4nZL8/S+Uhfis37gF44=";
npmDepsHash = "sha256-pBCWcdCTQh0N4pRLBWLZXybuhpiat030xvPZ5z7CUJ0=";

nativeBuildInputs = [
pkg-config
Expand Down Expand Up @@ -137,7 +158,7 @@ python.pkgs.buildPythonApplication rec {
channels-redis
concurrent-log-handler
dateparser
django
django_5
django-allauth
django-auditlog
django-celery-results
Expand All @@ -155,8 +176,10 @@ python.pkgs.buildPythonApplication rec {
flower
gotenberg-client
gunicorn
httpx-oauth
imap-tools
inotifyrecursive
jinja2
langdetect
mysqlclient
nltk
Expand Down Expand Up @@ -257,10 +280,8 @@ python.pkgs.buildPythonApplication rec {
"testNormalOperation"
# Something broken with new Tesseract and inline RTL/LTR overrides?
"test_rtl_language_detection"
# Broke during the pytest-httpx 0.30.0 -> 0.32.0 upgrade
"test_request_pdf_a_format"
"test_generate_pdf_html_email"
"test_generate_pdf_html_email_merge_failure"
# django.core.exceptions.FieldDoesNotExist: Document has no field named 'transaction_id'
"test_convert"
];

doCheck = !stdenv.hostPlatform.isDarwin;
Expand Down
53 changes: 53 additions & 0 deletions pkgs/development/python-modules/httpx-oauth/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
lib,
buildPythonPackage,
fastapi,
fetchFromGitHub,
hatchling,
hatch-regex-commit,
httpx,
pytest-asyncio,
pytest-cov-stub,
pytest-mock,
pytestCheckHook,
respx,
}:

buildPythonPackage rec {
pname = "httpx-oauth";
version = "0.15.1";
pyproject = true;

src = fetchFromGitHub {
owner = "frankie567";
repo = "httpx-oauth";
rev = "refs/tags/v${version}";
hash = "sha256-f3X3kSw7elTScCA3bNggwXyyHORre6Xzup/D0kgn4DQ=";
};

build-system = [
hatchling
hatch-regex-commit
];

dependencies = [ httpx ];

nativeCheckInputs = [
fastapi
pytest-asyncio
pytest-cov-stub
pytest-mock
pytestCheckHook
respx
];

pythonImportsCheck = [ "httpx_oauth" ];

meta = with lib; {
description = "Async OAuth client using HTTPX";
homepage = "https://github.com/frankie567/httpx-oauth";
changelog = "https://github.com/frankie567/httpx-oauth/releases/tag/v${version}";
license = licenses.mit;
maintainers = with maintainers; [ SuperSandro2000 ];
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5899,6 +5899,8 @@ self: super: with self; {

httpx-ntlm = callPackage ../development/python-modules/httpx-ntlm { };

httpx-oauth = callPackage ../development/python-modules/httpx-oauth { };

httpx-socks = callPackage ../development/python-modules/httpx-socks { };

httpx-sse = callPackage ../development/python-modules/httpx-sse { };
Expand Down