gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #231828 from Intuinewin/filezilla

Browse Source 
libfilezilla: 0.41.0 -> 0.45.0; filezilla: 3.63.1 -> 3.66.4
This commit is contained in:
Thomas Gerbet
2024-01-07 13:05:57 +01:00
committed by GitHub
parent 88f163d662 ac462d20a6
commit 5570f4ba1e
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/ftp/filezilla/default.nix
+12 -4
View File
@@ -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;
pkgs/development/libraries/libfilezilla/default.nix
+6 -6
View File
@@ -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;
};
}
pkgs/top-level/all-packages.nix
+3 -1
View File
@@ -31850,7 +31850,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;