From 56514d05b9922b14bf94e48ae20110494f374ba7 Mon Sep 17 00:00:00 2001 From: Antoine Labarussias Date: Sun, 14 May 2023 13:21:16 +0200 Subject: [PATCH 1/2] libfilezilla: 0.41.0 -> 0.45.0 --- pkgs/development/libraries/libfilezilla/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 3eb9fad6336f..99a3351d56ee 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.41.0"; + version = "0.45.0"; src = fetchurl { - url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - hash = "sha256-rCodDYKOpgB4fOoefuUNIfDTvZFSzs5hh7ivyQBiKqA="; + url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.xz"; + hash = "sha256-PBRUvBWG0Xd29ix1BdQ6BtOr0uLjVkLMpHf6IvJ9mC8="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { buildInputs = [ gettext gnutls nettle libxcrypt ] ++ lib.optionals stdenv.isDarwin [ libiconv ApplicationServices ]; - preBuild = lib.optionalString (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "11") '' - export MACOSX_DEPLOYMENT_TARGET=10.13 # for futimens() + preBuild = lib.optionalString (stdenv.isDarwin) '' + export MACOSX_DEPLOYMENT_TARGET=11.0 ''; enableParallelBuilding = true; @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { 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.unix; + platforms = lib.platforms.unix; }; } From ac462d20a6c074d701bfb0bd8ce22998125c0965 Mon Sep 17 00:00:00 2001 From: Antoine Labarussias Date: Sun, 14 May 2023 13:21:45 +0200 Subject: [PATCH 2/2] filezilla: 3.63.1 -> 3.66.4 --- .../networking/ftp/filezilla/default.nix | 16 ++++++++++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index ee114446ac1f..16a4e9b200c1 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -11,19 +11,22 @@ , pugixml , sqlite , tinyxml +, boost , wrapGAppsHook , wxGTK32 , gtk3 , xdg-utils +, CoreServices +, Security }: stdenv.mkDerivation rec { pname = "filezilla"; - version = "3.63.1"; + version = "3.66.4"; src = fetchurl { - url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; - hash = "sha256-TgtcD3n0+LykuiHnE7qXuG1bRcRyPeZ7nBDSO/QXo38="; + url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.xz"; + hash = "sha256-pA8E4C76rntQ0VFe4cNsSw5EWBhWbEUORAv9bHDpsgM="; }; configureFlags = [ @@ -34,6 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; buildInputs = [ + boost dbus gettext gnutls @@ -46,7 +50,11 @@ stdenv.mkDerivation rec { wxGTK32 gtk3 xdg-utils - ]; + ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; + + preBuild = lib.optionalString (stdenv.isDarwin) '' + export MACOSX_DEPLOYMENT_TARGET=11.0 + ''; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18538c0d86fd..49769cb79a74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31909,7 +31909,9 @@ with pkgs; feishu = callPackage ../applications/networking/instant-messengers/feishu { }; - filezilla = callPackage ../applications/networking/ftp/filezilla { }; + filezilla = darwin.apple_sdk_11_0.callPackage ../applications/networking/ftp/filezilla { + inherit (darwin.apple_sdk_11_0.frameworks) CoreServices Security; + }; fire = darwin.apple_sdk_11_0.callPackage ../applications/audio/fire { inherit (darwin.apple_sdk_11_0.frameworks) Accelerate Cocoa WebKit CoreServices DiscRecording CoreAudioKit MetalKit;