nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: icedtea6, icedtea7: Rename package to "icedtea". 

* gnu/packages/java.scm (icedtea6): Change package name to "icedtea".
(icedtea7): Inherit package name.
This commit is contained in:
Ricardo Wurmus 2015-12-30 14:31:16 +01:00
parent d2540f80c2
commit 5452588c1a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/packages/java.scm
View File

@ -186,7 +186,7 @@ build process and its dependencies, whereas Make uses Makefile format.")
(define-public icedtea6 (define-public icedtea6
(package (package
(name "icedtea6") (name "icedtea")
(version "1.13.9") (version "1.13.9")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
@ -514,7 +514,8 @@ build process and its dependencies, whereas Make uses Makefile format.")
(alist-replace (alist-replace
'install 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((doc (string-append (assoc-ref outputs "doc") "/share/doc/" ,name)) (let ((doc (string-append (assoc-ref outputs "doc")
"/share/doc/icedtea"))
(jre (assoc-ref outputs "out")) (jre (assoc-ref outputs "out"))
(jdk (assoc-ref outputs "jdk"))) (jdk (assoc-ref outputs "jdk")))
(copy-recursively "openjdk.build/docs" doc) (copy-recursively "openjdk.build/docs" doc)
@ -585,7 +586,6 @@ build process and its dependencies, whereas Make uses Makefile format.")
"/icedtea7/" version "/" name ".tar.bz2")) "/icedtea7/" version "/" name ".tar.bz2"))
(sha256 (base32 hash)))))) (sha256 (base32 hash))))))
(package (inherit icedtea6) (package (inherit icedtea6)
(name "icedtea7")
(version version) (version version)
(source (origin (source (origin
(method url-fetch) (method url-fetch)