From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id EGlYLtCkg2YiTAAA62LTzQ:P1 (envelope-from ) for ; Tue, 02 Jul 2024 06:57:20 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id EGlYLtCkg2YiTAAA62LTzQ (envelope-from ) for ; Tue, 02 Jul 2024 08:57:20 +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="wfa+E6Z/"; 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=1719903440; 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=KKKSaUJn9ogZnuQBtyLDl5QuVr1j7NuFFOBSJQzmHOQ=; b=f/w5d413u6e1NwseQn0pEGmX3sOKvz/QbPflR2yw5HVzwrUbWFovqnR8lTvooSEycOkfdt /XHOpSxp4TaMnjFLi1jMrGpMhHRBmUFe19E4Hb9CeYjUqcR5ZypfIFQ2afdo27Hv/PVuLa AO3dq35mKxzr5XhEn9erixjR6LG5swKYoJQO0W+QLZE0UZPXjMzq5BjxLk7bSlVnIC+4Wz 1UDQ+KZkbpBRrDGEoDiNwCTrpF99kP035kCAaqY1niMvajf7+0vAuFDVYBjPBNL3UesFne +T0GBOeWdrIJebtsSMb/3ykEEhyj0boETFZaF2QjlN7z89ZCiBrO7bfjq+SvVA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1719903440; a=rsa-sha256; cv=none; b=Z5KhDfrj2gM4yVZ/UOqKZwv0e/syZbvZNn1EfaijIRtyQSHQG8qQ/bTTC66DrhJ/hWhmy1 Y+sd8J8lYdFKuisy5bPYD2xeSmiJon2H/H6JGhsyc9EbCHAAJGi9H5Y8CxoB4izB5ZBW2d HiKV9t455PgKnXBZlADR52X6GNBSHwkF0Jn4yqlvN10zCvVsjvr5xstO6DDbJG91t8A1kS v/Vb79caauuMwMdQ3jVt722TAKySKy9sY370LhV19woGxwiKylbYhxh4iNeb4XH2dsraNo B0ALSuX1Lh3DCAkkrLpEavRXqVRru0IcSpUr7OIJV2dghKVUIT130Eeo0+iQew== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=goryachev.org header.s=dkim header.b="wfa+E6Z/"; 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 A015635ACC for ; Tue, 2 Jul 2024 08:57:20 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sOXQy-0000mL-7Y; Tue, 02 Jul 2024 02:56:12 -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 1sOXQp-0000bX-T2 for guix-patches@gnu.org; Tue, 02 Jul 2024 02:56: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 1sOXQn-0001tK-NF for guix-patches@gnu.org; Tue, 02 Jul 2024 02:56:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sOXQn-0007B2-Kt for guix-patches@gnu.org; Tue, 02 Jul 2024 02:56:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71707] [PATCH v4 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: Tue, 02 Jul 2024 06:56:01 +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.171990334727405 (code B ref 71707); Tue, 02 Jul 2024 06:56:01 +0000 Received: (at 71707) by debbugs.gnu.org; 2 Jul 2024 06:55:47 +0000 Received: from localhost ([127.0.0.1]:35682 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOXQY-00077q-J0 for submit@debbugs.gnu.org; Tue, 02 Jul 2024 02:55:47 -0400 Received: from mail.goryachev.org ([104.248.201.73]:47936) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sOXQW-00077R-9J for 71707@debbugs.gnu.org; Tue, 02 Jul 2024 02:55:45 -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 3F5E5120344; Tue, 2 Jul 2024 09:55:42 +0300 (MSK) Date: Tue, 2 Jul 2024 09:55:04 +0300 Message-ID: <32744e22e386e762bb5f6b73018cad3b7d03ecc9.1719903317.git.igor@goryachev.org> X-Mailer: git-send-email 2.45.2 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=1719903342; bh=KKKSaUJn9ogZnuQBtyLDl5QuVr1j7NuFFOBSJQzmHOQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; b=wfa+E6Z/yVMsfWYV1oc96eSGZhSU0wrG2tiXNRtxU4RTYFh809oWWffCG4qRv8gmC7JKGiur8OkcO2XocO1V1HtGt2AdB1RGfC+AmQI3aWCKqqGY8KVefWYXiGA9kqB8inrG57cUT9mx5KWUTsipWLMmAiX8dSIo5uzsY4ukG3g= 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-Queue-Id: A015635ACC X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -4.88 X-Spam-Score: -4.88 X-TUID: kG96TwzU7f6s * 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.2