From 27cfd94b5081651d462de53b2d4cc7b570fe9e1f Mon Sep 17 00:00:00 2001 From: Linus Karl Date: Wed, 25 Jun 2025 17:56:48 +0200 Subject: [PATCH] indilib, indi-3rdparty: 2.1.3 -> 2.1.4 Added a patch to fix build of indi-shelyak Changelogs: https://github.com/indilib/indi/releases/tag/v2.1.4 https://github.com/indilib/indi-3rdparty/releases/tag/v2.1.4 --- .../libraries/science/astronomy/indilib/default.nix | 8 ++++---- .../science/astronomy/indilib/indi-3rdparty.nix | 11 ++++++++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix index 8a4ca2f65cde..915b751cbfaa 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "indilib"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "indilib"; repo = "indi"; rev = "v${finalAttrs.version}"; - hash = "sha256-Y2JmlboNU7e2Whvv6snd8Qgotr+AAkUkAd9qCORZoI0="; + hash = "sha256-ceDuWnIeHTpXyQRXDEQxCDM1pdfz5rEDMyJIcCu6OaM="; }; nativeBuildInputs = [ @@ -67,8 +67,8 @@ stdenv.mkDerivation (finalAttrs: { postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' for f in $out/lib/udev/rules.d/*.rules do - substituteInPlace $f --replace "/bin/sh" "${bash}/bin/sh" \ - --replace "/sbin/modprobe" "${kmod}/sbin/modprobe" + substituteInPlace $f --replace-quiet "/bin/sh" "${bash}/bin/sh" \ + --replace-quiet "/sbin/modprobe" "${kmod}/sbin/modprobe" done ''; diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix index eb1673875ddb..b4de4d4ce9e8 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -9,6 +9,7 @@ coreutils, cfitsio, fetchFromGitHub, + fetchpatch, gtest, libusb1, libusb-compat-0_1, @@ -45,7 +46,7 @@ let owner = "indilib"; repo = "indi-3rdparty"; rev = "v${indilib.version}"; - hash = "sha256-REmeIP0Cl5FfwUnL40u0dqZaJugBlLGT/Bts5j1bvgw="; + hash = "sha256-zd88QHYhqxAQlzozXZMKXCFWKYqvGsPHhNxmkdexOOE="; }; buildIndi3rdParty = @@ -967,6 +968,14 @@ in indi-shelyak = buildIndi3rdParty { pname = "indi-shelyak"; buildInputs = [ indilib ]; + + patches = [ + (fetchpatch { + url = "https://github.com/indilib/indi-3rdparty/commit/db8106a9a03e0cfb700e02841d46f8b97b5513e0.patch"; + hash = "sha256-JJatmu/dxFEni6CdR6QUn7+EiPe18EwE7OmrCT8Nk2c="; + stripLen = 1; + }) + ]; }; indi-starbook = buildIndi3rdParty {