Merge master into closure-size

The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.

1 files changed, 19 insertions, 0 deletions

diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix
new file mode 100644
index 000000000000..d8e1c29875c0
--- /dev/null
+++ b/pkgs/development/libraries/libfilezilla/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "libfilezilla-${version}";
+  version = "0.4.0.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/filezilla/libfilezilla/${version}/${name}.tar.bz2";
+    sha256 = "1ldiyhjv4jg2jyj3d56mlgyj9lx0qkf1857wvsy51lp9aj96h0v0";
+  };
+
+  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";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ pSub ];
+    platforms = platforms.linux;
+  };
+}