From abd1b3156a419d8bb03fd1b0c9de177c343e5286 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 28 Sep 2024 13:34:00 +0200 Subject: [PATCH 1/4] gpredict: cleanup "with lib", remove let in for attribute set --- .../science/astronomy/gpredict/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix index 467f478da96b..3a6a920e6ab2 100644 --- a/pkgs/applications/science/astronomy/gpredict/default.nix +++ b/pkgs/applications/science/astronomy/gpredict/default.nix @@ -3,11 +3,9 @@ , hamlib, wrapGAppsHook3 }: -let - version = "2.2.1"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "gpredict"; - inherit version; + version = "2.2.1"; src = fetchurl { url = "https://github.com/csete/gpredict/releases/download/v${version}/gpredict-${version}.tar.bz2"; @@ -27,7 +25,7 @@ in stdenv.mkDerivation { nativeBuildInputs = [ pkg-config intltool wrapGAppsHook3 ]; buildInputs = [ curl glib gtk3 goocanvas2 gpsd hamlib ]; - meta = with lib; { + meta = { description = "Real time satellite tracking and orbit prediction"; mainProgram = "gpredict"; longDescription = '' @@ -37,9 +35,9 @@ in stdenv.mkDerivation { well. Gpredict uses the SGP4/SDP4 algorithms, which are compatible with the NORAD Keplerian elements. ''; - license = licenses.gpl2Only; - platforms = platforms.linux; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; homepage = "http://gpredict.oz9aec.net/"; - maintainers = [ maintainers.markuskowa maintainers.cmcdragonkai ]; + maintainers = with lib.maintainers; [ markuskowa cmcdragonkai ]; }; } From 311706db9cf75a710a9e46556d9af19c943f3ae7 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 28 Sep 2024 14:06:58 +0200 Subject: [PATCH 2/4] gpredict: switch to fetchFromGitHub --- .../science/astronomy/gpredict/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix index 3a6a920e6ab2..049a29a6be5d 100644 --- a/pkgs/applications/science/astronomy/gpredict/default.nix +++ b/pkgs/applications/science/astronomy/gpredict/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, intltool +{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, intltool, autoreconfHook , gtk3, glib, curl, goocanvas2, gpsd , hamlib, wrapGAppsHook3 }: @@ -7,9 +7,11 @@ stdenv.mkDerivation rec { pname = "gpredict"; version = "2.2.1"; - src = fetchurl { - url = "https://github.com/csete/gpredict/releases/download/v${version}/gpredict-${version}.tar.bz2"; - sha256 = "0hwf97kng1zy8rxyglw04x89p0bg07zq30hgghm20yxiw2xc8ng7"; + src = fetchFromGitHub { + owner = "csete"; + repo = "gpredict"; + rev = "v${version}"; + hash = "sha256-+hgjImfT3nWMBYwde7+KC/hzd84pwQbpoJvaJSNG4E8="; }; patches = [ @@ -22,7 +24,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkg-config intltool wrapGAppsHook3 ]; + nativeBuildInputs = [ pkg-config intltool wrapGAppsHook3 autoreconfHook ]; buildInputs = [ curl glib gtk3 goocanvas2 gpsd hamlib ]; meta = { From d036096765a17acaff011e5c36be7697c42b53f4 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 28 Sep 2024 14:07:44 +0200 Subject: [PATCH 3/4] gpredict: add to update TLE download URLs The old URLs do not work anymore --- pkgs/applications/science/astronomy/gpredict/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix index 049a29a6be5d..da384fa3827e 100644 --- a/pkgs/applications/science/astronomy/gpredict/default.nix +++ b/pkgs/applications/science/astronomy/gpredict/default.nix @@ -22,6 +22,14 @@ stdenv.mkDerivation rec { 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="; + }) + ]; nativeBuildInputs = [ pkg-config intltool wrapGAppsHook3 autoreconfHook ]; From ea824089d6d9b0ec81f39a6ad8afa35c999fdbff Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Sat, 28 Sep 2024 14:09:36 +0200 Subject: [PATCH 4/4] gpredict: apply nixfmt --- .../science/astronomy/gpredict/default.nix | 39 ++++++++++++++++--- 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/astronomy/gpredict/default.nix b/pkgs/applications/science/astronomy/gpredict/default.nix index da384fa3827e..7f0e0836d9ca 100644 --- a/pkgs/applications/science/astronomy/gpredict/default.nix +++ b/pkgs/applications/science/astronomy/gpredict/default.nix @@ -1,6 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, intltool, autoreconfHook -, gtk3, glib, curl, goocanvas2, gpsd -, hamlib, wrapGAppsHook3 +{ + lib, + stdenv, + fetchFromGitHub, + fetchpatch, + pkg-config, + intltool, + autoreconfHook, + gtk3, + glib, + curl, + goocanvas2, + gpsd, + hamlib, + wrapGAppsHook3, }: stdenv.mkDerivation rec { @@ -32,8 +44,20 @@ stdenv.mkDerivation rec { ]; - nativeBuildInputs = [ pkg-config intltool wrapGAppsHook3 autoreconfHook ]; - buildInputs = [ curl glib gtk3 goocanvas2 gpsd hamlib ]; + nativeBuildInputs = [ + pkg-config + intltool + wrapGAppsHook3 + autoreconfHook + ]; + buildInputs = [ + curl + glib + gtk3 + goocanvas2 + gpsd + hamlib + ]; meta = { description = "Real time satellite tracking and orbit prediction"; @@ -48,6 +72,9 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; homepage = "http://gpredict.oz9aec.net/"; - maintainers = with lib.maintainers; [ markuskowa cmcdragonkai ]; + maintainers = with lib.maintainers; [ + markuskowa + cmcdragonkai + ]; }; }