Merge pull request #286293 from returntoreality/indi-full-update

indi-full: update hash to match version, indilib: add package test
This commit is contained in:
Weijia Wang 2024-02-05 00:57:12 +01:00 committed by GitHub
commit d79892e70d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 6 deletions

View File

@ -15,16 +15,17 @@
, gsl
, fftw
, gtest
, indi-full
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "indilib";
version = "2.0.6";
src = fetchFromGitHub {
owner = "indilib";
repo = "indi";
rev = "v${version}";
rev = "v${finalAttrs.version}";
hash = "sha256-3MeF2G/rr//c7cgGzqDzmqoNKvR+7Kkbid1g8znKPkg=";
};
@ -48,7 +49,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DCMAKE_INSTALL_LIBDIR=lib"
"-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d"
] ++ lib.optional doCheck [
] ++ lib.optional finalAttrs.finalPackage.doCheck [
"-DINDI_BUILD_UNITTESTS=ON"
"-DINDI_BUILD_INTEGTESTS=ON"
];
@ -68,13 +69,19 @@ stdenv.mkDerivation rec {
done
'';
passthru.tests = {
# make sure 3rd party drivers compile with this indilib
indi-full = indi-full.override {
indilib = finalAttrs.finalPackage;
};
};
meta = with lib; {
homepage = "https://www.indilib.org/";
description = "Implementation of the INDI protocol for POSIX operating systems";
changelog = "https://github.com/indilib/indi/releases/tag/v${version}";
changelog = "https://github.com/indilib/indi/releases/tag/v${finalAttrs.version}";
license = licenses.lgpl2Plus;
maintainers = with maintainers; [ hjones2199 sheepforce ];
platforms = platforms.unix;
};
}
})

View File

@ -6,7 +6,7 @@ let
owner = "indilib";
repo = "indi-3rdparty";
rev = "v${version}";
hash = "sha256-EtwN3yuMsT9CV+CapkKDy3e92u9Blvy+ySrQU586Z1s=";
hash = "sha256-KNoyYldZWsXB9ubu0EYDgckRtpQgSCmzKlx7Erx4MRQ=";
};
indi-firmware = callPackage ./indi-firmware.nix {
inherit version;