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

technitium-dns-server: undo split / re-merge library and server #365428

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

FabianRig
Copy link
Contributor

@FabianRig FabianRig commented Dec 15, 2024

Things done

Update Technitium DNS Server to 13.3. More important: undo split / re-merge the library into the file so that automatic updates are possible. Refer to the closed PR at #363529 for details.

  • 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.

@FabianRig FabianRig requested a review from timhae December 15, 2024 19:46
@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Dec 15, 2024
@ofborg ofborg bot added 8.has: clean-up 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-linux: 1 labels Dec 16, 2024
@FabianRig FabianRig changed the title technitium-dns-server: 13.2 -> 13.2.2, merge library and server technitium-dns-server: 13.2 -> 13.3, merge library and server Dec 22, 2024
@wolfgangwalther
Copy link
Contributor

This now has a merge conflict.

@wolfgangwalther wolfgangwalther added the 2.status: merge conflict This PR has merge conflicts with the target branch label Dec 22, 2024
@FabianRig
Copy link
Contributor Author

Yes... Because of 1cd9516. -.-

I'll try to fix that.

@FabianRig FabianRig force-pushed the update-technitium branch 3 times, most recently from 522576d to 9844034 Compare December 22, 2024 19:32
@FabianRig
Copy link
Contributor Author

This now has a merge conflict.

Should be fixed now. Both nuget-deps are now jsons.

@FabianRig FabianRig removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Dec 22, 2024
@wolfgangwalther
Copy link
Contributor

Could you split the "merge" and the "update" into separate commits?

Merge first, then update. This would allow us to test that the update of both together works well with the update script.

@FabianRig
Copy link
Contributor Author

This would allow us to test that the update of both together works well with the update script.

Thank you for your suggestion! However, the update script has never worked. Initially, the script's author suggested splitting the package -- which we did and which led to problems. Now we (re-)merge it in order for a new update script to work properly.

So it would be great if you could merge it as is so that we can work on the new update script which updates both components simultaneously in one package.

@wolfgangwalther
Copy link
Contributor

So, you split the package to make the update script work. It didn't work.

Now you merge the package again - to make update script work. But we can't confirm.

This seems pointless. We should make sure that the update script works after merging the packages - before merging the PR.

In any case, the commits should be split into merge and update - independently of whether we can confirm the update script working this way or not. Different kind of changes shouldn't be in the same commit.

@FabianRig
Copy link
Contributor Author

FabianRig commented Dec 25, 2024

So, you split the package to make the update script work. It didn't work.

No. Another contributor asked to split the package and separate the library for an update script. I approved that PR. However, that attempt failed.

Now you merge the package again - to make update script work. But we can't confirm.

No. This update script will probably not work -- it has never worked before. However, in the current state, the update script will never work.

This seems pointless. We should make sure that the update script works after merging the packages - before merging the PR.

It hasn't worked. Perhaps a new update script will work, but I don't know. I haven't created any update scripts yet.

In any case, the commits should be split into merge and update - independently of whether we can confirm the update script working this way or not. Different kind of changes shouldn't be in the same commit.

OK. I removed the update part and only included the merging of the library into the package -- e.g. the original state.

@FabianRig FabianRig changed the title technitium-dns-server: 13.2 -> 13.3, merge library and server technitium-dns-server: undo split / re-merge library and server Dec 25, 2024
@wolfgangwalther
Copy link
Contributor

Seems like we need a release of Mic92/nix-update#311 to make the updating work for the merged derivation.

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 4, 2025
@FabianRig FabianRig removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 11, 2025
@FabianRig
Copy link
Contributor Author

Merge conflict removed.

@wolfgangwalther
Copy link
Contributor

Seems like we need a release of Mic92/nix-update#311 to make the updating work for the merged derivation.

I tested the new --subpackage option - but this is designed for a different use-case. It only works when the source repository is the same for the two derivations, but in this case it's a different repo.

I don't see any way to automate updates for multiple packages at the same time, right now. There is an open ticket here though: nix-community/nixpkgs-update#29 - that seems to be better.

In short: I don't see any benefit to undo the split. It won't help with updating.

@FabianRig
Copy link
Contributor Author

In short: I don't see any benefit to undo the split. It won't help with updating.

And I don't see any benefit in keeping an unnecessary split. I shouldn't have accepted the suggestion to split the package -- but unfortunately I did. I'd like to correct that now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: clean-up 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants