Update josm.
more/packages/java.scm
1587 | 1587 | (define-public java-josm | |
1588 | 1588 | (package | |
1589 | 1589 | (name "java-josm") | |
1590 | - | (version "14760") | |
1590 | + | (version "14824") | |
1591 | 1591 | (source (origin | |
1592 | - | (method svn-fetch) | |
1593 | - | (uri (svn-reference | |
1594 | - | (url "https://svn.openstreetmap.org/applications/editors/josm") | |
1595 | - | (revision (string->number version)))) | |
1592 | + | (method git-fetch) | |
1593 | + | (uri (git-reference | |
1594 | + | (url "https://github.com/openstreetmap/josm.git") | |
1595 | + | (commit "4b30f7f925343c90f40d02a350645c890eb7af9e"))) | |
1596 | + | ;(method svn-fetch) | |
1597 | + | ;(uri (svn-reference | |
1598 | + | ; (url "https://svn.openstreetmap.org/applications/editors/josm") | |
1599 | + | ; (revision (string->number version)))) | |
1596 | 1600 | (sha256 | |
1597 | 1601 | (base32 | |
1598 | - | "1g5pb24bjanfmajvg5l4xp5iqy7rpary8b27489xfkyfi04kskcz")) | |
1599 | - | (file-name (string-append name "-" version)) | |
1602 | + | "0psjf9xjvhn1zz8d6sp0jhdzcxk3nwvj16bz6lkyknb8zwc22xds")) | |
1603 | + | (file-name (git-file-name name version)) | |
1600 | 1604 | (modules '((guix build utils))) | |
1601 | 1605 | (snippet | |
1602 | 1606 | `(begin | |
1603 | 1607 | (for-each delete-file (find-files "." ".*.jar")) | |
1604 | - | (with-directory-excursion "core" | |
1605 | - | (delete-file-recursively "test/lib") | |
1606 | - | (delete-file-recursively "windows")) | |
1608 | + | ;(with-directory-excursion "core" | |
1609 | + | ; (delete-file-recursively "test/lib") | |
1610 | + | ; (delete-file-recursively "windows")) | |
1607 | 1611 | #t)))) | |
1608 | 1612 | (build-system ant-build-system) | |
1609 | 1613 | (native-inputs | |
… | |||
1631 | 1635 | #:jar-name "josm.jar" | |
1632 | 1636 | #:phases | |
1633 | 1637 | (modify-phases %standard-phases | |
1634 | - | (add-after 'unpack 'chdir | |
1635 | - | (lambda _ | |
1636 | - | (chdir "core") | |
1637 | - | #t)) | |
1638 | - | (add-after 'chdir 'rm-build.xml | |
1638 | + | ;(add-after 'unpack 'chdir | |
1639 | + | ; (lambda _ | |
1640 | + | ; (chdir "core") | |
1641 | + | ; #t)) | |
1642 | + | (add-after 'unpack 'rm-build.xml | |
1639 | 1643 | (lambda* _ | |
1640 | 1644 | (delete-file "build.xml") | |
1641 | 1645 | #t)) |