From patchwork Wed Oct 31 06:06:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Vong X-Patchwork-Id: 60 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A095B1676A; Wed, 31 Oct 2018 06:07:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 3DE9C1675C for ; Wed, 31 Oct 2018 06:07:20 +0000 (GMT) Received: from localhost ([::1]:57490 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHjex-0002CO-JR for patchwork@mira.cbaines.net; Wed, 31 Oct 2018 02:07:19 -0400 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 X-Loop: help-debbugs@gnu.org 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-From: Alex Vong Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 31 Oct 2018 06:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33215 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33215@debbugs.gnu.org Received: via spool by 33215-submit@debbugs.gnu.org id=B33215.154096601125419 (code B ref 33215); Wed, 31 Oct 2018 06:07:02 +0000 Received: (at 33215) by debbugs.gnu.org; 31 Oct 2018 06:06:51 +0000 Received: from localhost ([127.0.0.1]:56167 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gHjeU-0006bv-NB for submit@debbugs.gnu.org; Wed, 31 Oct 2018 02:06:50 -0400 Received: from mail-pl1-f174.google.com ([209.85.214.174]:39628) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gHjeS-0006bi-RR for 33215@debbugs.gnu.org; Wed, 31 Oct 2018 02:06:49 -0400 Received: by mail-pl1-f174.google.com with SMTP id b5-v6so6124571pla.6 for <33215@debbugs.gnu.org>; Tue, 30 Oct 2018 23:06:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:user-agent:mime-version; bh=Pi/3kXwKtUGl/lQ4LDOlqkevXx1fqNmfeoW4HYv+oBI=; b=PgxBnmLEGmROyeDhN4ePJ6urgqXpxLuCX3Yl7fdWYqtfxKp3+sdU89WRHPmr84kApS FbcEcTh+4JRZ70XhcCDsHzorVG14RHNAgz+YUEzF7sNRYxANDdsWKuio3QFnEr9uZmAR ITpGLBDB18bGzPSfnIpx15QSUSGUJwlY/caDBiCgKt4ecR2etYhy3WWGgunfe3Hq2e+3 z1TfiX6q1UdP1TqO9zAc5hHE77qQgcvKusKXqGVYJ3yvyrrLB//Ebu1kCWWCTKAFmAEn +GZt/pR5Y2n0PhQ9SWmN70s2D4vAosAQCpj8EGbR2N6a8K0TXyUVjeR5433BQ5FcHLHb TcCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:user-agent :mime-version; bh=Pi/3kXwKtUGl/lQ4LDOlqkevXx1fqNmfeoW4HYv+oBI=; b=smSJcA8mlOqMn9iPIUxqFiaoHoGQDjjvapaeL1M8aSRirog90qDR0TN2jec926Vzvc WP1EfpSwpTd+HQugDiajrC4RjXjjeGhAtox7+ePWd2CxwhcTq03DADsrO6bWMQl31iUw +qpCh9Wa2CzdndAwujipQhRoAz5LbTN5U9th5fQTXeCwClANs1Q/NjnnaIRLqFDwUeWN vYhWHhIGKdGyxxmZa3No5Xeu5/+yl+MQHzJBWya8ikV7fFxhQ6c/P3KutMexASpFBW+p QnWooBnoXPhvtO6UiF3J68TXWaaW65K2hrIiPEUv4SH7rG9lWESIsCLrlwDSGfXMvzhJ OLeA== X-Gm-Message-State: AGRZ1gJhDG5ODF+MaboN/oea/UH7t4a3DdijYHmJcKwRfzOPNuLaiHtb mFTpTdUcLwq008gLsVL2/5Q= X-Google-Smtp-Source: AJdET5fkePfpwQam+6Qd1ozsMe8tSpKOnoF3PlP5WE6vbJpzibwEwvlwQlKOn0AtzDG7xLK15ZBosQ== X-Received: by 2002:a17:902:ab:: with SMTP id a40-v6mr1914839pla.201.1540966003222; Tue, 30 Oct 2018 23:06:43 -0700 (PDT) Received: from debian (42-3-197-089.static.netvigator.com. [42.3.197.89]) by smtp.gmail.com with ESMTPSA id r76-v6sm48205672pgr.11.2018.10.30.23.06.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 Oct 2018 23:06:42 -0700 (PDT) From: Alex Vong Date: Wed, 31 Oct 2018 14:06:35 +0800 Message-ID: <87efc6hcpg.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alexvong1995@gmail.com Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From aade1b3a84bc1e2cb6ad46b477025cb14daa6080 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. --- 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