ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-19 17:23:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: java.scm: Adjust to new #:disallowed-references convention.

Browse source 
* gnu/packages/java.scm (icedtea-8, openjdk9, openjdk10,
openjdk11)[arguments]: Adjust #:disallowed-references.
This commit is contained in:
Marius Bakke 2021-05-17 17:46:57 +02:00
parent 0fb80f349d
commit b12a916e35
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gnu/packages/java.scm
View file

@ -41,6 +41,7 @@ (define-module (gnu packages java)
#:use-module (guix svn-download)
#:use-module ((guix build utils) #:select (alist-replace))
#:use-module (guix utils)
#:use-module (guix gexp)
#:use-module (guix build-system ant)
#:use-module (guix build-system gnu)
#:use-module (guix build-system trivial)
@ -1752,7 +1753,7 @@ (define-public icedtea-8
(guix build syscalls)
,@%gnu-build-system-modules)
#:disallowed-references ((,icedtea-7 "jdk"))
#:disallowed-references ,(list (gexp-input icedtea-7 "jdk"))
,@(substitute-keyword-arguments (package-arguments icedtea-7)
((#:modules modules)
@ -1908,7 +1909,8 @@ (define-public openjdk9
((guix build syscalls)
,@%gnu-build-system-modules)
#:disallowed-references (,icedtea-8 (,icedtea-8 "jdk"))
#:disallowed-references ,(list (gexp-input icedtea-8)
(gexp-input icedtea-8 "jdk"))
#:phases
(modify-phases %standard-phases
@ -2107,7 +2109,8 @@ (define-public openjdk10
(string-append "--prefix=" (assoc-ref outputs "out")))
#t))))
((#:disallowed-references _ '())
`(,openjdk9 (,openjdk9 "jdk")))))
`(,(gexp-input openjdk9)
,(gexp-input openjdk9 "jdk")))))
(native-inputs
`(("openjdk9" ,openjdk9)
("openjdk9:jdk" ,openjdk9 "jdk")
@ -2138,7 +2141,8 @@ (define-public openjdk11
`(#:imported-modules ((guix build syscalls)
,@%gnu-build-system-modules)
#:disallowed-references (,openjdk10 (,openjdk10 "jdk"))
#:disallowed-references ,(list (gexp-input openjdk10)
(gexp-input openjdk10 "jdk"))
#:tests? #f; requires jtreg
;; TODO package jtreg