From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id mCxZNyfUdWaPfgAAe85BDQ:P1 (envelope-from ) for ; Fri, 21 Jun 2024 19:27:36 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id mCxZNyfUdWaPfgAAe85BDQ (envelope-from ) for ; Fri, 21 Jun 2024 21:27:36 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=goryachev.org header.s=dkim header.b="W/k04plp"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1718998055; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=eIdQhg+OHzeNnQnocJ/RAhWVn5/BCx4wpEHm8PpJwsA=; b=Rr4h4WR1vI7glYU9zjaF7yhP8/Uzbc2NESykCuJJiFjAbK0Jwm+HIqaQncdUzrHZwoZFxm I7H8DYhEdf8cc+3yanLSp/izYjyLkceynT8IY+i8AXLp9szRkNi3OuSCnCTFAZYl6q1ghZ ctCjQLnaft0AFU6XQVP37pOSq+sJfYKWUqGvueS40Ep094b35lomKGRP99ryzM/4kYshr1 ZLZB2B6dx0+Fv2ex+B0KyIRrbv1zQPMNbnECaL3jjZdPjhn6aIYiHujCaemtlcR8zMTWeW qBFC2NhtWCWmOQuRJW+R09VZVgpnIdk48mW1GUP3LXCGJ4XYP3HF91WPVF/mpA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1718998055; a=rsa-sha256; cv=none; b=dm2iD6/zKpzVX65FXsHlpQBo9Za7kHDJ0reEapih/C80vh5GbpVJUAc8RW/Yesxrrm7iZn vGx0ahJ70Es6nRsac05O1X3dShNEGi/VoLpTU6RHJIQU7MNry40ZvOJOca4loKBbP1357w mcyYXDQf7Q7p7yXX0oA6hqN+C7S+scK4Cv89MiAVMz+QyiUGevGqCZK+fiF/s8RM0wlAS5 IuAfZO1H0NKvGPQPvpZBAhOFR6PlQ4xjkPXrjVpTfM/yKB7Z9M46/60BI0+1DianmvRtyi J+O3MPbNpiJNPV3M0ly3ZkyYQFgM7SbA3uy6JBMeJnS9B409Tcj6nwTn+rUcQQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=goryachev.org header.s=dkim header.b="W/k04plp"; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BECAC64FC3 for ; Fri, 21 Jun 2024 21:27:35 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sKjWV-0003ib-Sx; Fri, 21 Jun 2024 15:02:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sKjWN-0003hj-Bh for guix-patches@gnu.org; Fri, 21 Jun 2024 15:02:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sKjWN-0007Ef-1N for guix-patches@gnu.org; Fri, 21 Jun 2024 15:02:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sKjWM-00056X-1d for guix-patches@gnu.org; Fri, 21 Jun 2024 15:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71707] [PATCH 02/15] gnu: elixir-hex: Remove redundant directory, fix lint warnings. Resent-From: Igor Goryachev Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Jun 2024 19:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71707 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71707@debbugs.gnu.org Cc: Igor Goryachev , Andrew Tropin Received: via spool by 71707-submit@debbugs.gnu.org id=B71707.171899651519540 (code B ref 71707); Fri, 21 Jun 2024 19:02:02 +0000 Received: (at 71707) by debbugs.gnu.org; 21 Jun 2024 19:01:55 +0000 Received: from localhost ([127.0.0.1]:43738 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sKjWF-000552-3F for submit@debbugs.gnu.org; Fri, 21 Jun 2024 15:01:55 -0400 Received: from mail.goryachev.org ([104.248.201.73]:36134) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sKjWC-00054Z-WF for 71707@debbugs.gnu.org; Fri, 21 Jun 2024 15:01:53 -0400 Received: from localhost.localdomain (213-91-248-88.ip.btc-net.bg [213.91.248.88]) by mail.goryachev.org (Postfix) with ESMTPSA id C192D1202E5; Fri, 21 Jun 2024 22:01:52 +0300 (MSK) Date: Fri, 21 Jun 2024 22:01:08 +0300 Message-ID: <4351173e2417ee0bd95b37a78c2518ee8edb96fc.1718992389.git.igor@goryachev.org> X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=goryachev.org; s=dkim; t=1718996513; bh=eIdQhg+OHzeNnQnocJ/RAhWVn5/BCx4wpEHm8PpJwsA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; b=W/k04plpkR9u6i1Csv5ae1mRpoNOb4rp8cy3jvCYGDXeJ+Q3McLSz561AyDQzVS0beH4ovBw5UsPPB7UtIyqi+7UI4hBX3tINDy3QEmGKPyPnm+rGJIlSGPEoMogeydFJCFu39Wp+t9+kj/5YNsAfzuqLbbNZ4oEM4g0RPCHKZg= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Igor Goryachev X-ACL-Warn: , Igor Goryachev via Guix-patches From: Igor Goryachev via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -3.36 X-Spam-Score: -3.36 X-Migadu-Queue-Id: BECAC64FC3 X-Migadu-Scanner: mx11.migadu.com X-TUID: Qcd5c3OrTtmJ * gnu/packages/elixir.scm (elixir-hex): Remove redundant directory, fix lint warnings. Change-Id: Ic5b29d8ddb9c3d4dc058494cf6cbb5f60a492bb1 --- gnu/packages/elixir.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/elixir.scm b/gnu/packages/elixir.scm index ace067aa47..e2e9fcc245 100644 --- a/gnu/packages/elixir.scm +++ b/gnu/packages/elixir.scm @@ -174,7 +174,7 @@ (define-public elixir-hex (origin (method git-fetch) (uri (git-reference - (url "https://github.com/hexpm/hex.git") + (url "https://github.com/hexpm/hex") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 @@ -201,9 +201,14 @@ (define-public elixir-hex (replace 'install (lambda* (#:key inputs outputs #:allow-other-keys) (define X.Y #$(version-major+minor (package-version elixir))) - (define out (string-append (assoc-ref outputs "out") "/lib/elixir/" X.Y "/hex")) + (define out (string-append (assoc-ref outputs "out") + "/lib/elixir/" X.Y "/hex")) (mkdir-p out) - (copy-recursively "_build/prod/lib/hex" out)))))) + (let* ((prod-dir "_build/prod/lib/hex") + (prod-dir-mix (string-append prod-dir "/.mix"))) + (and (directory-exists? prod-dir-mix) + (delete-file-recursively prod-dir-mix)) + (copy-recursively "_build/prod/lib/hex" out))))))) (synopsis "Package manager for the Erlang VM") (description "This project provides tasks that integrate with Mix, Elixir's build -- 2.45.1