me
/
guix
Archived
1
0
Fork 0
Code

Revert "gnu: bcachefs-tools: Restyle format." 

This reverts commit a5477e3a82.
This ‘guix style’d change does not improve readability, sometimes
reduces it, and awkwardly cramps horizontal space.
master
Tobias Geerinckx-Rice 2023-09-24 02:00:00 +02:00
parent ce0cc6137d
commit f5e349ceb2
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 79 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
gnu/packages/file-systems.scm
View File

@ -578,41 +578,38 @@ from a mounted file system.")
(package
(name "bcachefs-tools")
(version "1.2")
(source (origin
(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
"0wgqclkkdkqis3aq6wp0kcn1bsynybm3dnpcf7vlcvx85kdmcxg8"))))
(base32 "0wgqclkkdkqis3aq6wp0kcn1bsynybm3dnpcf7vlcvx85kdmcxg8"))))
(build-system gnu-build-system)
(arguments
(list #:make-flags #~(list (string-append "VERSION="
#$version) ;‘v…-nogit’ otherwise
(string-append "PREFIX="
#$output)
(list #:make-flags
#~(list (string-append "VERSION=" #$version) ; ‘v…-nogit’ otherwise
(string-append "PREFIX=" #$output)
"INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools"
(string-append "CC="
#$(cc-for-target))
(string-append "PKG_CONFIG="
#$(pkg-config-for-target))
(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
#: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.
;; 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")
(invoke (string-append
#$(this-package-native-input "python-pytest")
"/bin/pytest") "-k"
;; These fail (‘invalid argument’) on kernels
;; with a previous bcachefs version.
@ -627,24 +624,22 @@ from a mounted file system.")
;; simply patch in the latter file name directly, and do.
(lambda _
(let ((sbin/ (string-append #$output "/sbin/")))
(substitute* (find-files sbin/
(lambda (file stat)
(substitute* (find-files sbin/ (lambda (file stat)
(not (elf-file? file))))
(("SDIR=.*")
"")
(("\\$\\{SDIR.*}/")
sbin/))))))))
(native-inputs (cons* pkg-config
(("SDIR=.*") "")
(("\\$\\{SDIR.*}/") sbin/))))))))
(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))
(if (member (%current-system) (package-supported-systems valgrind))
(list valgrind)
'())))
(inputs (list eudev
(inputs
(list eudev
keyutils
libaio
libscrypt