Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 35ecd632afcd
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 36b48140d643
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Apr 14, 2020

  1. biblesync: 1.1.2 -> 2.0.1

    @AndersonTorres
    AndersonTorres committed Apr 14, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    eliottness Eliott Bouhana
    GPG key ID: 5C4DC5A45005B771
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8897848 View commit details

  2. sword: 1.7.4 -> 1.8.1

    @AndersonTorres
    AndersonTorres committed Apr 14, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    968ccdb View commit details

Commits on Apr 15, 2020

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

    Update biblesync+sword
    @AndersonTorres
    AndersonTorres authored Apr 15, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    36b4814 View commit details
Showing with 32 additions and 30 deletions.
  1. +18 −18 pkgs/development/libraries/biblesync/default.nix
  2. +14 −12 pkgs/development/libraries/sword/default.nix
36 changes: 18 additions & 18 deletions pkgs/development/libraries/biblesync/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
26 changes: 14 additions & 12 deletions pkgs/development/libraries/sword/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
};

}