Merge pull request #273999 from paveloom/gr-framework

gr-framework: 0.72.11 -> 0.73.5

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

@@ -2,9 +2,9 @@
 , stdenv
 , fetchFromGitHub
 , nix-update-script
+, qt5
 
 , cmake
-, wrapQtAppsHook
 
 , cairo
 , ffmpeg
@@ -14,29 +14,28 @@
 , libjpeg
 , libtiff
 , qhull
-, qtbase
 , xorg
 , zeromq
 }:
 
 stdenv.mkDerivation rec {
   pname = "gr-framework";
-  version = "0.72.11";
+  version = "0.73.5";
 
   src = fetchFromGitHub {
     owner = "sciapp";
     repo = "gr";
     rev = "v${version}";
-    hash = "sha256-HspDRqO/JKpPeHOfctYAOwwR3y1u+GW3v0OnN7OfLT4=";
+    hash = "sha256-9Py2r774GaUXWhF3yO3ceT1rPi/uqMVZVAo0xs9n+I0=";
   };
 
   patches = [
-    ./Use-the-module-mode-to-search-for-the-LibXml2-package.patch
+    ./patches/use-the-module-mode-to-search-for-the-LibXml2-package.patch
   ];
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -48,7 +47,7 @@ stdenv.mkDerivation rec {
     libjpeg
     libtiff
     qhull
-    qtbase
+    qt5.qtbase
     xorg.libX11
     xorg.libXft
     xorg.libXt

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

@@ -0,0 +1,25 @@
+From 78a86da95c7227cbfd0f3073841df5409a576837 Mon Sep 17 00:00:00 2001
+From: Pavel Sobolev <paveloomm@gmail.com>
+Date: Wed, 31 Jan 2024 16:50:36 +0000
+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 5f865a5b..5550b493 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -117,7 +117,7 @@ if(GR_USE_BUNDLED_LIBRARIES)
+   # (`ONLY_CMAKE_FIND_ROOT_PATH` option is not inherited to `find_package` calls within the LibXml2 config file)
+   find_package(LibXml2 NO_MODULE ONLY_CMAKE_FIND_ROOT_PATH)
+ else()
+-  find_package(LibXml2 NO_MODULE)
++  find_package(LibXml2 MODULE)
+ endif()
+
+ # Find the following packages only in 3rdparty, if `GR_USE_BUNDLED_LIBRARIES` is set
+--
+2.42.0
+

pkgs/development/libraries/gr-framework/Use-the-module-mode-to-search-for-the-LibXml2-package.patch

@@ -1,25 +0,0 @@
-From 5d2377ad5e99742662e056bb782d5c21afb01dfb Mon Sep 17 00:00:00 2001
-From: Pavel Sobolev <paveloom@riseup.net>
-Date: Tue, 19 Sep 2023 13:27:39 +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 03490335..fb69e8fd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -96,7 +96,7 @@ find_package(Expat)
- # CMake ships with a `FindLibXml2.cmake` module which does not configure needed libxml2 dependencies.
- # Thus, use the `libxml2-config.cmake` config file shipped with libxml which configures dependencies correctly by
- # skipping module search mode.
--find_package(LibXml2 NO_MODULE)
-+find_package(LibXml2 MODULE)
- if(${CMAKE_VERSION} VERSION_GREATER "3.16.0")
-   find_package(
-     Qt6
---
-2.42.0
-

pkgs/top-level/all-packages.nix

@@ -20896,7 +20896,7 @@ with pkgs;
 
   ghcid = haskellPackages.ghcid.bin;
 
-  gr-framework = libsForQt5.callPackage ../development/libraries/gr-framework {
+  gr-framework = callPackage ../by-name/gr/gr-framework/package.nix {
     stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else stdenv;
   };