From 3678b3d2c77c72547dea4714c5c3afcd4389bb1c Mon Sep 17 00:00:00 2001 From: Hunter Jones Date: Tue, 7 Sep 2021 12:22:21 -0500 Subject: [PATCH 1/2] stellarsolver: 1.5 -> 1.8 --- .../libraries/science/astronomy/stellarsolver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix b/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix index c3a63c637c34..191751993c3a 100644 --- a/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix +++ b/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "stellarsolver"; - version = "1.5"; + version = "1.8"; src = fetchFromGitHub { owner = "rlancaste"; repo = pname; rev = version; - sha256 = "12j20j9qbkkx55ix4nm1iw7wd36hamkpidbwhcnmj4yk5fqlyq4y"; + sha256 = "sha256-eC45V0aqFSUVJrxhaEXFzgzaXkHVwA5Yj8YyGvii0QI="; }; nativeBuildInputs = [ cmake ]; From bc19f8dd1eaca6cb0e9af129f1b6815b1b9cffc7 Mon Sep 17 00:00:00 2001 From: Hunter Jones Date: Tue, 7 Sep 2021 13:04:31 -0500 Subject: [PATCH 2/2] kstars: 3.5.3 -> 3.5.4 --- pkgs/applications/science/astronomy/kstars/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/astronomy/kstars/default.nix b/pkgs/applications/science/astronomy/kstars/default.nix index 861dc66293ee..cf3ea143cedf 100644 --- a/pkgs/applications/science/astronomy/kstars/default.nix +++ b/pkgs/applications/science/astronomy/kstars/default.nix @@ -14,11 +14,11 @@ mkDerivation rec { pname = "kstars"; - version = "3.5.3"; + version = "3.5.4"; src = fetchurl { url = "mirror://kde/stable/kstars/kstars-${version}.tar.xz"; - sha256 = "sha256-kgUsG2k2YSAAH7ea2qfGw4gON5CFdUoQ3EwOnATXZ5g="; + sha256 = "sha256-JCdSYcogvoUmu+vB/vye+6ZMIJqVoScAKreh89dxoDU="; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; @@ -33,6 +33,11 @@ mkDerivation rec { cfitsio indi-full xplanet libnova libraw gsl wcslib stellarsolver ]; + # See https://bugs.kde.org/show_bug.cgi?id=439541 + preConfigure = '' + rm po/de/docs/kstars/index.docbook + ''; + cmakeFlags = [ "-DINDI_PREFIX=${indi-full}" "-DXPLANET_PREFIX=${xplanet}"