From cbe0036b35cbeef2fc0819c0799949a2da40136e Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 12 Feb 2025 22:13:49 -0500
Subject: [PATCH 1/3] quark-engine: 25.1.1 -> 25.2.1, relax dependency on
 androguard

Diff: https://github.com/quark-engine/quark-engine/compare/refs/tags/v25.1.1...v25.2.1

Changelog: https://github.com/quark-engine/quark-engine/releases/tag/v25.2.1
---
 pkgs/by-name/qu/quark-engine/package.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/qu/quark-engine/package.nix b/pkgs/by-name/qu/quark-engine/package.nix
index 4055484a4c11..1230eb4f7ca2 100644
--- a/pkgs/by-name/qu/quark-engine/package.nix
+++ b/pkgs/by-name/qu/quark-engine/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "quark-engine";
-  version = "25.1.1";
+  version = "25.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "quark-engine";
     repo = "quark-engine";
     tag = "v${version}";
-    hash = "sha256-+Qp0u4mayzBh55yXG2RspRRiW2cQtMA2vrqP7Zvnbl4=";
+    hash = "sha256-avQT6m6DjVham+IMkY2Gcjnb1K1L5PuOxvkqAeLNNhQ=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];
@@ -35,7 +35,10 @@ python3.pkgs.buildPythonApplication rec {
     tqdm
   ];
 
-  pythonRelaxDeps = [ "r2pipe" ];
+  pythonRelaxDeps = [
+    "r2pipe"
+    "androguard"
+  ];
 
   # Project has no tests
   doCheck = false;

From a40e2985e838f335014e0662ac3c971b41563cc0 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 12 Feb 2025 22:21:32 -0500
Subject: [PATCH 2/3] python312Packages.docling: disable tests requiring
 network access

---
 pkgs/development/python-modules/docling/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/docling/default.nix b/pkgs/development/python-modules/docling/default.nix
index 7dc476f7edf1..a0996e6f1636 100644
--- a/pkgs/development/python-modules/docling/default.nix
+++ b/pkgs/development/python-modules/docling/default.nix
@@ -138,6 +138,8 @@ buildPythonPackage rec {
     "test_convert_stream"
     "test_compare_legacy_output"
     "test_ocr_coverage_threshold"
+    # requires network access
+    "test_page_range"
   ];
 
   meta = {

From fe8c356feca45bf9cdd017bd41b108b890a50c1d Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 12 Feb 2025 22:23:36 -0500
Subject: [PATCH 3/3] python312Packages.datashader: 0.16.3 -> 0.17.0

---
 .../python-modules/datashader/default.nix     | 99 +++++++------------
 1 file changed, 36 insertions(+), 63 deletions(-)

diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix
index 7940e62cb371..470cd51401c9 100644
--- a/pkgs/development/python-modules/datashader/default.nix
+++ b/pkgs/development/python-modules/datashader/default.nix
@@ -1,101 +1,74 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  dask,
-  bokeh,
-  toolz,
-  datashape,
+  pythonOlder,
+  fetchFromGitHub,
+  hatchling,
+  hatch-vcs,
+  colorcet,
+  multipledispatch,
   numba,
   numpy,
   pandas,
-  pillow,
-  xarray,
-  colorcet,
   param,
   pyct,
+  requests,
   scipy,
+  toolz,
+  packaging,
+  xarray,
   pytestCheckHook,
-  pythonOlder,
-  nbsmoke,
-  fastparquet,
-  nbconvert,
   pytest-xdist,
-  netcdf4,
+  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
   pname = "datashader";
-  version = "0.16.3";
-  format = "setuptools";
+  version = "0.17.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-nQBAx4h/elpe3TdMKXQC/SCKYr9oReh2MbVPA7muR50=";
+  src = fetchFromGitHub {
+    owner = "holoviz";
+    repo = "datashader";
+    tag = "v${version}";
+    hash = "sha256-ZmVuDqmFTjq2cgnG+Eve07pynMkEyqFkLtNiCXSandA=";
   };
 
-  propagatedBuildInputs = [
-    dask
-    bokeh
-    toolz
-    datashape
+  build-system = [
+    hatchling
+    hatch-vcs
+  ];
+
+  dependencies = [
+    colorcet
+    multipledispatch
     numba
     numpy
     pandas
-    pillow
-    xarray
-    colorcet
     param
     pyct
+    requests
     scipy
-  ] ++ dask.optional-dependencies.complete;
+    toolz
+    packaging
+    xarray
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook
     pytest-xdist
-    nbsmoke
-    fastparquet
-    nbconvert
-    netcdf4
-  ];
-
-  # The complete extra is for usage with conda, which we
-  # don't care about
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "dask[complete]" "dask" \
-      --replace "xarray >=0.9.6" "xarray"
-  '';
-
-  preCheck = ''
-    export HOME=$TMPDIR
-  '';
-
-  pytestFlagsArray = [ "datashader" ];
-
-  disabledTests = [
-    # Not compatible with current version of bokeh
-    # see: https://github.com/holoviz/datashader/issues/1031
-    "test_interactive_image_update"
-    # Latest dask broken array marshalling
-    # see: https://github.com/holoviz/datashader/issues/1032
-    "test_raster_quadmesh_autorange_reversed"
-  ];
-
-  disabledTestPaths = [
-    # 31/50 tests fail with TypeErrors
-    "datashader/tests/test_datatypes.py"
+    writableTmpDirAsHomeHook
   ];
 
   pythonImportsCheck = [ "datashader" ];
 
-  meta = with lib; {
+  meta = {
     description = "Data visualization toolchain based on aggregating into a grid";
     mainProgram = "datashader";
     homepage = "https://datashader.org";
-    license = licenses.bsd3;
-    maintainers = [ ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ nickcao ];
   };
 }