From d97c858d1c2f43a9847a36c9a387d7922afc5421 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 26 Nov 2022 15:52:59 +0300 Subject: [PATCH] xygrib: 1.2.6.1 -> unstable-2022-05-16 Upstream hasn't had a release since 2019, and this makes it build with Qt 5.15. --- pkgs/applications/misc/xygrib/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/xygrib/default.nix b/pkgs/applications/misc/xygrib/default.nix index 580faa360268..6fedf6751205 100644 --- a/pkgs/applications/misc/xygrib/default.nix +++ b/pkgs/applications/misc/xygrib/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, bzip2, qtbase, qttools, libnova, proj_7, libpng, openjpeg }: stdenv.mkDerivation rec { - version = "1.2.6.1"; + version = "unstable-2022-05-16"; pname = "xygrib"; src = fetchFromGitHub { owner = "opengribs"; repo = "XyGrib"; - rev = "v${version}"; - sha256 = "0xzsm8pr0zjk3f8j880fg5n82jyxn8xf1330qmmq1fqv7rsrg9ia"; + rev = "88c425ca2d7f4ba5d7ab75bfa25e177bee02d310"; + sha256 = "sha256-qMMeRYIQqJpVRE3YjbXIiXHwS/CHs9l2QihszwQIr/A="; }; nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed7f7bd924b5..23692a772349 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33379,7 +33379,7 @@ with pkgs; xnotify = callPackage ../tools/X11/xnotify { }; - xygrib = libsForQt514.callPackage ../applications/misc/xygrib {}; + xygrib = libsForQt5.callPackage ../applications/misc/xygrib { }; xzgv = callPackage ../applications/graphics/xzgv { };