[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/06: gnu: bcachefs-tools: Restore mount.bcachefs shell script version.
From: |
guix-commits |
Subject: |
04/06: gnu: bcachefs-tools: Restore mount.bcachefs shell script version. |
Date: |
Wed, 27 Sep 2023 13:35:46 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit bd6af33dbf2d89e2c34e6990de489c04e6ca8f35
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun Sep 24 02:00:00 2023 +0200
gnu: bcachefs-tools: Restore mount.bcachefs shell script version.
* gnu/packages/file-systems.scm (bcachefs-tools): Add back the old
'promote-mount.bcachefs.sh, tweaked to remove the new symlink.
[inputs]: Add back coreutils-minimal, gawk, and util-linux.
---
gnu/packages/file-systems.scm | 26 ++++++++++++++++++++++++--
1 file changed, 24 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index b98a838f43..63de393851 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -619,7 +619,24 @@ from a mounted file system.")
"not test_fsck and "
"not test_list and "
"not test_list_inodes and "
- "not test_list_dirent"))))))))
+ "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.
@@ -640,7 +657,12 @@ from a mounted file system.")
`(,util-linux "lib")
lz4
zlib
- `(,zstd "lib")))
+ `(,zstd "lib")
+
+ ;; Only for mount.bcachefs.sh.
+ coreutils-minimal
+ gawk
+ util-linux))
(home-page "https://bcachefs.org/")
(synopsis "Tools to create and manage bcachefs file systems")
(description
- branch master updated (ce0cc6137d -> 0500af5556), guix-commits, 2023/09/27
- 02/06: gnu: bcachefs-tools: Update to 1.2-0.1e35840., guix-commits, 2023/09/27
- 05/06: gnu: tio: Update to 2.7., guix-commits, 2023/09/27
- 06/06: Revert "build: Add missing guix-gc.timer file to binary tarball.", guix-commits, 2023/09/27
- 03/06: gnu: bcachefs-tools: Remove obsolete phase., guix-commits, 2023/09/27
- 04/06: gnu: bcachefs-tools: Restore mount.bcachefs shell script version.,
guix-commits <=
- 01/06: Revert "gnu: bcachefs-tools: Restyle format.", guix-commits, 2023/09/27