forked from mirrors/nixpkgs
Merge pull request #208723 from gador/paperless-ngx-add-poppler
paperless-ngx: fix build
This commit is contained in:
commit
5a236902c3
|
@ -212,14 +212,14 @@ in
|
|||
|
||||
systemd.services.paperless-scheduler = {
|
||||
description = "Paperless Celery Beat";
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
wants = [ "paperless-consumer.service" "paperless-web.service" "paperless-task-queue.service" ];
|
||||
serviceConfig = defaultServiceConfig // {
|
||||
User = cfg.user;
|
||||
ExecStart = "${pkg}/bin/celery --app paperless beat --loglevel INFO";
|
||||
Restart = "on-failure";
|
||||
};
|
||||
environment = env;
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
wants = [ "paperless-consumer.service" "paperless-web.service" "paperless-task-queue.service" ];
|
||||
|
||||
preStart = ''
|
||||
ln -sf ${manage} ${cfg.dataDir}/paperless-manage
|
||||
|
@ -248,6 +248,7 @@ in
|
|||
|
||||
systemd.services.paperless-task-queue = {
|
||||
description = "Paperless Celery Workers";
|
||||
after = [ "paperless-scheduler.service" ];
|
||||
serviceConfig = defaultServiceConfig // {
|
||||
User = cfg.user;
|
||||
ExecStart = "${pkg}/bin/celery --app paperless worker --loglevel INFO";
|
||||
|
@ -275,20 +276,24 @@ in
|
|||
|
||||
systemd.services.paperless-consumer = {
|
||||
description = "Paperless document consumer";
|
||||
# Bind to `paperless-scheduler` so that the consumer never runs
|
||||
# during migrations
|
||||
bindsTo = [ "paperless-scheduler.service" ];
|
||||
after = [ "paperless-scheduler.service" ];
|
||||
serviceConfig = defaultServiceConfig // {
|
||||
User = cfg.user;
|
||||
ExecStart = "${pkg}/bin/paperless-ngx document_consumer";
|
||||
Restart = "on-failure";
|
||||
};
|
||||
environment = env;
|
||||
# Bind to `paperless-scheduler` so that the consumer never runs
|
||||
# during migrations
|
||||
bindsTo = [ "paperless-scheduler.service" ];
|
||||
after = [ "paperless-scheduler.service" ];
|
||||
};
|
||||
|
||||
systemd.services.paperless-web = {
|
||||
description = "Paperless web server";
|
||||
# Bind to `paperless-scheduler` so that the web server never runs
|
||||
# during migrations
|
||||
bindsTo = [ "paperless-scheduler.service" ];
|
||||
after = [ "paperless-scheduler.service" ];
|
||||
serviceConfig = defaultServiceConfig // {
|
||||
User = cfg.user;
|
||||
ExecStart = ''
|
||||
|
@ -312,10 +317,6 @@ in
|
|||
# Allow the web interface to access the private /tmp directory of the server.
|
||||
# This is required to support uploading files via the web interface.
|
||||
unitConfig.JoinsNamespaceOf = "paperless-task-queue.service";
|
||||
# Bind to `paperless-scheduler` so that the web server never runs
|
||||
# during migrations
|
||||
bindsTo = [ "paperless-scheduler.service" ];
|
||||
after = [ "paperless-scheduler.service" ];
|
||||
};
|
||||
|
||||
users = optionalAttrs (cfg.user == defaultUser) {
|
||||
|
|
|
@ -26,6 +26,10 @@ import ./make-test-python.nix ({ lib, ... }: {
|
|||
# Wait until server accepts connections
|
||||
machine.wait_until_succeeds("curl -fs localhost:28981")
|
||||
|
||||
# Required for consuming documents via the web interface
|
||||
with subtest("Task-queue gets ready"):
|
||||
machine.wait_for_unit("paperless-task-queue.service")
|
||||
|
||||
with subtest("Add a document via the web interface"):
|
||||
machine.succeed(
|
||||
"convert -size 400x40 xc:white -font 'DejaVu-Sans' -pointsize 20 -fill black "
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
, qpdf
|
||||
, tesseract5
|
||||
, unpaper
|
||||
, poppler_utils
|
||||
, liberation_ttf
|
||||
, fetchFromGitHub
|
||||
}:
|
||||
|
@ -75,6 +76,7 @@ let
|
|||
qpdf
|
||||
tesseract5
|
||||
unpaper
|
||||
poppler_utils
|
||||
];
|
||||
in
|
||||
python.pkgs.pythonPackages.buildPythonApplication rec {
|
||||
|
|
Loading…
Reference in a new issue