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

sublime-merge: 1116 -> 2020; sublime-merge-dev: 1115 -> 2011 #88952

Merged
merged 3 commits into from May 28, 2020
Merged

sublime-merge: 1116 -> 2020; sublime-merge-dev: 1115 -> 2011 #88952

merged 3 commits into from May 28, 2020

Conversation

victorluft
Copy link
Contributor

Motivation for this change

Upstream changelogs:
stable
dev

libGL was added to buildInputs/rpath as it is used in Sublime Merge 2.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@victorluft victorluft changed the title sublime-merge-dev: 1115 -> 2020 sublime-merge: 1116 -> 2020; sublime-merge-dev: 1115 -> 2011 May 26, 2020
@ofborg ofborg bot requested a review from zookatron May 26, 2020 16:03
@zookatron
Copy link
Contributor

I ran the new version through various tests on my machine and these changes look good to go! Thanks for the pull request, @victorluft .

Not that big of a deal, but is there any reason why the new libGL inclusion here needs to be conditional...? Is it really likely that the version is ever going to be < 2000 after this is merged in? Even if it was it doesn't seem like it would cause a problem to have libGL included anyway?

@victorluft
Copy link
Contributor Author

Probably not; I figured there's a chance somebody might for some reason want to override with a previous version, but I'm happy to un-conditional it if preferred.

@zookatron
Copy link
Contributor

I can see the logic for allowing overrides if it was a library removal or something, but since it's just the addition of a new library it shouldn't prevent anyone from overriding without issues even without the conditional. I think it's best to keep the change simple and remove the conditional.

@victorluft
Copy link
Contributor Author

Makes sense. Done!

Copy link
Contributor

@zookatron zookatron left a comment

Choose a reason for hiding this comment

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

I ran the new version through various tests on my machine and these changes look good to go!

@jtojnar jtojnar merged commit 30b4108 into NixOS:master May 28, 2020
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.

None yet

4 participants