update josm and start a kotlin package

LEPILLER JulienTue Dec 12 11:48:59+0100 2017

4d8c2fa

update josm and start a kotlin package

more/packages/java.scm

202202 
(define-public java-josm
203203 
  (package
204204 
    (name "java-josm")
205-
    (version "12921")
205+
    (version "13170")
206206 
    (source (origin
207207 
              (method git-fetch)
208208 
              (uri (git-reference
209209 
                    (url "https://github.com/openstreetmap/josm.git")
210-
                    (commit "82b3a6bc44ce02ce8398b3842fa4ec2647bb5e4a")))
211-
              ;;(uri (svn-reference
212-
              ;;      (url "https://svn.openstreetmap.org/applications/editors/josm")
213-
              ;;      (revision 12039)))
210+
                    (commit "bfbb677395e5d788c2d49b6ed8fd9dac23495674")))
211+
              ;; FIXME: Fetching from mirror on github because svn-fetch result
212+
              ;; is not deterministic: hash differs each time it fetches the repo.
213+
              ;(uri (svn-reference
214+
              ;      (url "https://svn.openstreetmap.org/applications/editors/josm")
215+
              ;      (revision (string->number version))))
214216 
              (sha256
215217 
               (base32
216-
                "1v2mf8y42r3jplc72xy481a3263j9p2g72d76szcsvnh3cg5kd3i"))
217-
              (file-name (string-append name "-" version))))
218+
                "186sxgh51p8k6h05mvn710l566xvdw9qxsmq81y78bfbrda9n9sw"))
219+
              (file-name (string-append name "-" version))
220+
              (modules '((guix build utils)))
221+
              (snippet
222+
                '(delete-file-recursively "src/org/apache"))))
218223 
    (build-system ant-build-system)
219224 
    (native-inputs
220225 
     `(("java-javacc" ,java-javacc)))

…

233238 
       ("java-httpcomponents-core" ,java-httpcomponents-core)
234239 
       ("java-commons-jcs" ,java-commons-jcs)
235240 
       ("java-commons-collections" ,java-commons-collections)
236-
       ("java-commons-jcs" ,java-commons-jcs)
237241 
       ("java-commons-logging-minimal" ,java-commons-logging-minimal)
238242 
       ("java-commons-compress" ,java-commons-compress-latest)))
239243 
    (arguments

…

245249 
         (add-after 'unpack 'rm-build.xml
246250 
           (lambda* _
247251 
             (delete-file "build.xml")))
248-
         (add-after 'unpack 'rm-jcs-embedded
249-
           (lambda _
250-
             (delete-file-recursively "src/org/apache/commons/jcs")))
251252 
         (add-before 'build 'fix-revision
252253 
           (lambda* _
253254 
             (with-output-to-file "REVISION.XML"

…

282283 
             (rename-file "data" "build/classes/data")))
283284 
         (add-before 'install 'regenerate-jar
284285 
           (lambda _
285-
             ;; We need to regenerate the jar file with to add data.
286+
             ;; We need to regenerate the jar file to add data.
286287 
             (delete-file "build/jar/josm.jar")
287288 
             (zero? (system* "jar" "-cf" "build/jar/josm.jar" "-C"
288289 
                             "build/classes" "."))))

…

485486 
                                  "_spec-1.0.1.Final.tar.gz"))
486487 
              (sha256
487488 
               (base32
488-
                "0crfl4f5m2sm59kdsivrw2dy63w02al1li88bhlhp7mxnicfmxv7"))))
489+
                "0yhyjf9p21cjs84nz66bxnmzdxdr98kfpbyp5gr3js0hwl6zz7xb"))))
489490 
    (build-system ant-build-system)
490491 
    (arguments
491492 
     `(#:jar-name "java-jboss-transaction-api_spec.jar"

…

64216422 
    (synopsis "")
64226423 
    (description "")
64236424 
    (license license:asl2.0)))
6425+
6426+
(define-public kotlin
6427+
  (package
6428+
    (name "kotlin")
6429+
    (version "1.1.61")
6430+
    (source (origin
6431+
              (method url-fetch)
6432+
              (uri (string-append "https://github.com/JetBrains/kotlin/archive/v"
6433+
                                  version ".tar.gz"))
6434+
              (file-name (string-append name "-" version ".tar.gz"))
6435+
              (sha256
6436+
               (base32
6437+
                "0pj7x0b93r85cc3wj1lj1ydf48rikdbv0hq6wfxs059z140icq0a"))))
6438+
    (build-system ant-build-system)
6439+
    (home-page "https://kotlinlang.org/")
6440+
    (synopsis "Statically typed programming language")
6441+
    (description "")
6442+
    ;; described in license/README.md
6443+
    ;; Kotlin is under asl2.0, third-party libraries have different licenses
6444+
    (license license:asl2.0)))