diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-06-30 12:04:22 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-30 12:04:22 +0000 |
commit | 629cea2cd0c3e429c333c1ab239caa18058128bf (patch) | |
tree | 74e51e35bdbd3ee05b7e9bb36fe24ccc94c0c51d /pkgs/applications/science | |
parent | 7f05df0a91b94c3f488a83f86ef2f5c32e3025a5 (diff) | |
parent | f091739337022031ebeb14a8f1bc2ecfc76d14fc (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/science')
3 files changed, 25 insertions, 11 deletions
diff --git a/pkgs/applications/science/astronomy/phd2/default.nix b/pkgs/applications/science/astronomy/phd2/default.nix index 0e0ad06bbe9f5..543e6820a7630 100644 --- a/pkgs/applications/science/astronomy/phd2/default.nix +++ b/pkgs/applications/science/astronomy/phd2/default.nix @@ -1,19 +1,32 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, gtk3, wxGTK30-gtk3, - curl, gettext, glib, indi-full, libnova, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, gtk3, wxGTK30-gtk3 +, curl, gettext, glib, indi-full, libnova, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "phd2"; - version = "2.6.9dev1"; + version = "2.6.10"; src = fetchFromGitHub { owner = "OpenPHDGuiding"; repo = "phd2"; rev = "v${version}"; - sha256 = "1ih7m9lilh12xbhmwm9kkicaqy72mi3firl6df7m5x38n2zj3zm4"; + sha256 = "sha256-2ZiPjhlguWXFcC53xG1aqAode7twtoHWszFUMQkK5xU="; }; - nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; - buildInputs = [ gtk3 wxGTK30-gtk3 curl gettext glib indi-full libnova ]; + nativeBuildInputs = [ + cmake + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 + wxGTK30-gtk3 + curl + gettext + glib + indi-full + libnova + ]; cmakeFlags = [ "-DOPENSOURCE_ONLY=1" @@ -27,8 +40,9 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://openphdguiding.org/"; description = "Telescope auto-guidance application"; + changelog = "https://github.com/OpenPHDGuiding/phd2/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ hjones2199 ]; - platforms = [ "x86_64-linux" ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index af5441f07e21d..b539df7592a50 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gtkwave"; - version = "3.3.109"; + version = "3.3.110"; src = fetchurl { url = "mirror://sourceforge/gtkwave/${pname}-gtk3-${version}.tar.gz"; - sha256 = "sha256-NUYezNm4tEcMqnirmo8U7Ky8ye/2MDPY3OWAk+eG3rc="; + sha256 = "sha256-Ku25IVa8ot3SWxODeMrOaxBY5X022TnvD3l2kAa3Wao="; }; nativeBuildInputs = [ pkg-config wrapGAppsHook ]; diff --git a/pkgs/applications/science/robotics/emuflight-configurator/default.nix b/pkgs/applications/science/robotics/emuflight-configurator/default.nix index 2b89a00eb4bd5..ab94df9ef18f5 100644 --- a/pkgs/applications/science/robotics/emuflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/emuflight-configurator/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "emuflight-configurator"; - version = "0.3.5"; + version = "0.3.6"; src = fetchurl { url = "https://github.com/emuflight/EmuConfigurator/releases/download/${version}/emuflight-configurator_${version}_linux64.zip"; - sha256 = "d55bdc52cf93d58c728ccb296ef912a5fc0f42c57ed95f3ded5f85d1c10838c4"; + sha256 = "sha256-egSUd/+RNo0vr2EJibgk9nNnql5sHC11gctUMK+DzW0="; }; nativeBuildInputs = [ wrapGAppsHook unzip copyDesktopItems ]; |