diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-10-19 12:51:57 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-10-19 13:11:40 -0400 |
| commit | 5e2140511c1ad9ccd731438b74d61b62111da1e6 (patch) | |
| tree | a4ff748ad26e121b88469b5d921001ef1382be8f /gnu/packages/ftp.scm | |
| parent | 9e3a5ee417ea7fe9721be8804ff047e80c4f22ed (diff) | |
| parent | 353bdae32f72b720c7ddd706576ccc40e2b43f95 (diff) | |
| download | guix-5e2140511c1ad9ccd731438b74d61b62111da1e6.tar.gz guix-5e2140511c1ad9ccd731438b74d61b62111da1e6.zip | |
Merge branch 'staging'
Conflicts:
gnu/packages/admin.scm
gnu/packages/commencement.scm
gnu/packages/gdb.scm
gnu/packages/llvm.scm
gnu/packages/package-management.scm
gnu/packages/tls.scm
Diffstat (limited to 'gnu/packages/ftp.scm')
| -rw-r--r-- | gnu/packages/ftp.scm | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/gnu/packages/ftp.scm b/gnu/packages/ftp.scm index 651e732ab3..b178063556 100644 --- a/gnu/packages/ftp.scm +++ b/gnu/packages/ftp.scm @@ -170,20 +170,25 @@ as required.") (define-public libfilezilla (package (name "libfilezilla") - (version "0.16.0") + (version "0.24.1") (source (origin (method url-fetch) (uri (string-append "https://download.filezilla-project.org/" "libfilezilla/libfilezilla-" version ".tar.bz2")) (sha256 - (base32 "1fd71vmllzvljff5l5ka5wnzbdsxx4i54dpxpklydmbsqpilnv1v")))) + (base32 "1zfnqbn14dx0fl45mfaznr5n5xsxy1kx8z9f80fppbqn37pb9mgx")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list "--disable-static"))) (native-inputs `(("cppunit" ,cppunit) + ("gettext" ,gettext-minimal) ("pkg-config" ,pkg-config))) (inputs - `(("nettle" ,nettle))) + `(("gnutls" ,gnutls) + ("nettle" ,nettle))) (home-page "https://lib.filezilla-project.org") (synopsis "Cross-platform C++ library used by Filezilla client") (description @@ -208,20 +213,21 @@ output. (define-public filezilla (package (name "filezilla") - (version "3.42.1") + (version "3.50.0") (source (origin (method url-fetch) (uri (string-append "https://download.filezilla-project.org/client/" "FileZilla_" version "_src.tar.bz2")) (sha256 - (base32 "083ycsycwy1szhp3mzf998wsqa74hmdxdsy07x6k81vp2cxjxijg")))) + (base32 "042w2f5cf8g9cr7d3m6294ygx7jggcria9502jnql855khk8gnz0")))) (build-system gnu-build-system) (arguments ;; Don't let filezilla phone home to check for updates. '(#:configure-flags '("--disable-autoupdatecheck"))) (native-inputs - `(("gettext" ,gettext-minimal) + `(("cppunit" ,cppunit) + ("gettext" ,gettext-minimal) ("pkg-config" ,pkg-config) ("xdg-utils" ,xdg-utils))) (inputs |