Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

linuxPackages.drbd: 9.2.8 -> 9.2.9 #309022

Closed
wants to merge 7 commits into from
Closed

Conversation

birkb
Copy link
Contributor

@birkb birkb commented May 4, 2024

Description of changes

Things done

  • 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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 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.

- 6.8 kernel support added
- aligned to Nix standard build environment
- test added
- redundant installPhase and postFixup definitions removed

Signed-off-by: birkb <birk@batchworks.de>
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/linuxpackages-drbd-missing-system-map-file-skipping-depmod/44848/1

birkb and others added 3 commits May 4, 2024 13:49
Signed-off-by: birkb <birk@batchworks.de>
Signed-off-by: birkb <birk@batchworks.de>
@birkb birkb marked this pull request as ready for review May 4, 2024 13:40
Copy link
Contributor

@Thesola10 Thesola10 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct me if I'm wrong, but the following commits do not fit NixOS contributor guidelines. All commits should be squashed into the first one, or split according to their semantic effect.

image

@@ -266,6 +266,7 @@ in {
dovecot = handleTest ./dovecot.nix {};
drawterm = discoverTests (import ./drawterm.nix);
drbd = handleTest ./drbd.nix {};
drbd-driver = handleTest ./drbd-driver.nix {};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The drbd test above uses the services.drbd.enable option, which already enables the kernel module. This test is redundant.

boot.kernelModules = [ "drbd" ];

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The drbd test validates the userland utilities, but not the kernel driver. The in-tree driver is loaded to create the DRBD devices, but no special driver checks are done.

The drbd-driver test loads the out-of-tree driver (provided by this package) and validates the version of the loaded driver.

I think we need both tests...

nixos/tests/drbd-driver.nix Outdated Show resolved Hide resolved
nixos/tests/drbd-driver.nix Outdated Show resolved Hide resolved
birkb added 2 commits May 15, 2024 19:19
- for better readability

Signed-off-by: birkb <birk@batchworks.de>
- 6.8 kernel support added
- aligned to Nix standard build environment
- test added
- redundant installPhase and postFixup definitions removed

Signed-off-by: birkb <birk@batchworks.de>
@K900
Copy link
Contributor

K900 commented May 15, 2024

Mass ping, please resubmit.

@birkb birkb deleted the drbd-kernel-module branch May 15, 2024 18:09
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants