[bug#63570] [PATCH 0/5] Update cli11 and paraview

[bug#63570] [PATCH 0/5] Update cli11 and paraview

[Liliana Marie Prikler]

Hi Guix,

I saw that cli11 is a few versions outdated so I decided to bump both it
and its only dependant.  I also removed paraview-5.9 as its last
successful build was two weeks before the rust-team merge and thus users
are probably better off with a time machine.

Cheers

Liliana Marie Prikler (5):
  gnu: cli11: Update to 2.3.2.
  gnu: cli11: Use G-Expressions.
  gnu: python-mpi4py: Update to 3.1.4.
  gnu: Remove paraview-5.9.
  gnu: paraview: Update to 5.11.1.

 gnu/packages/cpp.scm              |  33 ++--------
 gnu/packages/image-processing.scm | 103 ++----------------------------
 gnu/packages/mpi.scm              |   4 +-
 3 files changed, 13 insertions(+), 127 deletions(-)


base-commit: 5b700945fb0b33eec410de8979cae2fbf0d4f118
-- 
2.40.1

[bug#63570] [PATCH 1/5] gnu: cli11: Update to 2.3.2.

[Liliana Marie Prikler]

* gnu/packages/cpp.scm (cli11): Update to 2.3.2.
[source]: Remove snippet.
[arguments]: Drop #:imported-modules, #:modules, and #:phases.
[native-inputs]: Add “catch2”.
---
 gnu/packages/cpp.scm | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 237e232078..e3d68136cb 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -1580,7 +1580,7 @@ (define-public mcpp
 (define-public cli11
   (package
     (name "cli11")
-    (version "1.9.1")
+    (version "2.3.2")
     (source
       (origin
         (method git-fetch)
@@ -1589,35 +1589,14 @@ (define-public cli11
               (commit (string-append "v" version))))
         (file-name (git-file-name name version))
         (sha256
-         (base32 "0hbch0vk8irgmiaxnfqlqys65v1770rxxdfn3d23m2vqyjh0j9l6"))
-        (modules '((guix build utils)))
-        (snippet
-         '(begin (delete-file-recursively "extern")
-                 #t))))
+         (base32 "1iif7kzp3yyjqg4yfar89rqmz44xkbi603gf9kjdqbgraw3f8zy7"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags
        '("-DCLI11_SINGLE_FILE=OFF"
-         "-DCLI11_BUILD_EXAMPLES=OFF")
-       #:imported-modules ,%cmake-build-system-modules
-       #:modules ((guix build cmake-build-system)
-                  (guix build utils))
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'configure 'no-vendor-gtest
-           (lambda _
-             (substitute* "tests/CMakeLists.txt"
-               ;; We provide our own googletest, so this is not really a
-               ;; problem.
-               (("message\\(FATAL_ERROR \"You have requested")
-                "message(TRACE \"You have requested"))
-             (substitute* "cmake/AddGoogletest.cmake"
-               (("^add_subdirectory\\(.*googletest.*$") "find_package(GTest REQUIRED)")
-               (("^set_target_properties\\(gtest gtest_main gmock gmock_main") "")
-               (("^    PROPERTIES FOLDER \"Extern\"\\)") ""))
-             #t)))))
+         "-DCLI11_BUILD_EXAMPLES=OFF")))
     (native-inputs
-     (list doxygen googletest))
+     (list catch2 doxygen googletest))
     (synopsis "Command line parser for C++11")
     (description
      "CLI11 is a command line parser for C++11 and beyond that provides a rich
-- 
2.40.1

bug#63570: [PATCH 1/5] gnu: cli11: Update to 2.3.2.

[Liliana Marie Prikler]

Am Donnerstag, dem 18.05.2023 um 16:55 +0200 schrieb Liliana Marie
Prikler:
> * gnu/packages/cpp.scm (cli11): Update to 2.3.2.
> [source]: Remove snippet.
> [arguments]: Drop #:imported-modules, #:modules, and #:phases.
> [native-inputs]: Add “catch2”.
> ---
Pushed along with the rest.

[bug#63570] [PATCH 2/5] gnu: cli11: Use G-Expressions.

[Liliana Marie Prikler]

* gnu/packages/cpp.scm (cli11)[arguments]: Convert to list of G-Expressions.
---
 gnu/packages/cpp.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index e3d68136cb..221604e36e 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -1592,9 +1592,9 @@ (define-public cli11
          (base32 "1iif7kzp3yyjqg4yfar89rqmz44xkbi603gf9kjdqbgraw3f8zy7"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:configure-flags
-       '("-DCLI11_SINGLE_FILE=OFF"
-         "-DCLI11_BUILD_EXAMPLES=OFF")))
+     (list #:configure-flags
+           #~(list "-DCLI11_SINGLE_FILE=OFF"
+                   "-DCLI11_BUILD_EXAMPLES=OFF")))
     (native-inputs
      (list catch2 doxygen googletest))
     (synopsis "Command line parser for C++11")
-- 
2.40.1

[bug#63570] [PATCH 3/5] gnu: python-mpi4py: Update to 3.1.4.

[Liliana Marie Prikler]

* gnu/packages/mpi.scm (python-mpi4py): Update to 3.1.4.
---
 gnu/packages/mpi.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/mpi.scm b/gnu/packages/mpi.scm
index 20fc1a16a4..fb874484bf 100644
--- a/gnu/packages/mpi.scm
+++ b/gnu/packages/mpi.scm
@@ -399,13 +399,13 @@ (define-public %openmpi-setup
 (define-public python-mpi4py
   (package
     (name "python-mpi4py")
-    (version "3.0.3")
+    (version "3.1.4")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "mpi4py" version))
        (sha256
-        (base32 "07ssbhssv27rrjx1c5vd3vsr31vay5d8xcf4zh9yblcyidn72b81"))))
+        (base32 "101lz7bnm9l17nrkbg6497kxscyh53aah7qd2b820ck2php8z18p"))))
     (build-system python-build-system)
     (arguments
      `(#:phases
-- 
2.40.1

[bug#63570] [PATCH 4/5] gnu: Remove paraview-5.9.

[Liliana Marie Prikler]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 4149 bytes --]

* gnu/packages/image-processing.scm (paraview-5.9): Delete variable.
---
 gnu/packages/image-processing.scm | 93 -------------------------------
 1 file changed, 93 deletions(-)

diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index 0aaac00870..03a78695bb 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -898,99 +898,6 @@ (define-public nip2
 recalculates.")
     (license license:gpl2+)))
 
-;; This package bundles and extends VTK.  It also reuses the VTK build system
-;; to some degree.  Sadly, it does not seem to be possible to build with an
-;; external VTK, despite the CMake option PARAVIEW_USE_EXTERNAL_VTK.
-(define-public paraview-5.9
-  (package
-    (name "paraview")
-    (version "5.9.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://www.paraview.org/files/v"
-                           (version-major+minor version)
-                           "/ParaView-v" version ".tar.xz"))
-       (sha256
-        (base32 "13aczmfshzia324h9r2m675yyrklz2308rf98n444ppmzfv6qj0d"))))
-    (build-system qt-build-system)
-    (arguments
-     (list
-      #:build-type "Release"        ;Build without debug symbols to save space
-      #:configure-flags
-      '(list "-DPARAVIEW_BUILD_WITH_EXTERNAL=ON"
-             "-DPARAVIEW_BUILD_SHARED_LIBS=ON"
-             "-DPARAVIEW_BUILD_DEVELOPER_DOCUMENTATION=OFF"
-             "-DPARAVIEW_USE_PYTHON=ON"
-             "-DPARAVIEW_ENABLE_FFMPEG=ON"
-             "-DPARAVIEW_ENABLE_GDAL=ON"
-             "-DPARAVIEW_ENABLE_WEB=OFF"
-
-             "-DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion=ON"
-             "-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=ON"
-             "-DVTK_MODULE_USE_EXTERNAL_VTK_expat=ON"
-             "-DVTK_MODULE_USE_EXTERNAL_VTK_freetype=ON"
-             "-DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps=ON"
-             "-DVTK_MODULE_USE_EXTERNAL_VTK_glew=ON"
-             "-DVTK_MODULE_USE_EXTERNAL_VTK_hdf5=ON"
-             "-DVTK_MODULE_USE_EXTERNAL_VTK_jpeg=ON"
-             "-DVTK_MODULE_USE_EXTERNAL_VTK_libxml2=ON"
-             "-DVTK_MODULE_USE_EXTERNAL_VTK_lz4=ON"
-             "-DVTK_MODULE_USE_EXTERNAL_VTK_lzma=ON"
-             "-DVTK_MODULE_USE_EXTERNAL_VTK_netcdf=ON"
-             "-DVTK_MODULE_USE_EXTERNAL_VTK_png=ON"
-             "-DVTK_MODULE_USE_EXTERNAL_VTK_theora=ON"
-             "-DVTK_MODULE_USE_EXTERNAL_VTK_tiff=ON"
-             "-DVTK_MODULE_USE_EXTERNAL_VTK_utf8=ON"
-             "-DVTK_MODULE_USE_EXTERNAL_VTK_zlib=ON"
-
-             "-DVTK_MODULE_USE_EXTERNAL_ParaView_vtkcatalyst=OFF"
-             "-DVTK_MODULE_USE_EXTERNAL_VTK_cgns=OFF"
-             "-DVTK_MODULE_USE_EXTERNAL_VTK_exprtk=OFF"
-             "-DVTK_MODULE_USE_EXTERNAL_VTK_fmt=OFF"
-             "-DVTK_MODULE_USE_EXTERNAL_VTK_ioss=OFF")))
-    (inputs
-     (list ;; XXX: We can't simply #:use-module due to a cycle somewhere.
-           (module-ref
-            (resolve-interface '(gnu packages engineering))
-            'cgns)
-           cli11
-           double-conversion
-           eigen
-           expat
-           ffmpeg-4
-           freetype
-           gdal
-           gl2ps
-           glew
-           hdf5
-           jsoncpp
-           libharu
-           libjpeg-turbo
-           libpng
-           libtheora
-           libtiff
-           libxml2
-           lz4
-           mesa
-           netcdf
-           protobuf
-           pugixml
-           python
-           qtbase-5
-           qtsvg-5
-           qttools-5
-           qtxmlpatterns
-           utfcpp
-           zlib))
-    (home-page "https://www.paraview.org/")
-    (synopsis "Data analysis and visualization application")
-    (description "ParaView is a data analysis and visualization application.
-Users can quickly build visualizations to analyze their data using qualitative
-and quantitative techniques.  The data exploration can be done interactively
-in 3D or programmatically using ParaView’s batch processing capabilities.")
-    (license license:bsd-3)))
-
 (define-public paraview
   (package
     (name "paraview")
-- 
2.40.1

[bug#63570] [PATCH 5/5] gnu: paraview: Update to 5.11.1.

[Liliana Marie Prikler]

* gnu/packages/image-processing.scm (paraview): Update to 5.11.1.
[source]: Unbundle nlohmannjson.
[arguments]<#:configure-flags>: Add
“-DVTK_MODULE_USE_EXTERNAL_VTK_nlohmannjson=ON”.
[inputs]: Add nlohmann-json.
---
 gnu/packages/image-processing.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index 03a78695bb..9a2eae8214 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -901,7 +901,7 @@ (define-public nip2
 (define-public paraview
   (package
     (name "paraview")
-    (version "5.11.0")
+    (version "5.11.1")
     (source
      (origin
        (method git-fetch)
@@ -911,7 +911,7 @@ (define-public paraview
              (recursive? #t)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0qifzsbgg8f7zvg5a4934nql6nv5b6sm1f59bylyc6v5bqd0myas"))
+        (base32 "0m1lgkl95f0pyhxp97gq2rf8hibv39v4c49imfj1va40z0flvard"))
        (modules '((guix build utils)))
        (snippet
         ;; TODO: Also remove unused bundled libraries and plugins?
@@ -962,7 +962,7 @@ (define-public paraview
                         "lzma"
                         "mpi4py"
                         "netcdf"
-                        ;;"nlohmannjson" ; ParFlow build fails even with bundled
+                        "nlohmannjson"
                         "ogg"
                         ;;"pegtl"
                         "png"
@@ -1071,7 +1071,7 @@ (define-public paraview
            "-DVTK_MODULE_USE_EXTERNAL_VTK_lzma=ON"
            "-DVTK_MODULE_USE_EXTERNAL_VTK_mpi4py=ON"
            "-DVTK_MODULE_USE_EXTERNAL_VTK_netcdf=ON"
-           ;;"-DVTK_MODULE_USE_EXTERNAL_VTK_nlohmannjson=ON"
+           "-DVTK_MODULE_USE_EXTERNAL_VTK_nlohmannjson=ON"
            "-DVTK_MODULE_USE_EXTERNAL_VTK_ogg=ON"
            ;;"-DVTK_MODULE_USE_EXTERNAL_VTK_pegtl=ON"
            "-DVTK_MODULE_USE_EXTERNAL_VTK_png=ON"
@@ -1120,7 +1120,7 @@ (define-public paraview
            glew
            gmsh
            hdf5
-           ;;nlohmann-json                ;For ParFlow; build fails
+           nlohmann-json                ;For ParFlow; build fails
            jsoncpp
            libjpeg-turbo
            libogg
-- 
2.40.1