diff options
Diffstat (limited to 'pkgs/applications/office')
-rw-r--r-- | pkgs/applications/office/libreoffice/default.nix | 7 | ||||
-rw-r--r-- | pkgs/applications/office/paperless-ngx/default.nix | 36 | ||||
-rw-r--r-- | pkgs/applications/office/skrooge/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/office/treesheets/default.nix | 6 |
4 files changed, 24 insertions, 27 deletions
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 44d07503b2fa..e49f4be07b2f 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, fetchpatch , lib , substituteAll , pam @@ -218,6 +219,12 @@ in stdenv.mkDerivation (finalAttrs: { # runtime closure. This behavior was introduced by upstream in commit # cbfac11330882c7d0a817b6c37a08b2ace2b66f4 ./0001-Strip-away-BUILDCONFIG.patch + + # Backport fix for tests broken by expired test certificates. + (fetchpatch { + url = "https://cgit.freedesktop.org/libreoffice/core/patch/?id=ececb678b8362e3be8e02768ddd5e4197d87dc2a"; + hash = "sha256-TUfKlwNxUTOJ95VLqwVD+ez1xhu7bW6xZlgIaCyIiNg="; + }) ]; # libreoffice tries to reference the BUILDCONFIG (e.g. PKG_CONFIG_PATH) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index c5c291511ebb..31816fc203fa 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -20,21 +20,16 @@ }: let - version = "1.17.4"; + version = "2.0.1"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-Kl8AUfHfEiEy40qeDI8x2rxdXcj01mpitw7T/96ibQQ="; + hash = "sha256-qSX+r99y7a/eITfaC/UYqSgcxx/xYOqJ4tY/iuvoeNA="; }; - # Use specific package versions required by paperless-ngx - python = python3.override { - packageOverrides = self: super: { - django = super.django_4; - }; - }; + python = python3; path = lib.makeBinPath [ ghostscript @@ -52,7 +47,7 @@ let pname = "paperless-ngx-frontend"; inherit version src; - npmDepsHash = "sha256-5Q9NtIO7k/6AiF9Er10HhmEBFyQOP9CiTkTZglUeChg="; + npmDepsHash = "sha256-uDaZ7j7IDgKy7wCWND2xzR1qHwUtdyjR4eyIAVy01dM="; nativeBuildInputs = [ python3 @@ -92,16 +87,6 @@ python.pkgs.buildPythonApplication rec { inherit version src; - patches = [ - # https://github.com/paperless-ngx/paperless-ngx/pull/4146 - (fetchpatch { - name = "fix-tests-for-python311.patch"; - url = "https://github.com/paperless-ngx/paperless-ngx/commit/73f6c0a056e3859061339e295f57213fd4239b2d.patch"; - hash = "sha256-sZcRug5T4cw5ppKpGYrrfz9RxtYxnkeNOlXcMgdWT0E="; - }) - ]; - - nativeBuildInputs = [ gettext ]; @@ -131,18 +116,24 @@ python.pkgs.buildPythonApplication rec { constantly cryptography dateparser + django-auditlog django-celery-results - django-cors-headers django-compression-middleware + django-cors-headers django-extensions django-filter django-guardian + django-multiselectfield django djangorestframework-guardian2 djangorestframework + drf-writable-nested filelock + flower + gotenberg-client gunicorn h11 + h2 hiredis httptools httpx @@ -178,8 +169,8 @@ python.pkgs.buildPythonApplication rec { python-dateutil python-dotenv python-ipware - python-gnupg python-magic + python-gnupg pytz pyyaml pyzbar @@ -190,8 +181,8 @@ python.pkgs.buildPythonApplication rec { requests scikit-learn scipy - service-identity setproctitle + service-identity sniffio sqlparse threadpoolctl @@ -255,7 +246,6 @@ python.pkgs.buildPythonApplication rec { daphne factory-boy imagehash - pdfminer-six pytest-django pytest-env pytest-httpx diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index d070d98d3f55..e59d473a0789 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -10,7 +10,7 @@ mkDerivation rec { version = "2.28.0"; src = fetchurl { - url = "https://download.kde.org/stable/skrooge/${pname}-${version}.tar.xz"; + url = "mirror://kde/stable/skrooge/skrooge-${version}.tar.xz"; sha256 = "sha256-s2SkGMBx7HVpr1NBUJpqji3PTPnw4RqnkakdQVC5ric="; }; diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index e41dfcd15fa8..c474ae474499 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2023-09-15"; + version = "unstable-2023-11-13"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "8e1ebe5a55f6a725ba6fe342b4b7604438d9d406"; - sha256 = "zz2erN/ap6vT56khqbpANu1eV/C9eQ6SBWEV4GNbmEY="; + rev = "cbc18fe9910c6f10a9f2c2b8838ed047e00a5415"; + sha256 = "uzb6gboWEu5GL92OFvcdeoaXYTU7jhzCmpI8LwhNVk0="; }; nativeBuildInputs = [ |