Update josm (broken)

Julien LepillerTue Oct 10 23:05:35+0200 2017

203bedb

Update josm (broken)

more/packages/java.scm

252252 
(define-public java-josm
253253 
  (package
254254 
    (name "java-josm")
255-
    (version "12712")
255+
    (version "12921")
256256 
    (source (origin
257257 
              (method git-fetch)
258258 
              (uri (git-reference
259259 
                    (url "https://github.com/openstreetmap/josm.git")
260-
                    (commit "13645f32a20ff596f7a359be2ecf15680437cd22")))
260+
                    (commit "82b3a6bc44ce02ce8398b3842fa4ec2647bb5e4a")))
261261 
              ;;(uri (svn-reference
262262 
              ;;      (url "https://svn.openstreetmap.org/applications/editors/josm")
263263 
              ;;      (revision 12039)))
264264 
              (sha256
265265 
               (base32
266-
                "02bbv7ac47vj7p63ffxa3pqx8pagkvfhnq0819s07mhhqav1kvy0"))
266+
                "1v2mf8y42r3jplc72xy481a3263j9p2g72d76szcsvnh3cg5kd3i"))
267267 
              (file-name (string-append name "-" version))))
268268 
    (build-system ant-build-system)
269269 
    (native-inputs

…

33203320 
    (description "")
33213321 
    (license license:asl2.0)))
33223322 
3323+
(define-public java-velocity-tools
3324+
  (package
3325+
    (name "java-velocity-tools")
3326+
    (version "2.0")
3327+
    (source (origin
3328+
              (method url-fetch)
3329+
              (uri (string-append "mirror://apache/velocity/tools/" version
3330+
                                  "/velocity-tools-" version "-src.tar.gz"))
3331+
              (sha256
3332+
               (base32
3333+
                "0d93v8nj95jfdgx7n72axaavdq2h800vxyi4vx35rdphndy1xg51"))))
3334+
    (build-system ant-build-system)
3335+
    (arguments
3336+
     `(#:jdk ,icedtea-8
3337+
       #:test-target "test-main"
3338+
       #:tests? #f; FIXME: need a fix to build.xml and hsqldb
3339+
       #:phases
3340+
       (modify-phases %standard-phases
3341+
         (add-before 'build 'prepare
3342+
           (lambda* (#:key inputs #:allow-other-keys)
3343+
             ;; Don't download anything
3344+
             (substitute* "build.xml"
3345+
               ((".*download.xml.*") ""))))
3346+
         (replace 'install
3347+
           (lambda* (#:key outputs #:allow-other-keys)
3348+
             (let* ((out (assoc-ref outputs "out"))
3349+
                    (dir (string-append out "/share/java")))
3350+
               (mkdir-p dir)
3351+
               (copy-file "../bin/velocity-tools-2.0.jar"
3352+
                          (string-append dir "/velocity-tools-2.0.jar"))))))))
3353+
    (inputs
3354+
     `(("dom4j" ,java-dom4j)
3355+
       ("velocity" ,java-velocity)
3356+
       ("beanutils", java-commons-beanutils)))
3357+
    ;; apache struts, commons validator
3358+
    (home-page "https://velocity.apache.org/tools/devel")
3359+
    (synopsis "")
3360+
    (description "")
3361+
    (license license:asl2.0)))
3362+
33233363 
;; Older version, unmaintained, for jcs.
33243364 
(define-public java-commons-httpclient
33253365 
  (package