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

Merge pull request #218661 from e1mo/paperless-ngx-1-13 

 paperless-ngx: 1.12.2 -> 1.13.0
parents 83a88dea 3ee30ec4

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

+5 −4
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ 
}:



let

  version = "1.12.2";

  version = "1.13.0";



  src = fetchFromGitHub {

    owner = "paperless-ngx";

    repo = "paperless-ngx";

    rev = "refs/tags/v${version}";

    hash = "sha256-1QufnRD2Nbc4twRZ4Yrf3ae1BRGves8tJ/M7coWnRPI=";

    hash = "sha256-aIJWEZD98tjfNDQjQfxRR1kOJ4P/fxZP8sw1dKy7apw=";

  };



  # Use specific package versions required by paperless-ngx
@@ -93,7 +93,7 @@ let 
    pname = "paperless-ngx-frontend";

    inherit version src;



    npmDepsHash = "sha256-fp0Gy3018u2y6jaUM9bmXU0SVjyEJdsvkBqbmb8S10Y=";

    npmDepsHash = "sha256-es9x7KR5S7E8KjYWq8ie/EwlAy6zrDvySYQi1vy08Wc=";



    nativeBuildInputs = [

      python3
@@ -157,6 +157,7 @@ python.pkgs.buildPythonApplication rec { 
    dateparser

    django-celery-results

    django-cors-headers

    django-compression-middleware

    django-extensions

    django-filter

    django
@@ -295,7 +296,7 @@ python.pkgs.buildPythonApplication rec { 


    # Disable unneeded code coverage test

    substituteInPlace src/setup.cfg \

      --replace "--cov --cov-report=html" ""

      --replace "--cov --cov-report=html --cov-report=xml" ""

    # OCR on NixOS recognizes the space in the picture, upstream CI doesn't.

    # See https://github.com/paperless-ngx/paperless-ngx/pull/2216

    substituteInPlace src/paperless_tesseract/tests/test_parser.py \

pkgs/development/python-modules/django-compression-middleware/default.nix

0 → 100644
+32 −0
Original line number Diff line number Diff line 
{ lib

, fetchPypi

, buildPythonPackage

, django

, zstandard

, brotli

}:



buildPythonPackage rec {

  pname = "django-compression-middleware";

  version = "0.4.2";

  format = "setuptools";



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-cdS80JVGz4h4MVCsZGfrQWhZlTR3Swm4Br4wFxOcKVs=";

  };



  propagatedBuildInputs = [

    django

    zstandard

    brotli

  ];



  meta = with lib; {

    description = "Django middleware to compress responses using several algorithms";

    homepage = "https://github.com/friedelwolff/django-compression-middleware";

    changelog = "https://github.com/friedelwolff/django-compression-middleware/releases/tag/v${version}";

    license = licenses.mpl20;

    maintainers = with maintainers; [ e1mo ];

  };

}

pkgs/top-level/python-packages.nix

+2 −0
Original line number Diff line number Diff line
@@ -2569,6 +2569,8 @@ self: super: with self; { 


  django-compressor = callPackage ../development/python-modules/django-compressor { };



  django-compression-middleware = callPackage ../development/python-modules/django-compression-middleware { };



  django-configurations = callPackage ../development/python-modules/django-configurations { };



  django_contrib_comments = callPackage ../development/python-modules/django_contrib_comments { };