From patchwork Sat Jul 8 03:49:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hilton Chain X-Patchwork-Id: 51631 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 9C03427BBEA; Sat, 8 Jul 2023 04:50:15 +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=-0.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, SPF_HELO_PASS,URIBL_BLOCKED autolearn=no 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 E517627BBE2 for ; Sat, 8 Jul 2023 04:50:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qHyxP-0000p7-Li; Fri, 07 Jul 2023 23:50:03 -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 1qHyxO-0000oy-FB for guix-patches@gnu.org; Fri, 07 Jul 2023 23: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 1qHyxO-0000HD-44 for guix-patches@gnu.org; Fri, 07 Jul 2023 23:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qHyxN-0000Al-W9 for guix-patches@gnu.org; Fri, 07 Jul 2023 23:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64527] [PATCH 2/2] gnu: bees: Wrap script. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 08 Jul 2023 03:50:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64527 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64527@debbugs.gnu.org Cc: Hilton Chain Received: via spool by 64527-submit@debbugs.gnu.org id=B64527.1688788196647 (code B ref 64527); Sat, 08 Jul 2023 03:50:01 +0000 Received: (at 64527) by debbugs.gnu.org; 8 Jul 2023 03:49:56 +0000 Received: from localhost ([127.0.0.1]:43992 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qHyxH-0000AN-ON for submit@debbugs.gnu.org; Fri, 07 Jul 2023 23:49:56 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:39914) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qHyxE-0000AC-76 for 64527@debbugs.gnu.org; Fri, 07 Jul 2023 23:49:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1688787964; 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=pOVWv6m9Wl3n9d9pMmXWsWxZE01v+rImnujQL10YCEQ=; b=EjpChqAMypUbA4YNYbmhCNOFWimj1uhY6c3m/NRbHizWr4t16cye3pE+7lqpxD6kLNSIDl TgLYaiMKx0/00Qsyn6RE6pJcB8d82D+3VOk28ol9tNjmrSTEsNquic0ABfFNANUihDbzvm BnW7BWs/Y6Giycu7lufxO2B45GYD2Jnke094S8z7myIAYzMIC5wv8kGAPrJJDlrni6AAPb SDLYcjjs2a+BpgU2fAj4a9N9xwClz1elcJtMcDKVqatVW57UZA96AzNZTqGnSWRPBjNdrb StwWtiDA9MdjMm+PION3NO1A7U5PdVovX2HmyDAjnXFHukskIPn7LYXvVT4oQg== Date: Sat, 8 Jul 2023 11:49:55 +0800 Message-Id: In-Reply-To: <45766016e071762b6cffcac63cd43006baeeb7ad.1688787928.git.hako@ultrarare.space> References: <45766016e071762b6cffcac63cd43006baeeb7ad.1688787928.git.hako@ultrarare.space> MIME-Version: 1.0 X-Spamd-Bar: -- Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space 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: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches X-Patchwork-Original-From: Hilton Chain via Guix-patches via From: Hilton Chain 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/file-systems.scm (bees)[arguments]<#:phases>: Remove 'fixpath. Add 'wrap. [inputs]: Add guile-3.0. --- gnu/packages/file-systems.scm | 38 +++++++++++++---------------------- 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 0b024d6b92..52c8224ec1 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -1982,31 +1982,21 @@ (define-public bees #:phases #~(modify-phases %standard-phases (delete 'configure) - (add-after 'unpack 'fixpath + (add-after 'install 'wrap (lambda* (#:key inputs #:allow-other-keys) - (substitute* "scripts/beesd.in" - (((string-append "\\<(" (string-join (list "realpath" - "uuidparse" - "grep" - "false" - "sed" - "true" - "head" - "mkdir" - "mount" - "touch" - "du" - "cut" - "rm" - "truncate" - "chmod") - "|") ")\\>") command) - (search-input-file inputs (string-append "/bin/" command))) - - (("btrfs sub") - (string-append (search-input-file inputs "/bin/btrfs") - " sub")))))))) - (inputs (list btrfs-progs cityhash util-linux)) + (wrap-script (string-append #$output "/sbin/beesd") + `("PATH" suffix + ,(map (lambda (program) + (dirname (search-input-file + inputs (string-append "/bin/" program)))) + '("btrfs" "grep" "sed" + ;; Provided by `util-linux`: + "uuidparse" + ;; Provided by `coreutils`: + ;; "chmod" "cut" "du" "false" "head" "mkdir" + ;; "mount" "realpath" "rm" "touch" "true" + "truncate"))))))))) + (inputs (list btrfs-progs cityhash guile-3.0 util-linux)) (home-page "https://github.com/Zygo/bees") (synopsis "Deduplication agent for btrfs file systems") (description