diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2024-01-07 16:14:41 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2024-01-07 16:14:41 +0100 |
commit | ff42d23313880d627c7dea5addf744db4562dee5 (patch) | |
tree | c9b37f000821c6e8e2e39d983ce8ea25a56e949c /pkgs/development/libraries/libfilezilla/default.nix | |
parent | 798690dc6b55c17705f9f2faab07d5b86b6d50d4 (diff) | |
parent | 9ea3a3cfaa995c201b68c1cd3877bd35e1d7dd04 (diff) | |
download | nixlib-ff42d23313880d627c7dea5addf744db4562dee5.tar nixlib-ff42d23313880d627c7dea5addf744db4562dee5.tar.gz nixlib-ff42d23313880d627c7dea5addf744db4562dee5.tar.bz2 nixlib-ff42d23313880d627c7dea5addf744db4562dee5.tar.lz nixlib-ff42d23313880d627c7dea5addf744db4562dee5.tar.xz nixlib-ff42d23313880d627c7dea5addf744db4562dee5.tar.zst nixlib-ff42d23313880d627c7dea5addf744db4562dee5.zip |
Merge branch 'master' into staging-next
Conflicts: pkgs/development/python-modules/dbt-core/default.nix pkgs/development/python-modules/dbt-semantic-interfaces/default.nix Still broken by pydantic 2 bump, though.
Diffstat (limited to 'pkgs/development/libraries/libfilezilla/default.nix')
-rw-r--r-- | pkgs/development/libraries/libfilezilla/default.nix | 12 |
1 files 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; }; } |