10 files changed, 55 insertions, 22 deletions
diff --git a/pkgs/applications/audio/distrho/default.nix b/pkgs/applications/audio/distrho/default.nix
index 1e52e8423307..a590716537bc 100644
--- a/pkgs/applications/audio/distrho/default.nix
+++ b/pkgs/applications/audio/distrho/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchgit, alsaLib, fftwSinglePrec, freetype, libjack2
-, libxslt, lv2, pkgconfig, premake3, xlibs }:
+, libxslt, lv2, pkgconfig, premake3, xlibs, ladspa-sdk }:
 
 stdenv.mkDerivation rec {
-  name = "distrho-ports-git-2015-05-04";
+  name = "distrho-ports-git-2015-07-18";
 
   src = fetchgit {
     url = "https://github.com/DISTRHO/DISTRHO-Ports.git";
-    rev = "3f13db5dc7722ed0dcbb5256d7fac1ac9165c2d8";
-    sha256 = "6f740f6a8af714436ef75b858944e8122490a2faa04591a201105e84bca42fa0";
+    rev = "53458838505efef91ed069d0a7d970b6b3588eba";
+    sha256 = "0fb4dxfvvqy8lnm9c91sxwn5wbcw8grfpm52zag25vrls251aih3";
   };
 
   patchPhase = ''
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     alsaLib fftwSinglePrec freetype libjack2 pkgconfig premake3
     xlibs.libX11 xlibs.libXcomposite xlibs.libXcursor xlibs.libXext
-    xlibs.libXinerama xlibs.libXrender
+    xlibs.libXinerama xlibs.libXrender ladspa-sdk
   ];
 
   buildPhase = ''
diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix
index cba69c476b54..67513bcf9230 100644
--- a/pkgs/applications/graphics/solvespace/default.nix
+++ b/pkgs/applications/graphics/solvespace/default.nix
@@ -4,7 +4,7 @@
 stdenv.mkDerivation {
   name = "solvespace-2.0";
   src = fetchgit {
-    url = "https://gitorious.org/solvespace/solvespace.git";
+    url = "https://github.com/jwesthues/solvespace.git";
     sha256 = "0sakxkmj2f0k27f67wy1xz2skpnwzg15yqrf7av97pgc5s8xb3da";
     rev = "e587d0e";
   };
diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix
index 78d499396772..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
@@ -12,15 +12,15 @@
 
 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";
+    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 = ''
diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix
index 9855738d6d6d..1ed63f7ac9e9 100644
--- a/pkgs/data/fonts/fira-code/default.nix
+++ b/pkgs/data/fonts/fira-code/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "fira-code-${version}";
-  version = "0.5";
+  version = "0.6";
 
   src = fetchurl {
     url = "https://github.com/tonsky/FiraCode/releases/download/${version}/FiraCode-Regular.otf";
-    sha256 = "1y2jz1v7m0q73rz9vblxgaqkgh9wpp4fp7dq21hdyfhxkk3ss6xk";
+    sha256 = "1blalxnmrxqlm5i74jhm8j29n0zsnmqi3gppxa9szjzv4x2k5s0a";
   };
 
   phases = [ "installPhase" ];
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/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 ];
diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix
index f82daee7b14f..dd06d946128d 100644
--- a/pkgs/servers/nosql/cassandra/2.1.nix
+++ b/pkgs/servers/nosql/cassandra/2.1.nix
@@ -11,8 +11,8 @@
 
 let
 
-  version = "2.1.7";
-  sha256 = "12chnxcl9zg20d0l4rlzp13cnxvdqr8bx3bbvwbcpnh7ir5s7ldd";
+  version = "2.1.8";
+  sha256 = "1x92nw81pa4s95lv9qj42p05ry3ajk8klsqgc30zv7sjzm7cc31s";
 
 in
 
diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix
index 31acb8dd9ecd..29b920295585 100644
--- a/pkgs/tools/networking/stunnel/default.nix
+++ b/pkgs/tools/networking/stunnel/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "stunnel-${version}";
-  version = "5.20";
+  version = "5.22";
 
   src = fetchurl {
     url    = "http://www.stunnel.org/downloads/${name}.tar.gz";
-    sha256 = "0ar940mw5sjxkh98d6wnrd366jfkqirbyf2b5kcdk1vjk9ra6dja";
+    sha256 = "0gxqiiksc5p65s67f53yxa2hb8w4hfcgd0s20jrcslw1jjk2imla";
   };
 
   buildInputs = [ openssl ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index acf9f628bbf0..19353eab4e95 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8215,6 +8215,8 @@ let
 
   sword = callPackage ../development/libraries/sword { };
 
+  biblesync = callPackage ../development/libraries/biblesync { };
+
   szip = callPackage ../development/libraries/szip { };
 
   t1lib = callPackage ../development/libraries/t1lib { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 379c245d9591..e952f266ed11 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9845,11 +9845,11 @@ let
 
 
   py = buildPythonPackage rec {
-    name = "py-1.4.24";
+    name = "py-1.4.30";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/py/${name}.tar.gz";
-      md5 = "8f32ee0cd1e01472a255fe1d28d81217";
+      md5 = "a904aabfe4765cb754f2db84ec7bb03a";
     };
   };