From afbbb2c528e4782214fdfed50b17bccddcf9003b Mon Sep 17 00:00:00 2001 From: Alex Jackson Date: Wed, 6 Dec 2023 16:35:40 -0600 Subject: [PATCH 1/3] paperless-ngx: 2.0.1 -> 2.1.0 --- .../office/paperless-ngx/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 129c700e19c7..99a669b1e404 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -16,16 +16,18 @@ , poppler_utils , liberation_ttf , xcbuild +, pango +, pkg-config }: let - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-qSX+r99y7a/eITfaC/UYqSgcxx/xYOqJ4tY/iuvoeNA="; + hash = "sha256-SRMrgwwRijAEO+Jv+c0la/eMB/ukEhejgs2fWUh0ynQ="; }; python = python3; @@ -46,17 +48,22 @@ let pname = "paperless-ngx-frontend"; inherit version src; - npmDepsHash = "sha256-uDaZ7j7IDgKy7wCWND2xzR1qHwUtdyjR4eyIAVy01dM="; + postPatch = '' + cd src-ui + ''; + + npmDepsHash = "sha256-K7wTYGGwEhPoXdRD+4swhSlMH0iem6YkF0tjnVHh7K8="; nativeBuildInputs = [ + pkg-config python3 ] ++ lib.optionals stdenv.isDarwin [ xcbuild ]; - postPatch = '' - cd src-ui - ''; + buildInputs = [ + pango + ]; CYPRESS_INSTALL_BINARY = "0"; NG_CLI_ANALYTICS = "false"; From 0a7702e8a5e5503fd1742d851ae214004ed1bf70 Mon Sep 17 00:00:00 2001 From: Alex Jackson Date: Wed, 6 Dec 2023 16:38:12 -0600 Subject: [PATCH 2/3] maintainers: add ajaxbits --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cd8feea7c86b..ea51b2914c3f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -603,6 +603,12 @@ githubId = 4717906; name = "Jakub Skokan"; }; + ajaxbits = { + email = "contact@ajaxbits.com"; + github = "ajaxbits"; + githubId = 45179933; + name = "Alex Jackson"; + }; ajgrf = { email = "a@ajgrf.com"; github = "ajgrf"; From 435b0778e223c4b312f4f10b97dc723ff3cddac6 Mon Sep 17 00:00:00 2001 From: Alex Jackson Date: Fri, 8 Dec 2023 09:14:54 -0600 Subject: [PATCH 3/3] paperless-ngx: 2.1.0 -> 2.1.1 --- pkgs/applications/office/paperless-ngx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 99a669b1e404..06bc88e5d0a2 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -21,13 +21,13 @@ }: let - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-SRMrgwwRijAEO+Jv+c0la/eMB/ukEhejgs2fWUh0ynQ="; + hash = "sha256-/f0al6OyYo8FTOWiNFoKUYWpY0nz3qFOB00QKIvS3Dk="; }; python = python3;