diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-04-21 04:57:29 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-04-21 05:02:52 -0400 |
| commit | c52872bfc418c6b2273f973dff8003ca9e062792 (patch) | |
| tree | 4184a250e6d8363b3901aa2abe6910ff08ce08d4 /gnu/packages/version-control.scm | |
| parent | 65bb22796f854cbc3eae053a80b1d64365dad376 (diff) | |
| parent | 3fe49e50153fec1dabac35e262a0888044f79aa6 (diff) | |
| download | patches-c52872bfc418c6b2273f973dff8003ca9e062792.tar patches-c52872bfc418c6b2273f973dff8003ca9e062792.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/version-control.scm')
| -rw-r--r-- | gnu/packages/version-control.scm | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 79ac7221fa..ef891a8b17 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -90,6 +90,7 @@ #:use-module (gnu packages sdl) #:use-module (gnu packages swig) #:use-module (gnu packages tcl) + #:use-module (gnu packages textutils) #:use-module (gnu packages time) #:use-module (gnu packages tls) #:use-module (gnu packages) @@ -1073,7 +1074,7 @@ following features: (define-public subversion (package (name "subversion") - (version "1.8.19") + (version "1.10.0") (source (origin (method url-fetch) (uri @@ -1084,7 +1085,7 @@ following features: "subversion-" version ".tar.bz2"))) (sha256 (base32 - "1gp6426gkdza6ni2whgifjcmjb4nq34ljy07yxkrhlarvfq6ks2n")))) + "115mlvmf663w16mc3xyypnaizq401vbypc56hl2ylzc3pcx3zwic")))) (build-system gnu-build-system) (arguments '(#:phases @@ -1100,6 +1101,11 @@ following features: (substitute* "libtool" (("\\\\`ls") (string-append "\\`" coreutils "/bin/ls"))) #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 (lambda* (#:key outputs #:allow-other-keys) ;; Follow the instructions from 'subversion/bindings/swig/INSTALL'. @@ -1126,10 +1132,12 @@ following features: (inputs `(("apr" ,apr) ("apr-util" ,apr-util) + ("lz4" ,lz4) ("serf" ,serf) ("perl" ,perl) - ("python" ,python-2) ; incompatible with Python 3 (print syntax) + ("python" ,python-wrapper) ("sqlite" ,sqlite) + ("utf8proc" ,utf8proc) ("zlib" ,zlib))) (home-page "https://subversion.apache.org/") (synopsis "Revision control system") |