diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-02-05 00:57:12 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-05 00:57:12 +0100 |
commit | d79892e70de6a30666d9ac7a8e086528c6613aa7 (patch) | |
tree | 4bead8669aa71bccf8760a2fdb6ae2d2dd3b711d /pkgs/development/libraries | |
parent | 755d86a4fc878c9dc2320c694950c033f6f5b45a (diff) | |
parent | b545722fda2c7db5dbbcfd6beadbaa53f868cb5b (diff) | |
download | nixlib-d79892e70de6a30666d9ac7a8e086528c6613aa7.tar nixlib-d79892e70de6a30666d9ac7a8e086528c6613aa7.tar.gz nixlib-d79892e70de6a30666d9ac7a8e086528c6613aa7.tar.bz2 nixlib-d79892e70de6a30666d9ac7a8e086528c6613aa7.tar.lz nixlib-d79892e70de6a30666d9ac7a8e086528c6613aa7.tar.xz nixlib-d79892e70de6a30666d9ac7a8e086528c6613aa7.tar.zst nixlib-d79892e70de6a30666d9ac7a8e086528c6613aa7.zip |
Merge pull request #286293 from returntoreality/indi-full-update
indi-full: update hash to match version, indilib: add package test
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/science/astronomy/indilib/default.nix | 17 | ||||
-rw-r--r-- | pkgs/development/libraries/science/astronomy/indilib/indi-full.nix | 2 |
2 files changed, 13 insertions, 6 deletions
diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix index c38842f128c7..f0d25defe122 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -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; }; -} +}) diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix index e2018ce7c2b0..4dd80c3f0275 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-full.nix @@ -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; |