[bug#33215,02/11] gnu: clojure: Remove 'remove-archives' snippet.

Message ID 87efc6hcpg.fsf@gmail.com
State New
Headers show
Series
  • build-system: Add 'clojure-build-system'.
Related show

Checks

Context Check Description
cbaines/applying patch success Successfully applied

Commit Message

Alex Vong Oct. 31, 2018, 6:06 a.m. UTC

Patch

From aade1b3a84bc1e2cb6ad46b477025cb14daa6080 Mon Sep 17 00:00:00 2001
From: Alex Vong <alexvong1995@gmail.com>
Date: Sat, 13 Oct 2018 18:32:14 +0800
Subject: [PATCH 02/11] gnu: clojure: Remove 'remove-archives' snippet.

This is no longer needed since clojure now makes official source releases
in github.

* gnu/packages/lisp.scm (clojure)[source]: Remove it.
[native-inputs]: Remove it in 'submodule'.
[arguments]: Adjust 'unpack-submodule-sources' phase accordingly.
---
 gnu/packages/lisp.scm | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 93851c1a8..df0c0a87e 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -562,18 +562,12 @@  interface.")
                    license:clarified-artistic)))) ;TRIVIAL-LDAP package
 
 (define-public clojure
-  (let* ((remove-archives '(begin
-                             (for-each delete-file
-                                       (find-files "." ".*\\.(jar|zip)"))
-                             #t))
-         (submodule (lambda (prefix version hash)
-                      (origin
-                        (method url-fetch)
-                        (uri (string-append "https://github.com/clojure/"
-                                            prefix version ".tar.gz"))
-                        (sha256 (base32 hash))
-                        (modules '((guix build utils)))
-                        (snippet remove-archives)))))
+  (let ((submodule (lambda (prefix version hash)
+                     (origin
+                       (method url-fetch)
+                       (uri (string-append "https://github.com/clojure/"
+                                           prefix version ".tar.gz"))
+                       (sha256 (base32 hash))))))
     (package
       (name "clojure")
       (version "1.9.0")
@@ -584,9 +578,7 @@  interface.")
           (string-append "https://github.com/clojure/clojure/archive/clojure-"
                          version ".tar.gz"))
          (sha256
-          (base32 "0xjbzcw45z32vsn9pifp7ndysjzqswp5ig0jkjpivigh2ckkdzha"))
-         (modules '((guix build utils)))
-         (snippet remove-archives)))
+          (base32 "0xjbzcw45z32vsn9pifp7ndysjzqswp5ig0jkjpivigh2ckkdzha"))))
       (build-system ant-build-system)
       (arguments
        `(#:modules ((guix build ant-build-system)
@@ -605,8 +597,6 @@  interface.")
                   (mkdir-p name)
                   (with-directory-excursion name
                     (invoke "tar"
-                            ;; Use xz for repacked tarball.
-                            "--xz"
                             "--extract"
                             "--verbose"
                             "--file" (assoc-ref inputs name)
-- 
2.19.1