indilib, indi-3rdparty: 2.1.4 -> 2.1.5.1 (#440785)
This commit is contained in:
@@ -22,13 +22,13 @@
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "indilib";
|
||||
version = "2.1.4";
|
||||
version = "2.1.5.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "indilib";
|
||||
repo = "indi";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-ceDuWnIeHTpXyQRXDEQxCDM1pdfz5rEDMyJIcCu6OaM=";
|
||||
hash = "sha256-mbY3iDLRcQ+pis26u6pHzB43ureaKH7KYPkV0CwHU/E=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
||||
@@ -47,7 +47,7 @@ let
|
||||
owner = "indilib";
|
||||
repo = "indi-3rdparty";
|
||||
rev = "v${indilib.version}";
|
||||
hash = "sha256-zd88QHYhqxAQlzozXZMKXCFWKYqvGsPHhNxmkdexOOE=";
|
||||
hash = "sha256-+WBQdu1iWleHf6xC4SK69y505wqZ36IUM4xnh1fnc6s=";
|
||||
};
|
||||
|
||||
buildIndi3rdParty =
|
||||
@@ -552,6 +552,14 @@ in
|
||||
indi-astarbox = buildIndi3rdParty {
|
||||
pname = "indi-astarbox";
|
||||
buildInputs = [ indilib ];
|
||||
# TODO patch already upstream, remove with version > 2.1.5.1
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/indilib/indi-3rdparty/commit/c347000ec227a5ef98911aab34c7b08a91509cba.patch";
|
||||
hash = "sha256-M3b4ySoGJRpfNmBaagjDaeEPKqwaVgRUWaQY626SGBI=";
|
||||
stripLen = 1;
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
indi-astroasis = buildIndi3rdParty {
|
||||
@@ -688,6 +696,7 @@ in
|
||||
indi-fli = buildIndi3rdParty {
|
||||
pname = "indi-fli";
|
||||
buildInputs = [
|
||||
libusb1
|
||||
cfitsio
|
||||
indilib
|
||||
zlib
|
||||
@@ -705,6 +714,15 @@ in
|
||||
glib
|
||||
zlib
|
||||
];
|
||||
# TODO patch already upstream, remove with version > 2.1.5.1
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
url = "https://github.com/indilib/indi-3rdparty/commit/c33c08b50093698e2aa73d73783d96f85df488a9.patch";
|
||||
hash = "sha256-EQ2G9gTexf9FESCAR28f2cwzvH4TOAA8bvyJCxFv/E8=";
|
||||
stripLen = 1;
|
||||
})
|
||||
];
|
||||
|
||||
};
|
||||
|
||||
indi-gphoto = buildIndi3rdParty {
|
||||
@@ -972,14 +990,6 @@ 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 {
|
||||
|
||||
Reference in New Issue
Block a user