From b7a1cac603817dce2d717b490d2bff29bee46ac6 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 14 May 2020 21:31:42 +0200 Subject: gnu: openjdk9: Simplify snippet. * gnu/packages/java.scm (openjdk9)[source]: Use only one find-files invocation. --- gnu/packages/java.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index e2f79c3dc5..d03d783448 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016, 2017 Roel Janssen ;;; Copyright © 2017, 2019 Carlo Zancanaro @@ -1808,9 +1808,8 @@ (define-public openjdk9 (modules '((guix build utils))) (snippet `(begin - (for-each delete-file (find-files "." ".*.bin$")) - (for-each delete-file (find-files "." ".*.exe$")) - (for-each delete-file (find-files "." ".*.jar$")) + (for-each delete-file + (find-files "." ".*.(bin|exe|jar)$")) #t)))) (build-system gnu-build-system) (outputs '("out" "jdk" "doc")) -- cgit v1.2.3 From f5789c265de99952ec703c3a5d8a2bfc1d9aa4d2 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 14 May 2020 21:32:30 +0200 Subject: gnu: openjdk9: Build in parallel. * gnu/packages/java.scm (openjdk9)[arguments]: Add phase "write-source-revision-file"; replace "build" phase; add make-flags; remove GUIX_LD_WRAPPER_ALLOW_IMPURITIES. --- gnu/packages/java.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d03d783448..ef7796f681 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1815,6 +1815,7 @@ (define-public openjdk9 (outputs '("out" "jdk" "doc")) (arguments `(#:tests? #f; require jtreg + #:make-flags '("all") #:imported-modules ((guix build syscalls) ,@%gnu-build-system-modules) @@ -1839,14 +1840,20 @@ (define-public openjdk9 "--with-libjpeg=system" (string-append "--prefix=" (assoc-ref outputs "out"))) #t)) - (replace 'build + (add-before 'build 'write-source-revision-file (lambda _ (with-output-to-file ".src-rev" (lambda _ (display ,version))) - (setenv "GUIX_LD_WRAPPER_ALLOW_IMPURITIES" "yes") - (invoke "make" "all") #t)) + (replace 'build + (lambda* (#:key make-flags parallel-build? #:allow-other-keys) + (apply invoke "make" + `(,@(if parallel-build? + (list (string-append "JOBS=" + (number->string (parallel-job-count)))) + '()) + ,@make-flags)))) ;; Some of the libraries in the lib/ folder link to libjvm.so. ;; But that shared object is located in the server/ folder, so it ;; cannot be found. This phase creates a symbolic link in the @@ -1919,8 +1926,7 @@ (define-public openjdk9 (native-inputs `(("icedtea-8" ,icedtea-8) ("icedtea-8:jdk" ,icedtea-8 "jdk") - ;; XXX: The build system is not particularly parallel safe and - ;; fails with newer versions of GNU Make. + ;; XXX: The build system fails with newer versions of GNU Make. ("make@4.2" ,gnu-make-4.2) ("unzip" ,unzip) ("which" ,which) -- cgit v1.2.3 From 49ad6aec80394379c6b63e8c88608a104e1b5e40 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 14 May 2020 22:07:02 +0200 Subject: gnu: openjdk10: Simplify snippet. * gnu/packages/java.scm (openjdk10)[source]: Use regular expression in find-files. --- gnu/packages/java.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index ef7796f681..ba98182ede 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1954,9 +1954,7 @@ (define-public openjdk10 (modules '((guix build utils))) (snippet `(begin - (for-each delete-file (find-files "." ".*.bin$")) - (for-each delete-file (find-files "." ".*.exe$")) - (for-each delete-file (find-files "." ".*.jar$")) + (for-each delete-file (find-files "." ".*.(bin|exe|jar)$")) #t)))) (arguments (substitute-keyword-arguments (package-arguments openjdk9) -- cgit v1.2.3 From 62d46ad6131b45b07e949808304e5cf15515516e Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 15 May 2020 00:12:49 +0200 Subject: gnu: openjdk11: Simplify snippet. * gnu/packages/java.scm (openjdk11)[source]: Use regular expression in find-files. --- gnu/packages/java.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index ba98182ede..f76dfc8681 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2001,9 +2001,7 @@ (define-public openjdk11 (modules '((guix build utils))) (snippet `(begin - (for-each delete-file (find-files "." ".*.bin$")) - (for-each delete-file (find-files "." ".*.exe$")) - (for-each delete-file (find-files "." ".*.jar$")) + (for-each delete-file (find-files "." ".*.(bin|exe|jar)$")) #t)))) (build-system gnu-build-system) (outputs '("out" "jdk" "doc")) -- cgit v1.2.3 From 7b82e1cdbed4c3a44ecbb99f754580a9e6a1b0ae Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 15 May 2020 00:15:25 +0200 Subject: gnu: openjdk11: Build in parallel. * gnu/packages/java.scm (openjdk11)[arguments]: Remove #:parallel-build?, #:parallel-tests?, and #:make-flags options; add "write-source-revision-file"; replace "build" phase; do not set GUIX_LD_WRAPPER_ALLOW_IMPURITIES; pass JOBS variable to make in "build" and "build-jre" phases. --- gnu/packages/java.scm | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index f76dfc8681..d74f0af9d9 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2013,11 +2013,6 @@ (define-public openjdk11 ,@%gnu-build-system-modules) #:tests? #f; requires jtreg ;; TODO package jtreg - ;; disable parallel builds, as the openjdk build system does not like -j - #:parallel-build? #f - #:parallel-tests? #f - ;; reenable parallel builds and tests by adding the flags manually - #:make-flags (list (string-append "JOBS=" (number->string (parallel-job-count)))) #:configure-flags `("--disable-option-checking" ; --enable-fast-install default flag errors otherwise "--disable-warnings-as-errors" @@ -2034,7 +2029,6 @@ (define-public openjdk11 (assoc-ref %build-inputs "freetype") "/include") ,(string-append "--with-freetype-lib=" (assoc-ref %build-inputs "freetype") "/lib")) - ;; TODO #:phases (modify-phases %standard-phases (add-after 'patch-source-shebangs 'fix-java-shebangs @@ -2044,22 +2038,32 @@ (define-public openjdk11 (substitute* "make/data/blacklistedcertsconverter/blacklisted.certs.pem" (("^#!.*") "#! java BlacklistedCertsConverter SHA-256\n")) #t)) - (replace 'build + (add-before 'build 'write-source-revision-file (lambda _ (with-output-to-file ".src-rev" (lambda _ (display ,version))) - (setenv "GUIX_LD_WRAPPER_ALLOW_IMPURITIES" "yes") - (invoke "make" "all") #t)) + (replace 'build + (lambda* (#:key parallel-build? make-flags #:allow-other-keys) + (apply invoke "make" "all" + `(,@(if parallel-build? + (list (string-append "JOBS=" + (number->string (parallel-job-count)))) + '()) + ,@make-flags)))) ;; jdk 11 does not build jre by default any more ;; building it anyways ;; for further information see: ;; https://github.com/AdoptOpenJDK/openjdk-build/issues/356 (add-after 'build 'build-jre - (lambda _ - (invoke "make" "legacy-jre-image") - #t)) + (lambda* (#:key parallel-build? make-flags #:allow-other-keys) + (apply invoke "make" "legacy-jre-image" + `(,@(if parallel-build? + (list (string-append "JOBS=" + (number->string (parallel-job-count)))) + '()) + ,@make-flags)))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From c7c9370dd7c5d2dfc038cbbec802f0f001af158f Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Fri, 15 May 2020 00:32:05 +0200 Subject: gnu: openjdk12: Simplify snippet. * gnu/packages/java.scm (openjdk12)[source]: Use regular expression in find-files. --- gnu/packages/java.scm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d74f0af9d9..c0ec683ebe 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2231,9 +2231,7 @@ (define-public openjdk12 (modules '((guix build utils))) (snippet `(begin - (for-each delete-file (find-files "." ".*.bin$")) - (for-each delete-file (find-files "." ".*.exe$")) - (for-each delete-file (find-files "." ".*.jar$")) + (for-each delete-file (find-files "." ".*.(bin|exe|jar)$")) #t)))) (inputs `(("alsa-lib" ,alsa-lib) -- cgit v1.2.3 From c4618174ecb6375849529f1d1026585817bb139e Mon Sep 17 00:00:00 2001 From: Not Zed Date: Tue, 28 Apr 2020 10:33:46 +0930 Subject: gnu: Add openjdk13. * gnu/packages/java.scm (openjdk13): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/java.scm | 42 ++++++++++++++++++++++++++ gnu/packages/patches/openjdk-14-builtins.patch | 11 +++++++ 2 files changed, 53 insertions(+) create mode 100644 gnu/packages/patches/openjdk-14-builtins.patch (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index c0ec683ebe..2519b4780b 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2259,6 +2259,48 @@ (define-public openjdk12 ("zip" ,zip))) (home-page "https://openjdk.java.net/projects/jdk/12"))) +(define-public openjdk13 + (package + (inherit openjdk12) + (name "openjdk") + (version "13.0") + (source (origin + (method url-fetch) + (uri "http://hg.openjdk.java.net/jdk/jdk13/archive/9c250a7600e1.tar.bz2") + (file-name (string-append name "-" version ".tar.bz2")) + (sha256 + (base32 + "0v0ljvx5dyzp96dw4z4ksw3pvasil7783mgnmd1wk9gads5ab8iq")) + (modules '((guix build utils))) + (snippet + `(begin + (for-each delete-file (find-files "." ".*.(bin|exe|jar)$")) + #t)))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("cups" ,cups) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("giflib" ,giflib) + ("lcms" ,lcms) + ("libjpeg" ,libjpeg-turbo) + ("libpng" ,libpng) + ("libx11" ,libx11) + ("libxext" ,libxext) + ("libxrandr" ,libxrandr) + ("libxrender" ,libxrender) + ("libxt" ,libxt) + ("libxtst" ,libxtst))) + (native-inputs + `(("autoconf" ,autoconf) + ("openjdk12:jdk" ,openjdk12 "jdk") + ("make@4.2" ,gnu-make-4.2) + ("pkg-config" ,pkg-config) + ("unzip" ,unzip) + ("which" ,which) + ("zip" ,zip))) + (home-page "https://openjdk.java.net/projects/jdk/13"))) + (define-public icedtea icedtea-8) diff --git a/gnu/packages/patches/openjdk-14-builtins.patch b/gnu/packages/patches/openjdk-14-builtins.patch new file mode 100644 index 0000000000..0e7e3dcaa9 --- /dev/null +++ b/gnu/packages/patches/openjdk-14-builtins.patch @@ -0,0 +1,11 @@ +--- jdk14-bc54620a3848/make/autoconf/basics.m4 2020-02-07 04:40:54.000000000 +1030 ++++ jdk14-bc54620a3848-new/make/autoconf/basics.m4 2020-04-24 10:59:33.056098506 +0930 +@@ -583,7 +583,7 @@ + BASIC_SETUP_TOOL($1, [AC_PATH_PROGS($1, $2, , $3)]) + if test "x[$]$1" = x; then + AC_MSG_NOTICE([Required tool $2 not found in PATH, checking built-in]) +- if help $2 > /dev/null 2>&1; then ++ if command -v $2 > /dev/null 2>&1; then + AC_MSG_NOTICE([Found $2 as shell built-in. Using it]) + $1="$2" + else -- cgit v1.2.3 From 65a11a59de86fa759f2ffbb7db53430a6727c2ea Mon Sep 17 00:00:00 2001 From: Not Zed Date: Sat, 16 May 2020 10:26:06 +0200 Subject: gnu: Add openjdk14. * gnu/packages/java.scm (openjdk14): New variable. Signed-off-by: Ricardo Wurmus --- gnu/packages/java.scm | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 2519b4780b..071b97582d 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2301,6 +2301,52 @@ (define-public openjdk13 ("zip" ,zip))) (home-page "https://openjdk.java.net/projects/jdk/13"))) +(define-public openjdk14 + (package + (inherit openjdk13) + (name "openjdk") + (version "14.0") + (source (origin + (method url-fetch) + (uri "http://hg.openjdk.java.net/jdk/jdk14/archive/bc54620a3848.tar.bz2") + (file-name (string-append name "-" version ".tar.bz2")) + (sha256 + (base32 + "0z485pk7r1xpw8004g4nrwrzj17sabgx8yfdbxwfvzkjp8qyajch")) + (modules '((guix build utils))) + (snippet + `(begin + ;; The m4 macro uses 'help' to search for builtins, which is + ;; not available in bash-minimal + (substitute* "make/autoconf/basics.m4" + (("if help") "if command -v")) + (for-each delete-file (find-files "." ".*.(bin|exe|jar)$")) + #t)))) + (inputs + `(("alsa-lib" ,alsa-lib) + ("cups" ,cups) + ("fontconfig" ,fontconfig) + ("freetype" ,freetype) + ("giflib" ,giflib) + ("lcms" ,lcms) + ("libjpeg" ,libjpeg-turbo) + ("libpng" ,libpng) + ("libx11" ,libx11) + ("libxext" ,libxext) + ("libxrandr" ,libxrandr) + ("libxrender" ,libxrender) + ("libxt" ,libxt) + ("libxtst" ,libxtst))) + (native-inputs + `(("autoconf" ,autoconf) + ("make@4.2" ,gnu-make-4.2) + ("openjdk13:jdk" ,openjdk13 "jdk") + ("pkg-config" ,pkg-config) + ("unzip" ,unzip) + ("which" ,which) + ("zip" ,zip))) + (home-page "https://openjdk.java.net/projects/jdk/14"))) + (define-public icedtea icedtea-8) -- cgit v1.2.3 From 8ba990e69dcf471c3c24964cd8d7438c7fae427c Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sat, 16 May 2020 15:59:39 +0200 Subject: gnu: Add java-picocli. gnu/packages/java.scm (java-picocli): New variable. --- gnu/packages/java.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 071b97582d..fc1f7d157a 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -11943,3 +11943,28 @@ (define-public java-jboss-transaction-api-spec Isolation and Durability) properties.") ;; either gpl2 only with classpath exception or cddl. (license (list license:gpl2 license:cddl1.0)))) + +(define-public java-picocli + (package + (name "java-picocli") + (version "4.3.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/remkop/picocli") + (commit (string-append "v" version)))) + (sha256 + (base32 + "1sxp6rxjfgjd98ly14b3d15dvxkm5wg4g46w12jyhmr0kmkaca3c")))) + (build-system ant-build-system) + (arguments + `(#:jar-name "picocli.jar" + #:source-dir "src/main/java" + ;; Tests require missing dependencies (junitparams, system-rules) + #:tests? #f)) + (home-page "https://picocli.info") + (synopsis "REPL for the JVM") + (description "Picocli is a framework for building command line applications +for the JVM. It supports colors, autocompletion, subcommands, and more. Written +in Java, usable from Groovy, Kotlin, Scala, etc.") + (license license:asl2.0))) -- cgit v1.2.3 From d308bc01e171f327084bfaa9fe79fb31fe662669 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 17 May 2020 01:48:28 +0200 Subject: gnu: java-xz: Remove duplicate definition. * gnu/packages/java.scm (java-xz): Remove duplicate variable. (java-plexus-archiver)[inputs]: Use java-xz. * gnu/packages/java-compression.scm (java-tukaani-xz): Rename to java-xz. --- gnu/packages/java-compression.scm | 4 ++-- gnu/packages/java.scm | 30 +----------------------------- 2 files changed, 3 insertions(+), 31 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java-compression.scm b/gnu/packages/java-compression.scm index 536e1e6530..b1d3ae7060 100644 --- a/gnu/packages/java-compression.scm +++ b/gnu/packages/java-compression.scm @@ -282,9 +282,9 @@ (define-public java-jbzip2 @code{CBZip2OutputStream} classes.") (license license:expat))) -(define-public java-tukaani-xz +(define-public java-xz (package - (name "java-tukaani-xz") + (name "java-xz") (version "1.6") (source (origin (method url-fetch) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index fc1f7d157a..a4659240fc 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -3403,34 +3403,6 @@ (define-public java-swt license:mpl2.0 license:lgpl2.1+)))) -(define-public java-xz - (package - (name "java-xz") - (version "1.6") - (source (origin - (method url-fetch) - (uri (string-append "http://tukaani.org/xz/xz-java-" version ".zip")) - (sha256 - (base32 - "1z3p1ri1gvl07inxn0agx44ck8n7wrzfmvkz8nbq3njn8r9wba8x")))) - (build-system ant-build-system) - (arguments - `(#:tests? #f ; There are no tests to run. - #:jar-name ,(string-append "xz-" version ".jar") - #:phases - (modify-phases %standard-phases - ;; The unpack phase enters the "maven" directory by accident. - (add-after 'unpack 'chdir - (lambda _ (chdir "..") #t))))) - (native-inputs - `(("unzip" ,unzip))) - (home-page "https://tukaani.org/xz/java.html") - (synopsis "Implementation of XZ data compression in pure Java") - (description "This library aims to be a complete implementation of XZ data -compression in pure Java. Single-threaded streamed compression and -decompression and random access decompression have been fully implemented.") - (license license:public-domain))) - ;; java-hamcrest-core uses qdox version 1.12. We package this version instead ;; of the latest release. (define-public java-qdox-1.12 @@ -3957,7 +3929,7 @@ (define-public java-plexus-archiver ("junit" ,java-junit) ("classworld" ,java-plexus-classworlds) ("xbean" ,java-geronimo-xbean-reflect) - ("xz" ,java-tukaani-xz) + ("xz" ,java-xz) ("guava" ,java-guava))) (home-page "https://github.com/codehaus-plexus/plexus-archiver") (synopsis "Archiver component of the Plexus project") -- cgit v1.2.3 From 695fb93e3b25d4b8f78da773e20135c4b2508b68 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 25 May 2020 23:57:59 +0200 Subject: gnu: java-xerces: Update to 2.12.1. * gnu/packages/java.scm (java-xerces): Update to 2.12.1. Signed-off-by: Tobias Geerinckx-Rice --- gnu/packages/java.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a4659240fc..b12c3ca95c 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -10523,14 +10523,14 @@ (define-public java-joda-time (define-public java-xerces (package (name "java-xerces") - (version "2.11.0") + (version "2.12.1") (source (origin (method url-fetch) (uri (string-append "mirror://apache/xerces/j/source/" "Xerces-J-src." version ".tar.gz")) (sha256 - (base32 "1006igwy2lqrmjvdk64v8dg6qbk9c29pm8xxx7r87n0vnpvmx6pm")) + (base32 "0494kq36gw3nah19ifb720vwxbpg4ww0k6m3zq6wyanw6a083p6s")) (patches (search-patches "java-xerces-xjavac_taskdef.patch" "java-xerces-build_dont_unzip.patch" -- cgit v1.2.3 From d9ef5aeba757c6f86d2abafe6b62ef4c2516c2e6 Mon Sep 17 00:00:00 2001 From: Alexey Abramov Date: Sat, 30 May 2020 19:09:43 +0200 Subject: gnu: java-openjfx-build: Add helpful patch. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/java.scm (java-openjfx-build)[source]: Use it. * gnu/packages/patches/java-openjfx-build-jdk_version.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. Signed-off-by: Alexey Abramov Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 + gnu/packages/java.scm | 3 ++- .../patches/java-openjfx-build-jdk_version.patch | 27 ++++++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/java-openjfx-build-jdk_version.patch (limited to 'gnu/packages/java.scm') diff --git a/gnu/local.mk b/gnu/local.mk index babcb8f6ad..01ec893310 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1111,6 +1111,7 @@ dist_patch_DATA = \ %D%/packages/patches/java-apache-ivy-port-to-latest-bouncycastle.patch \ %D%/packages/patches/java-commons-collections-fix-java8.patch \ %D%/packages/patches/java-jeromq-fix-tests.patch \ + %D%/packages/patches/java-openjfx-build-jdk_version.patch \ %D%/packages/patches/java-powermock-fix-java-files.patch \ %D%/packages/patches/java-simple-xml-fix-tests.patch \ %D%/packages/patches/java-svg-salamander-Fix-non-det.patch \ diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index b12c3ca95c..d569ed57d6 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2499,7 +2499,8 @@ (define-public java-openjfx-build #t)) (sha256 (base32 - "0yg38mwpivswccv9n96k06x3iv82i4px1a9xg9l8dswzwmfj259f")))) + "0yg38mwpivswccv9n96k06x3iv82i4px1a9xg9l8dswzwmfj259f")) + (patches (search-patches "java-openjfx-build-jdk_version.patch")))) (build-system ant-build-system) (arguments `(#:jar-name "java-openjfx.jar" diff --git a/gnu/packages/patches/java-openjfx-build-jdk_version.patch b/gnu/packages/patches/java-openjfx-build-jdk_version.patch new file mode 100644 index 0000000000..7be954467a --- /dev/null +++ b/gnu/packages/patches/java-openjfx-build-jdk_version.patch @@ -0,0 +1,27 @@ +Subject: [PATCH] openjfx: Determine the version of Java in JDK_HOME + +Icedtea contains guix in its version, so build.gradle failes to run. Openjfx +packaging is not trivial, so you will probably need to try build it with +gradlew. + +--- + build.gradle | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/build.gradle b/build.gradle +index df82f63..2c626cd 100644 +--- a/build.gradle ++++ b/build.gradle +@@ -742,9 +742,9 @@ try { + if (inStream.readLine() != null) { + String v = inStream.readLine(); + if (v != null) { +- int ib = v.indexOf(" (build "); ++ int ib = v.indexOf(" (guix build "); + if (ib != -1) { +- String ver = v.substring(ib + 8, v.size() - 1); ++ String ver = v.substring(ib + 13, v.size() - 1); + + defineProperty("jdkRuntimeVersion", ver) + defineProperty("jdkVersion", jdkRuntimeVersion.split("-")[0]) +2.24.1 -- cgit v1.2.3 From c19293ad091ae8bcb96373afd327bcb544879023 Mon Sep 17 00:00:00 2001 From: Alexey Abramov Date: Sat, 30 May 2020 19:09:44 +0200 Subject: gnu: java-openjfx-build: Fix indentation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/java.scm (java-openjfx-build)[source]: Change the indentation of the uri dirictive. Signed-off-by: Alexey Abramov Signed-off-by: Ludovic Courtès --- gnu/packages/java.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d569ed57d6..43f0f37b91 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2486,10 +2486,10 @@ (define-public java-openjfx-build (source (origin (method hg-fetch) (uri (hg-reference - (url "http://hg.openjdk.java.net/openjfx/8u-dev/rt") - (changeset (string-append - (string-join (string-split version #\.) "u") - "-ga")))) + (url "http://hg.openjdk.java.net/openjfx/8u-dev/rt") + (changeset (string-append + (string-join (string-split version #\.) "u") + "-ga")))) (file-name (string-append name "-" version "-checkout")) (modules '((guix build utils))) (snippet -- cgit v1.2.3 From f4bb881abda8f3cf3312b2da86ba93c8fdb13a7b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Jun 2020 11:52:18 +0300 Subject: gnu: ant-bootstrap: Use a mirror URL. * gnu/packages/java.scm (ant-bootstrap)[source]: Use an apache mirror:// URL. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 43f0f37b91..2d778d98cc 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -276,7 +276,7 @@ (define ant-bootstrap (version "1.8.4") (source (origin (method url-fetch) - (uri (string-append "http://archive.apache.org/dist/" + (uri (string-append "mirror://apache/dist/" "ant/source/apache-ant-" version "-src.tar.bz2")) (sha256 -- cgit v1.2.3 From 894d6a085dc47f767efa43520b524e0f6c53d224 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Jun 2020 11:53:39 +0300 Subject: gnu: java-commons-httpclient: Use a mirror URL. * gnu/packages/java.scm (java-commons-httpclient)[source]: Use an apache mirror:// URL. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 2d778d98cc..d36e3b0f92 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -10832,7 +10832,7 @@ (define-public java-commons-httpclient (version "3.1") (source (origin (method url-fetch) - (uri (string-append "https://archive.apache.org/dist/httpcomponents/" + (uri (string-append "mirror://apache/dist/httpcomponents/" "commons-httpclient/source/commons-httpclient-" version "-src.tar.gz")) (sha256 -- cgit v1.2.3 From bb0d840b7dffac94f8be298cfa4846f12157ad5b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 11 Jun 2020 11:54:31 +0300 Subject: gnu: java-jakarta-oro: Use a mirror URL. * gnu/packages/java.scm (java-jakarta-oro)[source]: Download using an apache mirror:// URL. --- gnu/packages/java.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index d36e3b0f92..885086fe30 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -10928,7 +10928,7 @@ (define-public java-jakarta-oro (version "2.0.8") (source (origin (method url-fetch) - (uri (string-append "https://archive.apache.org/dist/jakarta/oro/" + (uri (string-append "mirror://apache/dist/jakarta/oro/" "jakarta-oro-" version ".tar.gz")) (sha256 (base32 -- cgit v1.2.3 From 9a01efa262cef9a102823122b2deee9b38402bcc Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 12 Jun 2020 18:04:01 +0300 Subject: gnu: Fix apache mirror URIs. * gnu/packages/web.scm (serf)[source]: Remove redundant part of URI. * gnu/packages/java.scm (ant-bootstrap, java-commons-httpclient, java-jakarta-oro)[source]: Same. * gnu/packages/maven.scm (maven-shared-utils, maven-plugin-annotations, maven-wagon-provider-api, maven-artifact)[source]: Same. --- gnu/packages/java.scm | 6 +++--- gnu/packages/maven.scm | 8 ++++---- gnu/packages/web.scm | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages/java.scm') diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 885086fe30..d5bc713c70 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -276,7 +276,7 @@ (define ant-bootstrap (version "1.8.4") (source (origin (method url-fetch) - (uri (string-append "mirror://apache/dist/" + (uri (string-append "mirror://apache/" "ant/source/apache-ant-" version "-src.tar.bz2")) (sha256 @@ -10832,7 +10832,7 @@ (define-public java-commons-httpclient (version "3.1") (source (origin (method url-fetch) - (uri (string-append "mirror://apache/dist/httpcomponents/" + (uri (string-append "mirror://apache/httpcomponents/" "commons-httpclient/source/commons-httpclient-" version "-src.tar.gz")) (sha256 @@ -10928,7 +10928,7 @@ (define-public java-jakarta-oro (version "2.0.8") (source (origin (method url-fetch) - (uri (string-append "mirror://apache/dist/jakarta/oro/" + (uri (string-append "mirror://apache/jakarta/oro/" "jakarta-oro-" version ".tar.gz")) (sha256 (base32 diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm index a62eb7469e..66c6e3adfa 100644 --- a/gnu/packages/maven.scm +++ b/gnu/packages/maven.scm @@ -340,7 +340,7 @@ (define-public maven-shared-utils (version "3.2.1") (source (origin (method url-fetch) - (uri (string-append "mirror://apache/dist/maven/shared/" + (uri (string-append "mirror://apache/maven/shared/" "maven-shared-utils-" version "-source-release.zip")) (sha256 (base32 @@ -380,7 +380,7 @@ (define-public maven-plugin-annotations (version "3.5") (source (origin (method url-fetch) - (uri (string-append "mirror://apache/dist/maven/" + (uri (string-append "mirror://apache/maven/" "plugin-tools/maven-plugin-tools-" version "-source-release.zip")) (sha256 (base32 "1ryqhs62j5pas93brhf5dsnvp99hxbvssf681yj5rk3r9h24hqm2")))) @@ -404,7 +404,7 @@ (define-public maven-wagon-provider-api (version "3.1.0") (source (origin (method url-fetch) - (uri (string-append "mirror://apache/dist/maven/wagon/" + (uri (string-append "mirror://apache/maven/wagon/" "wagon-" version "-source-release.zip")) (sha256 (base32 "0r07j6xdzdnrvqnv8ida7dx1m05pznh5qgmcfcfpyvg9nxbj3l1n")))) (build-system ant-build-system) @@ -691,7 +691,7 @@ (define-public maven-artifact (version "3.6.1") (source (origin (method url-fetch) - (uri (string-append "mirror://apache/dist/maven/" + (uri (string-append "mirror://apache/maven/" "maven-3/" version "/source/" "apache-maven-" version "-src.tar.gz")) (sha256 (base32 "0grw9zp166ci53rd7qkyy2qmwmik37xhiz1z84jpm0msyvzj2n82")) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index a04d755a83..f6a0fc2e44 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -1575,7 +1575,7 @@ (define-public serf (source (origin (method url-fetch) - (uri (string-append "mirror://apache/dist/serf/serf-" + (uri (string-append "mirror://apache/serf/serf-" version ".tar.bz2")) (sha256 (base32 "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l")))) -- cgit v1.2.3