From 3a525f84f812e77732f2cb43686015e0bb1983f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 8 Apr 2024 15:05:47 +0200 Subject: [PATCH 1/3] diffoscope: fix pypdf support --- pkgs/tools/misc/diffoscope/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index cec60f83471d..fee45abb7ed2 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -168,7 +168,7 @@ python3.pkgs.buildPythonApplication rec { jsondiff libarchive-c progressbar33 - pypdf2 + pypdf python-magic pyxattr rpm From f4ed855c24c13495a68b352fc7c39acb15dc0447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 8 Apr 2024 23:31:07 +0200 Subject: [PATCH 2/3] diffoscope: add r2pipe --- pkgs/tools/misc/diffoscope/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index fee45abb7ed2..725c27920c4d 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -215,6 +215,7 @@ python3.pkgs.buildPythonApplication rec { guestfs h5py pdfminer-six + r2pipe # docx2txt, breaks the tests. ]) # oggvideotools is broken on Darwin, please put it back when it will be fixed? From 9e2322eb1014a9d9c1766841d415aa9faf964a7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 8 Apr 2024 23:31:16 +0200 Subject: [PATCH 3/3] diffoscope: update doc2txt comment --- pkgs/tools/misc/diffoscope/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 725c27920c4d..2d1db6ef434a 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -216,7 +216,7 @@ python3.pkgs.buildPythonApplication rec { h5py pdfminer-six r2pipe - # docx2txt, breaks the tests. + # docx2txt, nixpkgs packages another project named the same, which does not work ]) # oggvideotools is broken on Darwin, please put it back when it will be fixed? ++ lib.optionals stdenv.isLinux [ oggvideotools ]