From d028740622f2cc837d0fb161506b12e6c459505a Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Wed, 30 Dec 2015 14:33:11 +0100
Subject: gnu: icedtea6: Rename to icedtea-6.

* gnu/packages/java.scm (icedtea6): Rename variable to...
(icedtea-6): ...this.
---
 gnu/packages/java.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index b4c7bc31be..60873aa74e 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -184,7 +184,7 @@ and is best suited to building Java projects.  Ant uses XML to describe the
 build process and its dependencies, whereas Make uses Makefile format.")
     (license license:asl2.0)))
 
-(define-public icedtea6
+(define-public icedtea-6
   (package
     (name "icedtea")
     (version "1.13.9")
@@ -585,7 +585,7 @@ build process and its dependencies, whereas Make uses Makefile format.")
                          "http://icedtea.classpath.org/download/drops/"
                          "/icedtea7/" version "/" name ".tar.bz2"))
                    (sha256 (base32 hash))))))
-    (package (inherit icedtea6)
+    (package (inherit icedtea-6)
       (version version)
       (source (origin
                 (method url-fetch)
@@ -616,7 +616,7 @@ build process and its dependencies, whereas Make uses Makefile format.")
          #:tests? #f
          ;; Apparently, the C locale is needed for some of the tests.
          #:locale "C"
-         ,@(substitute-keyword-arguments (package-arguments icedtea6)
+         ,@(substitute-keyword-arguments (package-arguments icedtea-6)
              ((#:modules modules)
               `((ice-9 match)
                 (srfi srfi-26)
@@ -738,7 +738,7 @@ build process and its dependencies, whereas Make uses Makefile format.")
          ("hotspot-drop"
           ,(drop "hotspot"
                  "03pggsrhkzpjnj939vhr3b7mcrhfp22b7yg3hkx52kcv8dqkg3yx"))
-         ,@(fold alist-delete (package-native-inputs icedtea6)
+         ,@(fold alist-delete (package-native-inputs icedtea-6)
                  '("openjdk6-src")))))))
 
 (define-public icedtea icedtea7)
-- 
cgit v1.2.3

class='path'>path: <a href='/guix/log/?id=4108886b09e3b0175ba063d70cdaeb2237598def'>root</a>/<a href='/guix/log/gnu?id=4108886b09e3b0175ba063d70cdaeb2237598def'>gnu</a>/<a href='/guix/log/gnu/packages?id=4108886b09e3b0175ba063d70cdaeb2237598def'>packages</a>/<a href='/guix/log/gnu/packages/build-tools.scm?id=4108886b09e3b0175ba063d70cdaeb2237598def'>build-tools.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/build-tools.scm?id=4108886b09e3b0175ba063d70cdaeb2237598def&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2018-05-31 18:13:08 +0200'>2018-05-31</span></td><td><a href='/guix/commit/gnu/packages/build-tools.scm?id=73d854232fbdd38a59f1a514691f0411929b4adc'>gnu: bear: Fix python path.</a><span class='msg-avail'>...</span></td><td>Fis Trivial</td></tr>
<tr><td><span title='2018-04-25 15:53:41 +0200'>2018-04-25</span></td><td><a href='/guix/commit/gnu/packages/build-tools.scm?id=a9fe3882b9400d6a49ca95e136e78477b3e81a07'>Merge branch 'master' into staging</a></td><td>Marius Bakke</td></tr>
<tr><td><span title='2018-04-21 08:40:40 +0200'>2018-04-21</span></td><td><a href='/guix/commit/gnu/packages/build-tools.scm?id=9a5884023543e2ff6f421c766883ee467d3f2537'>gnu: Add osc.</a><span class='msg-avail'>...</span></td><td>Tomáš Čech</td></tr>
<tr><td><span title='2018-04-16 18:15:28 +0200'>2018-04-16</span></td><td><a href='/guix/commit/gnu/packages/build-tools.scm?id=5d904d63f4d43e3f0e4be38c5f5404e029c00a22'>Merge branch 'master' into staging</a></td><td>Marius Bakke</td></tr>
<tr><td><span title='2018-04-08 23:32:34 +0200'>2018-04-08</span></td><td><a href='/guix/commit/gnu/packages/build-tools.scm?id=71dab08dec718046e432e1fcd672566c0e67c19d'>gnu: Add bear.</a><span class='msg-avail'>...</span></td><td>Fis Trivial</td></tr>
<tr><td><span title='2018-03-22 15:17:04 +0100'>2018-03-22</span></td><td><a href='/guix/commit/gnu/packages/build-tools.scm?id=bbdf2761f595da7830570fb93dca6aaca1815e90'>gnu: meson: Update to 0.45.1.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2018-03-18 01:09:25 +0100'>2018-03-18</span></td><td><a href='/guix/commit/gnu/packages/build-tools.scm?id=7ace97395feedc4b3ec23be65f2ed63f29aac9a9'>Merge branch 'master' into staging</a></td><td>Marius Bakke</td></tr>
<tr><td><span title='2018-03-17 16:37:27 +0100'>2018-03-17</span></td><td><a href='/guix/commit/gnu/packages/build-tools.scm?id=c695fb769c94623371c5997da1dc454b0a4f58a8'>gnu: Fix common unquote typos.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2018-03-12 17:27:07 +0100'>2018-03-12</span></td><td><a href='/guix/commit/gnu/packages/build-tools.scm?id=3f6c185e0c2e800efed15761f5769761c8405289'>gnu: meson: Update to 0.45.0.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2018-03-12 17:27:07 +0100'>2018-03-12</span></td><td><a href='/guix/commit/gnu/packages/build-tools.scm?id=d31558632cb2d2ca0a5a70000ee5e3e1cbc92948'>gnu: meson-for-build: Update to 0.44.0.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2018-03-12 17:27:07 +0100'>2018-03-12</span></td><td><a href='/guix/commit/gnu/packages/build-tools.scm?id=b14a04b24bc0bbd5dc1196efc9e6c6bbffe8cb8e'>gnu: meson: Don't wrap the meson executable.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2018-03-07 15:37:13 +0100'>2018-03-07</span></td><td><a href='/guix/commit/gnu/packages/build-tools.scm?id=6c4da3b76a7c1a92b04983a93790f3a5f3bf8284'>gnu: meson: Mark up description.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2017-12-12 20:30:19 +0100'>2017-12-12</span></td><td><a href='/guix/commit/gnu/packages/build-tools.scm?id=e05cc6b80236d7987554d13627ccad69ec7a2a46'>gnu: meson: Update to 0.44.0.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2017-10-13 22:47:33 +0200'>2017-10-13</span></td><td><a href='/guix/commit/gnu/packages/build-tools.scm?id=a47ed09624d4406b4c9332a67bac1416519e33b5'>gnu: meson: Update to 0.43.0.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>
<tr><td><span title='2017-10-09 20:40:15 +0200'>2017-10-09</span></td><td><a href='/guix/commit/gnu/packages/build-tools.scm?id=137adfa3f87b91a8e3030fbbc05455b1d716db42'>gnu: meson: Update to 0.42.1.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2017-09-16 00:03:53 +0200'>2017-09-16</span></td><td><a href='/guix/commit/gnu/packages/build-tools.scm?id=dab666cd8d91bf2c4aacc920e3ea2ec01221123f'>gnu: Add meson-for-build.</a><span class='msg-avail'>...</span></td><td>Peter Mikkelsen</td></tr>
<tr><td><span title='2017-09-16 00:03:53 +0200'>2017-09-16</span></td><td><a href='/guix/commit/gnu/packages/build-tools.scm?id=67f8ba118e2b98755253a5b4ba647efb4314e03f'>gnu: meson: Update to 0.42.0.</a><span class='msg-avail'>...</span></td><td>Peter Mikkelsen</td></tr>
<tr><td><span title='2017-07-20 11:57:13 +0200'>2017-07-20</span></td><td><a href='/guix/commit/gnu/packages/build-tools.scm?id=c97cef0a91abc960e871be30da2c5096f4f83dd1'>gnu: Add premake4.</a><span class='msg-avail'>...</span></td><td>Oleg Pykhalov</td></tr>
<tr><td><span title='2017-07-19 01:06:54 +0200'>2017-07-19</span></td><td><a href='/guix/commit/gnu/packages/build-tools.scm?id=137a330988ec89cfe7ec9cb71fa08557c8cc5a55'>gnu: meson: Update to 0.41.1.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2017-05-07 02:33:29 +0200'>2017-05-07</span></td><td><a href='/guix/commit/gnu/packages/build-tools.scm?id=2d51ed9e04e79c32bb7a50013bc7ab0e55e5a55f'>gnu: meson: Update to 0.40.1.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2017-04-20 18:37:00 +0200'>2017-04-20</span></td><td><a href='/guix/commit/gnu/packages/build-tools.scm?id=162dd2900057ee86b3f69e47223958d99080d547'>gnu: Add Meson.</a><span class='msg-avail'>...</span></td><td>Corentin Bocquillon</td></tr>
<tr><td><span title='2017-04-13 23:17:00 +0200'>2017-04-13</span></td><td><a href='/guix/commit/gnu/packages/build-tools.scm?id=33f79a74b8f97fc39587ca66d38f0d82548bfe28'>gnu: Add bam.</a><span class='msg-avail'>...</span></td><td>Ricardo Wurmus</td></tr>