wxGTK31: 3.1.3 -> 3.1.4 by tfmoraes · Pull Request #95460 · NixOS/nixpkgs

tfmoraes · 2020-08-14T23:04:09Z

❯ nixpkgs-review rev e00baf6b52db9f377d1f444ec985f61f53f30c53                                                                                                                                                                                  nixpkgs-review 
$ git -c fetch.prune=false fetch --force https://github.com/NixOS/nixpkgs master:refs/nixpkgs-review/0
$ git worktree add /home/thiago/.cache/nixpkgs-review/rev-e00baf6b52db9f377d1f444ec985f61f53f30c53/nixpkgs d22cd376e501df3012f208488b9ff12384efffc6
Preparing worktree (detached HEAD d22cd376e50)
HEAD is now at d22cd376e50 Merge pull request #95161 from lf-/patch-1
$ nix-env -f /home/thiago/.cache/nixpkgs-review/rev-e00baf6b52db9f377d1f444ec985f61f53f30c53/nixpkgs -qaP --xml --out-path --show-trace
$ git merge --no-commit e00baf6b52db9f377d1f444ec985f61f53f30c53
Automatic merge went well; stopped before committing as requested
$ nix-env -f /home/thiago/.cache/nixpkgs-review/rev-e00baf6b52db9f377d1f444ec985f61f53f30c53/nixpkgs -qaP --xml --out-path --show-trace --meta
12 packages updated:
cubicsdr diff-pdf grandorgue kicad-unstable kicad-unstable-small prusa-slicer prusa-slicer pwsafe treesheets wxHexEditor wxGTK31-gtk3 (3.1.3 → 3.1.4) wxGTK31 (3.1.3 → 3.1.4)

$ nix build --no-link --keep-going --option build-use-sandbox relaxed -f /home/thiago/.cache/nixpkgs-review/rev-e00baf6b52db9f377d1f444ec985f61f53f30c53/build.nix
[15 built, 73 copied (1031.3 MiB), 249.2 MiB DL]
11 packages built:
cubicsdr diff-pdf grandorgue kicad-unstable kicad-unstable-small prusa-slicer pwsafe treesheets wxGTK31 wxGTK31-gtk3 wxhexeditor

Motivation for this change

Update WxWidgets to 3.1.4

Things done

pkgs/development/libraries/wxwidgets/3.1/default.nix

tfmoraes · 2020-08-15T15:12:05Z

Now that it's really building wx3.1.4 a package (pwsafe) is failing to build:

nix-shell -p nixpkgs-review --run "nixpkgs-review rev 21986a9b3424182406f1e96966fdf3785f0a8538"                                                                    
$ git -c fetch.prune=false fetch --force https://github.com/NixOS/nixpkgs master:refs/nixpkgs-review/0
remote: Enumerating objects: 494, done.
remote: Counting objects: 100% (494/494), done.
remote: Compressing objects: 100% (9/9), done.
remote: Total 767 (delta 484), reused 487 (delta 484), pack-reused 273
Receiving objects: 100% (767/767), 459.28 KiB | 1.00 MiB/s, done.
Resolving deltas: 100% (531/531), completed with 225 local objects.
From https://github.com/NixOS/nixpkgs
   ff8e1825ab8..99d379c45c7  master     -> refs/nixpkgs-review/0
$ git worktree add /home/thiago/.cache/nixpkgs-review/rev-21986a9b3424182406f1e96966fdf3785f0a8538/nixpkgs 99d379c45c793c078af4bb5d6c85459f72b1f30b
Preparing worktree (detached HEAD 99d379c45c7)
HEAD is now at 99d379c45c7 Merge pull request #79874 from oxzi/tinycbor-v0.5.3
$ nix-env -f /home/thiago/.cache/nixpkgs-review/rev-21986a9b3424182406f1e96966fdf3785f0a8538/nixpkgs -qaP --xml --out-path --show-trace
$ git merge --no-commit 21986a9b3424182406f1e96966fdf3785f0a8538
Automatic merge went well; stopped before committing as requested
$ nix-env -f /home/thiago/.cache/nixpkgs-review/rev-21986a9b3424182406f1e96966fdf3785f0a8538/nixpkgs -qaP --xml --out-path --show-trace --meta
12 packages updated:
cubicsdr diff-pdf grandorgue kicad-unstable kicad-unstable-small prusa-slicer prusa-slicer pwsafe treesheets wxHexEditor wxGTK31 (3.1.3 → 3.1.4) wxGTK31-gtk3 (3.1.3 → 3.1.4)

