* [bug#31158] [PATCH] gnu: subversion: Update to 1.10.0.
@ 2018-04-15 2:48 Leo Famulari
2018-04-16 22:17 ` Marius Bakke
0 siblings, 1 reply; 3+ messages in thread
From: Leo Famulari @ 2018-04-15 2:48 UTC (permalink / raw)
To: 31158
Tested by building Git and some svn-fetch sources. The new dependencies
are new requirements. Subversion gained compatibility with Python 3 in
this release, so we switch to it.
* 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.
---
gnu/packages/version-control.scm | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index cccdb31fb..71ede4f54 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)
@@ -1069,7 +1070,7 @@ following features:
(define-public subversion
(package
(name "subversion")
- (version "1.8.19")
+ (version "1.10.0")
(source (origin
(method url-fetch)
(uri
@@ -1080,7 +1081,7 @@ following features:
"subversion-" version ".tar.bz2")))
(sha256
(base32
- "1gp6426gkdza6ni2whgifjcmjb4nq34ljy07yxkrhlarvfq6ks2n"))))
+ "115mlvmf663w16mc3xyypnaizq401vbypc56hl2ylzc3pcx3zwic"))))
(build-system gnu-build-system)
(arguments
'(#:phases
@@ -1096,6 +1097,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'.
@@ -1124,10 +1130,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")
--
2.17.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#31158] [PATCH] gnu: subversion: Update to 1.10.0.
2018-04-15 2:48 [bug#31158] [PATCH] gnu: subversion: Update to 1.10.0 Leo Famulari
@ 2018-04-16 22:17 ` Marius Bakke
2018-04-17 18:38 ` bug#31158: " Leo Famulari
0 siblings, 1 reply; 3+ messages in thread
From: Marius Bakke @ 2018-04-16 22:17 UTC (permalink / raw)
To: Leo Famulari, 31158
[-- Attachment #1: Type: text/plain, Size: 460 bytes --]
Leo Famulari <leo@famulari.name> writes:
> Tested by building Git and some svn-fetch sources. The new dependencies
> are new requirements. Subversion gained compatibility with Python 3 in
> this release, so we switch to it.
>
> * 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.
LGTM, thank you!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 487 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* bug#31158: [PATCH] gnu: subversion: Update to 1.10.0.
2018-04-16 22:17 ` Marius Bakke
@ 2018-04-17 18:38 ` Leo Famulari
0 siblings, 0 replies; 3+ messages in thread
From: Leo Famulari @ 2018-04-17 18:38 UTC (permalink / raw)
To: Marius Bakke; +Cc: 31158-done
[-- Attachment #1: Type: text/plain, Size: 618 bytes --]
On Tue, Apr 17, 2018 at 12:17:50AM +0200, Marius Bakke wrote:
> Leo Famulari <leo@famulari.name> writes:
>
> > Tested by building Git and some svn-fetch sources. The new dependencies
> > are new requirements. Subversion gained compatibility with Python 3 in
> > this release, so we switch to it.
> >
> > * 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.
>
> LGTM, thank you!
Thanks! Pushed as 71653653ea39410d91ea7cc06cbb71790cc4da3c
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-04-17 18:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-15 2:48 [bug#31158] [PATCH] gnu: subversion: Update to 1.10.0 Leo Famulari
2018-04-16 22:17 ` Marius Bakke
2018-04-17 18:38 ` bug#31158: " Leo Famulari
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).