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.4 -> 3.1.5 #157848

Merged
merged 3 commits into from
Feb 5, 2022
Merged

wxGTK31: 3.1.4 -> 3.1.5 #157848

merged 3 commits into from
Feb 5, 2022

Conversation

AndersonTorres
Copy link
Member

Motivation for this change
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested a review from tfmoraes February 2, 2022 16:50
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 labels Feb 2, 2022
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

might not be relevant, but probably good to tackle now:

error: builder for '/nix/store/kxih50jb28xn8swyf5vn9nc8bld9lrym-wxwidgets-3.0.5.drv' failed with exit code 1;
       last 10 log lines:
       > applying patch /nix/store/71qmb62m4m5zl947jx53y98jakdjzycx-0001-fix-assertion-using-hide-in-destroy.patch
       > patching file src/common/toplvcmn.cpp
       > Hunk #1 succeeded at 124 (offset 2 lines).
       > configuring
       > fixing libtool script ./src/png/ltmain.sh
       > fixing libtool script ./src/tiff/config/ltmain.sh
       > fixing libtool script ./src/jpeg/ltmain.sh
       > fixing libtool script ./src/expat/expat/conftools/ltmain.sh
       > configure flags: --disable-dependency-tracking --prefix=/nix/store/yymqxrldmabpqnr6qa9svp90905xc197-wxwidgets-3.0.5 --disable-precomp-headers --enable-mediactrl --disable-compat24 --enable-compat26 --enable-unicode --with-opengl
       > configure: error: unrecognized options: --disable-compat24, --enable-compat26
       For full logs, run 'nix log /nix/store/kxih50jb28xn8swyf5vn9nc8bld9lrym-wxwidgets-3.0.5.drv'.

@AndersonTorres AndersonTorres merged commit c50e232 into NixOS:staging Feb 5, 2022
@sigprof sigprof mentioned this pull request Feb 22, 2022
12 tasks
Comment on lines +20556 to +20557
wxGTK31-gtk2 = wxGTK30.override { withGtk2 = true; };
wxGTK31-gtk3 = wxGTK30.override { withGtk2 = false; };
Copy link
Contributor

@KoviRobi KoviRobi Feb 23, 2022

Choose a reason for hiding this comment

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

Is this a typo that's meant to be wxGTK31.override? (I can open a separate MR, just trying to get kicad working)

Copy link
Member Author

Choose a reason for hiding this comment

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

Yep, I left that escape :/

@c0bw3b c0bw3b mentioned this pull request Mar 1, 2022
13 tasks
@Artturin
Copy link
Member

Artturin commented Mar 5, 2022

this didn't have to go into staging

./maintainers/scripts/rebuild-amount.sh  HEAD~3
Estimating rebuild amount by counting changed Hydra jobs (parallel=unset).
    156 x86_64-linux

@AndersonTorres
Copy link
Member Author

Originally it triggered red flags about many builds on master.

@AndersonTorres AndersonTorres deleted the new-wx branch March 7, 2022 12:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 101-500 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants