-
-
Notifications
You must be signed in to change notification settings - Fork 14.7k
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
base: master
Are you sure you want to change the base?
Conversation
ba1f215
to
8d5d9b9
Compare
8d5d9b9
to
5f45369
Compare
5f45369
to
4ae586b
Compare
4ae586b
to
282f7eb
Compare
This now has a merge conflict. |
Yes... Because of 1cd9516. -.- I'll try to fix that. |
522576d
to
9844034
Compare
Should be fixed now. Both nuget-deps are now jsons. |
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. |
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. |
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. |
9844034
to
a936900
Compare
No. Another contributor asked to split the package and separate the library for an update script. I approved that PR. However, that attempt failed.
No. This update script will probably not work -- it has never worked before. However, in the current state, the update script will never work.
It hasn't worked. Perhaps a new update script will work, but I don't know. I haven't created any update scripts yet.
OK. I removed the update part and only included the merging of the library into the package -- e.g. the original state. |
Seems like we need a release of Mic92/nix-update#311 to make the updating work for the merged derivation. |
a936900
to
b872d33
Compare
Merge conflict removed. |
I tested the new 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. |
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. |
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.
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.