diff options
author | Marius Bakke <marius@gnu.org> | 2021-05-09 21:29:46 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2021-05-09 21:29:46 +0200 |
commit | f03426420497cd9839f5fb3cb547dbecd8d6053b (patch) | |
tree | 220cdbab5b58b27c63d2df3ee711ad4bfdda074b /gnu/packages/ftp.scm | |
parent | 3cf1afb7e7249992b2db2f4f00899fd22237e89a (diff) | |
parent | 069399ee9dbf75b7c89583f03346a63b2cfe4ac6 (diff) | |
download | guix-f03426420497cd9839f5fb3cb547dbecd8d6053b.tar.gz guix-f03426420497cd9839f5fb3cb547dbecd8d6053b.zip |
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/bioinformatics.scm
gnu/packages/django.scm
gnu/packages/gtk.scm
gnu/packages/llvm.scm
gnu/packages/python-web.scm
gnu/packages/python.scm
gnu/packages/tex.scm
guix/build-system/asdf.scm
guix/build/emacs-build-system.scm
guix/profiles.scm
Diffstat (limited to 'gnu/packages/ftp.scm')
-rw-r--r-- | gnu/packages/ftp.scm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index 961ce3a464..4ee96125fd 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -32,6 +32,7 @@ #:use-module (gnu packages cpio) #:use-module (gnu packages compression) #:use-module (gnu packages freedesktop) + #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) @@ -175,20 +176,21 @@ as required.") (define-public libfilezilla (package (name "libfilezilla") - (version "0.24.1") + (version "0.28.0") (source (origin (method url-fetch) (uri (string-append "https://download.filezilla-project.org/" "libfilezilla/libfilezilla-" version ".tar.bz2")) (sha256 - (base32 "1zfnqbn14dx0fl45mfaznr5n5xsxy1kx8z9f80fppbqn37pb9mgx")))) + (base32 "0f0n0kkhclp387glmc758134z4l0qk8935mi523q60b11q3j3h77")))) (build-system gnu-build-system) (arguments `(#:configure-flags (list "--disable-static"))) (native-inputs `(("cppunit" ,cppunit) + ("gcc" ,gcc-8) ; XXX remove when it's the default ("gettext" ,gettext-minimal) ("pkg-config" ,pkg-config))) (inputs @@ -218,14 +220,14 @@ output. (define-public filezilla (package (name "filezilla") - (version "3.50.0") + (version "3.53.1") (source (origin (method url-fetch) (uri (string-append "https://download.filezilla-project.org/client/" "FileZilla_" version "_src.tar.bz2")) (sha256 - (base32 "042w2f5cf8g9cr7d3m6294ygx7jggcria9502jnql855khk8gnz0")))) + (base32 "0ygpqfzj5ms1pd46fpfya1y1jl4w2kmaa7plf8n6fm7cxbr78s35")))) (build-system gnu-build-system) (arguments ;; Don't let filezilla phone home to check for updates. |