From 811b907da7bad99b7d7493623a0d7d61c388451b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 14 Feb 2019 03:45:50 +0100 Subject: gnu: rclone: Update to 1.46. * gnu/packages/sync.scm (rclone): Update to 1.46. [arguments]: Remove 'set-home-directory' phase. --- gnu/packages/sync.scm | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'gnu/packages/sync.scm') diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 421e362cde..d8789de2ce 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner ;;; Copyright © 2017 Ricardo Wurmus -;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Ludovic Courtès ;;; Copyright © 2018 Nicolas Goaziou ;;; @@ -249,7 +249,7 @@ over the Internet in an HTTP and CDN friendly way; (define-public rclone (package (name "rclone") - (version "1.45") + (version "1.46") (source (origin (method git-fetch) (uri (git-reference @@ -258,19 +258,13 @@ over the Internet in an HTTP and CDN friendly way; (file-name (git-file-name name version)) (sha256 (base32 - "06xg0ibv9pnrnmabh1kblvxx1pk8h5rmkr9mjbymv497sx3zgz26")))) + "1fl52dl41n76r678nzkxa2kgk9khn1fxraxgk8jd3ayc787qs9ia")))) ;; 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" - #:install-source? #f - #:phases - (modify-phases %standard-phases - ;; Fix failure during "check" phase: "mkdir /homeless-shelter: - ;; permission denied". - (add-after 'unpack 'set-home-directory - (lambda _ (setenv "HOME" "/tmp") #t))))) + #:install-source? #f)) (synopsis "@code{rsync} for cloud storage") (description "@code{Rclone} is a command line program to sync files and directories to and from different cloud storage providers. -- cgit v1.2.3 From 836931a5a7036279310ecc955fbdebca3574ab47 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 17 Feb 2019 21:39:14 +0100 Subject: gnu: lsyncd: Don't use unstable tarball. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/sync.scm (lsyncd)[source]: Use GIT-FETCH and GIT-FILE-NAME. [arguments]: Adjust ‘install’ phase to new source directory. --- gnu/packages/sync.scm | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'gnu/packages/sync.scm') diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index d8789de2ce..df9f3b0e16 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -162,13 +162,13 @@ their folder. (version "2.2.2") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/axkibe/lsyncd/archive/release-" - version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/axkibe/lsyncd.git") + (commit (string-append "release-" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 - "02g054qv8rnbxywd4f0gnd13lrlns9175d3ciqnyslhs1zs15nqb")))) + (base32 "1q2ixp52r96ckghgmxdbms6xrq8dbziimp8gmgzqfq4lk1v1w80y")))) (build-system cmake-build-system) (arguments `(;; The "tests" target is broken and assumes that tests are run in the @@ -184,10 +184,7 @@ their folder. (bin (string-append out "/bin")) (man (string-append out "/share/man/man1"))) (install-file "lsyncd" bin) - (install-file (string-append "../lsyncd-release-" - ,version - "/doc/manpage/lsyncd.1") - man) + (install-file "../source/doc/manpage/lsyncd.1" man) #t)))))) (native-inputs `(("lua" ,lua-5.2))) -- cgit v1.2.3 From 2b371f4dd5ddafa0786240b40408ef5c30d7a526 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 20 Feb 2019 09:05:30 +0200 Subject: gnu: Don't use the store path in the .desktop file. This fixes bug#30228. * gnu/packages/sync.scm (owncloud-client)[arguments]: Add a custom phase to substitute the executable name for the full path to the binary. Remove the 'patch-dot-desktop-files phase. --- gnu/packages/sync.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages/sync.scm') diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index df9f3b0e16..450e7b767a 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -79,7 +79,13 @@ (substitute* "test/CMakeLists.txt" (("owncloud_add_test\\(Utility \"\"\\)" test) (string-append "#" test))) - #t))) + #t)) + (add-after 'unpack 'dont-embed-store-path + (lambda _ + (substitute* "src/common/utility_unix.cpp" + (("QCoreApplication::applicationFilePath\\()") "\"owncloud\"")) + #t)) + (delete 'patch-dot-desktop-files)) #:configure-flags '("-DUNIT_TESTING=ON" ;; build without qtwebkit, which causes the ;; package to FTBFS while looking for QWebView. -- cgit v1.2.3 From b6f69340bbbfe30c28488904c1d3bb9aceedf804 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 20 Feb 2019 09:06:09 +0200 Subject: gnu: owncloud-client: Update to 2.5.3.11470. * gnu/packages/sync.scm (owncloud-client): Update to 2.5.3.11470. --- gnu/packages/sync.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/sync.scm') diff --git a/gnu/packages/sync.scm b/gnu/packages/sync.scm index 450e7b767a..1aae3a8ed6 100644 --- a/gnu/packages/sync.scm +++ b/gnu/packages/sync.scm @@ -48,14 +48,14 @@ (define-public owncloud-client (package (name "owncloud-client") - (version "2.5.1.10973") + (version "2.5.3.11470") (source (origin (method url-fetch) (uri (string-append "https://download.owncloud.com/desktop/stable/" "owncloudclient-" version ".tar.xz")) (sha256 - (base32 "19x4rbnqg7f7hspz1xy86b1q51q1n5y7yvq8kqc1m64n2r2s3srk")) + (base32 "0cznis8qadsnlgm046lxn8vmbxli6zp4b8nk93n53mkfxlcw355n")) (patches (search-patches "owncloud-disable-updatecheck.patch")) (modules '((guix build utils))) (snippet -- cgit v1.2.3