Merge branch 'master' into core-updates

This commit is contained in:
Mark H Weaver 2016-10-23 14:16:39 -04:00
commit ca0635b4ba
No known key found for this signature in database
GPG key ID: 7CEF29847562C516
43 changed files with 1474 additions and 455 deletions

View file

@ -419,7 +419,10 @@ detection, and lossless compression.")
delete-file (find-files "borg" "^(c|h|p).*\\.c$")))))
(build-system python-build-system)
(arguments
`(#:phases
`(#:modules ((srfi srfi-26) ; for cut
(guix build utils)
(guix build python-build-system))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'set-env
(lambda* (#:key inputs #:allow-other-keys)
@ -452,7 +455,12 @@ detection, and lossless compression.")
(add-after 'install 'install-doc
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(man (string-append out "/share/man/man1")))
(man (string-append out "/share/man/man1"))
(misc (string-append out "/share/borg/misc")))
(for-each (cut install-file <> misc)
'("docs/misc/create_chunker-params.txt"
"docs/misc/internals-picture.txt"
"docs/misc/prune-example.txt"))
(and
(zero? (system* "python3" "setup.py" "build_ext" "--inplace"))
(zero? (system* "make" "-C" "docs" "man"))