Skip to content

knot-resolver: re-enable http module#301747

Merged
flokli merged 2 commits intoNixOS:stagingfrom
flokli:revert-knot-resolver-workaround
Apr 5, 2024
Merged

knot-resolver: re-enable http module#301747
flokli merged 2 commits intoNixOS:stagingfrom
flokli:revert-knot-resolver-workaround

Conversation

@flokli
Copy link
Member

@flokli flokli commented Apr 5, 2024

Description of changes

The reverts 4cad050 and 11fd363.

The proper fix (#286822) has been merged, this isn't necessary anymore, and brings back prometheus metrics (#300905 (comment)).

I successfully built knot-resolver with this again (but reverted another stdenv rebuild locally to avoid some more rebuilds.

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.

Add a 👍 reaction to pull requests you find important.

Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

Sounds good, especially if you tested it.

@flokli
Copy link
Member Author

flokli commented Apr 5, 2024

I verified it built, which previously failed. I didn't run it (and there's no VM test to execute either), but considering #286822 added a (passing) test for lua http module imports and that the knot-resolver tests can now import it, it's probably safe to assume it should work :-)

@ofborg ofborg bot requested a review from vcunat April 5, 2024 09:17
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Apr 5, 2024
@flokli flokli merged commit b22fabb into NixOS:staging Apr 5, 2024
@flokli flokli deleted the revert-knot-resolver-workaround branch April 5, 2024 09:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants