Update package names, add java packages for velocity

Julien LepillerSat Aug 05 10:06:52+0200 2017

f577d62

Update package names, add java packages for velocity

java-velocity-dont-use-werken-xpath.patch unknown status 1

1+
This patch was taken from the Fedora source RPM of java-velocity. It removes the dependency
2+
on werken-xpath which is unmaintained since 2001, and uses jdom instead.
3+
4+
From 8a9344f55d74a5b809051ae144b3c028499fec0d Mon Sep 17 00:00:00 2001
5+
From: Mikolaj Izdebski <mizdebsk@redhat.com>
6+
Date: Sat, 27 Sep 2013 10:53:46 +0200
7+
Subject: [PATCH] Don't use Werken XPath
8+
9+
---
10+
 src/java/org/apache/velocity/anakia/AnakiaElement.java |  7 +++++--
11+
 src/java/org/apache/velocity/anakia/NodeList.java      |  6 ++++--
12+
 src/java/org/apache/velocity/anakia/XPathCache.java    |  9 ++++++---
13+
 src/java/org/apache/velocity/anakia/XPathTool.java     | 16 ++++++++++------
14+
 4 files changed, 25 insertions(+), 13 deletions(-)
15+
16+
diff --git a/src/java/org/apache/velocity/anakia/AnakiaElement.java b/src/java/org/apache/velocity/anakia/AnakiaElement.java
17+
index c72b653..df13153 100644
18+
--- a/src/java/org/apache/velocity/anakia/AnakiaElement.java
19+
+++ b/src/java/org/apache/velocity/anakia/AnakiaElement.java
20+
@@ -20,8 +20,10 @@ package org.apache.velocity.anakia;
21+
  */
22+
 
23+
 import org.jdom.Element;
24+
+import org.jdom.JDOMException;
25+
 import org.jdom.Namespace;
26+
 import org.jdom.output.XMLOutputter;
27+
+
28+
 import java.util.List;
29+
 
30+
 /**
31+
@@ -126,10 +128,11 @@ public class AnakiaElement extends Element
32+
      * @param xpathExpression the XPath expression you wish to apply
33+
      * @return a NodeList representing the nodes that are the result of
34+
      * application of the XPath to the current element. It can be empty.
35+
+     * @throws JDOMException
36+
      */
37+
-    public NodeList selectNodes(String xpathExpression)
38+
+    public NodeList selectNodes(String xpathExpression) throws JDOMException
39+
     {
40+
-        return new NodeList(XPathCache.getXPath(xpathExpression).applyTo(this), false);
41+
+        return new NodeList(XPathCache.getXPath(xpathExpression).selectNodes(this), false);
42+
     }
43+
 
44+
     /**
45+
diff --git a/src/java/org/apache/velocity/anakia/NodeList.java b/src/java/org/apache/velocity/anakia/NodeList.java
46+
index daf611d..b303bda 100644
47+
--- a/src/java/org/apache/velocity/anakia/NodeList.java
48+
+++ b/src/java/org/apache/velocity/anakia/NodeList.java
49+
@@ -35,6 +35,7 @@ import org.jdom.DocType;
50+
 import org.jdom.Document;
51+
 import org.jdom.Element;
52+
 import org.jdom.EntityRef;
53+
+import org.jdom.JDOMException;
54+
 import org.jdom.ProcessingInstruction;
55+
 import org.jdom.Text;
56+
 import org.jdom.output.XMLOutputter;
57+
@@ -289,10 +290,11 @@ public class NodeList implements List, Cloneable
58+
      * @param xpathString the XPath expression you wish to apply
59+
      * @return a NodeList representing the nodes that are the result of
60+
      * application of the XPath to the current node list. It can be empty.
61+
+     * @throws JDOMException
62+
      */
63+
-    public NodeList selectNodes(String xpathString)
64+
+    public NodeList selectNodes(String xpathString) throws JDOMException
65+
     {
66+
-        return new NodeList(XPathCache.getXPath(xpathString).applyTo(nodes), false);
67+
+        return new NodeList(XPathCache.getXPath(xpathString).selectNodes(nodes), false);
68+
     }
69+
 
70+
 // List methods implemented hereafter
71+
diff --git a/src/java/org/apache/velocity/anakia/XPathCache.java b/src/java/org/apache/velocity/anakia/XPathCache.java
72+
index cef43d9..0d633b0 100644
73+
--- a/src/java/org/apache/velocity/anakia/XPathCache.java
74+
+++ b/src/java/org/apache/velocity/anakia/XPathCache.java
75+
@@ -19,7 +19,9 @@ package org.apache.velocity.anakia;
76+
  * under the License.    
77+
  */
78+
 
79+
-import com.werken.xpath.XPath;
80+
+import org.jdom.JDOMException;
81+
+import org.jdom.xpath.XPath;
82+
+
83+
 import java.util.Map;
84+
 import java.util.WeakHashMap;
85+
 
86+
@@ -46,8 +48,9 @@ class XPathCache
87+
      * A cached object is returned if it already exists for the requested expression.
88+
      * @param xpathString the XPath expression to parse
89+
      * @return the XPath object that represents the parsed XPath expression.
90+
+     * @throws JDOMException
91+
      */
