Merge staging-next into staging

pkgs/development/libraries/libfilezilla/default.nix

@@ -1,14 +1,17 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, pkgconfig, nettle }:
 
 stdenv.mkDerivation rec {
-  name = "libfilezilla-${version}";
-  version = "0.13.0";
+  pname = "libfilezilla";
+  version = "0.16.0";
 
   src = fetchurl {
-    url = "http://download.filezilla-project.org/libfilezilla/${name}.tar.bz2";
-    sha256 = "0sk8kz2zrvf7kp9jrp3l4rpipv4xh0hg8d4h734xyag7vd03rjpz";
+    url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2";
+    sha256 = "1fd71vmllzvljff5l5ka5wnzbdsxx4i54dpxpklydmbsqpilnv1v";
   };
 
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ nettle ];
+
   meta = with stdenv.lib; {
     homepage = https://lib.filezilla-project.org/;
     description = "A modern C++ library, offering some basic functionality to build high-performing, platform-independent programs";

pkgs/development/libraries/pyotherside/default.nix

@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pyotherside";
-  version = "1.5.5";
+  version = "1.5.6";
 
   src = fetchFromGitHub {
     owner = "thp";
     repo = "pyotherside";
     rev = version;
-    sha256 = "1mczagl7mrgw9rqxlasgybrkfigdw1g7k542q75am8gp82m6wka9";
+    sha256 = "1cjx0fbrq9qvbirwy76pw1f5skm2afd51k4qb269ql4gpl67d5lv";
   };
 
   nativeBuildInputs = [ qmake ];

pkgs/development/libraries/re2/default.nix

@@ -1,24 +1,31 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   name = "re2-${version}";
-  version = "20140304";
+  version = "20190401";
 
-  src = fetchurl {
-    url = "https://re2.googlecode.com/files/${name}.tgz";
-    sha256 = "19wn0472c9dsxp35d0m98hlwhngx1f2xhxqgr8cb5x72gnjx3zqb";
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "re2";
+    rev = "2019-04-01";
+    sha256 = "018b8z3fgcr02rmhxdz80r363k40938cbgmk1c9b46k6xkc4q0hd";
   };
 
   preConfigure = ''
     substituteInPlace Makefile --replace "/usr/local" "$out"
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    # Fixed in https://github.com/google/re2/commit/b2c9765b4a7afbea8b6be1dae548b6f4d5f39e42
-    substituteInPlace Makefile \
-        --replace '-dynamiclib' '-dynamiclib -Wl,-install_name,$(libdir)/libre2.so.$(SONAME)'
+    # we're using gnu sed, even on darwin
+    substituteInPlace Makefile  --replace "SED_INPLACE=sed -i '''" "SED_INPLACE=sed -i"
   '';
 
+  preCheck = "patchShebangs runtests";
+  doCheck = true;
+  checkTarget = "test";
+
+  doInstallCheck = true;
+  installCheckTarget = "testinstall";
+
   meta = {
-    homepage = https://code.google.com/p/re2/;
+    homepage = https://github.com/google/re2;
     description = "An efficient, principled regular expression library";
     license = stdenv.lib.licenses.bsd3;
     platforms = with stdenv.lib.platforms; all;