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

filezilla: 3.46.3 -> 3.48.0 #86217

Merged
merged 2 commits into from May 2, 2020
Merged

filezilla: 3.46.3 -> 3.48.0 #86217

merged 2 commits into from May 2, 2020

Conversation

@peterhoeg
Copy link
Member

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.
@peterhoeg peterhoeg force-pushed the peterhoeg:u/filezilla_3_48 branch from d533cbd to bd50584 Apr 28, 2020
@ofborg ofborg bot requested a review from pSub Apr 28, 2020
@peterhoeg peterhoeg force-pushed the peterhoeg:u/filezilla_3_48 branch from bd50584 to 2747cfc Apr 29, 2020
Copy link
Member

cole-h left a comment

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

@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

@cole-h cole-h mentioned this pull request Apr 29, 2020
3 of 10 tasks complete
@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.

@FRidh
Copy link
Member

FRidh commented May 1, 2020

please rebase onto staging.

@FRidh FRidh added this to WIP in Staging May 1, 2020
@peterhoeg peterhoeg force-pushed the peterhoeg:u/filezilla_3_48 branch from 939dafe to 78cc331 May 1, 2020
@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.

@peterhoeg peterhoeg merged commit 2092ed1 into NixOS:staging May 2, 2020
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
filezilla, filezilla.passthru.tests, libfilezilla, libfilezilla.passthru.tests on aarch64-linux Success
Details
filezilla, filezilla.passthru.tests, libfilezilla, libfilezilla.passthru.tests on x86_64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="78cc331"; rev="78cc33197ccb2df2652964599ba818cc592d64da"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="78cc331"; rev="78cc33197ccb2df2652964599ba818cc592d64da"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="78cc331"; rev="78cc33197ccb2df2652964599ba818cc592d64da"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="78cc331"; rev="78cc33197ccb2df2652964599ba818cc592d64da"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="78cc331"; rev="78cc33197ccb2df2652964599ba818cc592d64da"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="78cc331"; rev="78cc33197ccb2df2652964599ba818cc592d64da"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="78cc331"; rev="78cc33197ccb2df2652964599ba818cc592d64da"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
Staging automation moved this from WIP to Done May 2, 2020
@peterhoeg peterhoeg deleted the peterhoeg:u/filezilla_3_48 branch May 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Staging
  
Done
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.