[Backport release-25.11] bcachefs-tools: 1.31.7 -> 1.31.11 #454223

JohnRTitor · 2025-10-21T14:40:49Z

Manual backport of #452314

Things done

Add a 👍 reaction to pull requests you find important.

(cherry picked from commit 3f4171b)

(cherry picked from commit 4257910)

add github repo as downloadPage (cherry picked from commit 4c6e189)

koverstreet/bcachefs-tools@456f73c Tools is now compatible with Kernel version 6.18 (cherry picked from commit 80776b6)

github-actions

This report is automatically generated by the PR / Check / cherry-pick CI workflow.

Some of the commits in this PR require the author's and reviewer's attention.

Please follow the backporting guidelines and cherry-pick with the -x flag.
This requires changes to the unstable master and staging branches first, before backporting them.

Occasionally, commits are not cherry-picked at all, for example when updating minor versions of packages which have already advanced to the next major on unstable.
These commits can optionally be marked with a Not-cherry-picked-because: <reason> footer.

Sometimes it is not possible to cherry-pick exactly the same patch.
This most frequently happens when resolving merge conflicts.
The range-diff will help to review the resolution of conflicts.

If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.

Warning

Difference between a975d6d and original 3f4171b may warrant inspection.

Show diff

@@ Metadata
  ## Commit message ##
     bcachefs-tools: use versionCheckHook instead of a passthru.tests
 
+    (cherry picked from commit 3f4171b8b38d716ae3a20ee12083f04c12bbb1fa)
+
  ## pkgs/by-name/bc/bcachefs-tools/package.nix ##
 @@
    rustPlatform,
@@ pkgs/by-name/bc/bcachefs-tools/package.nix
    nixosTests,
    installShellFiles,
    fuseSupport ? false,
-@@ pkgs/by-name/bc/bcachefs-tools/package.nix: stdenv.mkDerivation (finalAttrs: {
-     rustPlatform.bindgenHook
-     makeWrapper
-     installShellFiles
--    udevCheckHook
-   ];
++  udevCheckHook,
+ }:
  
