wxGTK31: 3.1.3 -> 3.1.4 + python3Packages.wxpython_4_1: init at 4.1.0 #98951

tfmoraes · 2020-09-27T15:24:46Z

Motivation for this change

Update wxWidgets to 3.1.4 and add wxPython-4.1.0

Things done

tfmoraes · 2020-09-27T17:04:19Z

Just pwsafe failed to compile with wxWidget 3.1.4:

nix-shell -p nixpkgs-review --run "nixpkgs-review pr 98951"                                                                                             
these paths will be fetched (0.04 MiB download, 0.15 MiB unpacked):
  /nix/store/8q0fbh6cg79bca0gmlhv8s9xv0zzv10b-nixpkgs-review-2.4.0
copying path '/nix/store/8q0fbh6cg79bca0gmlhv8s9xv0zzv10b-nixpkgs-review-2.4.0' from 'https://cache.nixos.org'...
$ git -c fetch.prune=false fetch --force https://github.com/NixOS/nixpkgs master:refs/nixpkgs-review/0 pull/98951/head:refs/nixpkgs-review/1
remote: Enumerating objects: 201, done.
remote: Counting objects: 100% (201/201), done.
remote: Compressing objects: 100% (13/13), done.
remote: Total 312 (delta 194), reused 188 (delta 188), pack-reused 111
Receiving objects: 100% (312/312), 252.07 KiB | 13.27 MiB/s, done.
Resolving deltas: 100% (219/219), completed with 123 local objects.
From https://github.com/NixOS/nixpkgs
   2b575c5f1f2..495895c34e2  master               -> refs/nixpkgs-review/0
 + 801715d822a...e6badde3776 refs/pull/98951/head -> refs/nixpkgs-review/1  (forced update)
$ git worktree add /home/thiago/.cache/nixpkgs-review/pr-98951/nixpkgs 495895c34e280322c30d2620c05ca4c3e180e89a
Preparing worktree (detached HEAD 495895c34e2)
HEAD is now at 495895c34e2 Merge pull request #98928 from thall/master
$ nix-env -f /home/thiago/.cache/nixpkgs-review/pr-98951/nixpkgs -qaP --xml --out-path --show-trace
$ git merge --no-commit e6badde3776aaff76ab19040634b0f97d6330bc7
Auto-merging pkgs/top-level/python-packages.nix
Automatic merge went well; stopped before committing as requested
$ nix-env -f /home/thiago/.cache/nixpkgs-review/pr-98951/nixpkgs -qaP --xml --out-path --show-trace --meta
2 packages added:
python37Packages.wxPython_4_1 (init at 4.1.0) python38Packages.wxPython_4_1 (init at 4.1.0)

16 packages updated:
cubicsdr diff-pdf freqtweak-unstable grandorgue kicad-unstable kicad-unstable-small prusa-slicer prusa-slicer pwsafe saga super-slicer treesheets wxFormBuilder-unstable 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/pr-98951/build.nix
builder for '/nix/store/0lgmghb522lp3fqz89zwmms2yj7gg7w2-pwsafe-3.52.0.drv' failed with exit code 2; last 10 log lines:
  /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[2]: *** Waiting for unfinished jobs....
  make[1]: *** [CMakeFiles/Makefile2:253: CMakeFiles/pwsafe.dir/all] Error 2
  make: *** [Makefile:182: all] Error 2
cannot build derivation '/nix/store/5f0liffxrqrd35vvnc7yyfnzyswk351a-env.drv': 1 dependencies couldn't be built
[38 built (1 failed), 147 copied (1813.7 MiB), 415.4 MiB DL]
error: build of '/nix/store/5f0liffxrqrd35vvnc7yyfnzyswk351a-env.drv' failed
https://github.com/NixOS/nixpkgs/pull/98951
1 package failed to build:
pwsafe

16 packages built:
cubicsdr diff-pdf freqtweak grandorgue kicad-unstable kicad-unstable-small prusa-slicer python37Packages.wxPython_4_1 python38Packages.wxPython_4_1 saga super-slicer treesheets wxGTK31 wxGTK31-gtk3 wxformbuilder wxhexeditor

$ nix-shell /home/thiago/.cache/nixpkgs-review/pr-98951/shell.nix

jonringer

if you can get pwsafe to build, i will merge this. Looks like upstream doesn't support it yet, so you may have to do some overriding for that package.

I would just feel bad for pwsafe users to have their tool broken

cc @c0bw3b @pjones

tfmoraes · 2020-10-02T00:48:56Z

@jonringer If I change pwsafe to compile with wxWidgets 3.0 it compiles. Pwsafe Mac, Ubuntu and Debian packages are being created with wxWidgets 3.0 see https://github.com/pwsafe/pwsafe/blob/master/.github/workflows/main.yml and https://github.com/pwsafe/pwsafe/blob/master/Misc/setup-linux-dev-env.sh . Maybe we should use wxWidgets 3.0 too until they support 3.1. If you want, I add a commit in this PR with this change.

jonringer · 2020-10-02T02:48:45Z

I think that's preferable over breaking the other packages. but we can also let the maintainers respond first. I would just like to point out that this PR has been going on for months

cc @c0bw3b @pjones

tfmoraes · 2020-10-04T22:53:05Z

@jonringer I've just committed the change to make Pwsafe use wxGTK30 in this PR. It's building all packages that depend on wxGTK31 correctly:

❯ nix-shell -p nixpkgs-review --run "nixpkgs-review pr 98951"
these paths will be fetched (0.04 MiB download, 0.15 MiB unpacked):
  /nix/store/8q0fbh6cg79bca0gmlhv8s9xv0zzv10b-nixpkgs-review-2.4.0
copying path '/nix/store/8q0fbh6cg79bca0gmlhv8s9xv0zzv10b-nixpkgs-review-2.4.0' from 'https://cache.nixos.org'...
$ git -c fetch.prune=false fetch --force https://github.com/NixOS/nixpkgs master:refs/nixpkgs-review/0 pull/98951/head:refs/nixpkgs-review/1
remote: Enumerating objects: 2008, done.
remote: Counting objects: 100% (2008/2008), done.
remote: Compressing objects: 100% (12/12), done.
remote: Total 3875 (delta 2000), reused 1996 (delta 1996), pack-reused 1867
Receiving objects: 100% (3875/3875), 3.18 MiB | 5.32 MiB/s, done.
Resolving deltas: 100% (2750/2750), completed with 751 local objects.
From https://github.com/NixOS/nixpkgs
   495895c34e2..e782471d2b8  master               -> refs/nixpkgs-review/0
 + e6badde3776...51c14f8079b refs/pull/98951/head -> refs/nixpkgs-review/1  (forced update)
$ git worktree add /home/thiago/.cache/nixpkgs-review/pr-98951-1/nixpkgs e782471d2b8f6a77de0189a9a99639176e12fff1
Preparing worktree (detached HEAD e782471d2b8)
Updating files: 100% (22843/22843), done.
HEAD is now at e782471d2b8 cheesecutter: unstable-2019-12-06 -> unstable-2020-04-03
$ nix-env -f /home/thiago/.cache/nixpkgs-review/pr-98951-1/nixpkgs -qaP --xml --out-path --show-trace
$ git merge --no-commit 51c14f8079b1addd2bd693191f62acf29b2e40cb
Auto-merging pkgs/top-level/python-packages.nix
Automatic merge went well; stopped before committing as requested
$ nix-env -f /home/thiago/.cache/nixpkgs-review/pr-98951-1/nixpkgs -qaP --xml --out-path --show-trace --meta
2 packages added:
python37Packages.wxPython_4_1 (init at 4.1.0) python38Packages.wxPython_4_1 (init at 4.1.0)

16 packages updated:
cubicsdr diff-pdf freqtweak-unstable grandorgue kicad-unstable kicad-unstable-small prusa-slicer prusa-slicer pwsafe saga super-slicer treesheets wxFormBuilder-unstable 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/pr-98951-1/build.nix
[19 built, 80 copied (1469.7 MiB), 336.7 MiB DL]
https://github.com/NixOS/nixpkgs/pull/98951
17 packages built:
cubicsdr diff-pdf freqtweak grandorgue kicad-unstable kicad-unstable-small prusa-slicer pwsafe python37Packages.wxPython_4_1 python38Packages.wxPython_4_1 saga super-slicer treesheets wxGTK31 wxGTK31-gtk3 wxformbuilder wxhexeditor

[0.0 MiB DL]
$ nix-shell /home/thiago/.cache/nixpkgs-review/pr-98951-1/shell.nix

[nix-shell:~/.cache/nixpkgs-review/pr-98951-1]$

jonringer · 2020-10-04T22:57:03Z

do you mind changing the commit message to:

pwsafe: use wxGTK30

tfmoraes · 2020-10-04T23:03:07Z

do you mind changing the commit message to:
pwsafe: use wxGTK30

Done.

evils · 2020-10-05T03:44:08Z

if you change the order of the commits so the pwsafe change applies first, then none of the commits have a breakage

tfmoraes · 2020-10-05T03:53:16Z

if you change the order of the commits so the pwsafe change applies first, then none of the commits have a breakage

Good idea! Done.

tfmoraes · 2020-10-11T20:19:35Z

@jonringer It seems that the maintainers of pwsafe are not going respond.

tfmoraes · 2020-11-08T22:44:18Z

Hi @jonringer. @c0bw3b @pjones not responded yet. Do you think it's better to wait yet?

jonringer · 2020-11-10T07:24:53Z

I think a month is plenty of time

jonringer

I'm going to merge this unless there's any objection

https://github.com/NixOS/nixpkgs/pull/98951
16 packages built:
cubicsdr diff-pdf freqtweak grandorgue kicad-unstable-small prusa-slicer pwsafe python37Packages.wxPython_4_1 python38Packages.wxPython_4_1 saga super-slicer treesheets wxGTK31 wxGTK31-gtk3 wxformbuilder wxhexeditor

cc @FRidh

tfmoraes · 2020-11-10T17:42:33Z

Ok @jonringer!

jonringer · 2020-11-10T23:07:48Z

everything builds, and looks fine.

sorry for the VERY long PR

deliciouslytyped · 2021-06-22T00:34:13Z

I think this might be missing some dependencies; see #94108 (comment)

tfmoraes requested review from FRidh and jonringer as code owners September 27, 2020 15:24

tfmoraes mentioned this pull request Sep 27, 2020

python3Packages.wxpython_4_1: init at 4.1.0 #95462

Closed

10 tasks

ofborg bot added 6.topic: python 2.status: merge conflict labels Sep 27, 2020

ofborg bot added 8.has: package (new) 11.by: package-maintainer 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100 and removed 2.status: merge conflict labels Sep 27, 2020

tfmoraes force-pushed the wxgtk314_wxpython411 branch from e6badde to 83a3938 Compare September 30, 2020 17:50

jonringer reviewed Oct 1, 2020

View reviewed changes

evils mentioned this pull request Oct 2, 2020

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

Closed

10 tasks

ofborg bot requested review from c0bw3b and pjones October 4, 2020 22:38

tfmoraes force-pushed the wxgtk314_wxpython411 branch from 51c14f8 to 2e1018f Compare October 4, 2020 23:02

tfmoraes added 3 commits October 5, 2020 00:52

pwsafe: use wxGTK30

6f2046a

wxGTK31: 3.1.3 -> 3.1.4

fd50d50

python3Packages.wxpython_4_1: init at 4.1.0

0647927

tfmoraes force-pushed the wxgtk314_wxpython411 branch from 2e1018f to 0647927 Compare October 5, 2020 03:52

tfmoraes requested a review from jonringer November 9, 2020 18:33

jonringer approved these changes Nov 10, 2020

View reviewed changes

jonringer merged commit dd72edc into NixOS:master Nov 10, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

wxGTK31: 3.1.3 -> 3.1.4 + python3Packages.wxpython_4_1: init at 4.1.0 #98951

wxGTK31: 3.1.3 -> 3.1.4 + python3Packages.wxpython_4_1: init at 4.1.0 #98951

tfmoraes commented Sep 27, 2020 •

edited

tfmoraes commented Sep 27, 2020

jonringer left a comment

tfmoraes commented Oct 2, 2020

jonringer commented Oct 2, 2020

tfmoraes commented Oct 4, 2020

jonringer commented Oct 4, 2020

tfmoraes commented Oct 4, 2020

evils commented Oct 5, 2020

tfmoraes commented Oct 5, 2020

tfmoraes commented Oct 11, 2020

tfmoraes commented Nov 8, 2020

jonringer commented Nov 10, 2020

jonringer left a comment

tfmoraes commented Nov 10, 2020

jonringer commented Nov 10, 2020

deliciouslytyped commented Jun 22, 2021

wxGTK31: 3.1.3 -> 3.1.4 + python3Packages.wxpython_4_1: init at 4.1.0 #98951

wxGTK31: 3.1.3 -> 3.1.4 + python3Packages.wxpython_4_1: init at 4.1.0 #98951

Conversation

tfmoraes commented Sep 27, 2020 • edited

Motivation for this change

Things done

tfmoraes commented Sep 27, 2020

jonringer left a comment

Choose a reason for hiding this comment

tfmoraes commented Oct 2, 2020

jonringer commented Oct 2, 2020

tfmoraes commented Oct 4, 2020

jonringer commented Oct 4, 2020

tfmoraes commented Oct 4, 2020

evils commented Oct 5, 2020

tfmoraes commented Oct 5, 2020

tfmoraes commented Oct 11, 2020

tfmoraes commented Nov 8, 2020

jonringer commented Nov 10, 2020

jonringer left a comment

Choose a reason for hiding this comment

tfmoraes commented Nov 10, 2020

jonringer commented Nov 10, 2020

deliciouslytyped commented Jun 22, 2021

tfmoraes commented Sep 27, 2020 •

edited