summary refs log tree commit diff
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2019-02-10 14:45:35 +0100
committerTobias Geerinckx-Rice <me@tobias.gr>2019-02-10 17:45:41 +0100
commiteed5e162adef90324e46dc45ab83dff1a471bcf8 (patch)
treee44d409317edb80c29843b0d3ff3326596ec4c9a
parenta4b96726b510979c0784dab81ffd68349788554b (diff)
downloadguix-eed5e162adef90324e46dc45ab83dff1a471bcf8.tar.gz
gnu: java-xom: Don't use unstable tarball.
* gnu/packages/xml.scm (java-xom)[source]: Use GIT-FETCH and
GIT-FILE-NAME.
[arguments]: Add 'make-git-checkout-writable' phase.
-rw-r--r--gnu/packages/xml.scm16
1 files changed, 11 insertions, 5 deletions
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 461c021967..3a320351e9 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -1651,12 +1651,14 @@ with XPath too.")
     (name "java-xom")
     (version "127")
     (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/elharo/xom/archive/XOM_"
-                                  version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/elharo/xom.git")
+                    (commit (string-append "XOM_" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "04m69db1irqja12a9rfxrac8cbn9psqa1k136wh4ls4pxfsdr5wg"))
+                "1jh6y03g5zzdhsb5jm6ms1xnamr460qmn96y3w6aw0ikfwqlg0bq"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@ -1667,9 +1669,13 @@ with XPath too.")
     (arguments
      `(#:jar-name "xom.jar"
        #:jdk ,icedtea-8
-       #:tests? #f; no tests
+       #:tests? #f                      ; no tests
        #:phases
        (modify-phases %standard-phases
+         (add-after 'unpack 'make-git-checkout-writable
+           (lambda _
+             (for-each make-file-writable (find-files "."))
+             #t))
          (add-before 'configure 'fix-tagsoup-dep
            (lambda _
              ;; FIXME: Where is tagsoup source?