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

Jump to bottom

wxGTK31: 3.1.0 -> 3.1.2 #62147

Closed
wants to merge 1 commit into from
Closed

wxGTK31: 3.1.0 -> 3.1.2 #62147

wants to merge 1 commit into from

Conversation

ArdaXi
Copy link
Contributor

@ArdaXi ArdaXi commented May 28, 2019 •
edited

Motivation for this change

In #55475 a crash bug was introduced in Prusa Slicer. After some investigation, this seemed to be a bug in wxWidgets 3.1.0 that was no longer present in 3.1.2. As 3.1.2 has been out for a while, it seemed like a good idea to upgrade the package.

3.1.2 no longer accepts the compat2[46] options, which is why I copied the old file over and removed those configure flags. They seemed to be passed downstream however, so I did not remove the arguments entirely.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@Moredread
Copy link
Contributor

If just the compat options are different, maybe filtering them out (and asserting that they aren't set) in the 3.1 derivation would be nicer.

I'm not sure though how you can override a derivation and changing the function signature though.

@ArdaXi
Copy link
Contributor Author

ArdaXi commented May 30, 2019

It would be possible, but it would involve complex filtering on the configureFlags attribute, which is fragile and creates inter-dependencies between 3.0 and 3.1. Given that the scripts changed meaningfully between versions, I would argue that having entirely separate derivations is the cleanest option here. Additionally, 2.8, 2.9 and 3.0 are all entirely independent files already, it was only 3.1 that differed.

@Moredread
Copy link
Contributor

That makes sense :)

@vcunat
Copy link
Member

vcunat commented Jun 9, 2019 •
edited

From my NixPkgs experience I'd personally prefer to have e.g. common.nix and each of the pair could add a couple flags to this base. So far the expression are almost exactly the same and I suspect future fixes would often need to be applied to both.

EDIT: we're actually successfully using a sharing approach even for Firefox where the differences are much larger: https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/browsers/firefox/packages.nix

@evils
Copy link
Member

evils commented Nov 13, 2019

@ArdaXi it looks like these changes got in, can this PR be closed?

@ArdaXi
Copy link
Contributor Author

ArdaXi commented Nov 13, 2019

Looks like #63595 is an exact duplicate of this and got merged, so yes, closing.

@ArdaXi ArdaXi closed this Nov 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@ArdaXi @Moredread @vcunat @evils