From 7757f44044926d1aaa3a9520c5ee6f841d68f58e Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 20 Oct 2019 08:18:34 +0200 Subject: gnu: obnam: Remove this package. This package is abandoned and does not build anymore due to dependencies to old versions of python packages such as pylint. * gnu/packages/backup.scm (obnam): Remove variable. --- gnu/packages/backup.scm | 58 +------------------------------------------------ 1 file changed, 1 insertion(+), 57 deletions(-) (limited to 'gnu/packages/backup.scm') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index a92c8c9aca..a4a087728f 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -14,6 +14,7 @@ ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2019 Alex Vong ;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; @@ -711,63 +712,6 @@ (define-public wimlib license:lgpl3+ license:cc0)))) -(define-public obnam - (package - (name "obnam") - (version "1.21") - (source - (origin - (method url-fetch) - (uri (string-append - "http://code.liw.fi/debian/pool/main/o/obnam/obnam_" - version ".orig.tar.xz")) - (sha256 - (base32 - "0qlipsq50hca71zc0dp1mg9zs12qm0sbblw7qfzl0hj6mk2rv1by")))) - (build-system python-build-system) - (arguments - `(#:python ,python-2 - #:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - (substitute* "obnamlib/vfs_local_tests.py" - ;; Check for the nobody user instead of root. - (("self.fs.get_username\\(0\\), 'root'") - "self.fs.get_username(65534), 'nobody'") - ;; Disable tests checking for root group. - (("self.fs.get_groupname\\(0\\)") "'root'")) - (substitute* "obnamlib/vfs_local.py" - ;; Don't cover get_groupname function. - (("def get_groupname\\(self, gid\\):") - "def get_groupname(self, gid): # pragma: no cover")) - ;; Can't run network tests. - (invoke "./check" "--unit-tests")))))) - (inputs - `(("python2-cliapp" ,python2-cliapp) - ("python2-larch" ,python2-larch) - ("python2-paramiko" ,python2-paramiko) - ("python2-pyaml" ,python2-pyaml) - ("python2-tracing" ,python2-tracing) - ("python2-ttystatus" ,python2-ttystatus))) - (native-inputs - `(("gnupg" ,gnupg) - ("python2-coverage" ,python2-coverage) - ("python2-coverage-test-runner" ,python2-coverage-test-runner) - ("python2-pep8" ,python2-pep8) - ("python2-pylint" ,python2-pylint))) - (home-page "https://obnam.org/") - (synopsis "Retired backup program") - (description - "Warning: @uref{https://blog.liw.fi/posts/2017/08/13/retiring_obnam/, -the Obnam project is retired}. You should use another backup solution instead. - -Obnam was an easy, secure backup program. Features included snapshot backups, -data de-duplication and encrypted backups using GnuPG. Backups can be stored on -local hard disks, or online via the SSH SFTP protocol. The backup server, if -used, does not require any special software, on top of SSH.") - (license license:gpl3+))) - (define-public dirvish (package (name "dirvish") -- cgit v1.2.3 From 6dc424f92464f962ba8d43ebdd319c096c6975e5 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 21 Oct 2019 10:10:51 +0200 Subject: gnu: backup: Remove my copyright. This is a follow-up of 7757f440449, where my copyright is not needed. * gnu/packages/backup.scm: Remove my copyright. --- gnu/packages/backup.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages/backup.scm') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index a4a087728f..fc43f93d7d 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -14,7 +14,6 @@ ;;; Copyright © 2018, 2019 Ricardo Wurmus ;;; Copyright © 2019 Alex Vong ;;; Copyright © 2019 Marius Bakke -;;; Copyright © 2019 Mathieu Othacehe ;;; ;;; This file is part of GNU Guix. ;;; -- cgit v1.2.3 From 658ef2ecdd72576f5183b43c770cd61c6be693e7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 1 Nov 2019 23:34:52 +0100 Subject: gnu: rdup: Don't use unstable tarball. * gnu/packages/backup.scm (rdup)[source]: Use GIT-FETCH and GIT-FILE-NAME. --- gnu/packages/backup.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gnu/packages/backup.scm') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index fc43f93d7d..508ed9c7e4 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -292,13 +292,13 @@ (define-public rdup (version "1.1.15") (source (origin - (method url-fetch) - (file-name (string-append name "-" version ".tar.gz")) - (uri (string-append "https://github.com/miekg/rdup/archive/" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/miekg/rdup.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 - (base32 - "1jr91hgcf0rrpanqlwws72ql9db6d6grs2i122ki1s4bx0vqqyvq")))) + (base32 "0bzyv6qmnivxnv9nw7lnfn46k0m1dlxcjj53zcva6v8y8084l1iw")))) (build-system gnu-build-system) (native-inputs `(("autoconf" ,autoconf) -- cgit v1.2.3 From d939b2955d8de2084f550a9063ce0c8006ecc4fa Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 1 Nov 2019 23:36:06 +0100 Subject: gnu: rdup: Fix build, disable encryption. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/backup.scm (nettle)[inputs]: Remove nettle. [arguments]: Add ‘disable-failing-tests’ phase. --- gnu/packages/backup.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'gnu/packages/backup.scm') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 508ed9c7e4..0894cb38bf 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -308,11 +308,14 @@ (define-public rdup ;; For tests. ("dejagnu" ,dejagnu))) (inputs + ;; XXX Compiling with nettle (encryption) support requires patching out + ;; -Werror from GNUmakefile.in. Then, rdup-tr-{en,de}crypt tests fail: + ;; free(): invalid pointer + ;; ** rdup-tr: SIGPIPE received, exiting `(("glib" ,glib) ("pcre" ,pcre) ("libarchive" ,libarchive) - ("mcrypt" ,mcrypt) - ("nettle" ,nettle))) + ("mcrypt" ,mcrypt))) (arguments `(#:parallel-build? #f ;race conditions #:phases @@ -328,6 +331,13 @@ (define-public rdup ;; Avoid frivolous dependency on ‘which’ with a shell builtin. (("which") "command -v")) #t)) + (add-before 'check 'disable-encryption-tests + (lambda _ + (for-each delete-file + (list "testsuite/rdup/rdup.rdup-tr-crypt.exp" + "testsuite/rdup/rdup.rdup-tr-decrypt.exp" + "testsuite/rdup/rdup.rdup-tr-encrypt.exp")) + #t)) (add-before 'check 'pre-check (lambda _ (setenv "HOME" (getcwd)) -- cgit v1.2.3