From: Alex Vong <alexvong1995@gmail.com>
To: 33215@debbugs.gnu.org
Cc: alexvong1995@gmail.com
Subject: [bug#33215] [PATCH 02/11] gnu: clojure: Remove 'remove-archives' snippet.
Date: Wed, 31 Oct 2018 14:06:35 +0800 [thread overview]
Message-ID: <87efc6hcpg.fsf@gmail.com> (raw)
In-Reply-To: <87muquhcw3.fsf@gmail.com>
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.1: 0002-gnu-clojure-Remove-remove-archives-snippet.patch --]
[-- Type: text/x-diff, Size: 2865 bytes --]
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]
next prev parent reply other threads:[~2018-10-31 6:07 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-31 6:02 [bug#33215] [PATCH 00/11] build-system: Add 'clojure-build-system' Alex Vong
2018-10-31 6:05 ` [bug#33215] [PATCH 01/11] gnu: clojure: Move from java to lisp Alex Vong
2018-10-31 6:06 ` Alex Vong [this message]
2018-10-31 6:07 ` [bug#33215] [PATCH 03/11] gnu: clojure: Refactor to ensure there's a single list of libraries Alex Vong
2018-10-31 6:08 ` [bug#33215] [PATCH 04/11] gnu: clojure: Use (guix build java-utils) to simplify build phases Alex Vong
2018-10-31 6:09 ` [bug#33215] [PATCH 05/11] guix: Add clojure-utils Alex Vong
2018-11-20 21:55 ` Ludovic Courtès
2018-11-21 14:35 ` Alex Vong
2018-11-21 22:12 ` Ludovic Courtès
2018-10-31 6:10 ` [bug#33215] [PATCH 06/11] build-system: Add 'clojure-build-system' Alex Vong
2018-11-20 22:03 ` Ludovic Courtès
2018-10-31 6:11 ` [bug#33215] [PATCH 07/11] gnu: Add clojure-instaparse Alex Vong
2018-10-31 6:11 ` [bug#33215] [PATCH 08/11] gnu: Add clojure-core-match Alex Vong
2018-10-31 6:12 ` [bug#33215] [PATCH 09/11] gnu: Add clojure-algo-generic Alex Vong
2018-10-31 6:13 ` [bug#33215] [PATCH 10/11] gnu: Add clojure-tools-macro Alex Vong
2018-10-31 6:14 ` [bug#33215] [PATCH 11/11] gnu: Add clojure-algo-monads Alex Vong
2018-11-19 12:53 ` bug#33215: [PATCH 00/11] build-system: Add 'clojure-build-system' Danny Milosavljevic
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87efc6hcpg.fsf@gmail.com \
--to=alexvong1995@gmail.com \
--cc=33215@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).