From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60381) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dQuzu-0006FO-L2 for guix-patches@gnu.org; Fri, 30 Jun 2017 08:26:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dQuzs-0001aD-4D for guix-patches@gnu.org; Fri, 30 Jun 2017 08:26:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:42912) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dQuzr-0001a0-W7 for guix-patches@gnu.org; Fri, 30 Jun 2017 08:26:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dQuzr-0007hA-Pb for guix-patches@gnu.org; Fri, 30 Jun 2017 08:26:03 -0400 Subject: [bug#27537] [PATCH 5/6] gnu: Add java-jgit-4.2. Resent-Message-ID: From: Ricardo Wurmus Date: Fri, 30 Jun 2017 14:25:22 +0200 Message-Id: <20170630122523.30510-5-rekado@elephly.net> In-Reply-To: <20170630122523.30510-1-rekado@elephly.net> References: <20170630122523.30510-1-rekado@elephly.net> 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: 27537@debbugs.gnu.org Cc: Ricardo Wurmus * gnu/packages/version-control.scm (java-jgit-4.2): New variable. --- gnu/packages/version-control.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 7cbee01a8..465cdc997 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1511,3 +1511,34 @@ unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}. Git version control system, providing repository access routines, support for network protocols, and core version control algorithms.") (license license:edl1.0))) + +;; For axoloti. This package can still be built with icedtea-7, which is +;; currently used as the default JDK. +(define-public java-jgit-4.2 + (package (inherit java-jgit) + (version "4.2.0.201601211800-r") + (source (origin + (method url-fetch) + (uri (string-append "https://repo1.maven.org/maven2/" + "org/eclipse/jgit/org.eclipse.jgit/" + version "/org.eclipse.jgit-" + version "-sources.jar")) + (sha256 + (base32 + "15gm537iivhnzlkjym4x3wn5jqdjdragsw9pdpzqqg21nrc817mm")))) + (build-system ant-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'use-latest-javaewah-API + (lambda _ + (substitute* "src/org/eclipse/jgit/internal/storage/file/BitmapIndexImpl.java" + (("wordinbits") "WORD_IN_BITS")) + #t))) + ;; Build for default JDK. + ,@(substitute-keyword-arguments (package-arguments java-jgit) + ((#:jdk _) icedtea-7)))) + (inputs + `(("java-javaewah" ,java-javaewah) + ("java-jsch" ,java-jsch) + ("java-slf4j-api" ,java-slf4j-api))))) -- 2.12.2