me/guix
Archived
1
0
Fork 0
Code Activity

gnu: bcachefs-tools: Restyle format.

Browse source 
* gnu/packages/file-systems.scm (bcachefs-tools): Reformat with 'guix style'
and manually break some long lines.

Signed-off-by: Christopher Baines <mail@cbaines.net>
This commit is contained in:
Ahmad Draidi 2023-09-17 10:38:01 +04:00 • committed by Christopher Baines
parent 7efa17af88
commit a5477e3a82
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
1 changed files with 84 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
gnu/packages/file-systems.scm
View file

@ -578,38 +578,41 @@ from a mounted file system.")
(package (package
(name "bcachefs-tools") (name "bcachefs-tools")
(version "1.2") (version "1.2")
(source (source (origin
(origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://evilpiepirate.org/git/bcachefs-tools.git") (url "https://evilpiepirate.org/git/bcachefs-tools.git")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "0wgqclkkdkqis3aq6wp0kcn1bsynybm3dnpcf7vlcvx85kdmcxg8")))) (base32
"0wgqclkkdkqis3aq6wp0kcn1bsynybm3dnpcf7vlcvx85kdmcxg8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list #:make-flags (list #:make-flags #~(list (string-append "VERSION="
#~(list (string-append "VERSION=" #$version) ; ‘v…-nogit’ otherwise #$version) ;‘v…-nogit’ otherwise
(string-append "PREFIX=" #$output) (string-append "PREFIX="
#$output)
"INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools" "INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools"
(string-append "CC=" #$(cc-for-target)) (string-append "CC="
(string-append "PKG_CONFIG=" #$(pkg-config-for-target)) #$(cc-for-target))
(string-append "PKG_CONFIG="
#$(pkg-config-for-target))
;; ‘This will be less of an option in the future, as more ;; ‘This will be less of an option in the future, as more
;; code gets rewritten in Rust.’ ;; code gets rewritten in Rust.’
"NO_RUST=better") "NO_RUST=better")
#:phases #:phases #~(modify-phases %standard-phases
#~(modify-phases %standard-phases
(delete 'configure) ;no configure script (delete 'configure) ;no configure script
(replace 'check (replace 'check
;; The test suite is moribund upstream (‘never been useful’), ;; The test suite is moribund upstream (‘never been
;; but let's keep running it as a sanity check until then. ;; useful’), but let's keep running it as a sanity
;; check until then.
(lambda* (#:key tests? make-flags #:allow-other-keys) (lambda* (#:key tests? make-flags #:allow-other-keys)
(when tests? (when tests?
;; We must manually build the test_helper first. ;; We must manually build the test_helper first.
(apply invoke "make" "tests" make-flags) (apply invoke "make" "tests" make-flags)
(invoke (string-append (invoke (string-append #$(this-package-native-input
#$(this-package-native-input "python-pytest") "python-pytest")
"/bin/pytest") "-k" "/bin/pytest") "-k"
;; These fail (‘invalid argument’) on kernels ;; These fail (‘invalid argument’) on kernels
;; with a previous bcachefs version. ;; with a previous bcachefs version.
@ -624,22 +627,24 @@ from a mounted file system.")
;; simply patch in the latter file name directly, and do. ;; simply patch in the latter file name directly, and do.
(lambda _ (lambda _
(let ((sbin/ (string-append #$output "/sbin/"))) (let ((sbin/ (string-append #$output "/sbin/")))
(substitute* (find-files sbin/ (lambda (file stat) (substitute* (find-files sbin/
(lambda (file stat)
(not (elf-file? file)))) (not (elf-file? file))))
(("SDIR=.*") "") (("SDIR=.*")
(("\\$\\{SDIR.*}/") sbin/)))))))) "")
(native-inputs (("\\$\\{SDIR.*}/")
(cons* pkg-config sbin/))))))))
(native-inputs (cons* pkg-config
;; For generating documentation with rst2man. ;; For generating documentation with rst2man.
python python
python-docutils python-docutils
;; For tests. ;; For tests.
python-pytest python-pytest
(if (member (%current-system) (package-supported-systems valgrind)) (if (member (%current-system)
(package-supported-systems valgrind))
(list valgrind) (list valgrind)
'()))) '())))
(inputs (inputs (list eudev
(list eudev
keyutils keyutils
libaio libaio
libscrypt libscrypt