summary refs log tree commit diff
path: root/gnu/packages
diff options
context:
space:
mode:
authorRicardo Wurmus <ricardo.wurmus@mdc-berlin.de>2015-12-30 14:31:16 +0100
committerRicardo Wurmus <ricardo.wurmus@mdc-berlin.de>2016-01-06 11:38:50 +0100
commit5452588c1a662bdcee240342a9df87efa4b1c017 (patch)
treefc523c857e149afac57773352faa2e8b485e9ca4 /gnu/packages
parentd2540f80c223b40faefd1ab528d4e98e3995211d (diff)
downloadguix-5452588c1a662bdcee240342a9df87efa4b1c017.tar.gz
gnu: icedtea6, icedtea7: Rename package to "icedtea".
* gnu/packages/java.scm (icedtea6): Change package name to "icedtea".
(icedtea7): Inherit package name.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/java.scm6
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index c4ad45e86d..b4c7bc31be 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -186,7 +186,7 @@ build process and its dependencies, whereas Make uses Makefile format.")
 
 (define-public icedtea6
   (package
-    (name "icedtea6")
+    (name "icedtea")
     (version "1.13.9")
     (source (origin
               (method url-fetch)
@@ -514,7 +514,8 @@ build process and its dependencies, whereas Make uses Makefile format.")
                (alist-replace
                 'install
                 (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"))
                         (jdk (assoc-ref outputs "jdk")))
                     (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"))
                    (sha256 (base32 hash))))))
     (package (inherit icedtea6)
-      (name "icedtea7")
       (version version)
       (source (origin
                 (method url-fetch)