suzanne.soy/nixpkgs
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge pull request #84631 from AndersonTorres/update-biblesync+sword

Browse Source 
Update biblesync+sword
This commit is contained in:
Anderson Torres 2020-04-15 01:13:49 -03:00 committed by GitHub
commit 36b48140d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkgs/development/libraries/biblesync/default.nix
View File

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

26
pkgs/development/libraries/sword/default.nix
View File

@ -3,11 +3,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "sword"; pname = "sword";
version = "1.7.4"; version = "1.8.1";
src = fetchurl { src = fetchurl {
url = "https://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/${pname}-${version}.tar.gz"; url = "https://www.crosswire.org/ftpmirror/pub/sword/source/v1.8/${pname}-${version}.tar.gz";
sha256 = "0g91kpfkwccvdikddffdbzd6glnp1gdvkx4vh04iyz10bb7shpcr"; sha256 = "14syphc47g6svkbg018nrsgq4z6hid1zydax243g8dx747vsi6nf";
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
@ -17,13 +17,6 @@ stdenv.mkDerivation rec {
patchShebangs .; 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" ]; configureFlags = [ "--without-conf" "--enable-tests=no" ];
CXXFLAGS = [ CXXFLAGS = [
"-Wno-unused-but-set-variable" "-Wno-unused-but-set-variable"
@ -34,9 +27,18 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A software framework that allows research manipulation of Biblical texts"; description = "A software framework that allows research manipulation of Biblical texts";
homepage = "http://www.crosswire.org/sword/"; 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; license = licenses.gpl2;
maintainers = [ maintainers.piotr maintainers.AndersonTorres ]; maintainers = with maintainers; [ piotr AndersonTorres ];
platforms = platforms.unix;
}; };
} }