Merge pull request #9272 from AndersonTorres/xiphos

Xiphos

pkgs/applications/misc/xiphos/default.nix

···
 , python
 , intltool
 , docbook2x, docbook_xml_dtd_412, libxslt
-, sword, clucene_core
+, sword, clucene_core, biblesync
 , gnome_doc_utils
 , libgsf, gconf
 , gtkhtml, libgtkhtml, libglade, scrollkeeper
···
 
 stdenv.mkDerivation rec {
   name = "xiphos-${version}";  
-  version = "4.0.0";
+  version = "4.0.3-20150806";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/gnomesword/Xiphos/${version}/${name}.tar.gz";
-    sha256 = "0rk9xhnaqm17af9ppjf2yqpy9p8s0z7m5ax586b7p16lylcqjh68";
+    url = "http://downloads.sourceforge.net/project/gnomesword/Xiphos/4.0.3/${name}.tar.gz";
+    sha256 = "1xkvhpasdlda2rp0874znz158z4rjh1hpynwy13d96kjxq4npiqv";
   };
 
   buildInputs = [ pkgconfig python intltool docbook2x docbook_xml_dtd_412 libxslt
-                  sword clucene_core gnome_doc_utils libgsf gconf gtkhtml libgtkhtml
+                  sword clucene_core biblesync gnome_doc_utils libgsf gconf gtkhtml libgtkhtml
                   libglade scrollkeeper webkitgtk dbus_glib enchant isocodes libuuid ];
 
   prePatch = ''

pkgs/development/libraries/biblesync/default.nix

···
+{ stdenv, fetchurl, pkgconfig, cmake, libuuid }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec{
+
+  name = "biblesync-${version}";
+  version = "1.1.2";
+
+  src = fetchurl{
+    url = "http://downloads.sourceforge.net/project/gnomesword/BibleSync/1.1.2/${name}.tar.gz";
+    sha256 = "0190q2da0ppif2242lahl8xfz01n9sijy60aq1a0545qcp0ilvl8";
+  };
+
+  buildInputs = [ pkgconfig cmake libuuid ];
+
+  meta = {
+    homepage = http://www.crosswire.org/wiki/BibleSync;
+    description = "A multicast protocol to Bible software shared conavigation";
+    longDescription = ''
+      BibleSync is a multicast protocol to support Bible software
+      shared co-navigation. It uses LAN multicast in either a
+      personal/small team mutual navigation motif or in a classroom
+      environment where there are Speakers plus the Audience. The
+      library implementing the protocol is a single C++ class
+      providing a complete yet minimal public interface to support
+      mode setting, setup for packet reception, transmit on local
+      navigation, and handling of incoming packets.
+    '';
+    license = licenses.publicDomain;
+    maintainers = [ maintainers.AndersonTorres ]; 
+  };
+}

pkgs/development/libraries/sword/default.nix

···
 
 stdenv.mkDerivation rec {
 
-  version = "1.7.3";
-
   name = "sword-${version}";
+  version = "1.7.4";
 
   src = fetchurl {
     url = "http://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${name}.tar.gz";
-    sha256 = "1sm9ivypsx3mraqnziic7qkxjx1b7crvlln0zq6cnpjx2pzqfgas";
+    sha256 = "0g91kpfkwccvdikddffdbzd6glnp1gdvkx4vh04iyz10bb7shpcr";
   };
 
   buildInputs = [ pkgconfig icu clucene_core curl ];

pkgs/top-level/all-packages.nix

···
 
   sword = callPackage ../development/libraries/sword { };
 
+  biblesync = callPackage ../development/libraries/biblesync { };
+
   szip = callPackage ../development/libraries/szip { };
 
   t1lib = callPackage ../development/libraries/t1lib { };