From b92afdaebca325a2243399c710705b8cadcc3d9a Mon Sep 17 00:00:00 2001 From: winston Date: Wed, 29 Apr 2026 15:31:36 +0200 Subject: [PATCH] gpredict: 2.2.1 -> 2.5.1 - goocanvas has been replaced with native GTK3/Cairo: https://github.com/csete/gpredict/pull/390 - hamlib C bindings haven't been used since 2008: https://github.com/csete/gpredict/commit/1123de6044f6e5ad031567f0c047c13e0a348123 --- pkgs/by-name/gp/gpredict/package.nix | 33 +++++----------------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/pkgs/by-name/gp/gpredict/package.nix b/pkgs/by-name/gp/gpredict/package.nix index bf2811325998..e1e6d45f80a0 100644 --- a/pkgs/by-name/gp/gpredict/package.nix +++ b/pkgs/by-name/gp/gpredict/package.nix @@ -2,48 +2,29 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, pkg-config, intltool, autoreconfHook, gtk3, - glib, curl, - goocanvas_2, gpsd, - hamlib_4, wrapGAppsHook3, nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "gpredict"; - version = "2.2.1"; + version = "2.5.1"; src = fetchFromGitHub { owner = "csete"; repo = "gpredict"; tag = "v${finalAttrs.version}"; - hash = "sha256-+hgjImfT3nWMBYwde7+KC/hzd84pwQbpoJvaJSNG4E8="; + hash = "sha256-lP+QakQ+uTgBY8NNEC7DwQifh3Zi0ZKbarxNGB4onq0="; }; - patches = [ - # Pull upstream fix for -fno-common toolchains: - # https://github.com/csete/gpredict/issues/195 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/csete/gpredict/commit/c565bb3d48777bfe17114b5d01cd81150521f056.patch"; - sha256 = "1jhy9hpqlachq32bkij60q3dxkgi1kkr80rm29jjxqpmambf406a"; - }) - # Updates URLs for TLE files - # https://github.com/csete/gpredict/pull/305 - (fetchpatch { - name = "TLE-urls.patch"; - url = "https://github.com/csete/gpredict/commit/8f60f856921e8ee143cd6e2d34a9183778cb0fbf.patch"; - hash = "sha256-X/nKrqh5sjxDMLhA9LQek8AsJFqhvK/k8Ep3ug/0rMI="; - }) - - ]; + strictDeps = true; + __structuredAttrs = true; nativeBuildInputs = [ pkg-config @@ -51,13 +32,11 @@ stdenv.mkDerivation (finalAttrs: { wrapGAppsHook3 autoreconfHook ]; + buildInputs = [ curl - glib gtk3 - goocanvas_2 gpsd - hamlib_4 ]; passthru.updateScript = nix-update-script { }; @@ -74,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - homepage = "http://gpredict.oz9aec.net/"; + homepage = "https://oz9aec.dk/gpredict/"; maintainers = with lib.maintainers; [ cmcdragonkai pandapip1