gnu: vtk: Update to 9.5.2 and add vtk-9.4.

* gnu/packages/image-processing.scm (vtk): Update to 9.5.2.
(vtk-9.4): Add back the previous version.
* gnu/packages/maths.scm (python-quadpy)[inputs]: Replace vtk by vtk-9.4.

Change-Id: Ibf29e18245bd7415208b495cc36ed2c630bb9410

2 files changed, 28 insertions, 3 deletions

diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index 8129dce1a66..77b3a5cb8a9 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -353,7 +353,7 @@ many popular formats.")
 (define-public vtk
   (package
     (name "vtk")
-    (version "9.4.2")
+    (version "9.5.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://vtk.org/files/release/"
@@ -361,7 +361,7 @@ many popular formats.")
                                   "/VTK-" version ".tar.gz"))
               (sha256
                (base32
-                "00kahpi53hld3ip3cfswdnvfg4llmabq0w2kzqq2mcbbm46qxj9n"))
+                "12f9cbazgxrm71r4fpdlxk0mlpgzim2i7vziv8177zvhsac4prnf"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@ -482,6 +482,31 @@ a suite of 3D interaction widgets, supports parallel processing, and
 integrates with various databases on GUI toolkits such as Qt and Tk.")
     (license license:bsd-3)))
 
+(define-public vtk-9.4
+  (package
+    (inherit vtk)
+    (version "9.4.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://vtk.org/files/release/"
+                                  (version-major+minor version)
+                                  "/VTK-" version ".tar.gz"))
+              (sha256
+               (base32
+                "00kahpi53hld3ip3cfswdnvfg4llmabq0w2kzqq2mcbbm46qxj9n"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  (for-each
+                   (lambda (dir)
+                     (delete-file-recursively
+                      (string-append "ThirdParty/" dir "/vtk" dir)))
+                   ;; pugixml depended upon unconditionally
+                   '("doubleconversion" "eigen" "expat" "freetype" "gl2ps"
+                     "hdf5" "jpeg" "jsoncpp" "libharu" "libproj"
+                     "libxml2" "lz4" "netcdf" "ogg" "png" "sqlite" "theora"
+                     "tiff" "zlib"))))))))
+
 (define-public vtk-9.3
   (package
     (inherit vtk)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 969d8cebcff..8f7a79a36c4 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -4821,7 +4821,7 @@ Mathematics (GLM) library to Python.")
            python-pytest
            python-setuptools
            unzip
-           vtk))
+           vtk-9.4))
     (inputs
      ;; [optional]
      (list python-matplotlib))