From 25469dd2c92f716e8525b7bc3eeabdfa22e89b21 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Fri, 1 Dec 2023 16:55:43 +0300 Subject: [PATCH 1/2] gr-framework: refactor --- pkgs/development/libraries/gr-framework/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/gr-framework/default.nix b/pkgs/development/libraries/gr-framework/default.nix index 42994adc7375..0dfd6777626b 100644 --- a/pkgs/development/libraries/gr-framework/default.nix +++ b/pkgs/development/libraries/gr-framework/default.nix @@ -3,8 +3,10 @@ , fetchFromGitHub , nix-update-script -, cairo , cmake +, wrapQtAppsHook + +, cairo , ffmpeg , freetype , ghostscript @@ -13,7 +15,6 @@ , libtiff , qhull , qtbase -, wrapQtAppsHook , xorg , zeromq }: @@ -60,11 +61,11 @@ stdenv.mkDerivation rec { passthru.updateScript = nix-update-script { }; - meta = { + meta = with lib; { description = "GR framework is a graphics library for visualisation applications"; homepage = "https://gr-framework.org"; - maintainers = [ lib.maintainers.paveloom ]; - license = lib.licenses.mit; - platforms = lib.platforms.unix; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ paveloom ]; }; } From 7e70d6327422e339cb9c69616c9720b1bc6d195c Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Fri, 1 Dec 2023 17:00:01 +0300 Subject: [PATCH 2/2] gr-framework: 0.72.10 -> 0.72.11 --- pkgs/development/libraries/gr-framework/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gr-framework/default.nix b/pkgs/development/libraries/gr-framework/default.nix index 0dfd6777626b..2157a18f58d1 100644 --- a/pkgs/development/libraries/gr-framework/default.nix +++ b/pkgs/development/libraries/gr-framework/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "gr-framework"; - version = "0.72.10"; + version = "0.72.11"; src = fetchFromGitHub { owner = "sciapp"; repo = "gr"; rev = "v${version}"; - hash = "sha256-ZFaun8PBtPTmhZ0+OHzUu27NvcJGxsImh+c7ZvCTNa0="; + hash = "sha256-HspDRqO/JKpPeHOfctYAOwwR3y1u+GW3v0OnN7OfLT4="; }; patches = [