From 88978483b1b05b639c89232146806bbc14550ced Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Tue, 14 Apr 2020 13:06:09 -0300
Subject: [PATCH 1/2] biblesync: 1.1.2 -> 2.0.1

---
 .../libraries/biblesync/default.nix           | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/libraries/biblesync/default.nix b/pkgs/development/libraries/biblesync/default.nix
index bc62f6d47ad3..54a4fa7a686e 100644
--- a/pkgs/development/libraries/biblesync/default.nix
+++ b/pkgs/development/libraries/biblesync/default.nix
@@ -1,30 +1,30 @@
-{ stdenv, fetchurl, pkgconfig, cmake, libuuid }:
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, libuuid }:
 
-with stdenv.lib;
-stdenv.mkDerivation rec{
+stdenv.mkDerivation rec {
 
   pname = "biblesync";
-  version = "1.1.2";
+  version = "2.0.1";
 
-  src = fetchurl{
-    url = "mirror://sourceforge/project/gnomesword/BibleSync/1.1.2/${pname}-${version}.tar.gz";
-    sha256 = "0190q2da0ppif2242lahl8xfz01n9sijy60aq1a0545qcp0ilvl8";
+  src = fetchFromGitHub {
+    owner = "karlkleinpaste";
+    repo = "biblesync";
+    rev = version;
+    sha256 = "1baq2fwf6132i514xrvq05p2gy98mkg1rn5whf9q5k475q81nrlr";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake libuuid ];
+  nativeBuildInputs = [ pkgconfig cmake ];
+  buildInputs = [ libuuid ];
 
-  meta = {
-    homepage = "http://www.crosswire.org/wiki/BibleSync";
+  meta = with stdenv.lib; {
+    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
+      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;

From 968ccdbc39215364315462754da1eff32c104bbe Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@protonmail.com>
Date: Tue, 14 Apr 2020 13:06:47 -0300
Subject: [PATCH 2/2] sword: 1.7.4 -> 1.8.1

---
 pkgs/development/libraries/sword/default.nix | 26 +++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix
index bdbed724b20c..7349d7f81eb6 100644
--- a/pkgs/development/libraries/sword/default.nix
+++ b/pkgs/development/libraries/sword/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   pname = "sword";
-  version = "1.7.4";
+  version = "1.8.1";
 
   src = fetchurl {
-    url = "https://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${pname}-${version}.tar.gz";
-    sha256 = "0g91kpfkwccvdikddffdbzd6glnp1gdvkx4vh04iyz10bb7shpcr";
+    url = "https://www.crosswire.org/ftpmirror/pub/sword/source/v1.8/${pname}-${version}.tar.gz";
+    sha256 = "14syphc47g6svkbg018nrsgq4z6hid1zydax243g8dx747vsi6nf";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -17,13 +17,6 @@ stdenv.mkDerivation rec {
     patchShebangs .;
   '';
 
-  patches = [
-    (fetchurl {
-      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-text/sword/files/sword-1.7.4-gcc6.patch";
-      sha256 = "0cvnya5swc7dxabir6bz6la2h1qxd32g3xi06m9b5l5ahb6g10y7";
-    })
-  ];
-
   configureFlags = [ "--without-conf" "--enable-tests=no" ];
   CXXFLAGS = [
     "-Wno-unused-but-set-variable"
@@ -34,9 +27,18 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "A software framework that allows research manipulation of Biblical texts";
     homepage = "http://www.crosswire.org/sword/";
-    platforms = platforms.linux;
+    longDescription = ''
+      The SWORD Project is the CrossWire Bible Society's free Bible software
+      project. Its purpose is to create cross-platform open-source tools --
+      covered by the GNU General Public License -- that allow programmers and
+      Bible societies to write new Bible software more quickly and easily. We
+      also create Bible study software for all readers, students, scholars, and
+      translators of the Bible, and have a growing collection of many hundred
+      texts in around 100 languages.
+    '';
     license = licenses.gpl2;
-    maintainers = [ maintainers.piotr maintainers.AndersonTorres ];
+    maintainers = with maintainers; [ piotr AndersonTorres ];
+    platforms = platforms.unix;
   };
 
 }