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

wxGTK31: 3.1.2 -> 3.1.3 #87810

Merged
merged 2 commits into from Jul 20, 2020
Merged

wxGTK31: 3.1.2 -> 3.1.3 #87810

merged 2 commits into from Jul 20, 2020

Conversation

evils
Copy link
Member

@evils evils commented May 14, 2020

Motivation for this change

wxWidgets 3.1.3 has been out since 2019-10-28

Things done
nixpkgs-review
1 package failed to build:
cubicsdr

9 packages built:
diff-pdf grandorgue kicad-unstable kicad-unstable-small prusa-slicer pwsafe treesheets wxGTK31 wxhexeditor

@lasandell cubicsdr fails with this update, though comments on their github issues seem to indicate that it should be able to use 3.1.3

  • 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)
    • was 179060768 is now 179614160
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@lasandell
Copy link
Contributor

The changes here will allow CubicSDR to build with wxGTK 3.1.3: 5eb5d02. Can you incorporate this into your branch or do I need to open a separate PR?

@evils
Copy link
Member Author

evils commented May 14, 2020

@lasandell after a bit of struggling to get that commit onto my branch i found the hashes to mismatch
i've modified your commit to get the right hashes, added a comment about the source of the patches
and reset authorship so i get the blame for this change

i've also changed the order so it builds at all points

@ofborg ofborg bot requested a review from lasandell May 14, 2020 14:01
@lasandell
Copy link
Contributor

Hmm, sorry about that. I used nix-prefetch-url to obtain the hashes, which must be the wrong tool to use for patches.

@evils
Copy link
Member Author

evils commented May 14, 2020

nixpkgs-review clears now
10 packages built:
cubicsdr diff-pdf grandorgue kicad-unstable kicad-unstable-small prusa-slicer pwsafe treesheets wxGTK31 wxhexeditor

@evils
Copy link
Member Author

evils commented Jun 15, 2020

@peterhoeg, interested in this PR?

@peterhoeg
Copy link
Member

Sure, can you try to fix the merge conflicts please.

@evils
Copy link
Member Author

evils commented Jun 16, 2020

merge conflict resolved

nixpkgs-review clears
11 packages built:
cubicsdr diff-pdf grandorgue kicad-unstable kicad-unstable-small prusa-slicer pwsafe treesheets wxGTK31 wxGTK31-gtk3 wxhexeditor

@peterhoeg is there a PR/issue tracking your progress (and intent) for the wxGTK*-gtk3 transition?
it kinda seemed to come out of nowhere...

@peterhoeg
Copy link
Member

peterhoeg commented Jun 16, 2020 via email

@peterhoeg peterhoeg merged commit ee8b7b4 into NixOS:master Jul 20, 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

3 participants