$ nix build --no-link --keep-going --option build-use-sandbox relaxed -f /home/thiago/.cache/nixpkgs-review/rev-21986a9b3424182406f1e96966fdf3785f0a8538/build.nix
builder for '/nix/store/3fsqjnj1d94h9795djhbjv7jsbpv22ms-pwsafe-3.52.0.drv' failed with exit code 2; last 10 log lines:
        |                                        GetLabelText
  /build/source/src/ui/wxWidgets/PasswordSafeSearch.cpp:129:41: error: 'class wxSearchCtrl' has no member named 'IsModified'
    129 |   if (m_criteria->IsDirty() || txtCtrl->IsModified() || m_searchPointer.IsEmpty()) {
        |                                         ^~~~~~~~~~
  /build/source/src/ui/wxWidgets/PasswordSafeSearch.cpp:152:14: error: 'class wxSearchCtrl' has no member named 'SetModified'
    152 |     txtCtrl->SetModified(false);
        |              ^~~~~~~~~~~
  make[2]: *** [CMakeFiles/pwsafe.dir/build.make:134: CMakeFiles/pwsafe.dir/src/ui/wxWidgets/PasswordSafeSearch.cpp.o] Error 1
  make[1]: *** [CMakeFiles/Makefile2:253: CMakeFiles/pwsafe.dir/all] Error 2
  make: *** [Makefile:182: all] Error 2
cannot build derivation '/nix/store/744dxk025c2i2nsywab8q333fm2ijsvi-env.drv': 1 dependencies couldn't be built
[10 built (1 failed), 0.0 MiB DL]
error: build of '/nix/store/744dxk025c2i2nsywab8q333fm2ijsvi-env.drv' failed
1 package failed to build:
pwsafe

10 packages built:
cubicsdr diff-pdf grandorgue kicad-unstable kicad-unstable-small prusa-slicer treesheets wxGTK31 wxGTK31-gtk3 wxhexeditor

jonringer · 2020-08-15T18:12:46Z

Please follow CONTRIBUTING.md and manual#submitting-changes-making-patches and squash the commits.

This can be done with:

git reset HEAD~1                    # move fixup commits into unstaged
git add -- pkgs/                    # move changes into staged
git commit --amend --no-edit        # add changes to previous commit
git push ... ... --force            # modify current PR branch

jonringer · 2020-08-15T18:44:00Z

cc @c0bw3b @pjones on potential pwsafe breakage

tfmoraes · 2020-08-15T19:15:15Z

Please follow CONTRIBUTING.md and manual#submitting-changes-making-patches and squash the commits.

This can be done with:
git reset HEAD~1                    # move fixup commits into unstaged
git add -- pkgs/                    # move changes into staged
git commit --amend --no-edit        # add changes to previous commit
git push ... ... --force            # modify current PR branch

I think it's OK now.

tfmoraes · 2020-08-15T19:24:49Z

cc @c0bw3b @pjones on potential pwsafe breakage

I did a test here, if I set pwsafe to compile with wxGTK30 it compiles.

ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Aug 14, 2020

jonringer reviewed Aug 15, 2020

View reviewed changes

pkgs/development/libraries/wxwidgets/3.1/default.nix Outdated Show resolved Hide resolved

tfmoraes force-pushed the wxwidget-3.1.4 branch from 21986a9 to 850dad8 Compare August 15, 2020 19:14

ofborg bot added the 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. label Aug 15, 2020

evils mentioned this pull request Sep 24, 2020

kicad: use the same wxGTK version for KiCad and for wxPython #98634

Closed

10 tasks

tfmoraes mentioned this pull request Sep 24, 2020

python3Packages.wxpython_4_1: init at 4.1.0 #95462

Closed

10 tasks

wxGTK31: 3.1.3 -> 3.1.4

84a23b9

tfmoraes force-pushed the wxwidget-3.1.4 branch from 850dad8 to 84a23b9 Compare September 24, 2020 22:17

tfmoraes closed this Oct 1, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

wxGTK31: 3.1.3 -> 3.1.4#95460

wxGTK31: 3.1.3 -> 3.1.4#95460
tfmoraes wants to merge 1 commit intoNixOS:masterfrom
tfmoraes:wxwidget-3.1.4

tfmoraes commented Aug 14, 2020

Uh oh!

Uh oh!

tfmoraes commented Aug 15, 2020

Uh oh!

jonringer commented Aug 15, 2020 •

edited

Loading

Uh oh!

jonringer commented Aug 15, 2020

Uh oh!

tfmoraes commented Aug 15, 2020

Uh oh!

tfmoraes commented Aug 15, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

tfmoraes commented Aug 14, 2020

Motivation for this change

Things done

Uh oh!

Uh oh!

tfmoraes commented Aug 15, 2020

Uh oh!

jonringer commented Aug 15, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jonringer commented Aug 15, 2020

Uh oh!

tfmoraes commented Aug 15, 2020

Uh oh!

tfmoraes commented Aug 15, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

jonringer commented Aug 15, 2020 •

edited

Loading