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

nbd: 3.24 -> 3.25, fix build broken by GLib update #229123

Merged
merged 1 commit into from
May 3, 2023
Merged

Conversation

Yarny0
Copy link
Contributor

@Yarny0 Yarny0 commented Apr 30, 2023

Description of changes

The update of GLib coming with #218143 broke the nbd build (the server part is broken and lets the test suite fail, https://hydra.nixos.org/build/215806781). We have to apply two patches from upstream to nbd-server.c to make it work again.

The pull request at hand simply updates to the newest release which fixes those issues. It also changes the source archive download link to a github URL as it seems nbd is moving from sourceforge to github ("First official release on github, rather than sourceforge (as in the past)").

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.05 Release Notes (or backporting 22.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.

Besides the NixOS VM test, I also tested with a netboot scenario where the client uses server disk space via nbd for swapping (tested for client and server).

Result of nixpkgs-review run on x86_64-linux 1
1 package built:
  • nbd

"First official release on github,
rather than sourceforge (as in the past)",
according to the github tag message in

https://github.com/NetworkBlockDevice/nbd/releases/tag/nbd-3.25

Note that the commit at hand also fixes the build after it
broke due to the update to GLib 2.75.3 ("Log limit exceeded") in

NixOS@8e5ee71
@Yarny0 Yarny0 changed the title nbd: fix build after GLib update nbd: 3.24 -> 3.25, fix build broken by GLib update May 2, 2023
@Yarny0
Copy link
Contributor Author

Yarny0 commented May 2, 2023

nbd released a new version yesterday. According to a statement in the git tag on github, they are now moving to github with their releases. So I replaced the my previous branch that fixed the issue with two patches with a branch that simply updates to the new version. Also rebased onto current nixos-unstable and tested again (VM tests as well as the netboot scenario described in the PR text above) -- all OK.

@cbrewster
Copy link
Contributor

Seems to work for me, thanks!

@ryantm ryantm merged commit 5d61f92 into NixOS:master May 3, 2023
@Yarny0 Yarny0 deleted the nbd branch June 8, 2023 08:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants