From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54359) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f7Xj0-00012Z-3L for guix-patches@gnu.org; Sat, 14 Apr 2018 22:49:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f7Xiw-0003Cr-WB for guix-patches@gnu.org; Sat, 14 Apr 2018 22:49:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:45035) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f7Xiw-0003CV-RS for guix-patches@gnu.org; Sat, 14 Apr 2018 22:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1f7Xiw-0003jg-Gy for guix-patches@gnu.org; Sat, 14 Apr 2018 22:49:02 -0400 Subject: [bug#31158] [PATCH] gnu: subversion: Update to 1.10.0. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:53839) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f7XiK-0000rx-4b for guix-patches@gnu.org; Sat, 14 Apr 2018 22:48:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f7XiG-0002sV-Uh for guix-patches@gnu.org; Sat, 14 Apr 2018 22:48:24 -0400 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:47877) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f7XiG-0002rO-Ny for guix-patches@gnu.org; Sat, 14 Apr 2018 22:48:20 -0400 Received: from jasmine.lan (unknown [172.58.200.186]) by mail.messagingengine.com (Postfix) with ESMTPA id A120410252 for ; Sat, 14 Apr 2018 22:48:17 -0400 (EDT) From: Leo Famulari Date: Sat, 14 Apr 2018 22:48:13 -0400 Message-Id: List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 31158@debbugs.gnu.org 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