Skip to content

linuxPackages.drbd: 9.2.8 -> 9.2.12#360238

Merged
JohnRTitor merged 2 commits intoNixOS:masterfrom
blitz:drbd-kernel-module
Dec 3, 2024
Merged

linuxPackages.drbd: 9.2.8 -> 9.2.12#360238
JohnRTitor merged 2 commits intoNixOS:masterfrom
blitz:drbd-kernel-module

Conversation

@blitz
Copy link
Contributor

@blitz blitz commented Nov 29, 2024

Things done

This is a rebased, updated and fixed version of #312011.

It updates the drbd kernel module to the most recent version and fixes the kernel module for all supported kernel versions. (Minus linux_latest_libre, which is currently broken.)

@birkb Feel free to fold this into your PR, if you want.

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Nov 29, 2024
@blitz
Copy link
Contributor Author

blitz commented Nov 29, 2024

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 360238 --checkout commit


x86_64-linux

⏩ 1 package marked as broken and skipped:
  • linuxKernel.packages.linux_5_4_hardened.drbd
❌ 1 package failed to build:
  • linuxKernel.packages.linux_latest_libre.drbd
✅ 17 packages built:
  • linuxKernel.packages.linux_5_10.drbd
  • linuxKernel.packages.linux_5_10_hardened.drbd
  • linuxKernel.packages.linux_5_15.drbd
  • linuxKernel.packages.linux_5_15_hardened.drbd
  • linuxKernel.packages.linux_5_4.drbd
  • linuxKernel.packages.linux_6_1.drbd
  • linuxKernel.packages.linux_6_11.drbd
  • linuxKernel.packages.linux_6_11_hardened.drbd
  • linuxKernel.packages.linux_6_12.drbd
  • linuxKernel.packages.linux_6_1_hardened.drbd
  • linuxKernel.packages.linux_6_6.drbd
  • linuxKernel.packages.linux_hardened.drbd (linuxKernel.packages.linux_6_6_hardened.drbd)
  • linuxKernel.packages.linux_libre.drbd
  • linuxKernel.packages.linux_lqx.drbd
  • linuxKernel.packages.linux_xanmod.drbd
  • linuxKernel.packages.linux_xanmod_latest.drbd (linuxKernel.packages.linux_xanmod_stable.drbd)
  • linuxKernel.packages.linux_zen.drbd

@blitz
Copy link
Contributor Author

blitz commented Nov 29, 2024

The linux_libre failure is expected. See #359464.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Nov 30, 2024
birkb and others added 2 commits December 1, 2024 16:38
- 6.8 kernel support added
- aligned to Nix standard build environment
- test added
- redundant installPhase and postFixup definitions removed

Signed-off-by: birkb <[email protected]>
Signed-off-by: Julian Stecklina <[email protected]>
@blitz blitz force-pushed the drbd-kernel-module branch from 7d76756 to 9fd3fbe Compare December 1, 2024 15:57
@JohnRTitor JohnRTitor merged commit 93e8ab6 into NixOS:master Dec 3, 2024
@blitz blitz deleted the drbd-kernel-module branch December 4, 2024 21:13
@JulienMalka
Copy link
Member

I think this should maybe be backported to 24.11, as far as I am aware there is no version of drbd that works on 24.11 now.

@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Dec 16, 2024

Backport failed for release-24.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.11
git worktree add -d .worktree/backport-360238-to-release-24.11 origin/release-24.11
cd .worktree/backport-360238-to-release-24.11
git switch --create backport-360238-to-release-24.11
git cherry-pick -x 35d4e5e11b67211329b89fae1459f0e2dfc245d1 9fd3fbebd30dee00412d68a6abecf8284c203af5

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants