[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/11: gnu: clojure: Remove 'remove-archives' snippet.
From: |
Danny Milosavljevic |
Subject: |
02/11: gnu: clojure: Remove 'remove-archives' snippet. |
Date: |
Mon, 19 Nov 2018 07:52:40 -0500 (EST) |
dannym pushed a commit to branch master
in repository guix.
commit df0a180421b34b6f1f3395652291f94a37303988
Author: Alex Vong <address@hidden>
Date: Sat Oct 13 18:32:14 2018 +0800
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 0e07e19..f963dfb 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -566,18 +566,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")
@@ -588,9 +582,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)
@@ -609,8 +601,6 @@ interface.")
(mkdir-p name)
(with-directory-excursion name
(invoke "tar"
- ;; Use xz for repacked tarball.
- "--xz"
"--extract"
"--verbose"
"--file" (assoc-ref inputs name)
- branch master updated (f4ee41c -> 5497214), Danny Milosavljevic, 2018/11/19
- 02/11: gnu: clojure: Remove 'remove-archives' snippet.,
Danny Milosavljevic <=
- 03/11: gnu: clojure: Refactor to ensure there's a single list of libraries., Danny Milosavljevic, 2018/11/19
- 04/11: gnu: clojure: Use (guix build java-utils) to simplify build phases., Danny Milosavljevic, 2018/11/19
- 10/11: gnu: Add clojure-tools-macro., Danny Milosavljevic, 2018/11/19
- 08/11: gnu: Add clojure-core-match., Danny Milosavljevic, 2018/11/19
- 01/11: gnu: clojure: Move from java to lisp., Danny Milosavljevic, 2018/11/19
- 06/11: build-system: Add 'clojure-build-system'., Danny Milosavljevic, 2018/11/19
- 09/11: gnu: Add clojure-algo-generic., Danny Milosavljevic, 2018/11/19
- 05/11: guix: Add clojure-utils., Danny Milosavljevic, 2018/11/19
- 11/11: gnu: Add clojure-algo-monads., Danny Milosavljevic, 2018/11/19
- 07/11: gnu: Add clojure-instaparse., Danny Milosavljevic, 2018/11/19