summaryrefslogtreecommitdiff
path: root/gnu/packages/file-systems.scm
diff options
context:
space:
mode:
authorHilton Chain <hako@ultrarare.space>2025-04-07 21:45:59 +0800
committerHilton Chain <hako@ultrarare.space>2025-08-21 19:08:28 +0800
commit60e58ccfa7463cbebcf2010aeebe3de478cb28ba (patch)
treee33fa20f6bdc1247a9d3003338538e1c0dc89218 /gnu/packages/file-systems.scm
parent580c69ba81463323e814996d7f76c24d07317514 (diff)
gnu: bcachefs-tools-minimal: Remove #:cargo-inputs.
* gnu/packages/file-systems.scm (bcachefs-tools-minimal) [inputs]: Use ‘cargo-inputs’. [arguments]: Remove #:cargo-inputs. * gnu/packages/rust-crates.scm (lookup-cargo-inputs)[bcachefs-tools]: New entry. Change-Id: Id330080f9620021bce3c582070b347dad08ba00f
Diffstat (limited to 'gnu/packages/file-systems.scm')
-rw-r--r--gnu/packages/file-systems.scm46
1 files changed, 12 insertions, 34 deletions
diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index 236cdbf9607..1744e6edefc 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -770,29 +770,6 @@ from a mounted file system.")
;; even in Rust crates, creating ludicrous and totally bogus dependencies
;; such as the Android SDK. Put our crates elsewhere.
#:vendor-dir "../guix-vendor"
- #:cargo-inputs
- `(("rust-aho-corasick" ,rust-aho-corasick-1)
- ("rust-anstream" ,rust-anstream-0.6)
- ("rust-anstyle" ,rust-anstyle-1)
- ("rust-anstyle-parse" ,rust-anstyle-parse-0.2)
- ("rust-anyhow" ,rust-anyhow-1)
- ("rust-autocfg" ,rust-autocfg-1)
- ("rust-bitfield" ,rust-bitfield-0.14)
- ("rust-clap" ,rust-clap-4)
- ("rust-clap-complete" ,rust-clap-complete-4)
- ("rust-either" ,rust-either-1)
- ("rust-errno" ,rust-errno-0.2)
- ("rust-env-logger" ,rust-env-logger-0.10)
- ("rust-libc" ,rust-libc-0.2)
- ("rust-log" ,rust-log-0.4)
- ("rust-memoffset" ,rust-memoffset-0.8)
- ("rust-owo-colors" ,rust-owo-colors-4)
- ("rust-rustix" ,rust-rustix-0.38)
- ("rust-strum" ,rust-strum-0.26)
- ("rust-strum-macros" ,rust-strum-macros-0.26)
- ("rust-udev" ,rust-udev-0.7)
- ("rust-uuid" ,rust-uuid-1)
- ("rust-zeroize" ,rust-zeroize-1))
#:phases
#~(modify-phases %standard-phases
(replace 'build
@@ -818,17 +795,18 @@ from a mounted file system.")
(native-inputs
(list pkg-config))
(inputs
- (list clang
- eudev
- keyutils
- libaio
- libscrypt
- libsodium
- liburcu
- `(,util-linux "lib") ;libblkid
- lz4
- zlib
- `(,zstd "lib")))
+ (cons* clang
+ eudev
+ keyutils
+ libaio
+ libscrypt
+ libsodium
+ liburcu
+ `(,util-linux "lib") ;libblkid
+ lz4
+ zlib
+ `(,zstd "lib")
+ (cargo-inputs 'bcachefs-tools)))
(home-page "https://bcachefs.org/")
(synopsis "Tools to create and manage bcachefs file systems")
(description