From patchwork Mon Sep 16 20:10:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 67992 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 2227827BBEA; Mon, 16 Sep 2024 21:12:54 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A5D1927BBE2 for ; Mon, 16 Sep 2024 21:12:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sqI5Z-0002qX-Ft; Mon, 16 Sep 2024 16:12:49 -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 1sqI5Y-0002kQ-9u for guix-patches@gnu.org; Mon, 16 Sep 2024 16:12:48 -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 1sqI5X-0002lQ-U4 for guix-patches@gnu.org; Mon, 16 Sep 2024 16:12:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=3Kj8BT4AUHJ9JDxzokJowT6d9gHG7Quxxhgng0mENRw=; b=qOIJlId0n/5aNZ8l4TPLNvVXWHzCPIHILNrjzNbIez60oFVXRvcA3p/Purytv0Nsc9NsY+bpcOvI/J9wfVa8S+3TccBsuaY1l83uBwk+8GfOXOBRzxvY8cFCpjo9BSZysdKN5BuxAS6sE2HgWPWWp2D5t3QHprlNknKh6rH6OP5eKTakqZZYT/d5hRj7bsgzkO5Myin5jUsf+NPsa7QWDjU93TnlkuAcWcBw76qK+z1e0WGrLL+CWsakbpRDD6coFdMgS1a4bLeOocoxly9/qgvY3vUNQ3dcfeRRk/tDwKzrTe1LiO+q8z4qb30+/keXMVP8bfOPvbAjTViUWSFSBg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sqI5l-0005i8-JQ for guix-patches@gnu.org; Mon, 16 Sep 2024 16:13:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73299] [PATCH v2 2/3] gnu: go-github-com-prometheus-statsd-exporter: Remove redundant phase. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 16 Sep 2024 20:13:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73299 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73299@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 73299-submit@debbugs.gnu.org id=B73299.172651754021881 (code B ref 73299); Mon, 16 Sep 2024 20:13:01 +0000 Received: (at 73299) by debbugs.gnu.org; 16 Sep 2024 20:12:20 +0000 Received: from localhost ([127.0.0.1]:53373 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sqI55-0005gq-N4 for submit@debbugs.gnu.org; Mon, 16 Sep 2024 16:12:20 -0400 Received: from mail-wm1-f51.google.com ([209.85.128.51]:47330) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sqI53-0005gO-I9 for 73299@debbugs.gnu.org; Mon, 16 Sep 2024 16:12:18 -0400 Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-42cc8782869so48012645e9.2 for <73299@debbugs.gnu.org>; Mon, 16 Sep 2024 13:12:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726517458; x=1727122258; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3Kj8BT4AUHJ9JDxzokJowT6d9gHG7Quxxhgng0mENRw=; b=BCyHppONxZQsO3yGd9bJ5c1XgcJIUNfuCBfZsHU4qOyWV3cubzjOFvmQ2qcW9P215X OjTBttfFl1pbKT0GlJ9+52jsFl76ies7oZANs0waK1Syg0jJIA/+Y2toek02KHggEzSd F1roJyyE8dwktew6415z5xmOrmuaInco4Zwg2aMEey9a/kPDsWT5cwUM24IciduoUpWI WffBwCMMFZ7mE5EWB677hGrP/Jc+jYi4ti9rfz+TIo69pQDoa4FSDCP+kREgxnrHtRpn 1YGfz02m/guCwgkzkf2ckoBKI7Dzk/yWjeGUbuHl50FuXzWbvpVzWwuER+oFW5v/i6vB kbKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726517458; x=1727122258; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3Kj8BT4AUHJ9JDxzokJowT6d9gHG7Quxxhgng0mENRw=; b=VkzVVeTjzrYPeZyGSOGb+2sQ1Wq4zRDFtoRDA/LizkYndgaLMRgdUq++FNKNHlsncb ksaw/OTHv2z/AbKmVqQB046+a0NYOsM5UmmHNfRwbmtKvvj2I7EFEDExte9ZAgi7ODk9 yuIYRfv4R9ov7pwbsJpzzFzTK9PmbsmyP6YLVAkprguuNC+D4OZmJPqjoGoNJifX2hsW lr7w+I17kPfLOubWNHYL2A9D39o5+nMRbFjj/i2vCD/lb5ISY5votc1B7G4eWBKv/rDI zG9UzPsXgpHk7AYF2E4wW4SvOQcWKLNdM/enZtqLYcJg9CeuJ6P8ENG9Tz4XCz12VxCP UEQw== X-Gm-Message-State: AOJu0Yzx7k4hbT+6VDRSn4fYhzNKkWfj7yxVR4QFCDna+pVgpdPNkfQp MbS0jDsnE4t+QY1kYcxQitSDFITwQW0ox/IEfXMIBiwPvS3Dhr1mwepM1Nji X-Google-Smtp-Source: AGHT+IFnGEef0a5o2YJPNsXUaCJ5HnTdcwtUKaoexME7k05AkZZ8Z8ATHSdvvENCbxspTZ6OILRJrQ== X-Received: by 2002:a05:600c:4f0f:b0:42c:b9c7:f54b with SMTP id 5b1f17b1804b1-42cdb548b63mr151504685e9.16.1726517458131; Mon, 16 Sep 2024 13:10:58 -0700 (PDT) Received: from guxtil.incerto.xyz (cpc100684-bagu15-2-0-cust967.1-3.cable.virginm.net. [86.8.111.200]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-378e73f62bfsm7922576f8f.51.2024.09.16.13.10.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Sep 2024 13:10:57 -0700 (PDT) From: Sharlatan Hellseher Date: Mon, 16 Sep 2024 21:10:49 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/prometheus.scm (go-github-com-prometheus-statsd-exporter) [arguments]: <#:phases>: Remove 'fix-embed-files and relay on standard one. Change-Id: I1bc965c65bcd40fcaef7d0ace9943a01ef08bdd3 --- gnu/packages/prometheus.scm | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/gnu/packages/prometheus.scm b/gnu/packages/prometheus.scm index fe2fa18e95..a81932f62b 100644 --- a/gnu/packages/prometheus.scm +++ b/gnu/packages/prometheus.scm @@ -572,29 +572,7 @@ (define-public go-github-com-prometheus-statsd-exporter (arguments (list #:import-path "github.com/prometheus/statsd_exporter" - #:phases - #~(modify-phases %standard-phases - ;; TODO: Implement it in go-build-system. - ;; - ;; This happens due to Golang can't determine the valid directory of - ;; the module of embed file which is symlinked during setup - ;; environment phase, but easy resolved after coping file from the - ;; store to the build directory of the current package, see details - ;; in Golang source: - ;; - ;; - URL: - ;; - commit: 82c14346d89ec0eeca114f9ca0e88516b2cda454 - ;; - file: src/cmd/go/internal/load/pkg.go#L2059 - (add-before 'build 'fix-embed-files - (lambda _ - (for-each (lambda (file) - (let ((file-store-path (readlink file))) - (delete-file file) - (copy-recursively file-store-path file))) - (find-files "src" (string-append - ".*(editions_defaults.binpb" - "|landing_page.css" - "|landing_page.html)$")))))))) + #:embed-files #~(list "landing_page.css" "landing_page.html"))) (native-inputs (list go-github-com-stvp-go-udp-testing)) (propagated-inputs