Unverified Commit f399afc5 authored by Leona Maroni's avatar Leona Maroni Committed by GitHub
Browse files

Merge pull request #321072 from pyrox0/paperless-ngx-2.10 

paperless-ngx: 2.9.0 -> 2.10.1, python3Packages.django-soft-delete: init at 1.0.13
parents 3cca1900 56ad5831

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

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



let

  version = "2.9.0";

  version = "2.10.1";



  src = fetchFromGitHub {

    owner = "paperless-ngx";

    repo = "paperless-ngx";

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

    hash = "sha256-7dcZbuz3yi0sND6AEqIwIo9byeZheOpIAhmBpOW5lhU=";

    hash = "sha256-M1S5ebdpw11Ot4h4xvbk/rbJxXom2dZ5Of+6eOlBIuE=";

  };



  # subpath installation is broken with uvicorn >= 0.26
@@ -86,7 +86,7 @@ let 
      cd src-ui

    '';



    npmDepsHash = "sha256-gLEzifZK8Ok1SOo3YIIV5pTx4cbedQh025VqkodYrYQ=";

    npmDepsHash = "sha256-zmlYwlH2cnGbbKf6jt5zBLh0Iv3C9/xN0iA4xVetRNE=";



    nativeBuildInputs = [

      pkg-config
@@ -150,6 +150,7 @@ python.pkgs.buildPythonApplication rec { 
    django-filter

    django-guardian

    django-multiselectfield

    django-soft-delete

    djangorestframework

    djangorestframework-guardian2

    drf-writable-nested
@@ -165,7 +166,7 @@ python.pkgs.buildPythonApplication rec { 
    ocrmypdf

    pathvalidate

    pdf2image

    psycopg2

    psycopg

    python-dateutil

    python-dotenv

    python-gnupg

pkgs/development/python-modules/django-soft-delete/default.nix

0 → 100644
+31 −0
Original line number Diff line number Diff line 
{

  lib,

  buildPythonPackage,

  fetchPypi,

  django,

  setuptools,

}:



buildPythonPackage rec {

  pname = "django-soft-delete";

  version = "1.0.13";

  pyproject = true;



  src = fetchPypi {

    inherit pname version;

    hash = "sha256-RDwApUwG0jb/iAbDJgJD13XMU2WB1zd8J4UICxBBzh0=";

  };



  dependencies = [ django ];



  build-system = [ setuptools ];



  # No tests

  doCheck = false;



  meta = {

    description = "Soft delete models, managers, queryset for Django";

    homepage = "https://github.com/san4ezy/django_softdelete";

    license = lib.licenses.mit;

  };

}

pkgs/top-level/python-packages.nix

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














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



























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



























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





























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