[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/06: Revert "gnu: bcachefs-tools: Restyle format."
From: |
guix-commits |
Subject: |
01/06: Revert "gnu: bcachefs-tools: Restyle format." |
Date: |
Wed, 27 Sep 2023 13:35:46 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit f5e349ceb2cb2766d1d48ee75c415986a443c358
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sun Sep 24 02:00:00 2023 +0200
Revert "gnu: bcachefs-tools: Restyle format."
This reverts commit a5477e3a82114ce2909e63a07c7e6df6da617821.
This ‘guix style’d change does not improve readability, sometimes
reduces it, and awkwardly cramps horizontal space.
---
gnu/packages/file-systems.scm | 163 ++++++++++++++++++++----------------------
1 file changed, 79 insertions(+), 84 deletions(-)
diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index 215c1d338b..f362a2d143 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -575,89 +575,84 @@ from a mounted file system.")
(license license:gpl2+)))
(define-public bcachefs-tools
- (package
- (name "bcachefs-tools")
- (version "1.2")
- (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"))))
- (build-system gnu-build-system)
- (arguments
- (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))
- ;; ‘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
- (replace 'check
- ;; 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")
- "/bin/pytest") "-k"
- ;; These fail (‘invalid argument’) on
kernels
- ;; with a previous bcachefs version.
- (string-append "not test_format and "
- "not test_fsck and "
- "not test_list and "
- "not test_list_inodes and "
- "not test_list_dirent")))))
- (add-after 'install 'patch-shell-wrappers
- ;; These are overcomplicated wrappers that invoke
readlink(1)
- ;; to exec the appropriate bcachefs(8) subcommand.
We can
- ;; simply patch in the latter file name directly,
and do.
- (lambda _
- (let ((sbin/ (string-append #$output "/sbin/")))
- (substitute* (find-files sbin/
- (lambda (file stat)
- (not (elf-file?
file))))
- (("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))
- (list valgrind)
- '())))
- (inputs (list eudev
- keyutils
- libaio
- libscrypt
- libsodium
- liburcu
- `(,util-linux "lib")
- lz4
- zlib
- `(,zstd "lib")))
- (home-page "https://bcachefs.org/")
- (synopsis "Tools to create and manage bcachefs file systems")
- (description
- "The bcachefs-tools are command-line utilities for creating, checking,
+ (package
+ (name "bcachefs-tools")
+ (version "1.2")
+ (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"))))
+ (build-system gnu-build-system)
+ (arguments
+ (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))
+ ;; ‘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
+ (replace 'check
+ ;; 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")
+ "/bin/pytest") "-k"
+ ;; These fail (‘invalid argument’) on kernels
+ ;; with a previous bcachefs version.
+ (string-append "not test_format and "
+ "not test_fsck and "
+ "not test_list and "
+ "not test_list_inodes and "
+ "not test_list_dirent")))))
+ (add-after 'install 'patch-shell-wrappers
+ ;; These are overcomplicated wrappers that invoke
readlink(1)
+ ;; to exec the appropriate bcachefs(8) subcommand. We can
+ ;; simply patch in the latter file name directly, and do.
+ (lambda _
+ (let ((sbin/ (string-append #$output "/sbin/")))
+ (substitute* (find-files sbin/ (lambda (file stat)
+ (not (elf-file?
file))))
+ (("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))
+ (list valgrind)
+ '())))
+ (inputs
+ (list eudev
+ keyutils
+ libaio
+ libscrypt
+ libsodium
+ liburcu
+ `(,util-linux "lib")
+ lz4
+ zlib
+ `(,zstd "lib")))
+ (home-page "https://bcachefs.org/")
+ (synopsis "Tools to create and manage bcachefs file systems")
+ (description
+ "The bcachefs-tools are command-line utilities for creating, checking,
and otherwise managing bcachefs file systems.
Bcachefs is a @acronym{CoW, copy-on-write} file system supporting native
@@ -667,7 +662,7 @@ multiple block devices for replication and/or performance,
similar to RAID.
In addition, bcachefs provides all the functionality of bcache, a block-layer
caching system, and lets you assign different roles to each device based on its
performance and other characteristics.")
- (license license:gpl2+)))
+ (license license:gpl2+)))
(define-public bcachefs-tools/static
(package
- 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, 2023/09/27
- 01/06: Revert "gnu: bcachefs-tools: Restyle format.",
guix-commits <=