* [bug#66043] [PATCH 0/2] Update bcachefs-tools to 1.2 and restyle package
@ 2023-09-17 6:27 Ahmad Draidi via Guix-patches via
2023-09-17 6:38 ` [bug#66043] [PATCH 1/2] gnu: bcachefs-tools: Update to 1.2 Ahmad Draidi via Guix-patches via
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Ahmad Draidi via Guix-patches via @ 2023-09-17 6:27 UTC (permalink / raw)
To: 66043; +Cc: Ahmad Draidi
Hello Guix,
Who else is excited for bcachefs being merged upstream soon? :)
This patch series updates bcachefs-tools to version 1.2 and restyles the
package since we removed a level of parentheses.
Ahmad Draidi (2):
gnu: bcachefs-tools: Update to 1.2.
gnu: bcachefs-tools: Restyle format.
gnu/packages/file-systems.scm | 165 +++++++++++++++++-----------------
1 file changed, 84 insertions(+), 81 deletions(-)
base-commit: 9b78699744b0c4c8af28820cc4f0d59b9d317ead
--
2.41.0
^ permalink raw reply [flat|nested] 6+ messages in thread* [bug#66043] [PATCH 1/2] gnu: bcachefs-tools: Update to 1.2. 2023-09-17 6:27 [bug#66043] [PATCH 0/2] Update bcachefs-tools to 1.2 and restyle package Ahmad Draidi via Guix-patches via @ 2023-09-17 6:38 ` Ahmad Draidi via Guix-patches via 2023-09-17 6:38 ` [bug#66043] [PATCH 2/2] gnu: bcachefs-tools: Restyle format Ahmad Draidi via Guix-patches via 2023-09-25 10:58 ` [bug#66043] [PATCH 0/2] Update bcachefs-tools to 1.2 and restyle package Christopher Baines 2 siblings, 0 replies; 6+ messages in thread From: Ahmad Draidi via Guix-patches via @ 2023-09-17 6:38 UTC (permalink / raw) To: 66043; +Cc: Ahmad Draidi * gnu/packages/file-systems.scm (bcachefs-tools): Update to 1.2. [source]: Use version instead of commit. --- gnu/packages/file-systems.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 0d98e23e93..efa26a199a 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -575,20 +575,18 @@ (define-public gphotofs (license license:gpl2+))) (define-public bcachefs-tools - (let ((commit "c8bec83e307f28751c433ba1d3f648429fb5a34c") - (revision "17")) (package (name "bcachefs-tools") - (version (git-version "0.1" revision commit)) + (version "1.2") (source (origin (method git-fetch) (uri (git-reference (url "https://evilpiepirate.org/git/bcachefs-tools.git") - (commit commit))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0b1avy5mw3r3ppfs3n9cq4zb74yl45nd5l69r6hi27z9q5bc3nv8")))) + (base32 "0wgqclkkdkqis3aq6wp0kcn1bsynybm3dnpcf7vlcvx85kdmcxg8")))) (build-system gnu-build-system) (arguments (list #:make-flags @@ -664,7 +662,7 @@ (define-public bcachefs-tools 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 -- 2.41.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#66043] [PATCH 2/2] gnu: bcachefs-tools: Restyle format. 2023-09-17 6:27 [bug#66043] [PATCH 0/2] Update bcachefs-tools to 1.2 and restyle package Ahmad Draidi via Guix-patches via 2023-09-17 6:38 ` [bug#66043] [PATCH 1/2] gnu: bcachefs-tools: Update to 1.2 Ahmad Draidi via Guix-patches via @ 2023-09-17 6:38 ` Ahmad Draidi via Guix-patches via 2023-09-26 21:41 ` Tobias Geerinckx-Rice via Guix-patches via 2023-09-25 10:58 ` [bug#66043] [PATCH 0/2] Update bcachefs-tools to 1.2 and restyle package Christopher Baines 2 siblings, 1 reply; 6+ messages in thread From: Ahmad Draidi via Guix-patches via @ 2023-09-17 6:38 UTC (permalink / raw) To: 66043; +Cc: Ahmad Draidi * gnu/packages/file-systems.scm (bcachefs-tools): Reformat with 'guix style' and manually break some long lines. --- gnu/packages/file-systems.scm | 163 ++++++++++++++++++---------------- 1 file changed, 84 insertions(+), 79 deletions(-) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index efa26a199a..58fb1b5363 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -575,84 +575,89 @@ (define-public gphotofs (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 @@ -662,7 +667,7 @@ (define-public bcachefs-tools 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 -- 2.41.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#66043] [PATCH 2/2] gnu: bcachefs-tools: Restyle format. 2023-09-17 6:38 ` [bug#66043] [PATCH 2/2] gnu: bcachefs-tools: Restyle format Ahmad Draidi via Guix-patches via @ 2023-09-26 21:41 ` Tobias Geerinckx-Rice via Guix-patches via 2023-09-29 16:29 ` A via Guix-patches via 0 siblings, 1 reply; 6+ messages in thread From: Tobias Geerinckx-Rice via Guix-patches via @ 2023-09-26 21:41 UTC (permalink / raw) To: Ahmad Draidi; +Cc: 66043 Hi! Thanks for taking care of the bcachefs-tools package! > Who else is excited for bcachefs being merged upstream soon? :) /me raises hand. Four years of sometimes-painful rebases will not be missed. On 2023-09-17 8:38, Ahmad Draidi via Guix-patches via wrote: > * gnu/packages/file-systems.scm (bcachefs-tools): Reformat with 'guix > style' > and manually break some long lines. I don't think ‘guix style’ improved things anywhere, but hunks like - (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") + (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") are particularly regressive. This is of course not your fault at all and should be fixed in ‘guix style’, but I do intend on reverting this change when I upgrade bcachefs-tools to the next git snapshot ;-) Bcachefs is still improving fast enough that I think it's okay to package snapshots, at least until 6.7 lands. Using outdated tools on a newer kernel generally fails outright, and once corrupted my file system. Kind regards, T G-R Sent from a Web browser. Excuse or enjoy my brevity. ^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#66043] [PATCH 2/2] gnu: bcachefs-tools: Restyle format. 2023-09-26 21:41 ` Tobias Geerinckx-Rice via Guix-patches via @ 2023-09-29 16:29 ` A via Guix-patches via 0 siblings, 0 replies; 6+ messages in thread From: A via Guix-patches via @ 2023-09-29 16:29 UTC (permalink / raw) To: Tobias Geerinckx-Rice, Ahmad Draidi; +Cc: 66043 Hello Tobias, On 27 September 2023 01:41:07 GMT+04:00, Tobias Geerinckx-Rice <me@tobias.gr> wrote: >Hi! > >Thanks for taking care of the bcachefs-tools package! > >> Who else is excited for bcachefs being merged upstream soon? :) > >/me raises hand. Four years of sometimes-painful rebases will not be missed. I find it reassuring that a Guix maintainer is a long time bcachefs user. :) > >On 2023-09-17 8:38, Ahmad Draidi via Guix-patches via wrote: >> * gnu/packages/file-systems.scm (bcachefs-tools): Reformat with 'guix style' >> and manually break some long lines. > >I don't think ‘guix style’ improved things anywhere, but hunks like > >- (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") >+ (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") > >are particularly regressive. > >This is of course not your fault at all and should be fixed in ‘guix style’, but I do intend on reverting this change when I upgrade bcachefs-tools to the next git snapshot ;-) I had to remove the extra indentation caused by the parentheses, while keeping as much of my opinion out of styling as possible. It doesn't help with my OCD that the Guix patch submission checklist asks to run 'guix style'. :D Perhaps I should look at 'guix style' code sometime. > >Bcachefs is still improving fast enough that I think it's okay to package snapshots, at least until 6.7 lands. Using outdated tools on a newer kernel generally fails outright, and once corrupted my file system. > >Kind regards, > >T G-R Thanks, and keep up the great work! > >Sent from a Web browser. Excuse or enjoy my brevity. ^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#66043] [PATCH 0/2] Update bcachefs-tools to 1.2 and restyle package 2023-09-17 6:27 [bug#66043] [PATCH 0/2] Update bcachefs-tools to 1.2 and restyle package Ahmad Draidi via Guix-patches via 2023-09-17 6:38 ` [bug#66043] [PATCH 1/2] gnu: bcachefs-tools: Update to 1.2 Ahmad Draidi via Guix-patches via 2023-09-17 6:38 ` [bug#66043] [PATCH 2/2] gnu: bcachefs-tools: Restyle format Ahmad Draidi via Guix-patches via @ 2023-09-25 10:58 ` Christopher Baines 2 siblings, 0 replies; 6+ messages in thread From: Christopher Baines @ 2023-09-25 10:58 UTC (permalink / raw) To: Ahmad Draidi; +Cc: 66043-done, 66043 [-- Attachment #1: Type: text/plain, Size: 619 bytes --] Ahmad Draidi via Guix-patches via <guix-patches@gnu.org> writes: > Hello Guix, > > Who else is excited for bcachefs being merged upstream soon? :) > > This patch series updates bcachefs-tools to version 1.2 and restyles the > package since we removed a level of parentheses. > > Ahmad Draidi (2): > gnu: bcachefs-tools: Update to 1.2. > gnu: bcachefs-tools: Restyle format. > > gnu/packages/file-systems.scm | 165 +++++++++++++++++----------------- > 1 file changed, 84 insertions(+), 81 deletions(-) Thanks for the patches Ahmad, I've pushed them to master as a5477e3a82114ce2909e63a07c7e6df6da617821. Chris [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 987 bytes --] ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-09-29 19:10 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2023-09-17 6:27 [bug#66043] [PATCH 0/2] Update bcachefs-tools to 1.2 and restyle package Ahmad Draidi via Guix-patches via 2023-09-17 6:38 ` [bug#66043] [PATCH 1/2] gnu: bcachefs-tools: Update to 1.2 Ahmad Draidi via Guix-patches via 2023-09-17 6:38 ` [bug#66043] [PATCH 2/2] gnu: bcachefs-tools: Restyle format Ahmad Draidi via Guix-patches via 2023-09-26 21:41 ` Tobias Geerinckx-Rice via Guix-patches via 2023-09-29 16:29 ` A via Guix-patches via 2023-09-25 10:58 ` [bug#66043] [PATCH 0/2] Update bcachefs-tools to 1.2 and restyle package Christopher Baines
Code repositories for project(s) associated with this public inbox https://git.savannah.gnu.org/cgit/guix.git This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).