Re: 03/05: gnu: icedtea6, icedtea7: Rename package to "icedtea".

[Mark H Weaver]

Ricardo Wurmus <address@hidden> writes:

> rekado pushed a commit to branch master
> in repository guix.
>
> commit 5452588c1a662bdcee240342a9df87efa4b1c017
> Author: Ricardo Wurmus <address@hidden>
> Date:   Wed Dec 30 14:31:16 2015 +0100
>
>     gnu: icedtea6, icedtea7: Rename package to "icedtea".
>     
>     * gnu/packages/java.scm (icedtea6): Change package name to "icedtea".
>     (icedtea7): Inherit package name.

This broke the builds for icedtea-1.13.9, see:

  http://hydra.gnu.org/eval/108721#tabs-new
  http://hydra.gnu.org/build/908975/log/tail-reload

The relevant excerpt is:

--8<---------------cut here---------------start------------->8---
In unknown file:
   ?: 0 [chdir "icedtea-1.13.9"]

ERROR: In procedure chdir:
ERROR: In procedure chdir: No such file or directory
builder for `/gnu/store/dl93r8kpd9g7g3iamwz2n05nxlwjsfsn-icedtea-1.13.9.drv' 
failed with exit code 1
--8<---------------cut here---------------end--------------->8---

I guess the problem is that the custom unpack phase does this:

   (chdir (string-append ,name "-" ,version))

and this patch changes the value of 'name'.

     Regards,
       Mark


> diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
> index c4ad45e..b4c7bc3 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)