92+
-    static XPath getXPath(String xpathString)
93+
+    static XPath getXPath(String xpathString) throws JDOMException
94+
     {
95+
         XPath xpath = null;
96+
         synchronized(XPATH_CACHE)
97+
@@ -55,7 +58,7 @@ class XPathCache
98+
             xpath = (XPath)XPATH_CACHE.get(xpathString);
99+
             if(xpath == null)
100+
             {
101+
-                xpath = new XPath(xpathString);
102+
+                xpath = XPath.newInstance(xpathString);
103+
                 XPATH_CACHE.put(xpathString, xpath);
104+
             }
105+
         }
106+
diff --git a/src/java/org/apache/velocity/anakia/XPathTool.java b/src/java/org/apache/velocity/anakia/XPathTool.java
107+
index c9e6178..f85d2c1 100644
108+
--- a/src/java/org/apache/velocity/anakia/XPathTool.java
109+
+++ b/src/java/org/apache/velocity/anakia/XPathTool.java
110+
@@ -23,6 +23,7 @@ import java.util.List;
111+
 
112+
 import org.jdom.Document;
113+
 import org.jdom.Element;
114+
+import org.jdom.JDOMException;
115+
 
116+
 /**
117+
  * This class adds an entrypoint into XPath functionality,
118+
@@ -88,12 +89,13 @@ public class XPathTool
119+
      * @param doc The Document context
120+
      *
121+
      * @return A list of selected nodes
122+
+     * @throws JDOMException
123+
      */
124+
     public NodeList applyTo(String xpathSpec,
125+
-                        Document doc)
126+
+                        Document doc) throws JDOMException
127+
     {
128+
         //RuntimeSingleton.info("XPathTool::applyTo(String, Document)");
129+
-        return new NodeList(XPathCache.getXPath(xpathSpec).applyTo( doc ), false);
130+
+        return new NodeList(XPathCache.getXPath(xpathSpec).selectNodes( doc ), false);
131+
     }
132+
 
133+
     /**
134+
@@ -103,12 +105,13 @@ public class XPathTool
135+
      * @param elem The Element context
136+
      *
137+
      * @return A list of selected nodes
138+
+     * @throws JDOMException
139+
      */
140+
     public NodeList applyTo(String xpathSpec,
141+
-                        Element elem)
142+
+                        Element elem) throws JDOMException
143+
     {
144+
         //RuntimeSingleton.info("XPathTool::applyTo(String, Element)");
145+
-        return new NodeList(XPathCache.getXPath(xpathSpec).applyTo( elem ), false);
146+
+        return new NodeList(XPathCache.getXPath(xpathSpec).selectNodes( elem ), false);
147+
     }
148+
 
149+
     /**
150+
@@ -118,12 +121,13 @@ public class XPathTool
151+
      * @param nodeSet The nodeset context
152+
      *
153+
      * @return A list of selected nodes
154+
+     * @throws JDOMException
155+
      */
156+
     public NodeList applyTo(String xpathSpec,
157+
-                        List nodeSet)
158+
+                        List nodeSet) throws JDOMException
159+
     {
160+
         //RuntimeSingleton.info("XPathTool::applyTo(String, List)");
161+
-        return new NodeList(XPathCache.getXPath(xpathSpec).applyTo( nodeSet ), false);
162+
+        return new NodeList(XPathCache.getXPath(xpathSpec).selectNodes( nodeSet ), false);
163+
     }
164+
 }
165+
 
