gnu: rdup: Update to 1.1.15.

* gnu/packages/backup.scm (rdup): Update to 1.1.15.
[source]: Use new URI.  Remove snippet.
[native-inputs]: Add autoconf and automake.
[inputs]: Add mcrypt.
[arguments]: Add ‘bootstrap’ and ‘qualify-inputs’ phases.
Remove ‘remove-Werror’ phase.
[home-page]: Use apparent new (and HTTPS) home page.
This commit is contained in:
Tobias Geerinckx-Rice 2018-01-19 02:19:15 +01:00
parent 8fc46a43c0
commit fbf210cb24
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79

View file

@ -264,49 +264,47 @@ (define libarchive-3.3.2
(define-public rdup (define-public rdup
(package (package
(name "rdup") (name "rdup")
(version "1.1.14") (version "1.1.15")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://archive.miek.nl/projects/rdup/rdup-" (file-name (string-append name "-" version ".tar.gz"))
version ".tar.bz2")) (uri (string-append "https://github.com/miekg/rdup/archive/"
version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0aklwd9v7ix0m4ayl762sil685f42cwljzx3jz5skrnjaq32npmj")) "1jr91hgcf0rrpanqlwws72ql9db6d6grs2i122ki1s4bx0vqqyvq"))))
(modules '((guix build utils)))
(snippet
;; Some test scripts are missing shebangs, which cause "could not
;; execute" errors. Add shebangs.
'(for-each
(lambda (testscript)
(with-atomic-file-replacement
(string-append "testsuite/rdup/" testscript)
(lambda (in out)
(begin
(format out "#!/bin/sh\n" )
(dump-port in out)))))
'("rdup.hardlink.helper"
"rdup.hardlink-strip.helper"
"rdup.hardlink-strip2.helper"
"rdup.pipeline.helper")))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("autoconf" ,autoconf)
("automake" ,automake)
("pkg-config" ,pkg-config)
;; For tests.
("dejagnu" ,dejagnu))) ("dejagnu" ,dejagnu)))
(inputs (inputs
`(("glib" ,glib) `(("glib" ,glib)
("pcre" ,pcre) ("pcre" ,pcre)
("libarchive" ,libarchive) ("libarchive" ,libarchive)
("mcrypt" ,mcrypt)
("nettle" ,nettle))) ("nettle" ,nettle)))
(arguments (arguments
`(#:parallel-build? #f ;race conditions `(#:parallel-build? #f ;race conditions
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'build 'remove-Werror (add-after 'unpack 'bootstrap
;; rdup uses a deprecated function from libarchive
(lambda _ (lambda _
(substitute* "GNUmakefile" (invoke "autoreconf")))
(("^(CFLAGS=.*)-Werror" _ front) front)) (add-before 'build 'qualify-inputs
(lambda* (#:key inputs #:allow-other-keys)
;; This script is full of pitfalls. Fix some that particularly
;; affect Guix users & leave the rest as reader excercises.
(substitute* "rdup-simple"
;; Use the input mcrypt, not whatever's in $PATH at run time.
(("([' ])mcrypt " all delimiter)
(string-append delimiter (which "mcrypt") " "))
;; Avoid frivolous dependency on which with a shell builtin.
(("which") "command -v"))
#t)) #t))
(add-before 'check 'pre-check (add-before 'check 'pre-check
(lambda _ (lambda _
@ -314,7 +312,7 @@ (define-public rdup
(substitute* "testsuite/rdup/rdup.rdup-up-t-with-file.exp" (substitute* "testsuite/rdup/rdup.rdup-up-t-with-file.exp"
(("/bin/cat") (which "cat"))) (("/bin/cat") (which "cat")))
#t))))) #t)))))
(home-page "http://archive.miek.nl/projects/rdup/index.html") (home-page "https://github.com/miekg/rdup")
(synopsis "Provide a list of files to backup") (synopsis "Provide a list of files to backup")
(description (description
"Rdup is a utility inspired by rsync and the plan9 way of doing backups. "Rdup is a utility inspired by rsync and the plan9 way of doing backups.