Skip to content

filezilla: 3.46.3 -> 3.48.0#86217

Merged
peterhoeg merged 2 commits intoNixOS:stagingfrom
peterhoeg:u/filezilla_3_48
May 2, 2020
Merged

filezilla: 3.46.3 -> 3.48.0#86217
peterhoeg merged 2 commits intoNixOS:stagingfrom
peterhoeg:u/filezilla_3_48

Conversation

@peterhoeg
Copy link
Member

@peterhoeg peterhoeg commented Apr 28, 2020

Also moves from gtk2 to gtk3.

Things done
  • 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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested a review from pSub April 28, 2020 14:58
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Apr 28, 2020
This was referenced Apr 29, 2020
Closed
Closed
cole-h
cole-h requested changes Apr 29, 2020
View reviewed changes
Copy link
Member

@cole-h cole-h left a comment

Choose a reason for hiding this comment

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

This fails to build for me; nixpkgs-review pr 86217 gave me the following:

builder for '/nix/store/ybar8pvx0pr5kwhcm7s3c6w4j69gf7k0-wxwidgets-3.0.4.drv' failed with exit code 1; last 10 log lines:
  *** your path, or set the GTK_CONFIG environment variable to the
  *** full path to gtk-config.
  configure: error:
  The development files for GTK+ were not found. For GTK+ 2, please
  ensure that pkg-config is in the path and that gtk+-2.0.pc is
  installed. For GTK+ 1.2 please check that gtk-config is in the path,
  and that the version is 1.2.3 or above. Also check that the
  libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
  --libs' are in the LD_LIBRARY_PATH or equivalent.
cannot build derivation '/nix/store/6r4xgnpizsp6l0al3mpkpghigc3h4p4m-filezilla-3.48.0.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/96mqgazay6srsnzpw453ci2xdq7xsnph-env.drv': 1 dependencies couldn't be built
[0 built (1 failed), 0.0 MiB DL]
error: build of '/nix/store/96mqgazay6srsnzpw453ci2xdq7xsnph-env.drv' failed
https://github.com/NixOS/nixpkgs/pull/86217
1 package failed to build:
filezilla

1 package built:
libfilezilla

@peterhoeg
Copy link
Member Author

peterhoeg commented Apr 29, 2020

Try again - I was just pushing some fixes.

@peterhoeg
Copy link
Member Author

peterhoeg commented Apr 29, 2020

It builds and runs here.

@cole-h
Copy link
Member

cole-h commented Apr 29, 2020

It looks like borg has the same problem as I do: https://logs.nix.ci/?attempt_id=38a8d984-199f-4154-a029-44c5c661958e&key=nixos%2Fnixpkgs.86217 (x86_64-linux) and https://logs.nix.ci/?attempt_id=910b5dbf-37bf-4803-9a2e-6db0690beacf&key=nixos%2Fnixpkgs.86217 (aarch64-linux, error is at the bottom here).

@peterhoeg
Copy link
Member Author

peterhoeg commented Apr 29, 2020

Ah, so I was building against unstable (where it works) whereas master breaks due to af87f13 as meson.build in the upstream gtk package wasn't updated. Great.

If you want to try it out, you need to rebase against unstable. We need to get gtk3 fixed.

@peterhoeg
Copy link
Member Author

peterhoeg commented Apr 29, 2020

And here's the ticket: https://gitlab.gnome.org/GNOME/gtk/-/issues/2632

@cole-h cole-h mentioned this pull request Apr 29, 2020
Closed
10 tasks
@peterhoeg
Copy link
Member Author

peterhoeg commented Apr 29, 2020

OK, so here we go - now with a patch to gtk3.

Looping in @worldofpeace and @jtojnar who are interested in gtk3 (the tl;dr: gtk3 3.24.18 breaks downstream consumers as it advertises the wrong version).

@peterhoeg
Copy link
Member Author

peterhoeg commented Apr 29, 2020

@cole-h if you want to try it out, you can still build this branch. I'll drop my gtk3 patch when gtk3 is fixed.

@ofborg ofborg bot requested review from 7c6f434c, vcunat and worldofpeace April 29, 2020 05:16
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. and removed 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Apr 29, 2020
@FRidh FRidh changed the base branch from master to staging May 1, 2020 07:01
@FRidh
Copy link
Member

FRidh commented May 1, 2020

please rebase onto staging.

@ofborg ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label May 1, 2020
@peterhoeg peterhoeg force-pushed the u/filezilla_3_48 branch from 939dafe to 78cc331 Compare May 1, 2020 08:39
@peterhoeg
Copy link
Member Author

peterhoeg commented May 1, 2020

I dropped the gtk3 change now that gtk3 has been fixed in staging so this should be good to go when the checks pass.

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. and removed 2.status: merge conflict This PR has merge conflicts with the target branch 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. labels May 1, 2020
@peterhoeg peterhoeg merged commit 2092ed1 into NixOS:staging May 2, 2020
@peterhoeg peterhoeg deleted the u/filezilla_3_48 branch May 2, 2020 00:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cole-h cole-h cole-h requested changes

@pSub pSub Awaiting requested review from pSub

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

@worldofpeace worldofpeace Awaiting requested review from worldofpeace

@vcunat vcunat Awaiting requested review from vcunat

Assignees

No one assigned

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

No open projects
Staging
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@peterhoeg @cole-h @FRidh