Merge pull request #329215 from paveloom/gr-framework

gr-framework: 0.73.6 -> 0.73.7

pkgs/by-name/gr/gr-framework/package.nix

@@ -2,51 +2,50 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  nix-update-script,
-  qt5,
 
   cmake,
+  ninja,
+  qt6,
 
   cairo,
   ffmpeg,
-  freetype,
   ghostscript,
   glfw,
-  libjpeg,
   libtiff,
   qhull,
+  xercesc,
   xorg,
   zeromq,
+
+  nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
   pname = "gr-framework";
-  version = "0.73.6";
+  version = "0.73.7";
 
   src = fetchFromGitHub {
     owner = "sciapp";
     repo = "gr";
     rev = "v${version}";
-    hash = "sha256-XzOII13XwxkPZhtL4USkmUmJTL7dZImx4yVYJmhcn08=";
+    hash = "sha256-Xd1x6RUlre/5oxq0wiVKkIAuGKgtoNY/5aa7dvmn71U=";
   };
 
-  patches = [ ./use-the-module-mode-to-search-for-the-LibXml2-package.patch ];
-
   nativeBuildInputs = [
     cmake
-    qt5.wrapQtAppsHook
+    ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
     cairo
     ffmpeg
-    freetype
     ghostscript
     glfw
-    libjpeg
     libtiff
     qhull
-    qt5.qtbase
+    qt6.qtbase
+    xercesc
     xorg.libX11
     xorg.libXft
     xorg.libXt

pkgs/by-name/gr/gr-framework/use-the-module-mode-to-search-for-the-LibXml2-package.patch

@@ -1,25 +0,0 @@
-From 47063bf00060dd6e8ccb384770a7c04dc534dce0 Mon Sep 17 00:00:00 2001
-From: Pavel Sobolev <paveloomm@gmail.com>
-Date: Wed, 19 Jun 2024 21:17:33 +0300
-Subject: [PATCH] Use the module mode to search for the `LibXml2` package.
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ed36d99d..6031dc77 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -123,7 +123,7 @@ else()
-   # Therefore, disable the inspection of the `PATH` variable by setting `NO_SYSTEM_ENVIRONMENT_PATH` option.
-   # See <https://cmake.org/cmake/help/v3.30/command/find_package.html#:~:text=Search the standard system environment
-   # variables> for more details.
--  find_package(LibXml2 NO_MODULE NO_SYSTEM_ENVIRONMENT_PATH)
-+  find_package(LibXml2 MODULE)
- endif()
-
- # Find the following packages only in 3rdparty, if `GR_USE_BUNDLED_LIBRARIES` is set
---
-2.45.1
-