From 9413a340dbf0988555a6f0eba9bdc632b06e4f39 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 15 Aug 2015 09:35:41 -0300 Subject: [PATCH 1/4] Sword: 1.7.3 -> 1.7.4 --- pkgs/development/libraries/sword/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix index 6faf2224b0cf..6091bb3c8bb2 100644 --- a/pkgs/development/libraries/sword/default.nix +++ b/pkgs/development/libraries/sword/default.nix @@ -2,13 +2,12 @@ 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 ]; From 923006c5f1f4833cddc87feb07343a48a478689f Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 15 Aug 2015 12:35:01 -0300 Subject: [PATCH 2/4] Xiphos: 4.0.0 -> 4.0.3-20150806 --- pkgs/applications/misc/xiphos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index 78d499396772..450a756b4503 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -12,11 +12,11 @@ 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"; + sha256 = "1xkvhpasdlda2rp0874znz158z4rjh1hpynwy13d96kjxq4npiqv"; }; buildInputs = [ pkgconfig python intltool docbook2x docbook_xml_dtd_412 libxslt From 0935ef2913542cf843064f6b690a740bcd6db08f Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 15 Aug 2015 22:36:44 -0300 Subject: [PATCH 3/4] BibleSync: init at 1.1.2 Biblesync is a dependency of new Xiphos. --- .../libraries/biblesync/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/libraries/biblesync/default.nix diff --git a/pkgs/development/libraries/biblesync/default.nix b/pkgs/development/libraries/biblesync/default.nix new file mode 100644 index 000000000000..4b7be5ca3d4a --- /dev/null +++ b/pkgs/development/libraries/biblesync/default.nix @@ -0,0 +1,32 @@ +{ 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 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ada3e3bd1f75..1641083b79ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8067,6 +8067,8 @@ let sword = callPackage ../development/libraries/sword { }; + biblesync = callPackage ../development/libraries/biblesync { }; + szip = callPackage ../development/libraries/szip { }; t1lib = callPackage ../development/libraries/t1lib { }; From 53ff7e1664a177852f4b58ce23f417a5129e6627 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 15 Aug 2015 23:16:05 -0300 Subject: [PATCH 4/4] Xiphos: added new dependency: biblesync --- pkgs/applications/misc/xiphos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index 450a756b4503..dbc5e84e67bc 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -2,7 +2,7 @@ , python , intltool , docbook2x, docbook_xml_dtd_412, libxslt -, sword, clucene_core +, sword, clucene_core, biblesync , gnome_doc_utils , libgsf, gconf , gtkhtml, libgtkhtml, libglade, scrollkeeper @@ -15,12 +15,12 @@ stdenv.mkDerivation rec { version = "4.0.3-20150806"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/gnomesword/Xiphos/${version}/${name}.tar.gz"; + 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 = ''