ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-17 16:38:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
This reverts commit a5477e3a82.
This ‘guix style’d change does not improve readability, sometimes
reduces it, and awkwardly cramps horizontal space.
This commit is contained in:
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

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

@ -578,41 +578,38 @@ (define-public bcachefs-tools
(package (package
(name "bcachefs-tools") (name "bcachefs-tools")
(version "1.2") (version "1.2")
(source (origin (source
(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 (base32 "0wgqclkkdkqis3aq6wp0kcn1bsynybm3dnpcf7vlcvx85kdmcxg8"))))
"0wgqclkkdkqis3aq6wp0kcn1bsynybm3dnpcf7vlcvx85kdmcxg8"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list #:make-flags #~(list (string-append "VERSION=" (list #:make-flags
#$version) ;‘v…-nogit’ otherwise #~(list (string-append "VERSION=" #$version) ; ‘v…-nogit’ otherwise
(string-append "PREFIX=" (string-append "PREFIX=" #$output)
#$output)
"INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools" "INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools"
(string-append "CC=" (string-append "CC=" #$(cc-for-target))
#$(cc-for-target)) (string-append "PKG_CONFIG=" #$(pkg-config-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 #~(modify-phases %standard-phases #: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 ;; The test suite is moribund upstream (‘never been useful’),
;; useful’), but let's keep running it as a sanity ;; but let's keep running it as a sanity check until then.
;; 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 #$(this-package-native-input (invoke (string-append
"python-pytest") #$(this-package-native-input "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.
@ -627,24 +624,22 @@ (define-public bcachefs-tools
;; 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/ (substitute* (find-files sbin/ (lambda (file stat)
(lambda (file stat)
(not (elf-file? file)))) (not (elf-file? file))))
(("SDIR=.*") (("SDIR=.*") "")
"") (("\\$\\{SDIR.*}/") sbin/))))))))
(("\\$\\{SDIR.*}/") (native-inputs
sbin/)))))))) (cons* pkg-config
(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) (if (member (%current-system) (package-supported-systems valgrind))
(package-supported-systems valgrind))
(list valgrind) (list valgrind)
'()))) '())))
(inputs (list eudev (inputs
(list eudev
keyutils keyutils
libaio libaio
libscrypt libscrypt