[PATCH] gnu: Add Icedtea 3.0.0pre09

[PATCH] gnu: Add Icedtea 3.0.0pre09

[Ricardo Wurmus]

[-- Attachment #1: Type: text/plain, Size: 581 bytes --]

Hi Guix,

the latest icedtea-ified JDK has not yet been released, but this doesn’t
mean we can’t package it.

Attached is a patch to add “icedtea-8” (because it provides the JDK for
Java version 1.8).  It uses the upstream tarball for version 3.0.0pre09,
which I had to mirror on my own server because the Guile HTTP client
doesn’t like an invalid header in the response from
http://icedtea.classpath.org.

The version is declared as “2.99.99-pre09” so that version “3.0.0” (when
it is finally released) will be considered an update.

~~ Ricardo


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-icedtea-8.patch --]
[-- Type: text/x-patch, Size: 5007 bytes --]

From 3b04fd84c64263cac33172b1e60aa19df968a55b Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Thu, 10 Mar 2016 16:35:28 +0100
Subject: [PATCH] gnu: Add icedtea-8.

* gnu/packages/java.scm (icedtea-8): New variable.
---
 gnu/packages/java.scm | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 89 insertions(+)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 9b6a647..3143787 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -741,4 +741,93 @@ build process and its dependencies, whereas Make uses Makefile format.")
          ,@(fold alist-delete (package-native-inputs icedtea-6)
                  '("openjdk6-src")))))))
 
+(define-public icedtea-8
+  (let* ((version "3.0.0")
+         (drop (lambda (name hash)
+                 (origin
+                   (method url-fetch)
+                   (uri (string-append
+                         "http://icedtea.classpath.org/download/drops/"
+                         "/icedtea8/" version "/" name ".tar.xz"))
+                   (sha256 (base32 hash))))))
+    (package (inherit icedtea-7)
+      ;; Officially, this version is called "3.0.0pre09", but we cannot use
+      ;; that as it leads up to version "3.0.0", which would not be recognized
+      ;; as an update.
+      (version "2.99.99-pre09")
+      (source (origin
+                (method url-fetch)
+                ;; TODO: downloading the tarball from
+                ;; http://icedtea.classpath.org/hg/icedtea/archive/icedtea-3.0.0pre09.tar.gz
+                ;; fails because the Guile HTTP rejects an invalid header.
+                (uri (string-append "http://elephly.net/downies/icedtea-"
+                                    "3.0.0pre09" ".tar.gz"))
+                (sha256
+                 (base32
+                  "1lh13j9v2xmigp06w2qni6ddddi7yk6xa641vk5j2r8ba31j2b1p"))
+                (modules '((guix build utils)))
+                (snippet
+                 '(substitute* "Makefile.am"
+                    ;; do not leak information about the build host
+                    (("DISTRIBUTION_ID=\"\\$\\(DIST_ID\\)\"")
+                     "DISTRIBUTION_ID=\"\\\"guix\\\"\"")))))
+      (arguments
+       (substitute-keyword-arguments (package-arguments icedtea-7)
+         ((#:configure-flags flags)
+          `(let ((jdk (assoc-ref %build-inputs "jdk")))
+             `(;;"--disable-bootstrap"
+               "--enable-bootstrap"
+               "--enable-nss"
+               "--disable-downloading"
+               "--disable-tests"      ;they are run in the check phase instead
+               "--with-openjdk-src-dir=./openjdk.src"
+               ,(string-append "--with-jdk-home=" jdk))))
+         ((#:phases phases)
+          `(modify-phases ,phases
+             (delete 'fix-x11-extension-include-path)
+             (delete 'patch-paths)
+             (delete 'set-additional-paths)
+             (delete 'patch-patches)
+             (add-before 'configure 'autogen
+               (lambda _ (zero? (system* "bash" "./autogen.sh"))))
+             (replace 'install
+               (lambda* (#:key outputs #:allow-other-keys)
+                 (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)
+                   (copy-recursively "openjdk.build/images/j2re-image" jre)
+                   (copy-recursively "openjdk.build/images/j2sdk-image" jdk)
+                   #t)))))))
+      (native-inputs
+       `(("jdk" ,icedtea-7 "jdk")
+         ("openjdk-src"
+          ,(drop "openjdk"
+                 "1x55l6bbfi1nqf1qnkv3pd10ixpcckny9i2185902zxjsa0n9h7s"))
+         ("corba-drop"
+          ,(drop "corba"
+                 "1dsir6x9ah0cp1b7mjx67ycwzjfxbzxy2icbrbypwn6r67k4qfl8"))
+         ("jaxp-drop"
+          ,(drop "jaxp"
+                 "0k2iy6gcqmfavii9vh0qg1hwj26pmfgw2cvm3q4gvl6cb0n19psr"))
+         ("jaxws-drop"
+          ,(drop "jaxws"
+                 "0xxrhwi6xj7cw1ac49g6v7csvwaafd4d1hsydffspyijsbk0zbgk"))
+         ("jdk-drop"
+          ,(drop "jdk"
+                 "0scq1fslwffzqdrrgcrffjwq8z1y9ws3sybn6fl9240lfvnw4qab"))
+         ("langtools-drop"
+          ,(drop "langtools"
+                 "0vqyx8zpkx3ylf9q8v8zn8jh4m1cixkphq9wmwjbjdjmz2azxrf1"))
+         ("hotspot-drop"
+          ,(drop "hotspot"
+                 "1sjbiy2dalj50c17fb5df1jhhlhia9lc4wq15231n4s1rnh76ipq"))
+         ("nashorn-drop"
+          ,(drop "nashorn"
+                 "0ccqb8m0v7wlm5yq97mxy1spp6khjylfa6a0jc8nk8c29qih0dvm"))
+         ,@(fold alist-delete (package-native-inputs icedtea-7)
+                 '("gcj" "openjdk-src" "corba-drop" "jaxp-drop" "jaxws-drop"
+                   "jdk-drop" "langtools-drop" "hotspot-drop")))))))
+
 (define-public icedtea icedtea-7)
-- 
2.1.0

Re: [PATCH] gnu: Add Icedtea 3.0.0pre09

[Roel Janssen]

Hello Ricardo,

Thanks a lot for this patch.  I succesfully upgraded the icedtea-7 to
icedtea-8 package by modifying: (define-public icedtea icedtea-8).

Then I succesfully compiled Picard with ant and icedtea-8 from Guix.
So..  it works!

Thanks again for your work on all things Java,
Roel


Ricardo Wurmus writes:

> Hi Guix,
>
> the latest icedtea-ified JDK has not yet been released, but this doesn’t
> mean we can’t package it.
>
> Attached is a patch to add “icedtea-8” (because it provides the JDK for
> Java version 1.8).  It uses the upstream tarball for version 3.0.0pre09,
> which I had to mirror on my own server because the Guile HTTP client
> doesn’t like an invalid header in the response from
> http://icedtea.classpath.org.
>
> The version is declared as “2.99.99-pre09” so that version “3.0.0” (when
> it is finally released) will be considered an update.
>
> ~~ Ricardo

Re: [PATCH] gnu: Add Icedtea 3.0.0pre09

[Ricardo Wurmus]

Roel Janssen <roel@gnu.org> writes:

> Thanks a lot for this patch.  I succesfully upgraded the icedtea-7 to
> icedtea-8 package by modifying: (define-public icedtea icedtea-8).
>
> Then I succesfully compiled Picard with ant and icedtea-8 from Guix.
> So..  it works!

That’s great!  With the latest version of the “ant-build-system” (patch
will be sent out today) you can just do

    (arguments
      `(#:jdk ,icedtea-8
        #:ant ,some-other-ant))

to specify a different package for Ant or the JDK.  You would not need
to override the value of “icedtea” (which is set to “icedtea-7” for now
as this is the latest supported release).

~~ Ricardo

Re: [PATCH] gnu: Add Icedtea 3.0.0pre09

[Roel Janssen]

Ricardo Wurmus writes:

> Roel Janssen <roel@gnu.org> writes:
>
>> Thanks a lot for this patch.  I succesfully upgraded the icedtea-7 to
>> icedtea-8 package by modifying: (define-public icedtea icedtea-8).
>>
>> Then I succesfully compiled Picard with ant and icedtea-8 from Guix.
>> So..  it works!
>
> That’s great!  With the latest version of the “ant-build-system” (patch
> will be sent out today) you can just do
>
>     (arguments
>       `(#:jdk ,icedtea-8
>         #:ant ,some-other-ant))
>
> to specify a different package for Ant or the JDK.  You would not need
> to override the value of “icedtea” (which is set to “icedtea-7” for now
> as this is the latest supported release).

That looks brilliant to me.  Looking forward to the patch.
Thanks for your work!

Kind regards,
Roel

Re: [PATCH] gnu: Add Icedtea 3.0.0pre09

[Ricardo Wurmus]

Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> writes:

> the latest icedtea-ified JDK has not yet been released, but this doesn’t
> mean we can’t package it.
>
> Attached is a patch to add “icedtea-8” (because it provides the JDK for
> Java version 1.8).  It uses the upstream tarball for version 3.0.0pre09,
> which I had to mirror on my own server because the Guile HTTP client
> doesn’t like an invalid header in the response from
> http://icedtea.classpath.org.

On IRC there was the idea to provide “url-fetch/wget” which would be
less strict compared to the default Guile HTTP client.

> The version is declared as “2.99.99-pre09” so that version “3.0.0” (when
> it is finally released) will be considered an update.

Does it make sense to push this patch to master?  Or should we wait for
an official release?  Java 1.8 is already pretty old and it seems like
the pre-release is enough to build OpenJDK 8.

~~ Ricardo

Re: [PATCH] gnu: Add Icedtea 3.0.0pre09

[Ludovic Courtès]

Ricardo Wurmus <rekado@elephly.net> skribis:

> Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> writes:
>
>> the latest icedtea-ified JDK has not yet been released, but this doesn’t
>> mean we can’t package it.
>>
>> Attached is a patch to add “icedtea-8” (because it provides the JDK for
>> Java version 1.8).  It uses the upstream tarball for version 3.0.0pre09,
>> which I had to mirror on my own server because the Guile HTTP client
>> doesn’t like an invalid header in the response from
>> http://icedtea.classpath.org.
>
> On IRC there was the idea to provide “url-fetch/wget” which would be
> less strict compared to the default Guile HTTP client.

We could do that, but I would prefer fixing and/or monkey-patching the
date header check in Guile.

In this case, if the problem is date header validation, it seems that we
could monkey-patch the ‘parse-rfc-822-date’ procedure of (web http) to
do the right thing.

Would you like to give it a try?

>> The version is declared as “2.99.99-pre09” so that version “3.0.0” (when
>> it is finally released) will be considered an update.
>
> Does it make sense to push this patch to master?  Or should we wait for
> an official release?  Java 1.8 is already pretty old and it seems like
> the pre-release is enough to build OpenJDK 8.

I’d rather wait for an official release, but maybe there’s a good reason
to use the pre-release?

Thanks,
Ludo’.

Re: [PATCH] gnu: Add Icedtea 3.0.0pre09

[Ricardo Wurmus]

Ludovic Courtès <ludo@gnu.org> writes:

> Ricardo Wurmus <rekado@elephly.net> skribis:
>
>> Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> writes:
>>
>>> the latest icedtea-ified JDK has not yet been released, but this doesn’t
>>> mean we can’t package it.
>>>
>>> Attached is a patch to add “icedtea-8” (because it provides the JDK for
>>> Java version 1.8).  It uses the upstream tarball for version 3.0.0pre09,
>>> which I had to mirror on my own server because the Guile HTTP client
>>> doesn’t like an invalid header in the response from
>>> http://icedtea.classpath.org.
>>
>> On IRC there was the idea to provide “url-fetch/wget” which would be
>> less strict compared to the default Guile HTTP client.
>
> We could do that, but I would prefer fixing and/or monkey-patching the
> date header check in Guile.
>
> In this case, if the problem is date header validation, it seems that we
> could monkey-patch the ‘parse-rfc-822-date’ procedure of (web http) to
> do the right thing.
>
> Would you like to give it a try?

Yes, I’ll try to do it.

>>> The version is declared as “2.99.99-pre09” so that version “3.0.0” (when
>>> it is finally released) will be considered an update.
>>
>> Does it make sense to push this patch to master?  Or should we wait for
>> an official release?  Java 1.8 is already pretty old and it seems like
>> the pre-release is enough to build OpenJDK 8.
>
> I’d rather wait for an official release, but maybe there’s a good reason
> to use the pre-release?

I’m not sure.  Other distributions have been offering Java 1.8 via
version 8 of the OpenJDK for a long time.  However, I’m not sure the
vanilla OpenJDK is completely free software, which is why I’m not very
interested in packaging it.  IcedTea uses the OpenJDK sources but
applies patches to them to make building (and bootstrapping) with free
software possible; it also removes non-free components.

As the OpenJDK 8 has been release a very long time ago and IcedTea 8 is
using these source, I don’t think there are any problems with using the
pre-release.  Officially, only IcedTea 1 and 2 (using OpenJDK 6 and 7,
respectively) are supported by IcedTea upstream, but IcedTea 8 is also
regularly updated to use the latest OpenJDK sources.

I don’t know if an official release is actually planned.  I think it
could be useful to have Java 1.8 support via IcedTea in Guix, even if
the default “icedtea” package still points to the latest 2.x release
(for OpenJDK 7).

So many words for a variant of “I’m not sure” :)

~~ Ricardo

Re: [PATCH] gnu: Add Icedtea 3.0.0pre09

[Ludovic Courtès]

Ricardo Wurmus <rekado@elephly.net> skribis:

> Ludovic Courtès <ludo@gnu.org> writes:
>
>> Ricardo Wurmus <rekado@elephly.net> skribis:

[...]

>>> Does it make sense to push this patch to master?  Or should we wait for
>>> an official release?  Java 1.8 is already pretty old and it seems like
>>> the pre-release is enough to build OpenJDK 8.
>>
>> I’d rather wait for an official release, but maybe there’s a good reason
>> to use the pre-release?

[...]

> So many words for a variant of “I’m not sure” :)

In short ;-), it seems to me that packaging this pre-release would make
sense since it would bring the power of Java 8 to our users, so go for it!

Ludo’.

Re: [PATCH] gnu: Add Icedtea 3.0.0pre09

[Ricardo Wurmus]

Ludovic Courtès <ludo@gnu.org> writes:

>> On IRC there was the idea to provide “url-fetch/wget” which would be
>> less strict compared to the default Guile HTTP client.
>
> We could do that, but I would prefer fixing and/or monkey-patching the
> date header check in Guile.
>
> In this case, if the problem is date header validation, it seems that we
> could monkey-patch the ‘parse-rfc-822-date’ procedure of (web http) to
> do the right thing.

Actually, in this case it’s (again) the ETag header.

~~~~~~~~~~~~~~~~~~~
rekado in guix: wget -S --spider http://icedtea.classpath.org/hg/icedtea/archive/icedtea-3.0.0pre09.tar.gz

[...]

--2016-03-26 10:02:08--  http://icedtea.wildebeest.org/hg/icedtea/archive/icedtea-3.0.0pre09.tar.gz
Resolving icedtea.wildebeest.org (icedtea.wildebeest.org)... 80.127.118.211
Connecting to icedtea.wildebeest.org (icedtea.wildebeest.org)|80.127.118.211|:80... connected.
HTTP request sent, awaiting response... 
  HTTP/1.1 200 Script output follows
  Date: Sat, 26 Mar 2016 09:02:18 GMT
  Server: Apache/2.4.10 (Debian)
  Content-Disposition: attachment; filename=icedtea-icedtea-3.0.0pre09.tar.gz
  ETag: 1458585778.0
  Keep-Alive: timeout=5, max=100
  Connection: Keep-Alive
  Content-Type: application/x-gzip
Length: unspecified [application/x-gzip]
Remote file exists.
~~~~~~~~~~~~~~~~~~~

Is this something we want the Guile HTTP client to be more tolerant
about?

~~ Ricardo

Re: [PATCH] gnu: Add Icedtea 3.0.0pre09

[Ludovic Courtès]

Ricardo Wurmus <rekado@elephly.net> skribis:

> Actually, in this case it’s (again) the ETag header.
>
> ~~~~~~~~~~~~~~~~~~~
> rekado in guix: wget -S --spider http://icedtea.classpath.org/hg/icedtea/archive/icedtea-3.0.0pre09.tar.gz
>
> [...]
>
> --2016-03-26 10:02:08--  http://icedtea.wildebeest.org/hg/icedtea/archive/icedtea-3.0.0pre09.tar.gz
> Resolving icedtea.wildebeest.org (icedtea.wildebeest.org)... 80.127.118.211
> Connecting to icedtea.wildebeest.org (icedtea.wildebeest.org)|80.127.118.211|:80... connected.
> HTTP request sent, awaiting response... 
>   HTTP/1.1 200 Script output follows
>   Date: Sat, 26 Mar 2016 09:02:18 GMT
>   Server: Apache/2.4.10 (Debian)
>   Content-Disposition: attachment; filename=icedtea-icedtea-3.0.0pre09.tar.gz
>   ETag: 1458585778.0
>   Keep-Alive: timeout=5, max=100
>   Connection: Keep-Alive
>   Content-Type: application/x-gzip
> Length: unspecified [application/x-gzip]
> Remote file exists.
> ~~~~~~~~~~~~~~~~~~~
>
> Is this something we want the Guile HTTP client to be more tolerant
> about?

Yes.  This is fixed in Guile 2.0, commit
c5dac3595f42afbd76ab9110d7473bf4d16b0520.

I think we should backport this hack to (guix build download),
essentially through:

  (modules-set! (resolve-module '(web http)) 'parse-entity-tag …)

Thoughts?

Ludo’.

Re: [PATCH] gnu: Add Icedtea 3.0.0pre09

[Ricardo Wurmus]

Ludovic Courtès <ludo@gnu.org> writes:

> Ricardo Wurmus <rekado@elephly.net> skribis:
>
>> Ludovic Courtès <ludo@gnu.org> writes:
>>
>>> Ricardo Wurmus <rekado@elephly.net> skribis:
>
> [...]
>
>>>> Does it make sense to push this patch to master?  Or should we wait for
>>>> an official release?  Java 1.8 is already pretty old and it seems like
>>>> the pre-release is enough to build OpenJDK 8.
>>>
>>> I’d rather wait for an official release, but maybe there’s a good reason
>>> to use the pre-release?
>
> [...]
>
>> So many words for a variant of “I’m not sure” :)
>
> In short ;-), it seems to me that packaging this pre-release would make
> sense since it would bring the power of Java 8 to our users, so go for it!

Time has offered an alternative option.  IcedTea 3.0.0 has been
released, so I updated the package expression and pushed it.

We now have support for Java 8.  (...or 1.8, or IcedTea version 3.0.0,
gah, these version numbers drive me crazy!)

~~ Ricardo

Re: [PATCH] gnu: Add Icedtea 3.0.0pre09

[Roel Janssen]

Ricardo Wurmus writes:

> Ludovic Courtès <ludo@gnu.org> writes:
>
>> Ricardo Wurmus <rekado@elephly.net> skribis:
>>
>>> Ludovic Courtès <ludo@gnu.org> writes:
>>>
>>>> Ricardo Wurmus <rekado@elephly.net> skribis:
>>
>> [...]
>>
>>>>> Does it make sense to push this patch to master?  Or should we wait for
>>>>> an official release?  Java 1.8 is already pretty old and it seems like
>>>>> the pre-release is enough to build OpenJDK 8.
>>>>
>>>> I’d rather wait for an official release, but maybe there’s a good reason
>>>> to use the pre-release?
>>
>> [...]
>>
>>> So many words for a variant of “I’m not sure” :)
>>
>> In short ;-), it seems to me that packaging this pre-release would make
>> sense since it would bring the power of Java 8 to our users, so go for it!
>
> Time has offered an alternative option.  IcedTea 3.0.0 has been
> released, so I updated the package expression and pushed it.
>
> We now have support for Java 8.  (...or 1.8, or IcedTea version 3.0.0,
> gah, these version numbers drive me crazy!)
>
> ~~ Ricardo

This is cool.  Thanks!