The sources for INDIlib versions before the currently released 1.0.0 appear to no longer be available for download. The attached patch advances indilib to the new version 1.0.0
Also, the version of kstars included with kde-4.14 only builds with INDIlib versions before 1.0.0 whose source is no longer available, so the patch removes kstars from kde-4.14 Note that the kstars available from kdeApps 14.12 does build with INDIlib 1.0.0
>From b2bd45b1018e20a8b89081d9930ff45e8e0a850c Mon Sep 17 00:00:00 2001 From: Karn Kallio <[email protected]> Date: Sun, 29 Mar 2015 14:26:07 -0430 Subject: [PATCH] indilib version advance; older sources no longer available --- pkgs/desktops/kde-4.14/kde-package/4.14.3.nix | 3 --- pkgs/desktops/kde-4.14/kdeedu/kstars.nix | 14 -------------- pkgs/development/libraries/indilib/0_9_9.nix | 21 --------------------- pkgs/development/libraries/indilib/default.nix | 14 ++++++++------ pkgs/development/libraries/indilib/link-zlib.patch | 12 ------------ pkgs/development/libraries/indilib/udev-dir.patch | 22 +++++++++++----------- pkgs/top-level/all-packages.nix | 2 -- 7 files changed, 19 insertions(+), 69 deletions(-) delete mode 100644 pkgs/desktops/kde-4.14/kdeedu/kstars.nix delete mode 100644 pkgs/development/libraries/indilib/0_9_9.nix delete mode 100644 pkgs/development/libraries/indilib/link-zlib.patch diff --git a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix b/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix index b1673d4..a78041c 100644 --- a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix +++ b/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix @@ -116,7 +116,6 @@ hashes=builtins.listToAttrs[ {name="ksnapshot";value="10grzlp7sq367g91858d16sadzipzmgwczhnb5xvy0437lqhhz7c";} {name="kspaceduel";value="0cwgmpv2xcjwz914hqx6rivi5sk4x66imcdqy7pjnj5vk4f197m7";} {name="ksquares";value="1zzg6y6zfqd1a0939hd1wy7ix4wld7ixp5pz2qs315g51m9lpn7i";} - {name="kstars";value="1pjvy476yjir4z6x1j7192xjr9m0zcxq3x3lpvsxf92pk3l4c73p";} {name="ksudoku";value="0qgjx7fbawhn63vv37wv4z56jf0gi4chs64aw9bllbq52syirmgb";} {name="ksystemlog";value="11xh1psqhq7vimymb394kxjk83yax3gzi9fdckjspk6p10cycln2";} {name="kteatime";value="16rrlxc67afkin3afdf1s9dlr7z2281dfsja64pdrrdilwwpyqwi";} @@ -288,7 +287,6 @@ versions=builtins.listToAttrs[ {name="ksnapshot";value="4.14.3";} {name="kspaceduel";value="4.14.3";} {name="ksquares";value="4.14.3";} - {name="kstars";value="4.14.3";} {name="ksudoku";value="4.14.3";} {name="ksystemlog";value="4.14.3";} {name="kteatime";value="4.14.3";} @@ -529,7 +527,6 @@ modules=[ { name="klettres"; } { name="kmplot"; } { name="kqtquickcharts"; } - { name="kstars"; } { name="ktouch"; } { name="kturtle"; } { name="kwordquiz"; } diff --git a/pkgs/desktops/kde-4.14/kdeedu/kstars.nix b/pkgs/desktops/kde-4.14/kdeedu/kstars.nix deleted file mode 100644 index a5e9bee..0000000 --- a/pkgs/desktops/kde-4.14/kdeedu/kstars.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ kde, kdelibs, eigen, xplanet, indilib_0_9_9, pkgconfig, qjson }: - -kde { - -# TODO: wcslib, astrometry - - buildInputs = [ kdelibs eigen xplanet indilib_0_9_9 qjson ]; - - nativeBuildInputs = [ pkgconfig ]; - - meta = { - description = "A KDE graphical desktop planetarium"; - }; -} diff --git a/pkgs/development/libraries/indilib/0_9_9.nix b/pkgs/development/libraries/indilib/0_9_9.nix deleted file mode 100644 index f9447b1..0000000 --- a/pkgs/development/libraries/indilib/0_9_9.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, cmake, cfitsio, libusb1, zlib, boost, libnova, libjpeg, gsl, pkgconfig }: - -stdenv.mkDerivation { - name = "indilib-0.9.9"; - - src = fetchurl { - url = mirror://sourceforge/indi/libindi_0.9.9.tar.gz; - sha256 = "720b9096baef1489fd7d7d4a236177863a7f7cec86809f21d291b0d9758e4039"; - }; - - propagatedBuildInputs = [ cfitsio libusb1 zlib boost libnova libjpeg gsl ]; - nativeBuildInputs = [ cmake pkgconfig ]; - - preConfigure = '' - cmakeFlags+=" -DUDEVRULES_INSTALL_DIR=$out/etc/udev/rules.d" - ''; - - meta = { - homepage = http://indi.sf.net; - }; -} diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix index dd8207f..b060498 100644 --- a/pkgs/development/libraries/indilib/default.nix +++ b/pkgs/development/libraries/indilib/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl, cmake, cfitsio, libusb, zlib, boost }: +{ stdenv, fetchurl, cmake, cfitsio, libusb, zlib, boost, libnova +, libjpeg, gsl }: stdenv.mkDerivation { - name = "indilib-0.9.6"; + name = "indilib-1.0.0"; src = fetchurl { - url = mirror://sourceforge/indi/libindi_0.9.6.tar.gz; - sha256 = "1cyhsrsl68iczc4gcdnrrdh0r1dxjac6prxjfkw15wz97ya0mvs4"; + url = mirror://sourceforge/indi/libindi_1.0.0.tar.gz; + sha256 = "0f66jykpjk8mv50lc3rywbqj9mqr4p2n1igfb1222h5fs83c1jhm"; }; - patches = [ ./link-zlib.patch ./udev-dir.patch ]; + patches = [ ./udev-dir.patch ] ; - propagatedBuildInputs = [ cmake cfitsio libusb zlib boost ]; + propagatedBuildInputs = [ cmake cfitsio libusb zlib boost + libnova libjpeg gsl ]; meta = { homepage = http://indi.sf.net; diff --git a/pkgs/development/libraries/indilib/link-zlib.patch b/pkgs/development/libraries/indilib/link-zlib.patch deleted file mode 100644 index c051194..0000000 --- a/pkgs/development/libraries/indilib/link-zlib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur libindi-0.9.6-upstream/CMakeLists.txt libindi-0.9.6/CMakeLists.txt ---- libindi-0.9.6-upstream/CMakeLists.txt 2012-11-19 16:09:14.000000000 -0430 -+++ libindi-0.9.6/CMakeLists.txt 2013-05-02 16:50:25.666624174 -0430 -@@ -169,7 +169,7 @@ - # To link with main() and indibase classes ###### - ################################################## - add_library(indidriver SHARED ${libindicom_SRCS} ${liblilxml_SRCS} ${indimain_SRCS} ${indidriver_SRCS}) --target_link_libraries(indidriver ${LIBUSB_LIBRARIES}) -+target_link_libraries(indidriver z ${LIBUSB_LIBRARIES}) - if (NOVA_FOUND) - target_link_libraries(indidriver ${NOVA_LIBRARIES}) - endif(NOVA_FOUND) diff --git a/pkgs/development/libraries/indilib/udev-dir.patch b/pkgs/development/libraries/indilib/udev-dir.patch index 2f6d03d..0f49741 100644 --- a/pkgs/development/libraries/indilib/udev-dir.patch +++ b/pkgs/development/libraries/indilib/udev-dir.patch @@ -1,12 +1,12 @@ -diff -Naur libindi-0.9.6-upstream/CMakeLists.txt libindi-0.9.6/CMakeLists.txt ---- libindi-0.9.6-upstream/CMakeLists.txt 2012-11-19 16:09:14.000000000 -0430 -+++ libindi-0.9.6/CMakeLists.txt 2013-05-02 17:02:55.455944987 -0430 -@@ -13,7 +13,7 @@ - set(DATA_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/indi/") - set(BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin") - set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include") --set(UDEVRULES_INSTALL_DIR "/etc/udev/rules.d") -+set(UDEVRULES_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/etc/udev/rules.d") +diff -Naur libindi-1.0.0-upstream/CMakeLists.txt libindi-1.0.0/CMakeLists.txt +--- libindi-1.0.0-upstream/CMakeLists.txt 2015-03-28 21:06:49.576863460 -0430 ++++ libindi-1.0.0/CMakeLists.txt 2015-03-28 21:07:48.420677548 -0430 +@@ -28,7 +28,7 @@ + ## the following are directories where stuff will be installed to + set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/") + set(PKGCONFIG_INSTALL_PREFIX "${LIB_DESTINATION}/pkgconfig/") +-set(UDEVRULES_INSTALL_DIR "/lib/udev/rules.d" CACHE STRING "Base directory for udev rules") ++set(UDEVRULES_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib/udev/rules.d" CACHE STRING "Base directory for udev rules") - IF(APPLE) - set(CMAKE_SHARED_LINKER_FLAGS "-undefined dynamic_lookup") + ################## Includes ################################ + Include (CheckCXXSourceCompiles) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90a7b31..7c2ca08 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6059,8 +6059,6 @@ let indilib = callPackage ../development/libraries/indilib { }; - indilib_0_9_9 = callPackage ../development/libraries/indilib/0_9_9.nix { }; - iniparser = callPackage ../development/libraries/iniparser { }; intltool = callPackage ../development/tools/misc/intltool { }; -- 2.1.4
_______________________________________________ nix-dev mailing list [email protected] http://lists.science.uu.nl/mailman/listinfo/nix-dev
