From b920f2b53b08f5186b9845244bf5d1fff41d95d5 Mon Sep 17 00:00:00 2001 From: Moritz 'e1mo' Fromm Date: Sun, 8 Jan 2023 00:01:00 +0100 Subject: [PATCH 1/2] imagehash: init at 4.3.1 --- .../python-modules/imagehash/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/imagehash/default.nix diff --git a/pkgs/development/python-modules/imagehash/default.nix b/pkgs/development/python-modules/imagehash/default.nix new file mode 100644 index 000000000000..adc13af421e7 --- /dev/null +++ b/pkgs/development/python-modules/imagehash/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, numpy +, six +, scipy +, pillow +, pywavelets +}: + +buildPythonPackage rec { + pname = "imagehash"; + version = "4.3.1"; + + src = fetchFromGitHub { + owner = "JohannesBuchner"; + repo = "imagehash"; + rev = "v${version}"; + hash = "sha256-Tsq10TZqnzNTuO4goKjdylN4Eqy7DNbHLjr5n3+nidM="; + }; + + propagatedBuildInputs = [ + numpy + six + scipy + pillow + pywavelets + ]; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "A Python Perceptual Image Hashing Module"; + homepage = "https://github.com/JohannesBuchner/imagehash"; + license = licenses.bsd2; + maintainers = with maintainers; [ e1mo ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cdb5b38c7b6c..ea51d6ce620f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4491,6 +4491,8 @@ self: super: with self; { imagecorruptions = callPackage ../development/python-modules/imagecorruptions { }; + imagehash = callPackage ../development/python-modules/imagehash { }; + imageio = callPackage ../development/python-modules/imageio { }; imageio-ffmpeg = callPackage ../development/python-modules/imageio-ffmpeg { }; From 37c6a32f8078d6dd795debadd89e9dc869f28845 Mon Sep 17 00:00:00 2001 From: Moritz 'e1mo' Fromm Date: Sun, 8 Jan 2023 00:15:47 +0100 Subject: [PATCH 2/2] paperless-ngx: 1.10.2 -> 1.11.3 --- pkgs/applications/office/paperless-ngx/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index feda51e4f665..6f3735f8f192 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -81,12 +81,12 @@ let in python.pkgs.pythonPackages.buildPythonApplication rec { pname = "paperless-ngx"; - version = "1.10.2"; + version = "1.11.3"; # Fetch the release tarball instead of a git ref because it contains the prebuilt frontend src = fetchurl { url = "https://github.com/paperless-ngx/paperless-ngx/releases/download/v${version}/${pname}-v${version}.tar.xz"; - hash = "sha256-uOrRHHNqIYsDbzKcA7EsYZjadpLyAB4Ks+PU+BNsTWE="; + hash = "sha256-wGNkdczgV+UDd9ZO+BXMSWotpetE/+c/jJAAH+6SXps="; }; format = "other"; @@ -99,6 +99,7 @@ python.pkgs.pythonPackages.buildPythonApplication rec { attrs autobahn automat + bleach blessed celery certifi @@ -128,6 +129,7 @@ python.pkgs.pythonPackages.buildPythonApplication rec { httptools humanfriendly hyperlink + imagehash idna imap-tools img2pdf @@ -138,6 +140,7 @@ python.pkgs.pythonPackages.buildPythonApplication rec { langdetect lxml msgpack + nltk numpy ocrmypdf pathvalidate