Merge pull request #64528 from xrelkd/update/filezilla

filezilla: 3.42.1 -> 3.43.0, libfilezilla: 0.16.0 -> 0.17.1

2 files changed, 48 insertions, 15 deletions

diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index 6bac5bd58362..530671e6173f 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -1,13 +1,28 @@
-{ stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext
-, pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla, nettle }:
+{ stdenv
+, fetchurl
 
-let version = "3.42.1"; in
-stdenv.mkDerivation {
-  name = "filezilla-${version}";
+, dbus
+, gettext
+, gnutls
+, gtk2
+, libfilezilla
+, libidn
+, nettle
+, pkgconfig
+, pugixml
+, sqlite
+, tinyxml
+, wxGTK30
+, xdg_utils
+}:
+
+stdenv.mkDerivation rec {
+  pname = "filezilla";
+  version = "3.43.0";
 
   src = fetchurl {
     url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2";
-    sha256 = "083ycsycwy1szhp3mzf998wsqa74hmdxdsy07x6k81vp2cxjxijg";
+    sha256 = "13i505y34b6lg7knzznf8812d9nwpnbf3hidpq58cbv8c31m5rkg";
   };
 
   configureFlags = [
@@ -17,21 +32,32 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    dbus gnutls wxGTK30 libidn tinyxml gettext xdg_utils gtk2 sqlite
-    pugixml libfilezilla nettle ];
+    dbus
+    gettext
+    gnutls
+    gtk2
+    libfilezilla
+    libidn
+    nettle
+    pugixml
+    sqlite
+    tinyxml
+    wxGTK30
+    xdg_utils
+  ];
 
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = https://filezilla-project.org/;
+    homepage = "https://filezilla-project.org/";
     description = "Graphical FTP, FTPS and SFTP client";
-    license = licenses.gpl2;
     longDescription = ''
       FileZilla Client is a free, open source FTP client. It supports
       FTP, SFTP, and FTPS (FTP over SSL/TLS). The client is available
       under many platforms, binaries for Windows, Linux and macOS are
       provided.
     '';
+    license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ pSub ];
   };
diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix
index 4a051f34b0ba..2a87994db5ef 100644
--- a/pkgs/development/libraries/libfilezilla/default.nix
+++ b/pkgs/development/libraries/libfilezilla/default.nix
@@ -1,19 +1,26 @@
-{ stdenv, fetchurl, pkgconfig, nettle }:
+{ stdenv
+, fetchurl
+
+, gettext
+, gnutls
+, nettle
+, pkgconfig
+}:
 
 stdenv.mkDerivation rec {
   pname = "libfilezilla";
-  version = "0.16.0";
+  version = "0.17.1";
 
   src = fetchurl {
     url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2";
-    sha256 = "1fd71vmllzvljff5l5ka5wnzbdsxx4i54dpxpklydmbsqpilnv1v";
+    sha256 = "1cnkcl9vif5lz1yx813qrphlpc6gvmzxdmkbd17kh5jqiqdi9vyk";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ nettle ];
+  buildInputs = [ gettext gnutls nettle ];
 
   meta = with stdenv.lib; {
-    homepage = https://lib.filezilla-project.org/;
+    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 ];