nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Alex Vong 2018-10-13 18:32:14 +08:00 committed by Danny Milosavljevic
parent 28e32b14e4
commit df0a180421
No known key found for this signature in database
GPG Key ID: E71A35542C30BAA5
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/packages/lisp.scm
View File

@ -566,18 +566,12 @@ interface.")
license:clarified-artistic)))) ;TRIVIAL-LDAP package license:clarified-artistic)))) ;TRIVIAL-LDAP package
(define-public clojure (define-public clojure
(let* ((remove-archives '(begin (let ((submodule (lambda (prefix version hash)
(for-each delete-file
(find-files "." ".*\\.(jar|zip)"))
#t))
(submodule (lambda (prefix version hash)
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://github.com/clojure/" (uri (string-append "https://github.com/clojure/"
prefix version ".tar.gz")) prefix version ".tar.gz"))
(sha256 (base32 hash)) (sha256 (base32 hash))))))
(modules '((guix build utils)))
(snippet remove-archives)))))
(package (package
(name "clojure") (name "clojure")
(version "1.9.0") (version "1.9.0")
@ -588,9 +582,7 @@ interface.")
(string-append "https://github.com/clojure/clojure/archive/clojure-" (string-append "https://github.com/clojure/clojure/archive/clojure-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 "0xjbzcw45z32vsn9pifp7ndysjzqswp5ig0jkjpivigh2ckkdzha")) (base32 "0xjbzcw45z32vsn9pifp7ndysjzqswp5ig0jkjpivigh2ckkdzha"))))
(modules '((guix build utils)))
(snippet remove-archives)))
(build-system ant-build-system) (build-system ant-build-system)
(arguments (arguments
`(#:modules ((guix build ant-build-system) `(#:modules ((guix build ant-build-system)
@ -609,8 +601,6 @@ interface.")
(mkdir-p name) (mkdir-p name)
(with-directory-excursion name (with-directory-excursion name
(invoke "tar" (invoke "tar"
;; Use xz for repacked tarball.
"--xz"
"--extract" "--extract"
"--verbose" "--verbose"
"--file" (assoc-ref inputs name) "--file" (assoc-ref inputs name)