diff options
Diffstat (limited to 'pkgs/applications/science/astronomy')
4 files changed, 14 insertions, 19 deletions
diff --git a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix index c58b09889772d..603fb8087266f 100644 --- a/pkgs/applications/science/astronomy/astrolabe-generator/default.nix +++ b/pkgs/applications/science/astronomy/astrolabe-generator/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib;{ homepage = "https://www.astrolabeproject.com"; - description = "A Java-based tool for generating EPS files for constructing astrolabes and related tools"; + description = "Java-based tool for generating EPS files for constructing astrolabes and related tools"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.gpl3; maintainers = [ ]; diff --git a/pkgs/applications/science/astronomy/astrolog/default.nix b/pkgs/applications/science/astronomy/astrolog/default.nix index 7ad05e35e24e6..a2e2e0f02cf6d 100644 --- a/pkgs/applications/science/astronomy/astrolog/default.nix +++ b/pkgs/applications/science/astronomy/astrolog/default.nix @@ -3,13 +3,13 @@ , withEphemeris ? true , withMoonsEphemeris ? true }: -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "astrolog"; - version = "7.30"; + version = "7.70"; src = fetchzip { - url = "http://www.astrolog.org/ftp/ast73src.zip"; - sha256 = "0nry4gxwy5aa99zzr8dlb6babpachsc3jjyk0vw82c7x3clbhl7l"; + url = "https://www.astrolog.org/ftp/ast77src.zip"; + hash = "sha256-rG7njEtnHwUDqWstj0bQxm2c9CbsOmWOCYs0FtiVoJE="; stripRoot = false; }; diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index 8b40196fdbff5..3347fa5356b5d 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, freeglut, gtk2, gtkglext +{ lib, stdenv, fetchFromGitHub, pkg-config, libglut, gtk2, gtkglext , libjpeg_turbo, libtheora, libXmu, lua, libGLU, libGL, perl, autoreconfHook }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ - freeglut gtk2 gtkglext lua perl + libglut gtk2 gtkglext lua perl libjpeg_turbo libtheora libXmu libGLU libGL ]; diff --git a/pkgs/applications/science/astronomy/siril/default.nix b/pkgs/applications/science/astronomy/siril/default.nix index f039d056ec677..2f572350bae02 100644 --- a/pkgs/applications/science/astronomy/siril/default.nix +++ b/pkgs/applications/science/astronomy/siril/default.nix @@ -1,28 +1,21 @@ -{ lib, stdenv, fetchFromGitLab, fetchpatch, pkg-config, meson, ninja, cmake +{ lib, stdenv, fetchFromGitLab, pkg-config, meson, ninja, cmake , git, criterion, gtk3, libconfig, gnuplot, opencv, json-glib , fftwFloat, cfitsio, gsl, exiv2, librtprocess, wcslib, ffmpeg , libraw, libtiff, libpng, libjpeg, libheif, ffms, wrapGAppsHook3 +, curl }: stdenv.mkDerivation rec { pname = "siril"; - version = "1.2.0"; + version = "1.2.3"; src = fetchFromGitLab { owner = "free-astro"; repo = "siril"; rev = version; - hash = "sha256-lCoFQ7z6cZbyNPEm5s40DNdvTwFonHK3KCd8RniqQWs="; + hash = "sha256-JUMk2XHMOeocSpeeI+k3s9TsEQCdqz3oigTzuwRHbT4="; }; - patches = [ - (fetchpatch { - name = "siril-1.2-exiv2-0.28.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sci-astronomy/siril/files/siril-1.2-exiv2-0.28.patch?id=002882203ad6a2b08ce035a18b95844a9f4b85d0"; - hash = "sha256-R1yslW6hzvJHKo0/IqBxkCuqcX6VrdRSz68gpAExxVE="; - }) - ]; - nativeBuildInputs = [ meson ninja cmake pkg-config git criterion wrapGAppsHook3 ]; @@ -30,14 +23,16 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 cfitsio gsl exiv2 gnuplot opencv fftwFloat librtprocess wcslib libconfig libraw libtiff libpng libjpeg libheif ffms ffmpeg json-glib + curl ]; # Necessary because project uses default build dir for flatpaks/snaps dontUseMesonConfigure = true; dontUseCmakeConfigure = true; + # Meson fails to find libcurl unless the option is specifically enabled configureScript = '' - ${meson}/bin/meson --buildtype release nixbld . + ${meson}/bin/meson setup -Denable-libcurl=yes --buildtype release nixbld . ''; postConfigure = '' |