Unverified Commit b3c09089 authored by Luke Granger-Brown's avatar Luke Granger-Brown Committed by GitHub
Browse files

Merge pull request #215750 from puppe/fix-paperless 

nixos/paperless: download NLTK data
parents ccbbe66c 7be1ecb2

nixos/modules/services/misc/paperless.nix

+39 −7
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ let 
  pkg = cfg.package;



  defaultUser = "paperless";

  nltkDir = "/var/cache/paperless/nltk";



  # Don't start a redis instance if the user sets a custom redis connection

  enableRedis = !hasAttr "PAPERLESS_REDIS" cfg.extraConfig;
@@ -15,6 +16,7 @@ let 
    PAPERLESS_DATA_DIR = cfg.dataDir;

    PAPERLESS_MEDIA_ROOT = cfg.mediaDir;

    PAPERLESS_CONSUMPTION_DIR = cfg.consumptionDir;

    PAPERLESS_NLTK_DIR = nltkDir;

    GUNICORN_CMD_ARGS = "--bind=${cfg.address}:${toString cfg.port}";

  } // optionalAttrs (config.time.timeZone != null) {

    PAPERLESS_TIME_ZONE = config.time.timeZone;
@@ -24,9 +26,11 @@ let 
    lib.mapAttrs (_: toString) cfg.extraConfig

  );



  manage = let

  manage =

    let

      setupEnv = lib.concatStringsSep "\n" (mapAttrsToList (name: val: "export ${name}=\"${val}\"") env);

  in pkgs.writeShellScript "manage" ''

    in

    pkgs.writeShellScript "manage" ''

      ${setupEnv}

      exec ${pkg}/bin/paperless-ngx "$@"

    '';
@@ -47,6 +51,7 @@ let 
      cfg.dataDir

      cfg.mediaDir

    ];

    CacheDirectory = "paperless";

    CapabilityBoundingSet = "";

    # ProtectClock adds DeviceAllow=char-rtc r

    DeviceAllow = "";
@@ -291,6 +296,33 @@ in 
      };

    };



    # Download NLTK corpus data

    systemd.services.paperless-download-nltk-data = {

      wantedBy = [ "paperless-scheduler.service" ];

      before = [ "paperless-scheduler.service" ];

      after = [ "network-online.target" ];

      serviceConfig = defaultServiceConfig // {

        User = cfg.user;

        Type = "oneshot";

        # Enable internet access

        PrivateNetwork = false;

        # Restrict write access

        BindPaths = [];

        BindReadOnlyPaths = [

          "/nix/store"

          "-/etc/resolv.conf"

          "-/etc/nsswitch.conf"

          "-/etc/ssl/certs"

          "-/etc/static/ssl/certs"

          "-/etc/hosts"

          "-/etc/localtime"

        ];

        ExecStart = let pythonWithNltk = pkg.python.withPackages (ps: [ ps.nltk ]); in ''

          ${pythonWithNltk}/bin/python -m nltk.downloader -d '${nltkDir}' punkt snowball_data stopwords

        '';

      };

    };



    systemd.services.paperless-consumer = {

      description = "Paperless document consumer";

      # Bind to `paperless-scheduler` so that the consumer never runs

pkgs/applications/office/paperless-ngx/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ python.pkgs.buildPythonApplication rec { 


  meta = with lib; {

    description = "Tool to scan, index, and archive all of your physical documents";

    homepage = "https://paperless-ngx.readthedocs.io/";

    homepage = "https://docs.paperless-ngx.com/";

    changelog = "https://github.com/paperless-ngx/paperless-ngx/releases/tag/v${version}";

    license = licenses.gpl3Only;

    maintainers = with maintainers; [ lukegb gador erikarvstedt ];