From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56882) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHjem-0002C6-HV for guix-patches@gnu.org; Wed, 31 Oct 2018 02:07:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gHjei-0008TF-Df for guix-patches@gnu.org; Wed, 31 Oct 2018 02:07:08 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:51909) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gHjeg-0008SN-Ou for guix-patches@gnu.org; Wed, 31 Oct 2018 02:07:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gHjeg-0006cL-J0 for guix-patches@gnu.org; Wed, 31 Oct 2018 02:07:02 -0400 Subject: [bug#33215] [PATCH 02/11] gnu: clojure: Remove 'remove-archives' snippet. References: <87muquhcw3.fsf@gmail.com> In-Reply-To: <87muquhcw3.fsf@gmail.com> Resent-Message-ID: From: Alex Vong Date: Wed, 31 Oct 2018 14:06:35 +0800 Message-ID: <87efc6hcpg.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 33215@debbugs.gnu.org Cc: alexvong1995@gmail.com --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0002-gnu-clojure-Remove-remove-archives-snippet.patch Content-Transfer-Encoding: quoted-printable From=20aade1b3a84bc1e2cb6ad46b477025cb14daa6080 Mon Sep 17 00:00:00 2001 From: Alex Vong 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. =2D-- 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 =2D-- a/gnu/packages/lisp.scm +++ b/gnu/packages/lisp.scm @@ -562,18 +562,12 @@ interface.") license:clarified-artistic)))) ;TRIVIAL-LDAP package =20 (define-public clojure =2D (let* ((remove-archives '(begin =2D (for-each delete-file =2D (find-files "." ".*\\.(jar|zip)")) =2D #t)) =2D (submodule (lambda (prefix version hash) =2D (origin =2D (method url-fetch) =2D (uri (string-append "https://github.com/clojure/" =2D prefix version ".tar.gz")) =2D (sha256 (base32 hash)) =2D (modules '((guix build utils))) =2D (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/cloju= re-" version ".tar.gz")) (sha256 =2D (base32 "0xjbzcw45z32vsn9pifp7ndysjzqswp5ig0jkjpivigh2ckkdzha"= )) =2D (modules '((guix build utils))) =2D (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" =2D ;; Use xz for repacked tarball. =2D "--xz" "--extract" "--verbose" "--file" (assoc-ref inputs name) =2D-=20 2.19.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYIAB0WIQSof2ZdXkE0FM5aU4XzrkvbI+zaGwUCW9lGawAKCRDzrkvbI+za G9v/AP9+YJCuDZEsO49A5MBDeVyEEoUvPIu4ErCRGzZfLngL9AEA+XkAwSxc7udP s73DtY3nWSDc+db7URDoqoj6XUHQ8Q0= =6W3A -----END PGP SIGNATURE----- --==-=-=--