From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ricardo Wurmus Subject: [PATCH] gnu: Add Icedtea 3.0.0pre09 Date: Thu, 10 Mar 2016 16:40:21 +0100 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:38605) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ae2hW-0005nx-Qk for guix-devel@gnu.org; Thu, 10 Mar 2016 10:40:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ae2hT-0007Qq-8d for guix-devel@gnu.org; Thu, 10 Mar 2016 10:40:34 -0500 Received: from venus.bbbm.mdc-berlin.de ([141.80.25.30]:60311) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ae2hS-0007Qf-Rj for guix-devel@gnu.org; Thu, 10 Mar 2016 10:40:31 -0500 Received: from localhost (localhost [127.0.0.1]) by venus.bbbm.mdc-berlin.de (Postfix) with ESMTP id 3545D380ED3 for ; Thu, 10 Mar 2016 16:40:29 +0100 (CET) Received: from venus.bbbm.mdc-berlin.de ([127.0.0.1]) by localhost (venus.bbbm.mdc-berlin.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Bc-Gbt6zstzy for ; Thu, 10 Mar 2016 16:40:23 +0100 (CET) Received: from HTCATWO.mdc-berlin.net (puck.citx.mdc-berlin.de [141.80.36.101]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by venus.bbbm.mdc-berlin.de (Postfix) with ESMTPS for ; Thu, 10 Mar 2016 16:40:23 +0100 (CET) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel --=-=-= Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi Guix, the latest icedtea-ified JDK has not yet been released, but this doesn=E2= =80=99t mean we can=E2=80=99t package it. Attached is a patch to add =E2=80=9Cicedtea-8=E2=80=9D (because it provid= es 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=E2=80=99t like an invalid header in the response from http://icedtea.classpath.org. The version is declared as =E2=80=9C2.99.99-pre09=E2=80=9D so that versio= n =E2=80=9C3.0.0=E2=80=9D (when it is finally released) will be considered an update. ~~ Ricardo --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename="0001-gnu-Add-icedtea-8.patch" >From 3b04fd84c64263cac33172b1e60aa19df968a55b Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus 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 --=-=-=--