;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
-;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
-;;; Copyright © 2018 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2018 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2018, 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2018, 2019, 2020 Nicolas Goaziou <mail@nicolasgoaziou.fr>
+;;; Copyright © 2019 Clément Lassieur <clement@lassieur.org>
+;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
+;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
;;;
;;; This file is part of GNU Guix.
;;;
(define-module (gnu packages sync)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix build-system cmake)
+ #:use-module (guix build-system copy)
+ #:use-module (guix build-system gnu)
#:use-module (guix build-system go)
#:use-module (guix build-system meson)
+ #:use-module (guix build-system qt)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix packages)
#:use-module (gnu packages)
#:use-module (gnu packages acl)
+ #:use-module (gnu packages adns)
+ #:use-module (gnu packages autotools)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages crypto)
#:use-module (gnu packages curl)
+ #:use-module (gnu packages documentation)
+ #:use-module (gnu packages freedesktop)
+ #:use-module (gnu packages glib)
+ #:use-module (gnu packages gnome)
#:use-module (gnu packages golang)
+ #:use-module (gnu packages graphviz)
+ #:use-module (gnu packages image)
+ #:use-module (gnu packages kde-frameworks)
#:use-module (gnu packages linux)
#:use-module (gnu packages lua)
+ #:use-module (gnu packages ocaml)
+ #:use-module (gnu packages pcre)
#:use-module (gnu packages perl)
- #:use-module (gnu packages python-xyz)
#:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages python)
+ #:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
+ #:use-module (gnu packages readline)
#:use-module (gnu packages rsync)
+ #:use-module (gnu packages ruby)
#:use-module (gnu packages selinux)
+ #:use-module (gnu packages shells)
+ #:use-module (gnu packages sphinx)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages tls))
-(define-public owncloud-client
+(define-public nextcloud-client
(package
- (name "owncloud-client")
- (version "2.5.3.11470")
+ (name "nextcloud-client")
+ (version "3.1.3")
(source
(origin
- (method url-fetch)
- (uri (string-append "https://download.owncloud.com/desktop/stable/"
- "owncloudclient-" version ".tar.xz"))
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/nextcloud/desktop")
+ (commit (string-append "v" version))))
+ (file-name
+ (git-file-name name version))
(sha256
- (base32 "0cznis8qadsnlgm046lxn8vmbxli6zp4b8nk93n53mkfxlcw355n"))
- (patches (search-patches "owncloud-disable-updatecheck.patch"))
- (modules '((guix build utils)))
+ (base32 "15ymk3gvfmgwzmqbhlw7jjy9y65ib3391h1dlmpll65iaj2miajk"))
+ (modules '((guix build utils)
+ (ice-9 ftw)
+ (srfi srfi-1)))
(snippet
'(begin
- ;; libcrashreporter-qt has its own bundled dependencies
- (delete-file-recursively "src/3rdparty/libcrashreporter-qt")
- (delete-file-recursively "src/3rdparty/sqlite3")
- ;; qprogessindicator, qlockedfile, qtokenizer and
- ;; qtsingleapplication have not yet been packaged, but all are
- ;; explicitly used from the 3rdparty folder during build.
- ;; We can also remove the macgoodies folder
- (delete-file-recursively "src/3rdparty/qtmacgoodies")
+ ;; Not available in Guix.
+ (let* ((keep '("QProgressIndicator" "qtokenizer")))
+ (with-directory-excursion "src/3rdparty"
+ (for-each delete-file-recursively
+ (lset-difference string=?
+ (scandir ".")
+ (cons* "." ".." keep)))))
+ (with-directory-excursion "src/gui"
+ (substitute* "CMakeLists.txt"
+ ;; Remove references of deleted 3rdparties.
+ (("[ \t]*\\.\\./3rdparty/qtlockedfile/?.*\\.cpp")
+ "")
+ (("[ \t]*\\.\\./3rdparty/qtsingleapplication/?.*\\.cpp")
+ "")
+ (("[ \t]*\\.\\./3rdparty/kmessagewidget/?.*\\.cpp")
+ "")
+ (("[ \t]*list\\(APPEND 3rdparty_SRC \\.\\./3rdparty/?.*\\)")
+ "")
+ (("\\$\\{CMAKE_SOURCE_DIR\\}/src/3rdparty/qtlockedfile")
+ "")
+ (("\\$\\{CMAKE_SOURCE_DIR\\}/src/3rdparty/qtsingleapplication")
+ "")
+ (("\\$\\{CMAKE_SOURCE_DIR\\}/src/3rdparty/kmessagewidget")
+ ;; For this, we rely on build inputs, so let's just replace
+ ;; them by an autoconf-style variable.
+ "@kwidgetsaddons@")
+ ;; Expand libraries, that used to be statically linked, but
+ ;; no longer are post-vendoring.
+ (("\\$\\{synclib_NAME\\}")
+ (string-append "${synclib_NAME} "
+ "QtSolutions_LockedFile "
+ "QtSolutions_SingleApplication "
+ "KF5WidgetsAddons")))
+ ;; Fix compatibility with QtSingleApplication from QtSolutions.
+ (substitute* '("application.h" "application.cpp")
+ (("SharedTools::QtSingleApplication")
+ "QtSingleApplication")
+ (("slotParseMessage\\(const QString &(msg)?.*\\)")
+ "slotParseMessage(const QString &msg)")))
#t))))
+ (build-system qt-build-system)
+ (arguments
+ `(#:configure-flags
+ (list
+ "-DUNIT_TESTING=ON"
+ ;; Upstream Bug: https://github.com/nextcloud/desktop/issues/2885
+ "-DNO_SHIBBOLETH=ON")
+ #:imported-modules
+ ((guix build glib-or-gtk-build-system)
+ ,@%qt-build-system-modules)
+ #:modules
+ (((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
+ (guix build qt-build-system)
+ (guix build utils))
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'patch-cmake
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Patch install directory for dbus service files.
+ (substitute* "shell_integration/libcloudproviders/CMakeLists.txt"
+ (("PKGCONFIG_GETVAR\\(.+ _install_dir\\)")
+ (string-append "set(_install_dir \"${CMAKE_INSTALL_PREFIX}"
+ "/share/dbus-1/services\")")))
+ (substitute* "shell_integration/dolphin/CMakeLists.txt"
+ ;; Make sure, that Qt modules are installed under $prefix.
+ (("ON CACHE") "OFF CACHE"))
+ (substitute* "src/gui/CMakeLists.txt"
+ (("@kwidgetsaddons@")
+ (string-append (assoc-ref inputs "kwidgetsaddons")
+ "/include/KF5/KWidgetsAddons/")))
+ #t))
+ (add-before 'check 'pre-check
+ (lambda _
+ ;; Tests write to $HOME.
+ (setenv "HOME" (getcwd))
+ #t))
+ (add-after 'install 'glib-or-gtk-compile-schemas
+ (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
+ (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap
+ (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
+ (native-inputs
+ `(("cmocka" ,cmocka)
+ ("dot" ,graphviz)
+ ("doxygen" ,doxygen)
+ ("extra-cmake-modules" ,extra-cmake-modules)
+ ("glib:bin" ,glib "bin")
+ ("perl" ,perl)
+ ("pkg-config" ,pkg-config)
+ ("python" ,python-wrapper)
+ ("qttools" ,qttools)
+ ("ruby" ,ruby)))
+ (inputs
+ `(("appstream" ,appstream)
+ ("desktop-file-utils" ,desktop-file-utils)
+ ("glib" ,glib)
+ ("kconfig" ,kconfig)
+ ("kcoreaddons" ,kcoreaddons)
+ ("kio" ,kio)
+ ("kjs" ,kjs)
+ ("kwidgetsaddons" ,kwidgetsaddons)
+ ("libcloudproviders" ,libcloudproviders)
+ ("libzip" ,libzip)
+ ("openssl" ,openssl)
+ ("python-nautilus" ,python-nautilus)
+ ("qtbase" ,qtbase)
+ ("qtdeclarative" ,qtdeclarative)
+ ("qtgraphicaleffects" ,qtgraphicaleffects)
+ ("qtkeychain" ,qtkeychain)
+ ("qtquickcontrols2" ,qtquickcontrols2)
+ ("qtsolutions" ,qtsolutions)
+ ("qtsvg" ,qtsvg)
+ ("qtwebchannel" ,qtwebchannel)
+ ("qtwebsockets" ,qtwebsockets)
+ ("qtwebkit" ,qtwebkit)
+ ("sqlite" ,sqlite)
+ ("xdg-utils" ,xdg-utils)
+ ("zlib" ,zlib)))
+ (propagated-inputs
+ `(("qtwebengine" ,qtwebengine)))
+ (synopsis "Desktop sync client for Nextcloud")
+ (description "Nextcloud-Desktop is a tool to synchronize files from
+Nextcloud Server with your computer.")
+ (home-page "https://nextcloud.com")
+ (license (list license:expat ; QProgressIndicator
+ license:lgpl2.1+ ; qtokenizer
+ license:gpl2+))))
+
+(define-public megacmd
+ (package
+ (name "megacmd")
+ (version "1.1.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/meganz/MEGAcmd")
+ (commit (string-append version "_Linux"))
+ (recursive? #t)))
+ (sha256
+ (base32
+ "004j8m3xs6slx03g2g6wzr97myl2v3zc09wxnfar5c62a625pd53"))
+ (file-name (git-file-name name version))))
+ (build-system gnu-build-system)
+ ;; XXX: Disabling tests because they depend on libgtest.la from googletest,
+ ;; which is not installed for unclear reasons.
+ (arguments
+ `(#:tests? #f
+ #:configure-flags '("--with-pcre")))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("libtool" ,libtool)))
+ (inputs
+ `(("c-ares" ,c-ares)
+ ("crypto++" ,crypto++)
+ ("curl" ,curl)
+ ("freeimage" ,freeimage)
+ ("gtest" ,googletest)
+ ("openssl" ,openssl)
+ ("pcre" ,pcre)
+ ("readline" ,readline)
+ ("sodium" ,libsodium)
+ ("sqlite3" ,sqlite)
+ ("zlib" ,zlib)))
+ (home-page "https://mega.nz/cmd")
+ (synopsis
+ "Command Line Interactive and Scriptable Application to access mega.nz")
+ (description "MEGAcmd provides non UI access to MEGA services. It intends
+to offer all the functionality of a MEGA account via commands. It features
+synchronization, backup of local folders into a MEGA account and a
+webdav/streaming server.
+
+See also: megatools, a third-party alternative more commonly packaged in other
+distributions.")
+ (license (list license:bsd-2 license:gpl3+))))
+
+(define-public megatools
+ (package
+ (name "megatools")
+ (version "1.10.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://megatools.megous.com/builds/megatools-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1nwbalc54iz6616liyxfalf5yafwx0iv6cmqgvg4kz9khqscmhcd"))))
+ (build-system gnu-build-system)
+ (arguments
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'install-completions
+ (lambda* (#:key outputs #:allow-other-keys)
+ (install-file "contrib/bash-completion/megatools"
+ (string-append (assoc-ref outputs "out")
+ "/etc/bash_completion.d"))
+ #t)))))
+ (native-inputs
+ `(("pkg-config" ,pkg-config)
+ ;; For documentation
+ ("asciidoc" ,asciidoc)))
+ (inputs
+ `(("curl" ,curl)
+ ("glib" ,glib)
+ ("openssl" ,openssl)))
+ (home-page "https://megatools.megous.com/")
+ (synopsis "Command line client application for mega.nz")
+ (description "Megatools is a collection of programs for accessing the mega.nz service
+from the command line.
+
+Megatools allow you to copy individual files as well as entire directory trees to and from
+the cloud. You can also perform streaming downloads for example to preview videos and
+audio files, without needing to download the entire file first.
+
+Megatools are robust and optimized for fast operation - as fast as Mega servers allow.
+Memory requirements and CPU utilization are kept at minimum.
+
+See also: megacmd, the official tool set by MEGA.")
+ (license license:gpl2)))
+
+(define-public owncloud-client
+ (package
+ (name "owncloud-client")
+ (version "2.7.6.3261")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://download.owncloud.com/desktop/ownCloud/stable/"
+ version "/source/ownCloud-" version ".tar.xz"))
+ (sha256
+ (base32 "19jjlhbzhy4v5h1wj5a87ismxq2p7avb2bb4lfbh2rvl01r432vy"))
+ (patches (search-patches "owncloud-disable-updatecheck.patch"))))
+ ;; TODO: unbundle qprogessindicator, qlockedfile, qtokenizer and
+ ;; qtsingleapplication which have not yet been packaged, but all are
+ ;; explicitly used from the 3rdparty folder during build.
(build-system cmake-build-system)
(arguments
`(#:phases
;; "Could not create autostart folder"
(lambda _
(substitute* "test/CMakeLists.txt"
- (("owncloud_add_test\\(Utility \"\"\\)" test)
+ (("owncloud_add_test\\(Utility\\)" test)
(string-append "#" test)))
#t))
(add-after 'unpack 'dont-embed-store-path
"-DNO_SHIBBOLETH=1")))
(native-inputs
`(("cmocka" ,cmocka)
+ ("extra-cmake-modules" ,extra-cmake-modules)
("perl" ,perl)
("pkg-config" ,pkg-config)
("qtlinguist" ,qttools)))
(origin
(method git-fetch)
(uri (git-reference
- (url "https://github.com/axkibe/lsyncd.git")
+ (url "https://github.com/axkibe/lsyncd")
(commit (string-append "release-" version))))
(file-name (git-file-name name version))
(sha256
#:test-target "tests"
#:phases
(modify-phases %standard-phases
- ;; No install target.
+ (add-after 'unpack 'search-$PATH-for-binaries
+ ;; lsyncd requires and hard-codes absolute file names to binaries.
+ ;; Make it fall back to searching $PATH for relative file names.
+ (lambda _
+ (substitute* "lsyncd.c"
+ (("execv\\(") "execvp("))
+ (substitute* (list "lsyncd.lua"
+ "default-direct.lua"
+ "default-rsync.lua"
+ "default-rsyncssh.lua")
+ (("(|/usr)/bin/") ""))
+ #t))
(replace 'install
+ ;; No install target.
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
and does not hamper local file system performance.")
(license license:gpl2+)))
+(define-public usync
+ (let ((revision "1")
+ (commit "09a8059a1adc22666d3ecf7872e22e6846c3ac9e"))
+ (package
+ (name "usync")
+ (version (git-version "0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ebzzry/usync")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "16i1q8f0jmfd43rb8d70l2b383vr5ib4kh7iq3yd345q7xjz9c2j"))))
+ (build-system copy-build-system)
+ (inputs
+ `(("scsh" ,scsh)))
+ (propagated-inputs
+ `(("rsync" ,rsync)
+ ("unison" ,unison)))
+ (arguments
+ `(#:install-plan '(("usync" "bin/usync"))
+ #:phases (modify-phases %standard-phases
+ (add-before 'install 'patch-usync-shebang
+ (lambda _
+ (substitute* "usync"
+ (("/usr/bin/env scsh")
+ (which "scsh"))))))))
+ (home-page "https://github.com/ebzzry/usync")
+ (synopsis "Command line site-to-site synchronization tool")
+ (description
+ "@command{usync} is a simple site-to-site synchronization program
+written in @command{scsh}. It makes use of @command{unison} and
+@command{rsync} for bi- and uni-directional synchronizations.")
+ (license license:expat))))
+
(define-public casync
(package
(name "casync")
("rsync" ,rsync))) ;for tests
(inputs
`(("xz" ,xz) ;for liblzma
- ("zstd" ,zstd)
+ ("zstd" ,zstd "lib")
("curl" ,curl)
("acl" ,acl)
("libselinux" ,libselinux)
(define-public rclone
(package
(name "rclone")
- (version "1.46")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/ncw/rclone.git")
- (commit (string-append "v" version))))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1fl52dl41n76r678nzkxa2kgk9khn1fxraxgk8jd3ayc787qs9ia"))))
+ (version "1.52.3")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://github.com/rclone/rclone/releases/download/"
+ "v" version "/rclone-v" version ".tar.gz"))
+ (sha256
+ (base32 "1pdhsxzc5ch2brfylghc602h9ba3x5dshxm3vcaldrgfac0rx0zl"))))
;; FIXME: Rclone bundles some libraries Guix already provides. Need to
;; un-bundle them.
(build-system go-build-system)
(arguments
- '(#:import-path "github.com/ncw/rclone"
+ '(#:import-path "github.com/rclone/rclone"
#:install-source? #f))
(synopsis "@code{rsync} for cloud storage")
(description "@code{Rclone} is a command line program to sync files and
HCoop / jackhill / guix / guix.git / blobdiff