[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#33215] [PATCH 02/11] gnu: clojure: Remove 'remove-archives' snippet
From: |
Alex Vong |
Subject: |
[bug#33215] [PATCH 02/11] gnu: clojure: Remove 'remove-archives' snippet. |
Date: |
Wed, 31 Oct 2018 14:06:35 +0800 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) |
From aade1b3a84bc1e2cb6ad46b477025cb14daa6080 Mon Sep 17 00:00:00 2001
From: Alex Vong <address@hidden>
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
signature.asc
Description: PGP signature
- [bug#33215] [PATCH 00/11] build-system: Add 'clojure-build-system'., Alex Vong, 2018/10/31
- [bug#33215] [PATCH 01/11] gnu: clojure: Move from java to lisp., Alex Vong, 2018/10/31
- [bug#33215] [PATCH 02/11] gnu: clojure: Remove 'remove-archives' snippet.,
Alex Vong <=
- [bug#33215] [PATCH 03/11] gnu: clojure: Refactor to ensure there's a single list of libraries., Alex Vong, 2018/10/31
- [bug#33215] [PATCH 04/11] gnu: clojure: Use (guix build java-utils) to simplify build phases., Alex Vong, 2018/10/31
- [bug#33215] [PATCH 05/11] guix: Add clojure-utils., Alex Vong, 2018/10/31
- [bug#33215] [PATCH 06/11] build-system: Add 'clojure-build-system'., Alex Vong, 2018/10/31
- [bug#33215] [PATCH 08/11] gnu: Add clojure-core-match., Alex Vong, 2018/10/31
- [bug#33215] [PATCH 07/11] gnu: Add clojure-instaparse., Alex Vong, 2018/10/31
- [bug#33215] [PATCH 09/11] gnu: Add clojure-algo-generic., Alex Vong, 2018/10/31
- [bug#33215] [PATCH 10/11] gnu: Add clojure-tools-macro., Alex Vong, 2018/10/31
- [bug#33215] [PATCH 11/11] gnu: Add clojure-algo-monads., Alex Vong, 2018/10/31