Merge branch 'staging' into core-updates

This commit is contained in:
Marius Bakke 2019-03-01 17:40:51 +01:00
commit f5e563e50a
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
75 changed files with 1035 additions and 1840 deletions

View file

@ -95,7 +95,7 @@
`(("lockfile" ,python2-lockfile)
("urllib3" ,python2-urllib3)))
(inputs
`(("librsync" ,librsync)
`(("librsync" ,librsync-0.9)
("lftp" ,lftp)
("gnupg" ,gnupg) ; gpg executable needed
("util-linux" ,util-linux) ; for setsid
@ -346,7 +346,7 @@ list and implement the backup strategy.")
"0miklk4bqblpyzh1bni4x6lqn88fa8fjn15x1k1n8bxkx60nlymd"))))
(build-system gnu-build-system)
(inputs
`(("librsync" ,librsync)))
`(("librsync" ,librsync-0.9)))
(arguments
`(#:make-flags `(,(string-append "PREFIX=" (assoc-ref %outputs "out"))
"CC=gcc")
@ -379,7 +379,7 @@ errors.")
(build-system python-build-system)
(inputs
`(("python" ,python-2)
("librsync" ,librsync)))
("librsync" ,librsync-0.9)))
(arguments
`(#:python ,python-2
#:tests? #f))