summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndersonTorres <torres.anderson.85@protonmail.com>2020-04-14 13:06:47 -0300
committerAndersonTorres <torres.anderson.85@protonmail.com>2020-04-14 20:39:13 -0300
commit968ccdbc39215364315462754da1eff32c104bbe (patch)
tree74ab6751464fcbe60392240dabe92aa4fb3598eb
parent88978483b1b05b639c89232146806bbc14550ced (diff)
downloadnixpkgs-968ccdbc39215364315462754da1eff32c104bbe.tar
nixpkgs-968ccdbc39215364315462754da1eff32c104bbe.tar.gz
nixpkgs-968ccdbc39215364315462754da1eff32c104bbe.tar.bz2
nixpkgs-968ccdbc39215364315462754da1eff32c104bbe.tar.lz
nixpkgs-968ccdbc39215364315462754da1eff32c104bbe.tar.xz
nixpkgs-968ccdbc39215364315462754da1eff32c104bbe.tar.zst
nixpkgs-968ccdbc39215364315462754da1eff32c104bbe.zip
sword: 1.7.4 -> 1.8.1
-rw-r--r--pkgs/development/libraries/sword/default.nix26
1 files changed, 14 insertions, 12 deletions
diff --git a/pkgs/development/libraries/sword/default.nix b/pkgs/development/libraries/sword/default.nix
index bdbed724b20..7349d7f81eb 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;
   };
 
 }