From 0862f3c0fc2a33f732378b1772eff406ef59faf5 Mon Sep 17 00:00:00 2001 From: Linus Karl Date: Sun, 8 Dec 2024 23:59:26 +0100 Subject: [PATCH] indilib, indi-3rdparty: 2.0.9 -> 2.1.1 Updated with new drivers and removed drivers, updated the propagatedBuildInputs to make udev rules install when adding indi-full to the udev packages --- .../science/astronomy/indilib/default.nix | 4 +- .../astronomy/indilib/indi-3rdparty.nix | 41 +++++-------------- 2 files changed, 13 insertions(+), 32 deletions(-) diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix index 5d7137abac2c..e318aa231345 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "indilib"; - version = "2.0.9"; + version = "2.1.1"; src = fetchFromGitHub { owner = "indilib"; repo = "indi"; rev = "v${finalAttrs.version}"; - hash = "sha256-CV8nSz53wFeS/h7hGj9adN8qmyhsqOkTYj/0nuvhlSM="; + hash = "sha256-S9FXa+yBA4IYPOiiFkLUNdEFZPraVV5vjtgwDQ/FbNY="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix index 72a9c747eeb4..924ed861d5b0 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -45,7 +45,7 @@ let owner = "indilib"; repo = "indi-3rdparty"; rev = "v${indilib.version}"; - hash = "sha256-RhtdhMvseQUUFcKDuR1N5qc/86IxmQ/7owpjT+qweqc="; + hash = "sha256-J9WPoaULH6UXL1q1O76+IDW97ydQWkHIID6n7wvOdE4="; }; buildIndi3rdParty = @@ -363,8 +363,8 @@ let pname = "libqhy"; postPatch = '' - substituteInPlace --replace-fail CMakeLists.txt \ - --replace "/lib/firmware" "lib/firmware" + substituteInPlace CMakeLists.txt \ + --replace-fail "/lib/firmware" "lib/firmware" substituteInPlace 85-qhyccd.rules \ --replace-fail "/sbin/fxload" "${fxload}/sbin/fxload" \ @@ -506,6 +506,7 @@ in libapogee zlib ]; + propagatedBuildInputs = [ libapogee ]; meta.platforms = libapogee.meta.platforms; }; @@ -529,6 +530,7 @@ in libusb1 zlib ]; + propagatedBuildInputs = [ libasi ]; meta.platforms = libasi.meta.platforms; }; @@ -540,6 +542,11 @@ in meta.broken = true; }; + indi-astarbox = buildIndi3rdParty { + pname = "indi-astarbox"; + buildInputs = [ indilib ]; + }; + indi-astroasis = buildIndi3rdParty { pname = "indi-astroasis"; buildInputs = [ @@ -549,22 +556,10 @@ in libusb1 zlib ]; + propagatedBuildInputs = [ libastroasis ]; meta.platforms = libastroasis.meta.platforms; }; - indi-astrolink4 = buildIndi3rdParty { - pname = "indi-astrolink4"; - buildInputs = [ indilib ]; - }; - - indi-astromechfoc = buildIndi3rdParty { - pname = "indi-astromechfoc"; - buildInputs = [ - indilib - zlib - ]; - }; - indi-atik = buildIndi3rdParty { pname = "indi-atik"; buildInputs = [ @@ -620,11 +615,6 @@ in ]; }; - indi-dreamfocuser = buildIndi3rdParty { - pname = "indi-dreamfocuser"; - buildInputs = [ indilib ]; - }; - indi-dsi = buildIndi3rdParty { pname = "indi-dsi"; buildInputs = [ @@ -978,15 +968,6 @@ in buildInputs = [ indilib ]; }; - indi-spectracyber = buildIndi3rdParty { - pname = "indi-spectracyber"; - buildInputs = [ - indilib - libnova - zlib - ]; - }; - indi-starbook = buildIndi3rdParty { pname = "indi-starbook"; buildInputs = [