-   buildInputs = [
+ stdenv.mkDerivation (finalAttrs: {
 @@ pkgs/by-name/bc/bcachefs-tools/package.nix: stdenv.mkDerivation (finalAttrs: {
+   # FIXME: Try enabling this once the default linux kernel is at least 6.7
    doCheck = false; # needs bcachefs module loaded on builder
  
-   doInstallCheck = true;
++  doInstallCheck = true;
 +  nativeInstallCheckInputs = [
 +    udevCheckHook
 +    versionCheckHook
 +  ];
 +  versionCheckProgramArg = "version";
- 
++
    postPatch = ''
      substituteInPlace Makefile \
+       --replace-fail "target/release/bcachefs" "target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/bcachefs"
 @@ pkgs/by-name/bc/bcachefs-tools/package.nix: stdenv.mkDerivation (finalAttrs: {
      kernelModule = import ./kernel-module.nix finalAttrs.finalPackage;

Warning

Couldn't locate original commit hash in message of 17f553a.

Hint: The full diffs are also available in the runner logs with slightly better highlighting.

JohnRTitor · 2025-10-21T14:55:33Z

For some reason versionCheckHook is not respecting meta.mainProgram?

This should be reverted once/if NixOS#454228 is merged to release-25.05.

JohnRTitor · 2025-10-21T15:13:40Z

`nixpkgs-review` result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 454223

Logs: https://github.com/JohnRTitor/nixpkgs-review-gha/actions/runs/18687707613

`x86_64-linux`

✅ 1 test built:

nixosTests.bcachefs

JohnRTitor · 2025-10-21T15:19:47Z

`nixpkgs-review` result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 454223

Logs: https://github.com/JohnRTitor/nixpkgs-review-gha/actions/runs/18687699798

`x86_64-linux`

❌ 2 packages failed to build:

linuxPackages_latest-libre.bcachefs (linuxKernel.packages.linux_latest_libre.bcachefs)
linuxPackages_lqx.bcachefs (linuxKernel.packages.linux_lqx.bcachefs)

✅ 6 packages built:

bcachefs-tools
bcachefs-tools.dkms
linuxKernel.packages.linux_6_16.bcachefs
linuxPackages_latest.bcachefs (linuxKernel.packages.linux_6_17.bcachefs)
linuxPackages_xanmod_latest.bcachefs (linuxKernel.packages.linux_xanmod_latest.bcachefs, linuxPackages_xanmod_stable.bcachefs)
linuxPackages_zen.bcachefs (linuxKernel.packages.linux_zen.bcachefs)

Error logs: `x86_64-linux`

linuxPackages_lqx.bcachefs

  CC [M]  src/fs/bcachefs/data/reflink.o
  CC [M]  src/fs/bcachefs/data/update.o
  CC [M]  src/fs/bcachefs/data/write.o
  CC [M]  src/fs/bcachefs/debug/async_objs.o
src/fs/bcachefs/data/write.c: In function '__wp_update_state':
src/fs/bcachefs/data/write.c:634:32: error: 'struct task_struct' has no member named 'se'
  634 |                 u64 runtime = p->se.sum_exec_runtime +
      |                                ^~
src/fs/bcachefs/data/write.c:635:33: error: 'struct task_struct' has no member named 'se'
  635 |                         (now - p->se.exec_start);
      |                                 ^~
make[5]: *** [/nix/store/p3x3yrmphrkljpjimjnhiiiylkxiknhz-linux-lqx-6.16.9-dev/lib/modules/6.16.9-lqx1/source/scripts/Makefile.build:287: src/fs/bcachefs/data/write.o] Error 1
make[5]: *** Waiting for unfinished jobs....
make[4]: *** [/nix/store/p3x3yrmphrkljpjimjnhiiiylkxiknhz-linux-lqx-6.16.9-dev/lib/modules/6.16.9-lqx1/source/scripts/Makefile.build:555: src/fs/bcachefs] Error 2
make[3]: *** [/nix/store/p3x3yrmphrkljpjimjnhiiiylkxiknhz-linux-lqx-6.16.9-dev/lib/modules/6.16.9-lqx1/source/Makefile:2001: .] Error 2
make[2]: *** [/nix/store/p3x3yrmphrkljpjimjnhiiiylkxiknhz-linux-lqx-6.16.9-dev/lib/modules/6.16.9-lqx1/source/Makefile:248: __sub-make] Error 2
make[2]: Leaving directory '/build/bcachefs-tools-1.31.11-dkms'
make[1]: *** [/nix/store/p3x3yrmphrkljpjimjnhiiiylkxiknhz-linux-lqx-6.16.9-dev/lib/modules/6.16.9-lqx1/source/Makefile:248: __sub-make] Error 2
make[1]: Leaving directory '/nix/store/p3x3yrmphrkljpjimjnhiiiylkxiknhz-linux-lqx-6.16.9-dev/lib/modules/6.16.9-lqx1/build'
make: *** [Makefile:9: default] Error 2

`aarch64-linux`

❌ 1 package failed to build:

linuxPackages_latest-libre.bcachefs (linuxKernel.packages.linux_latest_libre.bcachefs)

✅ 4 packages built:

bcachefs-tools
bcachefs-tools.dkms
linuxKernel.packages.linux_6_16.bcachefs
linuxPackages_latest.bcachefs (linuxKernel.packages.linux_6_17.bcachefs)

dotlambda · 2025-10-21T15:55:06Z

For some reason versionCheckHook is not respecting meta.mainProgram?

I suggest you disable versionCheckHook on 25.11.
That's what I did in #452659.

bengsparks · 2025-10-21T16:08:37Z

Alternatively set versionCheckProgram manually, merge it for now, and soon enough the versionCheckHook change will make its way to release-25.11 when we start on 26.05.
There will hopefully be a treewide to catch cases like these where versionCheckProgram's last component matches mainProgram

expected due to conflict res

JohnRTitor · 2025-10-21T17:30:50Z

Alternatively set versionCheckProgram manually

That's what I did (17f553a), thanks.

JohnRTitor added 4 commits October 21, 2025 20:09

bcachefs-tools: use versionCheckHook instead of a passthru.tests

a975d6d

(cherry picked from commit 3f4171b)

bcachefs-tools: 1.31.7 -> 1.31.11

82b3fdf

(cherry picked from commit 4257910)

bcachefs-tools: cleanup, reorganise

afa580e

add github repo as downloadPage (cherry picked from commit 4c6e189)

linuxPackages_latest.bcachefs: update for 6.18

8034c4b

koverstreet/bcachefs-tools@456f73c Tools is now compatible with Kernel version 6.18 (cherry picked from commit 80776b6)

JohnRTitor requested a review from ElvishJerricco October 21, 2025 14:40

github-actions bot previously requested changes Oct 21, 2025

View reviewed changes

nix-owners bot requested review from Madouura and davidak October 21, 2025 14:46

This comment was marked as outdated.

Sign in to view

JohnRTitor mentioned this pull request Oct 21, 2025

versionCheckHook: Default versionCheckProgram to mainProgram #412768

Merged

13 tasks

bcachefs-tools: fix versionCheckHook

17f553a

This should be reverted once/if NixOS#454228 is merged to release-25.05.

JohnRTitor enabled auto-merge October 21, 2025 17:28

JohnRTitor added this pull request to the merge queue Oct 21, 2025

Merged via the queue into NixOS:release-25.05 with commit a38150e Oct 21, 2025
27 of 31 checks passed

JohnRTitor deleted the bcachefs-backport branch October 21, 2025 17:34

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

[Backport release-25.11] bcachefs-tools: 1.31.7 -> 1.31.11 #454223

[Backport release-25.11] bcachefs-tools: 1.31.7 -> 1.31.11 #454223

JohnRTitor commented Oct 21, 2025 •

edited

Loading

Uh oh!

github-actions bot left a comment •

edited

Loading

Uh oh!

This comment was marked as outdated.

This comment was marked as outdated.

JohnRTitor commented Oct 21, 2025

Uh oh!

JohnRTitor commented Oct 21, 2025

Uh oh!

JohnRTitor commented Oct 21, 2025

Uh oh!

dotlambda commented Oct 21, 2025 •

edited

Loading

Uh oh!

bengsparks commented Oct 21, 2025

Uh oh!

JohnRTitor commented Oct 21, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

[Backport release-25.11] bcachefs-tools: 1.31.7 -> 1.31.11 #454223

[Backport release-25.11] bcachefs-tools: 1.31.7 -> 1.31.11 #454223

Conversation

JohnRTitor commented Oct 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Things done

Uh oh!

github-actions bot left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

This comment was marked as outdated.

This comment was marked as outdated.

JohnRTitor commented Oct 21, 2025

Uh oh!

JohnRTitor commented Oct 21, 2025

nixpkgs-review result

x86_64-linux

Uh oh!

JohnRTitor commented Oct 21, 2025

nixpkgs-review result

x86_64-linux

aarch64-linux

Uh oh!

dotlambda commented Oct 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bengsparks commented Oct 21, 2025

Uh oh!

JohnRTitor commented Oct 21, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

JohnRTitor commented Oct 21, 2025 •

edited

Loading

github-actions bot left a comment •

edited

Loading

`nixpkgs-review` result

`x86_64-linux`

`nixpkgs-review` result

`x86_64-linux`

`aarch64-linux`

dotlambda commented Oct 21, 2025 •

edited

Loading