me
/
guix
Archived
1
0
Fork 0
Code

gnu: subversion: Update to 1.10.0. 

* gnu/packages/version-control.scm (subversion): Update to 1.10.0.
(arguments): Patch a hidden shebang in a new 'patch-test-sh' phase.
(inputs): Add lz4 and utf8proc. Switch from python-2 to python-wrapper@3.
master
Leo Famulari 2018-04-14 19:36:12 -04:00
parent 8366a67b0a
commit 71653653ea
No known key found for this signature in database
GPG Key ID: 2646FA30BACA7F08
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/packages/version-control.scm
View File

@ -90,6 +90,7 @@
#:use-module (gnu packages sdl) #:use-module (gnu packages sdl)
#:use-module (gnu packages swig) #:use-module (gnu packages swig)
#:use-module (gnu packages tcl) #:use-module (gnu packages tcl)
#:use-module (gnu packages textutils)
#:use-module (gnu packages time) #:use-module (gnu packages time)
#:use-module (gnu packages tls) #:use-module (gnu packages tls)
#:use-module (gnu packages) #:use-module (gnu packages)
@ -1069,7 +1070,7 @@ following features:
(define-public subversion (define-public subversion
(package (package
(name "subversion") (name "subversion")
(version "1.8.19") (version "1.10.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (uri
@ -1080,7 +1081,7 @@ following features:
"subversion-" version ".tar.bz2"))) "subversion-" version ".tar.bz2")))
(sha256 (sha256
(base32 (base32
"1gp6426gkdza6ni2whgifjcmjb4nq34ljy07yxkrhlarvfq6ks2n")))) "115mlvmf663w16mc3xyypnaizq401vbypc56hl2ylzc3pcx3zwic"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:phases '(#:phases
@ -1096,6 +1097,11 @@ following features:
(substitute* "libtool" (substitute* "libtool"
(("\\\\`ls") (string-append "\\`" coreutils "/bin/ls"))) (("\\\\`ls") (string-append "\\`" coreutils "/bin/ls")))
#t))) #t)))
(add-before 'build 'patch-test-sh
(lambda _
(substitute* "subversion/tests/libsvn_repos/repos-test.c"
(("#!/bin/sh") (string-append "#!" (which "sh"))))
#t))
(add-after 'install 'install-perl-bindings (add-after 'install 'install-perl-bindings
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Follow the instructions from 'subversion/bindings/swig/INSTALL'. ;; Follow the instructions from 'subversion/bindings/swig/INSTALL'.
@ -1124,10 +1130,12 @@ following features:
(inputs (inputs
`(("apr" ,apr) `(("apr" ,apr)
("apr-util" ,apr-util) ("apr-util" ,apr-util)
("lz4" ,lz4)
("serf" ,serf) ("serf" ,serf)
("perl" ,perl) ("perl" ,perl)
("python" ,python-2) ; incompatible with Python 3 (print syntax) ("python" ,python-wrapper)
("sqlite" ,sqlite) ("sqlite" ,sqlite)
("utf8proc" ,utf8proc)
("zlib" ,zlib))) ("zlib" ,zlib)))
(home-page "https://subversion.apache.org/") (home-page "https://subversion.apache.org/")
(synopsis "Revision control system") (synopsis "Revision control system")