-
-
Notifications
You must be signed in to change notification settings - Fork 14.9k
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
snx-rs: 2.2.3 -> 2.9.0 #376344
base: master
Are you sure you want to change the base?
snx-rs: 2.2.3 -> 2.9.0 #376344
Conversation
|
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems good.
@Shavyn This package is currently unmaintained ( I'd also suggest setting up automatic updates so @r-ryantm will automatically generate PRs and notify the maintainer(s) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Before merging, the commit history should be definitely cleaned up: squashing the commits, removing the merged from ...
commits, ideally keeping only one commit, which can then have additional information in the commit long description part from the current commits, if you want.
|
I looked at the upstream repo. They have a changelog file in there. We should add it to the changelog = "https://github.com/ancwrd1/snx-rs/blob/v${version}/CHANGELOG.md"; Could you make the change while you are at it, too? |
Since this project has regular releases on GitHub, adding an update script should be as easy as adding
|
Thanks for all the inputs, as soon as I come back from work I'll have everything (hopefully) sorted. |
TBH, that can be accomplished just as well with a squash merge, so I don't see a strong incentive to make people squash the history themselves, especially given that it's then harder for others to see what changed since they last reviewed. |
558feb8
to
a765728
Compare
I managed to:
Sorry it took me so long. For that reason I'm hesitating volunteering to maintain the package. Let me train a little bit more :). |
True, but it has disadvantages that, IMO, heavily outweigh its usefulness:
Personally, I prefer to make the job of committers as easy as possible, and put the responsibility of preparing the PR to an ideal state to each contributor. The only real disadvantage I see here is, as you point out, that the diff for the previous reviewers gets mangled. But here we are usually not reviewing "program" code spanning multiple source files, but "only" one "configuration" file which would get modified anyway, so unless you review the specific new commits separately, you will see that the entire file has changed, anyway. |
Thanks. It looks great. In general, one should not merge the master branch into the feature branch (creating the merge commit), but instead rebase onto the master branch. This would result in a single commit built atop the newest commit on the master branch. |
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/packages-looking-for-a-maintainer/5442/9 |
I mentioned that the package is looking for a maintainer. Hopefully someone steps in. |
The latest commit adds what @Adda0 suggested in his review, adds myself as maintainer (wish me good luck). I hope I used the git rebase command correctly instead of merging Thanks everyone for your help. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Other than the commit for maintainer list update, all seems well. I will do a final rebuild of all binaries soon and if all goes well, I am all for approving the PR. Thank you for the patience with our "demands" and good luck with the maintainership. Hopefully, all will work well with future versions of the package, and there will not be much additional work needed.
And yes, the rebase seems to went well. Great work!
966ddb2
to
3095f1d
Compare
|
https://github.com/ancwrd1/snx-rs/blob/v2.9.0/CHANGELOG.md Added dependencies for snx-rs GUI to work.
Removed the (unintentional) merge master commit. Sorry. |
This is only a version bump of the snx-rs package as the version in nixpkgs (2.2.3) didn't support a feature added later I needed.
Things done
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.