From patchwork Tue Jan 16 04:32:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ahmad Draidi X-Patchwork-Id: 58929 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 E015C27BBEA; Tue, 16 Jan 2024 04:34:32 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 EC2EB27BBE2 for ; Tue, 16 Jan 2024 04:34:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPb9I-0007DU-Bd; Mon, 15 Jan 2024 23:34:04 -0500 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 1rPb9G-0007CR-Of for guix-patches@gnu.org; Mon, 15 Jan 2024 23:34:02 -0500 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 1rPb9G-0008L4-5F for guix-patches@gnu.org; Mon, 15 Jan 2024 23:34:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rPb9F-00034e-Sx for guix-patches@gnu.org; Mon, 15 Jan 2024 23:34:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68495] [PATCH 1/2] gnu: bcachefs-tools: Update to 1.4.1. References: In-Reply-To: Resent-From: Ahmad Draidi Original-Sender: "Debbugs-submit" Resent-CC: , guix-patches@gnu.org Resent-Date: Tue, 16 Jan 2024 04:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68495 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68495@debbugs.gnu.org Cc: Ahmad Draidi , ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart X-Debbugs-Original-Xcc: ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart Received: via spool by 68495-submit@debbugs.gnu.org id=B68495.170537959911675 (code B ref 68495); Tue, 16 Jan 2024 04:34:01 +0000 Received: (at 68495) by debbugs.gnu.org; 16 Jan 2024 04:33:19 +0000 Received: from localhost ([127.0.0.1]:47428 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPb8Y-000329-RU for submit@debbugs.gnu.org; Mon, 15 Jan 2024 23:33:19 -0500 Received: from rainycloud.ext.redscript.org ([2402:28c0:4:1081::1]:36398) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPb8V-00031t-QI for 68495@debbugs.gnu.org; Mon, 15 Jan 2024 23:33:17 -0500 Received: from localhost.localdomain (bba-2-49-240-145.alshamil.net.ae [2.49.240.145]) (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 3D9CF6ED6; Tue, 16 Jan 2024 04:33:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1705379589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZS9M1JMZWNcw28YkdfK0XQd1oTVinCpfjyRQbzekEkI=; b=lTHn4+DHWYgRnCcenKf6VoZ2VKJx1j3vBQxzqldb7bRRfeMA/a46UYUYUjIJZLSEr0iQtv P4YEPtvnIsT9Nd8TYK49YoHUnzRf7cC2C2httzRY1CI5CYXY6yV7cXsGrBdG6o6ew+zMd/ orLA/UlZEesskP003mUar7mI5qUYSAKEQyyQKxLeaIfipnQcoghyJW5RG2Z9lzQqwux6HW hNwBnjg2WlpHF8qXiaVeU1Kb9RPOtYNNpRly0vu6iDWxfBFy3nxZVaUe589dA/IH4Yc8tf nLK8G2W4QArPwFdex7zEnUMDYp6G0RFDtxxTktACFSGfGg7XqRXMavm086Usj1h9AJblp1 zKDIwL4vdmyitgps8Hs3KCu9vq1NJnRiPudapsnIalns2pkQct3ogDkGj+VuS4RzyDZ5fP /h16HVDos7kbnje1do8s2qZ6RKjFvB8Yg0k2s9/L6779/WGFp0XKwQByo8LMjjo1iwlCrD gILEiX8gEcmjv1ILsQMdj5cIyNYnrrymmQqfl5ieOEgigNTBhCjHDbyRZYfFzcNXjFURkg 3ae021pFCsmIDupVklBjheKbLknKTj1w9/FuSJXNdRT2oK843Fr4wKSuj4Kum4y4NB00da g7EzEWgfCxZuLeKyxn/462wdHvbspCSLsA9aWb3ru1M8B1poEmFiI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1705379589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZS9M1JMZWNcw28YkdfK0XQd1oTVinCpfjyRQbzekEkI=; b=JwbuDC9649XaXieSZ1f76lMNGtLIy+W96lbD/j3Lw2jC6RyR9U7Yq+jiW2Bn+gRkWvsMa5 gzm3qW3sjEmcZvCg== Date: Tue, 16 Jan 2024 08:32:31 +0400 Message-ID: <0f7d0c5dd9fc6021d775cb31c8e5c54d569e4576.1705379539.git.a.r.draidi@redscript.org> X-Mailer: git-send-email 2.41.0 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/file-systems.scm (bcachefs-tools): Update to 1.4.1. [source]: Use version instead of commit. [arguments]:<#:make-flags>: Add "PKGCONFIG_UDEVRULESDIR" to put udev rules under "PREFIX" folder. [inputs]: Add bash-minimal to fix lint. Change-Id: I6818bc41260586664d408234323bdc9461e4b8e1 --- gnu/packages/file-systems.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) base-commit: 162d6a2fdd6af13272967c77347a54934ecb45e6 diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 8cac1eae9c..b0bf09625c 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -581,26 +581,25 @@ (define-public gphotofs (license license:gpl2+))) (define-public bcachefs-tools - (let ((commit "1e358401ecdf1963e5799de19ab69111e82e5ebc") - (revision "0")) (package (name "bcachefs-tools") - (version (git-version "1.2" revision commit)) + (version "1.4.1") (source (origin (method git-fetch) (uri (git-reference (url "https://evilpiepirate.org/git/bcachefs-tools.git") - (commit commit))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0bflgqb3q9jikyyrv6hywv6m1fapzzn874hlhf86pn6abxrlf5fa")))) + (base32 "0axwbckqrw1v3v50nzhpkvpyjbjwy3rq5bv23db84x3xia497apq")))) (build-system gnu-build-system) (arguments (list #:make-flags #~(list (string-append "VERSION=" #$version) ; ‘v…-nogit’ otherwise (string-append "PREFIX=" #$output) "INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools" + "PKGCONFIG_UDEVRULESDIR=$(PREFIX)/lib/udev/rules.d" (string-append "CC=" #$(cc-for-target)) (string-append "PKG_CONFIG=" #$(pkg-config-for-target)) ;; ‘This will be less of an option in the future, as more @@ -666,6 +665,7 @@ (define-public bcachefs-tools `(,zstd "lib") ;; Only for mount.bcachefs.sh. + bash-minimal coreutils-minimal gawk util-linux)) @@ -682,7 +682,7 @@ (define-public bcachefs-tools In addition, bcachefs provides all the functionality of bcache, a block-layer caching system, and lets you assign different roles to each device based on its performance and other characteristics.") - (license license:gpl2+)))) + (license license:gpl2+))) (define-public bcachefs-tools/static (package From patchwork Tue Jan 16 04:32:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ahmad Draidi X-Patchwork-Id: 58928 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 C806927BBEA; Tue, 16 Jan 2024 04:34:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 193DD27BBE2 for ; Tue, 16 Jan 2024 04:34:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rPb9J-0007EX-GG; Mon, 15 Jan 2024 23:34:06 -0500 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 1rPb9G-0007CS-Hd for guix-patches@gnu.org; Mon, 15 Jan 2024 23:34:02 -0500 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 1rPb9G-0008L7-5J for guix-patches@gnu.org; Mon, 15 Jan 2024 23:34:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rPb9G-00034l-9G for guix-patches@gnu.org; Mon, 15 Jan 2024 23:34:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68495] [PATCH 2/2] gnu: bcachefs-tools: Restyle format. Resent-From: Ahmad Draidi Original-Sender: "Debbugs-submit" Resent-CC: , guix-patches@gnu.org Resent-Date: Tue, 16 Jan 2024 04:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68495 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68495@debbugs.gnu.org Cc: Ahmad Draidi , ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart X-Debbugs-Original-Xcc: ( , Christopher Baines , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Raghav Gururajan , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice , jgart Received: via spool by 68495-submit@debbugs.gnu.org id=B68495.170537960811753 (code B ref 68495); Tue, 16 Jan 2024 04:34:02 +0000 Received: (at 68495) by debbugs.gnu.org; 16 Jan 2024 04:33:28 +0000 Received: from localhost ([127.0.0.1]:47430 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPb8b-00032V-FJ for submit@debbugs.gnu.org; Mon, 15 Jan 2024 23:33:26 -0500 Received: from rainycloud.ext.redscript.org ([2402:28c0:4:1081::1]:36400) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPb8Y-00031x-9c for 68495@debbugs.gnu.org; Mon, 15 Jan 2024 23:33:19 -0500 Received: from localhost.localdomain (bba-2-49-240-145.alshamil.net.ae [2.49.240.145]) (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 85FA36ED8; Tue, 16 Jan 2024 04:33:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1705379592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=H3snamtWmSVlzn+JXMj11w5uS29NY7rkd4/yJCr2FZE=; b=lYSfDh84oBA8k5ylqIzVo62ZlzgHvyKjT6d9GdB6bahXPL2fOuz52KKUzcIdTHksjBILPC A4rEWfVxkDcRm/+Wu+obUVxbjcpUYKxMgZNFhKHnIlJqIWDnO9W+7FhNHCaNOYGw4hEibV qPefeZhHa/4PSmw5cz0aw5p64lQg4iiwlSg+/1uJB3HZvLvrkkWsItTl3Fa6wPHd7febeO YLihzeQ1wxxAdk/wb3MPgRvE7iZPTHf+RwQoK0DQW36s2mE8GW3mZE6NCCJ2q/N4qr4W7U xpyatJ0Fj3DRWEMmD41LCRT1K/gqHzKrIyfVIh5yHb8vVTe3ujQ8Xsnmd0om5x9UohvkHz WdAiIxvXfRh7ue3ze7KWW1FsuZ1WITAGO5y7okyhsY3fN7pKkYLJdVAQDMlKAcUb1Uz6UF MGczJrsNv4yiT7YmGYCU0969MUGUox3AaYw7bJg4I5NmWZ2lTb+WHAfqBrgmWk7w6KoF83 iSunxnXI6uBaObC+TlPlawDpjy4+576U0XHil0EQGeohExcekqmF/tz2Xyj9GGAipnZ4X4 Xptvp48Kkc27vjyUt6mwMZtaHvGj3ZY7tWr7JXG9+5jbYOCn2sj/eXVGNQwubD5dg0wQDU 37u36Ggw1dQIXa2Z7KVBTTx0gzQnvCjOWOzcuUWnSHYJ8eR7QaWWA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1705379592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=H3snamtWmSVlzn+JXMj11w5uS29NY7rkd4/yJCr2FZE=; b=3Xj97a89iPIVN7z9kBgd0C5/a8QFhMUm/TKPkLHW1sndvZZcayMrVzrG7KNM4oNcZnMqlN Np6b7jV/0qirHTCA== Date: Tue, 16 Jan 2024 08:32:32 +0400 Message-ID: <47ec0f53c75d2db052eabb006025712d4ba862e6.1705379539.git.a.r.draidi@redscript.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <0f7d0c5dd9fc6021d775cb31c8e5c54d569e4576.1705379539.git.a.r.draidi@redscript.org> References: <0f7d0c5dd9fc6021d775cb31c8e5c54d569e4576.1705379539.git.a.r.draidi@redscript.org> 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/file-systems.scm (bcachefs-tools): Reindent all lines. Change-Id: I6f3ae711daf2f5d66724f513fe5e8876147f5ccf --- gnu/packages/file-systems.scm | 186 +++++++++++++++++----------------- 1 file changed, 93 insertions(+), 93 deletions(-) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index b0bf09625c..87af8ac925 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -581,98 +581,98 @@ (define-public gphotofs (license license:gpl2+))) (define-public bcachefs-tools - (package - (name "bcachefs-tools") - (version "1.4.1") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://evilpiepirate.org/git/bcachefs-tools.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0axwbckqrw1v3v50nzhpkvpyjbjwy3rq5bv23db84x3xia497apq")))) - (build-system gnu-build-system) - (arguments - (list #:make-flags - #~(list (string-append "VERSION=" #$version) ; ‘v…-nogit’ otherwise - (string-append "PREFIX=" #$output) - "INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools" - "PKGCONFIG_UDEVRULESDIR=$(PREFIX)/lib/udev/rules.d" - (string-append "CC=" #$(cc-for-target)) - (string-append "PKG_CONFIG=" #$(pkg-config-for-target)) - ;; ‘This will be less of an option in the future, as more - ;; code gets rewritten in Rust.’ - "NO_RUST=better") - #:phases - #~(modify-phases %standard-phases - (delete 'configure) ; no configure script - (replace 'check - ;; The test suite is moribund upstream (‘never been useful’), - ;; but let's keep running it as a sanity check until then. - (lambda* (#:key tests? make-flags #:allow-other-keys) - (when tests? - ;; We must manually build the test_helper first. - (apply invoke "make" "tests" make-flags) - (invoke (string-append - #$(this-package-native-input "python-pytest") - "/bin/pytest") "-k" - ;; These fail (‘invalid argument’) on kernels - ;; with a previous bcachefs version. - (string-append "not test_format and " - "not test_fsck and " - "not test_list and " - "not test_list_inodes and " - "not test_list_dirent"))))) - (add-after 'install 'promote-mount.bcachefs.sh - ;; The (optional) ‘mount.bcachefs’ requires rust:cargo. - ;; This shell alternative does the job well enough for now. - (lambda* (#:key inputs #:allow-other-keys) - (define (whence file) - (dirname (search-input-file inputs file))) - (let ((mount (string-append #$output - "/sbin/mount.bcachefs"))) - (delete-file mount) ; symlink to ‘bcachefs’ - (copy-file "mount.bcachefs.sh" mount) - ;; WRAP-SCRIPT causes bogus ‘Insufficient arguments’ errors. - (wrap-program mount - `("PATH" ":" prefix - ,(list (getcwd) - (whence "bin/tail") - (whence "bin/awk") - (whence "bin/mount")))))))))) - (native-inputs - (cons* pkg-config - ;; For generating documentation with rst2man. - python - python-docutils - ;; For tests. - python-pytest - (if (member (%current-system) (package-supported-systems valgrind)) - (list valgrind) - '()))) - (inputs - (list eudev - keyutils - libaio - libscrypt - libsodium - liburcu - `(,util-linux "lib") - lz4 - zlib - `(,zstd "lib") - - ;; Only for mount.bcachefs.sh. - bash-minimal - coreutils-minimal - gawk - util-linux)) - (home-page "https://bcachefs.org/") - (synopsis "Tools to create and manage bcachefs file systems") - (description - "The bcachefs-tools are command-line utilities for creating, checking, + (package + (name "bcachefs-tools") + (version "1.4.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://evilpiepirate.org/git/bcachefs-tools.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0axwbckqrw1v3v50nzhpkvpyjbjwy3rq5bv23db84x3xia497apq")))) + (build-system gnu-build-system) + (arguments + (list #:make-flags + #~(list (string-append "VERSION=" #$version) ; ‘v…-nogit’ otherwise + (string-append "PREFIX=" #$output) + "INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools" + "PKGCONFIG_UDEVRULESDIR=$(PREFIX)/lib/udev/rules.d" + (string-append "CC=" #$(cc-for-target)) + (string-append "PKG_CONFIG=" #$(pkg-config-for-target)) + ;; ‘This will be less of an option in the future, as more + ;; code gets rewritten in Rust.’ + "NO_RUST=better") + #:phases + #~(modify-phases %standard-phases + (delete 'configure) ; no configure script + (replace 'check + ;; The test suite is moribund upstream (‘never been useful’), + ;; but let's keep running it as a sanity check until then. + (lambda* (#:key tests? make-flags #:allow-other-keys) + (when tests? + ;; We must manually build the test_helper first. + (apply invoke "make" "tests" make-flags) + (invoke (string-append + #$(this-package-native-input "python-pytest") + "/bin/pytest") "-k" + ;; These fail (‘invalid argument’) on kernels + ;; with a previous bcachefs version. + (string-append "not test_format and " + "not test_fsck and " + "not test_list and " + "not test_list_inodes and " + "not test_list_dirent"))))) + (add-after 'install 'promote-mount.bcachefs.sh + ;; The (optional) ‘mount.bcachefs’ requires rust:cargo. + ;; This shell alternative does the job well enough for now. + (lambda* (#:key inputs #:allow-other-keys) + (define (whence file) + (dirname (search-input-file inputs file))) + (let ((mount (string-append #$output + "/sbin/mount.bcachefs"))) + (delete-file mount) ; symlink to ‘bcachefs’ + (copy-file "mount.bcachefs.sh" mount) + ;; WRAP-SCRIPT causes bogus ‘Insufficient arguments’ errors. + (wrap-program mount + `("PATH" ":" prefix + ,(list (getcwd) + (whence "bin/tail") + (whence "bin/awk") + (whence "bin/mount")))))))))) + (native-inputs + (cons* pkg-config + ;; For generating documentation with rst2man. + python + python-docutils + ;; For tests. + python-pytest + (if (member (%current-system) (package-supported-systems valgrind)) + (list valgrind) + '()))) + (inputs + (list eudev + keyutils + libaio + libscrypt + libsodium + liburcu + `(,util-linux "lib") + lz4 + zlib + `(,zstd "lib") + + ;; Only for mount.bcachefs.sh. + bash-minimal + coreutils-minimal + gawk + util-linux)) + (home-page "https://bcachefs.org/") + (synopsis "Tools to create and manage bcachefs file systems") + (description + "The bcachefs-tools are command-line utilities for creating, checking, and otherwise managing bcachefs file systems. Bcachefs is a @acronym{CoW, copy-on-write} file system supporting native @@ -682,7 +682,7 @@ (define-public bcachefs-tools In addition, bcachefs provides all the functionality of bcache, a block-layer caching system, and lets you assign different roles to each device based on its performance and other characteristics.") - (license license:gpl2+))) + (license license:gpl2+))) (define-public bcachefs-tools/static (package