diff options
Diffstat (limited to 'gnu/packages/java.scm')
| -rw-r--r-- | gnu/packages/java.scm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 73badacf631..c5190121e6a 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm | |||
| @@ -1609,7 +1609,7 @@ new Date();")))) | |||
| 1609 | (release-tag-suffix . "-ga") | 1609 | (release-tag-suffix . "-ga") |
| 1610 | (release-tag-version-delimiter . "."))) | 1610 | (release-tag-version-delimiter . "."))) |
| 1611 | (native-inputs | 1611 | (native-inputs |
| 1612 | (modify-inputs (package-native-inputs bootstrap) | 1612 | (modify-inputs native-inputs |
| 1613 | (replace "openjdk" bootstrap))) | 1613 | (replace "openjdk" bootstrap))) |
| 1614 | (home-page (string-append | 1614 | (home-page (string-append |
| 1615 | "https://openjdk.java.net/projects/jdk/" | 1615 | "https://openjdk.java.net/projects/jdk/" |
| @@ -1715,7 +1715,7 @@ blacklisted.certs.pem" | |||
| 1715 | (search-patches "openjdk-15-jtask-reproducibility.patch" | 1715 | (search-patches "openjdk-15-jtask-reproducibility.patch" |
| 1716 | "openjdk-15-xcursor-no-dynamic.patch")))) | 1716 | "openjdk-15-xcursor-no-dynamic.patch")))) |
| 1717 | (inputs | 1717 | (inputs |
| 1718 | (modify-inputs (package-inputs base) | 1718 | (modify-inputs inputs |
| 1719 | (append libxcursor))) ;for our patch to work | 1719 | (append libxcursor))) ;for our patch to work |
| 1720 | (arguments | 1720 | (arguments |
| 1721 | (substitute-keyword-arguments (package-arguments base) | 1721 | (substitute-keyword-arguments (package-arguments base) |
| @@ -1728,7 +1728,7 @@ blacklisted.certs.pem" | |||
| 1728 | #~(cons "--without-gtest" ;this replaces... | 1728 | #~(cons "--without-gtest" ;this replaces... |
| 1729 | (delete "--disable-hotspot-gtest" #$flags))))) ;... this | 1729 | (delete "--disable-hotspot-gtest" #$flags))))) ;... this |
| 1730 | (native-inputs | 1730 | (native-inputs |
| 1731 | (append (modify-inputs (package-native-inputs base) | 1731 | (append (modify-inputs native-inputs |
| 1732 | (delete "make" ;remove old gnu-make-4.2 | 1732 | (delete "make" ;remove old gnu-make-4.2 |
| 1733 | "openjdk") ;to remove non-jdk output | 1733 | "openjdk") ;to remove non-jdk output |
| 1734 | (append `(,openjdk14 "jdk"))) | 1734 | (append `(,openjdk14 "jdk"))) |
| @@ -5078,7 +5078,7 @@ every feature for every plugin."))) | |||
| 5078 | (list java-modello-core java-modello-plugins-java | 5078 | (list java-modello-core java-modello-plugins-java |
| 5079 | java-modello-plugins-xml)) | 5079 | java-modello-plugins-xml)) |
| 5080 | (native-inputs | 5080 | (native-inputs |
| 5081 | (modify-inputs (package-native-inputs java-modello-core) | 5081 | (modify-inputs native-inputs |
| 5082 | (prepend java-xmlunit java-modello-test))) | 5082 | (prepend java-xmlunit java-modello-test))) |
| 5083 | (synopsis "Modello XPP3 Plugin") | 5083 | (synopsis "Modello XPP3 Plugin") |
| 5084 | (description "The modello XPP3 plugin generates XML readers and writers based | 5084 | (description "The modello XPP3 plugin generates XML readers and writers based |
| @@ -5734,7 +5734,7 @@ The jMock library | |||
| 5734 | (not (string-suffix? "-sources.jar" name))))))) | 5734 | (not (string-suffix? "-sources.jar" name))))))) |
| 5735 | #t))))))) | 5735 | #t))))))) |
| 5736 | (inputs | 5736 | (inputs |
| 5737 | (modify-inputs (package-inputs java-hamcrest-core) | 5737 | (modify-inputs inputs |
| 5738 | (prepend java-junit | 5738 | (prepend java-junit |
| 5739 | java-jmock-1 | 5739 | java-jmock-1 |
| 5740 | ;; This is necessary because of what seems to be a race condition. | 5740 | ;; This is necessary because of what seems to be a race condition. |
| @@ -6802,7 +6802,7 @@ This package provides the blocking I/O model library.") | |||
| 6802 | (add-after 'unpack 'chdir | 6802 | (add-after 'unpack 'chdir |
| 6803 | (lambda _ (chdir "httpcore-nio") #t))))) | 6803 | (lambda _ (chdir "httpcore-nio") #t))))) |
| 6804 | (inputs | 6804 | (inputs |
| 6805 | (modify-inputs (package-inputs java-httpcomponents-httpcore) | 6805 | (modify-inputs inputs |
| 6806 | (prepend java-httpcomponents-httpcore java-hamcrest-core))) | 6806 | (prepend java-httpcomponents-httpcore java-hamcrest-core))) |
| 6807 | (description "HttpCore is a set of low level HTTP transport components | 6807 | (description "HttpCore is a set of low level HTTP transport components |
| 6808 | that can be used to build custom client and server side HTTP services with a | 6808 | that can be used to build custom client and server side HTTP services with a |
| @@ -6823,7 +6823,7 @@ NIO."))) | |||
| 6823 | (add-after 'unpack 'chdir | 6823 | (add-after 'unpack 'chdir |
| 6824 | (lambda _ (chdir "httpcore-ab") #t))))) | 6824 | (lambda _ (chdir "httpcore-ab") #t))))) |
| 6825 | (inputs | 6825 | (inputs |
| 6826 | (modify-inputs (package-inputs java-httpcomponents-httpcore) | 6826 | (modify-inputs inputs |
| 6827 | (prepend java-httpcomponents-httpcore java-commons-cli | 6827 | (prepend java-httpcomponents-httpcore java-commons-cli |
| 6828 | java-hamcrest-core))) | 6828 | java-hamcrest-core))) |
| 6829 | (synopsis "Apache HttpCore benchmarking tool") | 6829 | (synopsis "Apache HttpCore benchmarking tool") |
| @@ -6840,7 +6840,7 @@ an Apache AB clone based on HttpCore."))) | |||
| 6840 | (add-after 'unpack 'chdir | 6840 | (add-after 'unpack 'chdir |
| 6841 | (lambda _ (chdir "httpcore-osgi")))))) | 6841 | (lambda _ (chdir "httpcore-osgi")))))) |
| 6842 | (inputs | 6842 | (inputs |
| 6843 | (modify-inputs (package-inputs java-httpcomponents-httpcore) | 6843 | (modify-inputs inputs |
| 6844 | (prepend java-httpcomponents-httpcore | 6844 | (prepend java-httpcomponents-httpcore |
| 6845 | java-httpcomponents-httpcore-nio | 6845 | java-httpcomponents-httpcore-nio |
| 6846 | java-hamcrest-core))) | 6846 | java-hamcrest-core))) |
| @@ -6914,7 +6914,7 @@ standards and recommendations.") | |||
| 6914 | (add-after 'unpack 'chdir | 6914 | (add-after 'unpack 'chdir |
| 6915 | (lambda _ (chdir "httpclient-cache")))))) | 6915 | (lambda _ (chdir "httpclient-cache")))))) |
| 6916 | (inputs | 6916 | (inputs |
| 6917 | (modify-inputs (package-inputs java-httpcomponents-httpclient) | 6917 | (modify-inputs inputs |
| 6918 | (prepend java-httpcomponents-httpclient | 6918 | (prepend java-httpcomponents-httpclient |
| 6919 | java-httpcomponents-httpmime | 6919 | java-httpcomponents-httpmime |
| 6920 | java-hamcrest-core))) | 6920 | java-hamcrest-core))) |
| @@ -6932,7 +6932,7 @@ resources."))) | |||
| 6932 | (add-after 'unpack 'chdir | 6932 | (add-after 'unpack 'chdir |
| 6933 | (lambda _ (chdir "httpclient-osgi") #t))))) | 6933 | (lambda _ (chdir "httpclient-osgi") #t))))) |
| 6934 | (inputs | 6934 | (inputs |
| 6935 | (modify-inputs (package-inputs java-httpcomponents-httpclient) | 6935 | (modify-inputs inputs |
| 6936 | (prepend java-httpcomponents-httpclient | 6936 | (prepend java-httpcomponents-httpclient |
| 6937 | java-httpcomponents-httpclient-cache | 6937 | java-httpcomponents-httpclient-cache |
| 6938 | java-osgi-framework | 6938 | java-osgi-framework |
| @@ -13964,7 +13964,7 @@ This module lays the groundwork for the other two modules.") | |||
| 13964 | (invoke "ant" "jar") | 13964 | (invoke "ant" "jar") |
| 13965 | #t))))) | 13965 | #t))))) |
| 13966 | (inputs | 13966 | (inputs |
| 13967 | (modify-inputs (package-inputs java-logback-core) | 13967 | (modify-inputs inputs |
| 13968 | (prepend java-logback-core java-slf4j-api))) | 13968 | (prepend java-logback-core java-slf4j-api))) |
| 13969 | (native-inputs | 13969 | (native-inputs |
| 13970 | (list groovy)) | 13970 | (list groovy)) |
