movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

Merge pull request #336797 from SuperSandro2000/paperless-ngx

Browse source
This commit is contained in:
Sandro 2024-08-26 11:47:01 +02:00 • committed by GitHub
commit 6b4d280cf5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 30 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/misc/paperless.nix
View file

@ -84,7 +84,7 @@ let
}; };
in in
{ {
meta.maintainers = with maintainers; [ erikarvstedt Flakebi leona ]; meta.maintainers = with maintainers; [ leona SuperSandro2000 erikarvstedt ];
imports = [ imports = [
(mkRenamedOptionModule [ "services" "paperless-ng" ] [ "services" "paperless" ]) (mkRenamedOptionModule [ "services" "paperless-ng" ] [ "services" "paperless" ])

2
nixos/tests/paperless.nix
View file

@ -1,6 +1,6 @@
import ./make-test-python.nix ({ lib, ... }: { import ./make-test-python.nix ({ lib, ... }: {
name = "paperless"; name = "paperless";
meta.maintainers = with lib.maintainers; [ erikarvstedt Flakebi ]; meta.maintainers = with lib.maintainers; [ leona SuperSandro2000 erikarvstedt ];
nodes = let self = { nodes = let self = {
simple = { pkgs, ... }: { simple = { pkgs, ... }: {

10
pkgs/applications/office/paperless-ngx/default.nix
View file

@ -25,13 +25,13 @@
}: }:
let let
version = "2.11.4"; version = "2.11.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "paperless-ngx"; owner = "paperless-ngx";
repo = "paperless-ngx"; repo = "paperless-ngx";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-qqOTW7qgaZfNFYgVIDdwVh9KlT3Z6g8EALMOv39aRVc="; hash = "sha256-RNX+KS2h9zrOK8QzeQWH55pkNPTDW4gic2HLG+XXLRg=";
}; };
# subpath installation is broken with uvicorn >= 0.26 # subpath installation is broken with uvicorn >= 0.26
@ -76,7 +76,7 @@ let
cd src-ui cd src-ui
''; '';
npmDepsHash = "sha256-dze03mkWMA2o3v3aoPTrDtUndTdP7Tk4gvFp4nq80po="; npmDepsHash = "sha256-ML1Yp3JIMbRF6kVu190ReoY7oDUtUfNkHE7dHF6YUAE=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
@ -261,7 +261,7 @@ python.pkgs.buildPythonApplication rec {
passthru = { passthru = {
inherit python path frontend tesseract5; inherit python path frontend tesseract5;
nltkData = with nltk-data; [ punkt snowball_data stopwords ]; nltkData = with nltk-data; [ punkt_tab snowball_data stopwords ];
tests = { inherit (nixosTests) paperless; }; tests = { inherit (nixosTests) paperless; };
}; };
@ -271,6 +271,6 @@ python.pkgs.buildPythonApplication rec {
changelog = "https://github.com/paperless-ngx/paperless-ngx/releases/tag/v${version}"; changelog = "https://github.com/paperless-ngx/paperless-ngx/releases/tag/v${version}";
license = licenses.gpl3Only; license = licenses.gpl3Only;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ lukegb gador erikarvstedt leona ]; maintainers = with maintainers; [ leona SuperSandro2000 erikarvstedt ];
}; };
} }

5
pkgs/development/python-modules/nltk/default.nix
View file

@ -11,15 +11,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "nltk"; pname = "nltk";
version = "3.8.1"; version = "3.9.1";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
extension = "zip"; hash = "sha256-h9EnvT3kvYmk+BJl5fpZyxsZmydEAXU3D3QX0rx66Gg=";
hash = "sha256-GDTaPQaCy6Tyzt4vmq1rD6+2RhukUdsO+2+cOXmNZNM=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

35
pkgs/tools/text/nltk_data/default.nix → pkgs/tools/text/nltk-data/default.nix
View file

@ -1,7 +1,7 @@
{ lib, newScope, fetchFromGitHub, unzip, stdenvNoCC }: { lib, newScope, fetchFromGitHub, unzip, stdenvNoCC }:
let let
base = { base = {
version = "unstable-2023-02-02"; version = "0-unstable-2024-07-29";
nativeBuildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];
dontBuild = true; dontBuild = true;
meta = with lib; { meta = with lib; {
@ -17,14 +17,14 @@ let
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nltk"; owner = "nltk";
repo = "nltk_data"; repo = "nltk_data";
rev = "5db857e6f7df11eabb5e5665836db9ec8df07e28"; rev = "cfe82914f3c2d24363687f1db3b05e8b9f687e2b";
inherit hash; inherit hash;
sparseCheckout = [ "packages/${location}/${pname}.zip" ]; sparseCheckout = [ "packages/${location}/${pname}.zip" ];
}; };
in in
stdenvNoCC.mkDerivation (base // { stdenvNoCC.mkDerivation (base // {
inherit pname src; inherit pname src;
version = base.version; inherit (base) version;
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
@ -38,24 +38,29 @@ let
}); });
in in
lib.makeScope newScope (self: { lib.makeScope newScope (self: {
punkt = makeNltkDataPackage ({ punkt = makeNltkDataPackage {
pname = "punkt"; pname = "punkt";
location = "tokenizers"; location = "tokenizers";
hash = "sha256-rMkgn3xzmSJNv8//kqbPF2Xq3Gf16lgA1Wx8FPYbaQo="; hash = "sha256-OzMkruoYbFKqzuimOXIpE5lhHz8tmSqOFoLT+fjdTVg=";
}); };
averaged_perceptron_tagger = makeNltkDataPackage ({ punkt_tab = makeNltkDataPackage {
pname = "punkt_tab";
location = "tokenizers";
hash = "sha256-OzMkruoYbFKqzuimOXIpE5lhHz8tmSqOFoLT+fjdTVg=";
};
averaged_perceptron_tagger = makeNltkDataPackage {
pname = "averaged_perceptron_tagger"; pname = "averaged_perceptron_tagger";
location = "taggers"; location = "taggers";
hash = "sha256-ilTs4HWPUoHxQb4kWEy3wJ6QsE/98+EQya44gtV2inw="; hash = "sha256-tl3Cn2okhBkUtTXvAmFRx72Brez6iTGRdmFTwFmpk3M=";
}); };
snowball_data = makeNltkDataPackage ({ snowball_data = makeNltkDataPackage {
pname = "snowball_data"; pname = "snowball_data";
location = "stemmers"; location = "stemmers";
hash = "sha256-Y6LERPtaRbCtWmJCvMAd2xH02xdrevZBFNYvP9N4+3s="; hash = "sha256-mNefwOPVJGz9kXV3LV4DuV7FJpNir/Nwg4ujd0CogEk=";
}); };
stopwords = makeNltkDataPackage ({ stopwords = makeNltkDataPackage {
pname = "stopwords"; pname = "stopwords";
location = "corpora"; location = "corpora";
hash = "sha256-Rj1jnt6IDEmBbSIHHueyEvPmdE4EZ6/bJ3qehniebbk="; hash = "sha256-8lMjW5YI8h6dHJ/83HVY2OYGDyKPpgkUAKPISiAKqqk=";
}); };
}) })

2
pkgs/top-level/all-packages.nix
View file

@ -5783,7 +5783,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) Security; inherit (darwin.apple_sdk.frameworks) Security;
}; };
nltk-data = callPackage ../tools/text/nltk_data { }; nltk-data = callPackage ../tools/text/nltk-data { };
seaborn-data = callPackage ../tools/misc/seaborn-data { }; seaborn-data = callPackage ../tools/misc/seaborn-data { };