166+
-- 
167+
1.8.3.1
168+
more/packages/image.scm unknown status 2
1-
;;; GNU Guix --- Functional package management for GNU
2-
;;; Copyright ?? 2017 Julien Lepiller <julien@lepiller.eu>
3-
;;;
4-
;;; This file is part of GNU Guix.
5-
;;;
6-
;;; GNU Guix is free software; you can redistribute it and/or modify it
7-
;;; under the terms of the GNU General Public License as published by
8-
;;; the Free Software Foundation; either version 3 of the License, or (at
9-
;;; your option) any later version.
10-
;;;
11-
;;; GNU Guix is distributed in the hope that it will be useful, but
12-
;;; WITHOUT ANY WARRANTY; without even the implied warranty of
13-
;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14-
;;; GNU General Public License for more details.
15-
;;;
16-
;;; You should have received a copy of the GNU General Public License
17-
;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
18-
19-
(define-module (more packages image)
20-
  #:use-module (guix packages)
21-
  #:use-module (guix download)
22-
  #:use-module (guix build-system gnu)
23-
  #:use-module (guix build-system python)
24-
  #:use-module ((guix licenses) #:prefix license:)
25-
  #:use-module (gnu packages)
26-
  #:use-module (more packages boost)
27-
  #:use-module (gnu packages gettext)
28-
  #:use-module (gnu packages gtk)
29-
  #:use-module (gnu packages lua)
30-
  #:use-module (gnu packages pkg-config)
31-
  #:use-module (gnu packages python)
32-
  #:use-module (gnu packages xml))
33-
34-
(define-public gpick
35-
  (package
36-
    (name "gpick")
37-
    (version "0.2.5")
38-
    (source (origin
39-
              (method url-fetch)
40-
              (uri (string-append "https://github.com/thezbyg/gpick/archive/"
41-
                                  name "-" version ".tar.gz"))
42-
              (sha256
43-
               (base32
44-
                "0mxvxk15xhk2i5vfavjhnkk4j3bnii0gpf8di14rlbpq070hd5rs"))))
45-
    (build-system gnu-build-system)
46-
    (native-inputs
47-
     `(("pkg-config" ,pkg-config)
48-
       ("scons" ,scons)))
49-
    (inputs
50-
     `(("gtk2" ,gtk+-2)
51-
       ("lua" ,lua-5.2)
52-
       ("expat" ,expat)
53-
       ("boost" ,boost-fix)
54-
       ("gettext" ,gnu-gettext)))
55-
    (arguments
56-
     `(#:tests? #f
57-
       #:phases
58-
       (modify-phases %standard-phases
59-
         (delete 'configure)
60-
         (replace 'build
61-
           (lambda _
62-
             (substitute* "SConscript"
63-
               (("lua5.2") "lua-5.2"))
64-
             (zero? (system* "scons"))))
65-
         (replace 'install
66-
           (lambda* (#:key outputs #:allow-other-keys)
67-
             (setenv "DESTDIR" (assoc-ref outputs "out"))
68-
             (zero? (system* "scons" "install" (string-append "DESTDIR=" (assoc-ref outputs "out")))))))))
69-
    (home-page "http://www.gpick.org/")
70-
    (synopsis "Color picker")
71-
    (description "Gpick is an advanced color picker and palette editing tool.")
72-
    (license license:bsd-3)))
more/packages/java.scm
119119 
(define-public java-jmapviewer
120120 
  (package
121121 
    (name "java-jmapviewer")
122-
    (version "2.2")
122+
    (version "2.3")
123123 
    (source (origin
124124 
              (method url-fetch)
125125 
              (uri (string-append "https://svn.openstreetmap.org/applications/viewer/jmapviewer/releases/"
126126 
                                  version "/JMapViewer-" version "-Source.zip"))
127127 
              (sha256
128128 
               (base32
129-
                "00jxqc4fzy7hpdi0007f0a84aa630brvam7vxqirdk9j4za4p0d8"))))
129+
                "0xalq8bacn8ibz3xiaqvj5pg6pxk9irvwx5f1lb0y2z5gsny3l1x"))))
130130 
    (build-system ant-build-system)
131131 
    (native-inputs
132132 
     `(("unzip" ,unzip)))
…
371371 
     `(("log4j" ,java-log4j-api)
372372 
       ,@(package-inputs java-commons-logging-minimal)))))
373373 
374+
(define-public java-lz4
375+
  (package
376+
    (name "java-lz4")
377+
    (version "1.3.0")
378+
    (source (origin
379+
              (method url-fetch)
380+
              (uri (string-append "https://repo1.maven.org/maven2/net/jpountz/"
381+
                                  "lz4/lz4/" version "/lz4-" version "-sources.jar"))
382+
              (sha256
383+
               (base32
384+
                "1vplqq2fhwjjrkdnnlclwyclxvzav80f7246awd178xwl9ng4vcm"))))
385+
    (build-system ant-build-system)
386+
    (arguments
387+
     `(#:jar-name "java-lj4.jar"
388+
       #:jdk ,icedtea-8
389+
       #:source-dir "."
390+
       #:tests? #f)); no tests
391+
    (home-page "https://jpountz.github.io/lz4-java"); or http://blog.jpountz.net/
392+
    (synopsis "")
393+
    (description "")
394+
    (license license:asl2.0)))
395+
396+
(define-public java-kafka-clients
397+
  (package
398+
    (name "java-kafka-clients")
399+
    (version "0.11.0.0")
400+
    (source (origin
401+
              (method url-fetch)
402+
              (uri (string-append "mirror://apache/kafka/" version "/kafka-"
403+
                                  version "-src.tgz"))
404+
              (sha256
405+
               (base32
406+
                "01mbi12bdxhrv4iadb3179cqrg689jva8hh8nig4n747arsbgiby"))))
407+
    (build-system ant-build-system)
408+
    (arguments
409+
     `(#:jar-name "java-kafka-clients.jar"
410+
       #:jdk ,icedtea-8
411+
       #:source-dir "clients/src/main/java"
412+
       #:tests? #f))
413+
    (inputs
414+
     `(("java-slf4j-api" ,java-slf4j-api)
415+
       ("java-lz4" ,java-lz4)))
416+
    (home-page "https://kafka.apache.org")
417+
    (synopsis "")
418+
    (description "")
419+
    (license (list license:cddl1.0; actually cddl1.1
420+
                   license:gpl2)))); with classpath exception
421+
422+
(define-public java-bsh
423+
  (package
424+
    (name "java-bsh")
425+
    (version "2.0b6")
426+
    (source (origin
427+
              (method url-fetch)
428+
              (uri (string-append "https://github.com/beanshell/beanshell/archive/"
429+
                                  version ".tar.gz"))
430+
              (sha256
431+
               (base32
432+
                "1bawkxk6jyc75hxvzkpz689h73cn3f222m0ar3nvb0dal2b85kfv"))))
433+
    (build-system ant-build-system)
434+
    (arguments
435+
     `(#:build-target "jarall"
436+
       #:tests? #f
437+
       #:phases
438+
       (modify-phases %standard-phases
439+
         (replace 'install
440+
           (lambda* (#:key outputs #:allow-other-keys)
441+
             (let ((share (string-append (assoc-ref outputs "out") "/share/java")))
442+
               (mkdir-p share)
443+
               (copy-file "dist/bsh-2.0b6.jar" (string-append share "/bsh-2.0b6.jar"))))))))
444+
    (home-page "http://beanshell.org/")
445+
    (synopsis "")
446+
    (description "")
447+
    (license license:asl2.0)))
448+
449+
(define-public java-hdrhistogram
450+
  (package
451+
    (name "java-hdrhistogram")
452+
    (version "2.1.9")
453+
    (source (origin
454+
              (method url-fetch)
455+
              (uri (string-append "https://github.com/HdrHistogram/HdrHistogram/"
456+
                                  "archive/HdrHistogram-" version ".tar.gz"))
457+
              (sha256
458+
               (base32
459+
                "1sicbmc3sr42nw93qbkb26q9rn33ag33k6k77phjc3j5h5gjffqv"))))
460+
    (build-system ant-build-system)
461+
    (arguments
462+
     `(#:jar-name "java-hdrhistogram.jar"
463+
       #:source-dir "src/main/java"
464+
       #:tests? #f
465+
       #:phases
466+
       (modify-phases %standard-phases
467+
         (add-before 'configure 'set-version
468+
           (lambda _
469+
             (let* ((version-java "src/main/java/org/HdrHistogram/Version.java")
470+
                    (template (string-append version-java ".template")))
471+
               (copy-file template version-java)
472+
               (substitute* version-java
473+
                 (("\\$VERSION\\$") ,version)
474+
                 (("\\$BUILD_TIME\\$") "0"))))))))
475+
    (home-page "https://hdrhistogram.github.io/HdrHistogram")
476+
    (synopsis "")
477+
    (description "")
478+
    (license license:bsd-2)))
479+
480+
(define-public java-jmock
481+
  (package
482+
    (name "java-jmock")
483+
    (version "2.8.2")
484+
    (source (origin
485+
              (method url-fetch)
486+
              (uri (string-append "https://github.com/jmock-developers/"
487+
                                  "jmock-library/archive/" version ".tar.gz"))
488+
              (sha256
489+
               (base32
490+
                "18650a9g8xffcsdb6w91pbswa7f40fp2sh6s3nclkclz5dbzq8f0"))))
491+
    (build-system ant-build-system)
492+
    (inputs
493+
     `(("java-hamcrest-all" ,java-hamcrest-all)
494+
       ("java-asm" ,java-asm)
495+
       ("java-bsh" ,java-bsh)
496+
       ("java-jumit" ,java-junit)))
497+
    (arguments
498+
     `(#:jar-name "java-jmock.jar"
499+
       #:source-dir "jmock/src/main/java"
500+
       #:tests? #f))
501+
    (home-page "https://github.com/jmock-developers/jmock-library")
502+
    (synopsis "")
503+
    (description "")
504+
    (license license:bsd-3)))
505+
506+
(define-public java-jmock-junit4
507+
  (package
508+
    (inherit java-jmock)
509+
    (name "java-jmock-junit4")
510+
    (arguments
511+
     `(#:jar-name "java-jmock-junit4.jar"
512+
       #:source-dir "jmock-junit4/src/main/java"
513+
       #:tests? #f))
514+
    (inputs
515+
     `(("java-hamcrest-all" ,java-hamcrest-all)
516+
       ("java-asm" ,java-asm)
517+
       ("java-bsh" ,java-bsh)
518+
       ("java-jmock" ,java-jmock)
519+
       ("java-jumit" ,java-junit)))))
520+
521+
522+
(define-public java-jmock-legacy
523+
  (package
524+
    (inherit java-jmock)
525+
    (name "java-jmock-legacy")
526+
    (arguments
527+
     `(#:jar-name "java-jmock-legacy.jar"
528+
       #:source-dir "jmock-legacy/src/main/java"
529+
       #:tests? #f))
530+
    (inputs
531+
     `(("java-hamcrest-all" ,java-hamcrest-all)
532+
       ("java-objenesis" ,java-objenesis)
533+
       ("java-cglib" ,java-cglib)
534+
       ("java-jmock" ,java-jmock)
535+
       ("java-asm" ,java-asm)
536+
       ("java-bsh" ,java-bsh)
537+
       ("java-jumit" ,java-junit)))))
538+
539+
(define-public java-lmax-disruptor
540+
  (package
541+
    (name "java-lmax-disruptor")
542+
    (version "3.3.6")
543+
    (source (origin
544+
              (method url-fetch)
545+
              (uri (string-append "https://github.com/LMAX-Exchange/disruptor/"
546+
                                  "archive/" version ".tar.gz"))
547+
              (sha256
548+
               (base32
549+
                "19c7c5cf3lby4fy7vl3b6a9hds1g0j7xgfbskqbdlcai1x82hh8i"))))
550+
    (build-system ant-build-system)
551+
    (arguments
552+
     `(#:jar-name "java-lmax-disruptor.jar"
553+
       #:jdk ,icedtea-8
554+
       #:source-dir "src"
555+
       #:tests? #f)); no tests
556+
    (inputs
557+
     `(("junit" ,java-junit)
558+
       ("java-hdrhistogram" ,java-hdrhistogram)
559+
       ("java-jmock" ,java-jmock)
560+
       ("java-jmock-legacy" ,java-jmock-legacy)
561+
       ("java-jmock-junit4" ,java-jmock-junit4)
562+
       ("java-hamcrest-all" ,java-hamcrest-all)))
563+
    (home-page "https://www.lmax.com/disruptor")
564+
    (synopsis "")
565+
    (description "")
566+
    (license license:asl2.0)))
567+
568+
(define-public java-mail
569+
  (package
570+
    (name "java-mail")
571+
    (version "1.6.0")
572+
    (source (origin
573+
              (method url-fetch)
574+
              (uri (string-append "https://github.com/javaee/javamail/archive/"
575+
                                  "JAVAMAIL-1_6_0.tar.gz"))
576+
              (sha256
577+
               (base32
578+
                "1b4rg7fpj50ld90a71iz2m4gm3f5cnw18p3q3rbrrryjip46kx92"))))
579+
    (build-system ant-build-system)
580+
    (arguments
581+
     `(#:jar-name "java-mail.jar"
582+
       #:jdk ,icedtea-8
583+
       #:source-dir "mail/src/main/java"
584+
       #:tests? #f; no tests
585+
       #:phases
586+
       (modify-phases %standard-phases
587+
         (add-before 'configure 'move-version.java
588+
           (lambda _
589+
             ;; this is done in build.xml (init target)
590+
             (copy-file "mail/src/main/resources/javax/mail/Version.java"
591+
                        "mail/src/main/java/javax/mail/Version.java"))))))
592+
    (home-page "https://javaee.github.io/javamail")
593+
    (synopsis "")
594+
    (description "")
595+
    (license (list license:cddl1.0; actually cddl1.1
596+
                   license:gpl2)))); with classpath exception
597+
598+
(define-public java-log4j-core
599+
  (package
600+
    (inherit java-log4j-api)
601+
    (name "java-log4j-core")
602+
    (inputs
603+
     `(("java-osgi-core" ,java-osgi-core)
604+
       ("java-hamcrest-core" ,java-hamcrest-core)
605+
       ("java-log4j-api" ,java-log4j-api)
606+
       ("java-mail" ,java-mail)
607+
       ("java-lmax-disruptor" ,java-lmax-disruptor)
608+
       ("java-kafka" ,java-kafka-clients)
609+
       ("java-commons-compress" ,java-commons-compress)
610+
       ("java-junit" ,java-junit)))
611+
    (arguments
612+
     `(#:tests? #f ; tests require unpackaged software
613+
       #:jar-name "log4j-core.jar"
614+
       #:make-flags
615+
       (list (string-append "-Ddist.dir=" (assoc-ref %outputs "out")
616+
                            "/share/java"))
617+
       #:phases
618+
       (modify-phases %standard-phases
619+
         (add-after 'unpack 'enter-dir
620+
           (lambda _ (chdir "log4j-core") #t))
621+
         ;; FIXME: The tests require additional software that has not been
622+
         ;; packaged yet, such as
623+
         ;; * org.apache.maven
624+
         ;; * org.apache.felix
625+
         (add-after 'enter-dir 'delete-tests
626+
           (lambda _ (delete-file-recursively "src/test") #t)))))))
627+
374628 
(define-public java-velocity
375629 
  (package
376630 
    (name "java-velocity")
…
381635 
                                  version "/velocity-" version ".tar.gz"))
382636 
              (sha256
383637 
               (base32
384-
                "0rk7s04hkrr2k3glccx0yrglzqzj4qbipcrxhglk46yhx92vravc"))))
638+
                "0rk7s04hkrr2k3glccx0yrglzqzj4qbipcrxhglk46yhx92vravc"))
639+
	      (patches
640+
		(search-patches "java-velocity-dont-use-werken-xpath.patch"))))
385641 
    (build-system ant-build-system)
386642 
    (arguments
387643 
     `(#:source-dir "src/java"
388644 
       #:phases
389645 
       (modify-phases %standard-phases
646+
	     (add-before 'configure 'fix-log4j-path
647+
	       (lambda _
648+
	         (for-each (lambda (file)
649+
                         (substitute* file
650+
	                       (("org.apache.log4j") "org.apache.logging.log4j")))
651+
               '("src/java/org/apache/velocity/runtime/log/Log4JLogChute.java"
652+
                 "src/java/org/apache/velocity/runtime/log/SimpleLog4JLogSystem.java"))))
390653 
         (add-before 'build 'prepare
391654 
           (lambda* (#:key inputs #:allow-other-keys)
392655 
             (delete-file-recursively "lib")
…
9281191 
    (description "")
9291192 
    (license license:asl2.0)))
9301193 
931-
(define-public java-joda-convert
932-
  (package
933-
    (name "java-joda-convert")
934-
    (version "1.8.1")
935-
    (source (origin
936-
              (method url-fetch)
937-
              (uri (string-append "https://github.com/JodaOrg/joda-convert/archive/v"
938-
                                  version ".tar.gz"))
939-
              (file-name (string-append name "-" version ".tar.gz"))
940-
              (sha256
941-
               (base32
942-
                "1di9chp0pgvd2gxsmdaxhldwns9a2ss9705jmn97mdd69cg5zcnc"))))
943-
    (build-system ant-build-system)
944-
    (arguments
945-
     `(#:jar-name (string-append ,name "-" ,version ".jar")
946-
       #:source-dir "src/main/java"
947-
       #:tests? #f))
948-
    (inputs
949-
     `(("java-google-collect" ,java-google-collect)))
950-
    (native-inputs
951-
     `(("junit" ,java-junit)))
952-
    (home-page "")
953-
    (synopsis "")
954-
    (description "")
955-
    (license license:asl2.0)))
956-
957-
(define-public java-joda-time
958-
  (package
959-
    (name "java-joda-time")
960-
    (version "2.9.9")
961-
    (source (origin
962-
              (method url-fetch)
963-
              (uri (string-append "https://github.com/JodaOrg/joda-time/archive/v"
964-
                                  version ".tar.gz"))
965-
              (file-name (string-append name "-" version ".tar.gz"))
966-
              (sha256
967-
               (base32
968-
                "1i9x91mi7yg2pasl0k3912f1pg46n37sps6rdb0v1gs8hj9ppwc1"))))
969-
    (build-system ant-build-system)
970-
    (arguments
971-
     `(#:jar-name (string-append ,name "-" ,version ".jar")
972-
       #:source-dir "src/main/java"
973-
       #:tests? #f))
974-
    (inputs
975-
     `(("java-joda-convert" ,java-joda-convert)))
976-
    (native-inputs
977-
     `(("junit" ,java-junit)))
978-
    (home-page "")
979-
    (synopsis "")
980-
    (description "")
981-
    (license license:asl2.0)))
1194+
;(define-public java-joda-convert
1195+
;  (package
1196+
;    (name "java-joda-convert")
1197+
;    (version "1.8.1")
1198+
;    (source (origin
1199+
;              (method url-fetch)
1200+
;              (uri (string-append "https://github.com/JodaOrg/joda-convert/archive/v"
1201+
;                                  version ".tar.gz"))
1202+
;              (file-name (string-append name "-" version ".tar.gz"))
1203+
;              (sha256
1204+
;               (base32
1205+
;                "1di9chp0pgvd2gxsmdaxhldwns9a2ss9705jmn97mdd69cg5zcnc"))))
1206+
;    (build-system ant-build-system)
1207+
;    (arguments
1208+
;     `(#:jar-name (string-append ,name "-" ,version ".jar")
1209+
;       #:source-dir "src/main/java"
1210+
;       #:tests? #f))
1211+
;    (inputs
1212+
;     `(("java-google-collect" ,java-google-collect)))
1213+
;    (native-inputs
1214+
;     `(("junit" ,java-junit)))
1215+
;    (home-page "")
1216+
;    (synopsis "")
1217+
;    (description "")
1218+
;    (license license:asl2.0)))
1219+
;
1220+
;(define-public java-joda-time
1221+
;  (package
1222+
;    (name "java-joda-time")
1223+
;    (version "2.9.9")
1224+
;    (source (origin
1225+
;              (method url-fetch)
1226+
;              (uri (string-append "https://github.com/JodaOrg/joda-time/archive/v"
1227+
;                                  version ".tar.gz"))
1228+
;              (file-name (string-append name "-" version ".tar.gz"))
1229+
;              (sha256
1230+
;               (base32
1231+
;                "1i9x91mi7yg2pasl0k3912f1pg46n37sps6rdb0v1gs8hj9ppwc1"))))
1232+
;    (build-system ant-build-system)
1233+
;    (arguments
1234+
;     `(#:jar-name (string-append ,name "-" ,version ".jar")
1235+
;       #:source-dir "src/main/java"
1236+
;       #:tests? #f))
1237+
;    (inputs
1238+
;     `(("java-joda-convert" ,java-joda-convert)))
1239+
;    (native-inputs
1240+
;     `(("junit" ,java-junit)))
1241+
;    (home-page "")
1242+
;    (synopsis "")
1243+
;    (description "")
1244+
;    (license license:asl2.0)))
9821245 
9831246 
(define-public java-xstream
9841247 
  (package
…
10831346 
       #:source-dir "src/main"))))
10841347 
10851348 
1086-
(define-public antlr3-3.4
1087-
  (package
1088-
    (name "antlr3")
1089-
    (version "3.4")
1090-
    (source (origin
1091-
              (method url-fetch)
1092-
              (uri (string-append "https://github.com/antlr/website-antlr3/raw/"
1093-
                                  "gh-pages/download/antlr-"
1094-
                                  version ".tar.gz"))
1095-
              (sha256
1096-
               (base32
1097-
                "1cwfswpk3jlzl1dhc6b6586srza8q0bbzwlxcq136p29v62fjrb3"))))
1098-
    (build-system ant-build-system)
1099-
    (arguments
1100-
     `(#:jar-name (string-append ,name "-" ,version ".jar")
1101-
       #:source-dir "tool/src/main/java:runtime/Java/src/main/java:tool/src/main/antlr3"
1102-
       #:tests? #f
1103-
       #:phases
1104-
       (modify-phases %standard-phases
1105-
         (add-after 'install 'bin-install
1106-
           (lambda* (#:key inputs outputs #:allow-other-keys)
1107-
             (let ((jar (string-append (assoc-ref outputs "out") "/share/java"))
1108-
                   (bin (string-append (assoc-ref outputs "out") "/bin")))
1109-
               (mkdir-p bin)
1110-
               (with-output-to-file (string-append bin "/antlr3")
1111-
                 (lambda _
1112-
                   (display
1113-
                     (string-append "#!/bin/sh\n"
1114-
                                    "java -cp " jar "/antlr3-3.3.jar:"
1115-
                                    (string-concatenate
1116-
                                      (find-files (assoc-ref inputs "stringtemplate")
1117-
                                                  ".*\\.jar"))
1118-
                                    ":"
1119-
                                    (string-concatenate
1120-
                                      (find-files (string-append (assoc-ref inputs "antlr") "/lib")
1121-
                                                  ".*\\.jar"))
1122-
                                    " org.antlr.Tool $*"))))
1123-
               (chmod (string-append bin "/antlr3") #o755))))
1124-
         (add-before 'build 'generate-grammar
1125-
           (lambda _
1126-
             (chdir "tool/src/main/antlr3/org/antlr/grammar/v3/")
1127-
             (for-each (lambda (file)
1128-
                         (display file)
1129-
                         (newline)
1130-
                         (system* "antlr3" file))
1131-
                       '("ActionAnalysis.g" "ActionTranslator.g" "ANTLR.g"
1132-
                         "ANTLRTreePrinter.g" "ANTLRv3.g" "ANTLRv3Tree.g"
1133-
                         "AssignTokenTypesWalker.g" "CodeGenTreeWalker.g"
1134-
                         "DefineGrammarItemsWalker.g" "LeftRecursiveRuleWalker.g"
1135-
                         "TreeToNFAConverter.g"))
1136-
             (chdir "../../../../../../../..")
1137-
             (system* "antlr" "-o" "tool/src/main/java/org/antlr/tool"
1138-
                      "tool/src/main/java/org/antlr/tool/serialize.g")
1139-
             (substitute* "tool/src/main/java/org/antlr/tool/LeftRecursiveRuleAnalyzer.java"
1140-
               (("import org.antlr.grammar.v3.\\*;") "import org.antlr.grammar.v3.*;
1141-
import org.antlr.grammar.v3.ANTLRTreePrinter;"))
1142-
             (substitute* "tool/src/main/java/org/antlr/tool/Grammar.java"
1143-
               (("import org.antlr.grammar.v3.\\*;")
1144-
                "import org.antlr.grammar.v3.*;\n
1145-
import org.antlr.grammar.v3.TreeToNFAConverter;\n
1146-
import org.antlr.grammar.v3.DefineGrammarItemsWalker;\n
1147-
import org.antlr.grammar.v3.ANTLRTreePrinter;"))
1148-
             (substitute* "tool/src/main/java/org/antlr/tool/ErrorManager.java"
1149-
               (("case NO_SUCH_ATTRIBUTE_PASS_THROUGH:") ""))
1150-
             (substitute* "tool/src/main/antlr3/org/antlr/grammar/v3/ANTLRParser.java"
1151-
               (("public Object getTree") "public GrammarAST getTree"))
1152-
             (substitute* "tool/src/main/antlr3/org/antlr/grammar/v3/ANTLRv3Parser.java"
1153-
               (("public Object getTree") "public CommonTree getTree"))))
1154-
         (add-before 'build 'fix-build-xml
1155-
           (lambda _
1156-
             (substitute* "build.xml"
1157-
               (("<exec") "<copy todir=\"${classes.dir}\">
1158-
<fileset dir=\"tool/src/main/resources\">
1159-
<include name=\"**/*.stg\"/>
1160-
<include name=\"**/*.st\"/>
1161-
<include name=\"**/*.sti\"/>
1162-
<include name=\"**/STLexer.tokens\"/>
1163-
</fileset>
1164-
</copy><exec")))))))
1165-
    (native-inputs
1166-
     `(("antlr" ,antlr2)
1167-
       ("antlr3" ,antlr3-3.3)))
1168-
    (inputs
1169-
     `(("junit" ,java-junit)))
1170-
    (propagated-inputs
1171-
     `(("stringtemplate" ,stringtemplate3)
1172-
       ("stringtemplate4" ,stringtemplate4)
1173-
       ("antlr" ,antlr2)
1174-
       ("antlr3" ,antlr3-3.1)))
1175-
    (home-page "http://www.stringtemplate.org")
1176-
    (synopsis "")
1177-
    (description "")
1178-
    (license license:bsd-3)))
1349+
;(define-public antlr3-3.4
1350+
;  (package
1351+
;    (name "antlr3")
1352+
;    (version "3.4")
1353+
;    (source (origin
1354+
;              (method url-fetch)
1355+
;              (uri (string-append "https://github.com/antlr/website-antlr3/raw/"
1356+
;                                  "gh-pages/download/antlr-"
1357+
;                                  version ".tar.gz"))
1358+
;              (sha256
1359+
;               (base32
1360+
;                "1cwfswpk3jlzl1dhc6b6586srza8q0bbzwlxcq136p29v62fjrb3"))))
1361+
;    (build-system ant-build-system)
1362+
;    (arguments
1363+
;     `(#:jar-name (string-append ,name "-" ,version ".jar")
1364+
;       #:source-dir "tool/src/main/java:runtime/Java/src/main/java:tool/src/main/antlr3"
1365+
;       #:tests? #f
1366+
;       #:phases
1367+
;       (modify-phases %standard-phases
1368+
;         (add-after 'install 'bin-install
1369+
;           (lambda* (#:key inputs outputs #:allow-other-keys)
1370+
;             (let ((jar (string-append (assoc-ref outputs "out") "/share/java"))
1371+
;                   (bin (string-append (assoc-ref outputs "out") "/bin")))
1372+
;               (mkdir-p bin)
1373+
;               (with-output-to-file (string-append bin "/antlr3")
1374+
;                 (lambda _
1375+
;                   (display
1376+
;                     (string-append "#!/bin/sh\n"
1377+
;                                    "java -cp " jar "/antlr3-3.3.jar:"
1378+
;                                    (string-concatenate
1379+
;                                      (find-files (assoc-ref inputs "stringtemplate")
1380+
;                                                  ".*\\.jar"))
1381+
;                                    ":"
1382+
;                                    (string-concatenate
1383+
;                                      (find-files (string-append (assoc-ref inputs "antlr") "/lib")
1384+
;                                                  ".*\\.jar"))
1385+
;                                    " org.antlr.Tool $*"))))
1386+
;               (chmod (string-append bin "/antlr3") #o755))))
1387+
;         (add-before 'build 'generate-grammar
1388+
;           (lambda _
1389+
;             (chdir "tool/src/main/antlr3/org/antlr/grammar/v3/")
1390+
;             (for-each (lambda (file)
1391+
;                         (display file)
1392+
;                         (newline)
1393+
;                         (system* "antlr3" file))
1394+
;                       '("ActionAnalysis.g" "ActionTranslator.g" "ANTLR.g"
1395+
;                         "ANTLRTreePrinter.g" "ANTLRv3.g" "ANTLRv3Tree.g"
1396+
;                         "AssignTokenTypesWalker.g" "CodeGenTreeWalker.g"
1397+
;                         "DefineGrammarItemsWalker.g" "LeftRecursiveRuleWalker.g"
1398+
;                         "TreeToNFAConverter.g"))
1399+
;             (chdir "../../../../../../../..")
1400+
;             (system* "antlr" "-o" "tool/src/main/java/org/antlr/tool"
1401+
;                      "tool/src/main/java/org/antlr/tool/serialize.g")
1402+
;             (substitute* "tool/src/main/java/org/antlr/tool/LeftRecursiveRuleAnalyzer.java"
1403+
;               (("import org.antlr.grammar.v3.\\*;") "import org.antlr.grammar.v3.*;
1404+
;import org.antlr.grammar.v3.ANTLRTreePrinter;"))
1405+
;             (substitute* "tool/src/main/java/org/antlr/tool/Grammar.java"
1406+
;               (("import org.antlr.grammar.v3.\\*;")
1407+
;                "import org.antlr.grammar.v3.*;\n
1408+
;import org.antlr.grammar.v3.TreeToNFAConverter;\n
1409+
;import org.antlr.grammar.v3.DefineGrammarItemsWalker;\n
1410+
;import org.antlr.grammar.v3.ANTLRTreePrinter;"))
1411+
;             (substitute* "tool/src/main/java/org/antlr/tool/ErrorManager.java"
1412+
;               (("case NO_SUCH_ATTRIBUTE_PASS_THROUGH:") ""))
1413+
;             (substitute* "tool/src/main/antlr3/org/antlr/grammar/v3/ANTLRParser.java"
1414+
;               (("public Object getTree") "public GrammarAST getTree"))
1415+
;             (substitute* "tool/src/main/antlr3/org/antlr/grammar/v3/ANTLRv3Parser.java"
1416+
;               (("public Object getTree") "public CommonTree getTree"))))
1417+
;         (add-before 'build 'fix-build-xml
1418+
;           (lambda _
1419+
;             (substitute* "build.xml"
1420+
;               (("<exec") "<copy todir=\"${classes.dir}\">
1421+
;<fileset dir=\"tool/src/main/resources\">
1422+
;<include name=\"**/*.stg\"/>
1423+
;<include name=\"**/*.st\"/>
1424+
;<include name=\"**/*.sti\"/>
1425+
;<include name=\"**/STLexer.tokens\"/>
1426+
;</fileset>
1427+
;</copy><exec")))))))
1428+
;    (native-inputs
1429+
;     `(("antlr" ,antlr2)
1430+
;       ("antlr3" ,antlr3-3.3)))
1431+
;    (inputs
1432+
;     `(("junit" ,java-junit)))
1433+
;    (propagated-inputs
1434+
;     `(("stringtemplate" ,java-stringtemplate-3)
1435+
;       ("stringtemplate4" ,java-stringtemplate)
1436+
;       ("antlr" ,antlr2)
1437+
;       ("antlr3" ,antlr3-3.1)))
1438+
;    (home-page "http://www.stringtemplate.org")
1439+
;    (synopsis "")
1440+
;    (description "")
1441+
;    (license license:bsd-3)))
11791442 
11801443 
(define-public libantlr3c
11811444 
  (package
…
12701533 
       ("icu4j" ,java-icu4j)
12711534 
       ("java-json" ,java-json)
12721535 
       ("treelayout" ,java-treelayout)
1273-
       ("stringtemplate4" ,stringtemplate4)))
1536+
       ("stringtemplate4" ,java-stringtemplate)))
12741537 
    (home-page "https://antlr.org")
12751538 
    (synopsis "")
12761539 
    (description "")
more/packages/messaging.scm
4343 
  #:use-module (gnu packages xiph)
4444 
  #:use-module (gnu packages xorg)
4545 
  #:use-module (gnu packages xml)
46+
  #:use-module (gnu packages java)
4647 
  #:use-module (more packages java))
4748 
4849 
;; goes to check.scm
more/packages/ocaml.scm
3030 
  #:use-module (gnu packages emacs)
3131 
  #:use-module (gnu packages flex)
3232 
  #:use-module (gnu packages llvm)
33+
  #:use-module (gnu packages maths)
3334 
  #:use-module (gnu packages multiprecision)
3435 
  #:use-module (gnu packages ocaml)
3536 
  #:use-module (gnu packages perl)
…
937938 
     `(("ocaml" ,ocaml)
938939 
       ("which" ,which)))
939940 
    (propagated-inputs
940-
     `(("z3" ,z3-solver)))
941+
     `(("z3" ,z3)))
941942 
    (arguments
942943 
     `(#:configure-flags (list "--with-z3")
943944 
       #:tests? #f