From patchwork Sun May 21 05:48:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ahmad Draidi X-Patchwork-Id: 50202 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 0EE1C27BBE2; Sun, 21 May 2023 06:50:22 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 6147627BBE9 for ; Sun, 21 May 2023 06:50:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q0bxF-00064G-Io; Sun, 21 May 2023 01:50:05 -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 1q0bxC-00063i-Qx for guix-patches@gnu.org; Sun, 21 May 2023 01:50:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q0bxC-0003u2-HU for guix-patches@gnu.org; Sun, 21 May 2023 01:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q0bxC-00067r-DS for guix-patches@gnu.org; Sun, 21 May 2023 01:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63615] [PATCH v2 1/2] gnu: xmrig: Run 'guix style' over the package. Resent-From: Ahmad Draidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 21 May 2023 05:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63615 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63615@debbugs.gnu.org Cc: Ahmad Draidi Received: via spool by 63615-submit@debbugs.gnu.org id=B63615.168464818623500 (code B ref 63615); Sun, 21 May 2023 05:50:02 +0000 Received: (at 63615) by debbugs.gnu.org; 21 May 2023 05:49:46 +0000 Received: from localhost ([127.0.0.1]:59873 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q0bww-00066x-06 for submit@debbugs.gnu.org; Sun, 21 May 2023 01:49:46 -0400 Received: from rainycloud.ext.redscript.org ([103.105.48.212]:36942) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q0bwu-00066k-Bk for 63615@debbugs.gnu.org; Sun, 21 May 2023 01:49:44 -0400 Received: from localhost.localdomain (bba-2-49-245-37.alshamil.net.ae [2.49.245.37]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rainycloud.ext.redscript.org (Postfix) with ESMTPSA id 213D6247C; Sun, 21 May 2023 05:49:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1684648178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=a8LgNmfiF+/puOH4DuTnzNC/JRa4djqxPAWU49IM3Uo=; b=Ig5H4zqX1+pxktyrPd3BxpL8oRNbKp9xft+UE0A3JaQ0CZSoILAhHboLiWAN5VGSHjt1vi 0L8qw7jbvJ29a1FAd3J5U0OaCoSQyawJ+oiRI5ckVXxaIMpwlIjFc6Y2KazC2X9vzYON9D jYGxzR3jdOdW99JZdqCpxt0qrNwwswT8oof659puKJhjDQt4zHQzK+67zuXWX1EdJqSUN/ snAwf6PSWzkYD2f6L/ctrm78OOQcZfwJhEuKS8s9t5VsJPcUlC+The5hDKq03+CtLOyhRJ JhE8pX3eB0oBHcJr+Ya7w8DG6O/oJ/ktRxTA6QTUeWR+/NO8uatChtbs+cP771+YhBWpuJ oyGV37eT6xPKBMxM797Dc3L8kB4Z8BYy+pzJ4MoQ8bdP/2WbSnMXc8/OyxCswWzLNhB1/U JaOhFuB3F4ohWbElZP4+rMdOj8DGC9D04wmQY82nmmvo5bk5hfX1JJvIa2zAy+CcOAAYcb THFFa400Au6xgKdZZreILYZgLKmrKaXzmU2NnmLUhyuNlJo+Qt+4tvnbqajrJu9zP+HPDz Mu3t3Utpa/Q2s/8VsiTDYEZKhnLYM7+b/YOgCBAIDgRncVK1sq70HO6TqQ1G7aQdOjbakn QbZWzY5jRs7n1jgqWkQ/TvAzFZupQPnSFnTgXWKe9LptBCQ68OvhI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1684648178; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=a8LgNmfiF+/puOH4DuTnzNC/JRa4djqxPAWU49IM3Uo=; b=MlLXpQf/PnGHf5UQGVjzGJKH+6nOp6mdU13sI1xKywouBS02eB9lZdBFgRTRd9/WeW3/TH c5+dYbPjXvqRnYAg== Date: Sun, 21 May 2023 09:48:37 +0400 Message-Id: X-Mailer: git-send-email 2.40.1 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: , Reply-to: Ahmad Draidi X-ACL-Warn: , Ahmad Draidi via Guix-patches X-Patchwork-Original-From: Ahmad Draidi via Guix-patches via From: Ahmad Draidi 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/finance.scm (xmrig): Restyle. --- gnu/packages/finance.scm | 61 ++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 33 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index 559b22257b..71d80bd081 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -2266,44 +2266,39 @@ (define-public xmrig (package (name "xmrig") (version "6.19.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/xmrig/xmrig") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 (base32 "10vaq6ld4sddnpmv9dg71fjvw1jrfaddrp3bq6p3dxhsl153khm4")) - (modules '((guix build utils))) - (snippet - ;; TODO: Try to use system libraries instead of bundled ones in - ;; "src/3rdparty/". It requires changes to some "cmake/..." scripts - ;; and to some source files. - #~(begin - (delete-file-recursively "src/3rdparty/hwloc") - (substitute* "src/donate.h" - (("constexpr const int kDefaultDonateLevel = 1;") - "constexpr const int kDefaultDonateLevel = 0;") - (("constexpr const int kMinimumDonateLevel = 1;") - "constexpr const int kMinimumDonateLevel = 0;")))))) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/xmrig/xmrig") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "10vaq6ld4sddnpmv9dg71fjvw1jrfaddrp3bq6p3dxhsl153khm4")) + (modules '((guix build utils))) + (snippet + ;; TODO: Try to use system libraries instead of bundled ones in + ;; "src/3rdparty/". It requires changes to some "cmake/..." scripts + ;; and to some source files. + #~(begin + (delete-file-recursively "src/3rdparty/hwloc") + (substitute* "src/donate.h" + (("constexpr const int kDefaultDonateLevel = 1;") + "constexpr const int kDefaultDonateLevel = 0;") + (("constexpr const int kMinimumDonateLevel = 1;") + "constexpr const int kMinimumDonateLevel = 0;")))))) (build-system cmake-build-system) - (inputs - (list - `(,hwloc "lib") - libuv - openssl)) + (inputs (list `(,hwloc "lib") libuv openssl)) (arguments (list ;; There are no tests. #:tests? #f - #:phases - #~(modify-phases - %standard-phases - (replace 'install - ;; There is no 'install' target, we must install xmrig manually - (lambda* (#:key #:allow-other-keys) - (install-file "xmrig" - (string-append #$output "/bin"))))))) + #:phases #~(modify-phases %standard-phases + (replace 'install + ;; There is no 'install' target, we must install xmrig manually + (lambda* (#:key #:allow-other-keys) + (install-file "xmrig" + (string-append #$output "/bin"))))))) (home-page "https://xmrig.com/") (synopsis "Monero miner") (description