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

remmina: clean up #49254

Merged
merged 1 commit into from Oct 30, 2018
Merged

remmina: clean up #49254

merged 1 commit into from Oct 30, 2018

Conversation

jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Oct 27, 2018

Motivation for this change

Follow-up to #48722

  • Desktop file is included now, so no need to create it manually.
  • libgnome-keyring is not used anymore, libsecret replaced it.

/cc maintainers @melsigl @ryantm
/cc @oxij

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: remmina

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.


@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: remmina

Partial log (click to expand)

/nix/store/m22g86wvsybfr5cg31wjqzij3ik5s4sd-remmina-19.03pre-git/bin/.remmina-gnome-wrapped: interpreter directive changed from "/bin/sh" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/sh"
/nix/store/m22g86wvsybfr5cg31wjqzij3ik5s4sd-remmina-19.03pre-git/bin/.gnome-session-remmina-wrapped: interpreter directive changed from " /bin/sh" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/sh"
/nix/store/m22g86wvsybfr5cg31wjqzij3ik5s4sd-remmina-19.03pre-git/share/remmina/external_tools/remmina_traceroute.sh: interpreter directive changed from "/bin/sh" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/sh"
/nix/store/m22g86wvsybfr5cg31wjqzij3ik5s4sd-remmina-19.03pre-git/share/remmina/external_tools/remmina_ping.sh: interpreter directive changed from "/bin/sh" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/sh"
/nix/store/m22g86wvsybfr5cg31wjqzij3ik5s4sd-remmina-19.03pre-git/share/remmina/external_tools/remmina_nslookup.sh: interpreter directive changed from "/bin/sh" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/sh"
/nix/store/m22g86wvsybfr5cg31wjqzij3ik5s4sd-remmina-19.03pre-git/share/remmina/external_tools/remmina_filezilla_sftp_pki.sh: interpreter directive changed from "/bin/sh" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/sh"
/nix/store/m22g86wvsybfr5cg31wjqzij3ik5s4sd-remmina-19.03pre-git/share/remmina/external_tools/remmina_filezilla_sftp.sh: interpreter directive changed from "/bin/sh" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/sh"
/nix/store/m22g86wvsybfr5cg31wjqzij3ik5s4sd-remmina-19.03pre-git/share/remmina/external_tools/functions.sh: interpreter directive changed from "/bin/sh" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/sh"
/nix/store/m22g86wvsybfr5cg31wjqzij3ik5s4sd-remmina-19.03pre-git/share/remmina/external_tools/launcher.sh: interpreter directive changed from "/bin/sh" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/m22g86wvsybfr5cg31wjqzij3ik5s4sd-remmina-19.03pre-git...

@GrahamcOfBorg
Copy link

Timed out, unknown build status on x86_64-linux (full log)

Attempted: remmina

Partial log (click to expand)

stripping (with command strip and flags -S) in /nix/store/hyw0dp8qwmydn5i6dzhxmf2bkfl9vl49-spice-gtk-0.35/lib  /nix/store/hyw0dp8qwmydn5i6dzhxmf2bkfl9vl49-spice-gtk-0.35/bin
patching script interpreter paths in /nix/store/hyw0dp8qwmydn5i6dzhxmf2bkfl9vl49-spice-gtk-0.35
checking for references to /build in /nix/store/hyw0dp8qwmydn5i6dzhxmf2bkfl9vl49-spice-gtk-0.35...
shrinking RPATHs of ELF executables and libraries in /nix/store/w388w5q7j5mjh85w3ciyjf8y40fn64vf-spice-gtk-0.35-dev
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/w388w5q7j5mjh85w3ciyjf8y40fn64vf-spice-gtk-0.35-dev/lib
patching script interpreter paths in /nix/store/w388w5q7j5mjh85w3ciyjf8y40fn64vf-spice-gtk-0.35-dev
checking for references to /build in /nix/store/w388w5q7j5mjh85w3ciyjf8y40fn64vf-spice-gtk-0.35-dev...
cannot build derivation '/nix/store/ihqyd787750aqv2l5yp93pqdl6676qnk-remmina-19.03pre-git.drv': 2 dependencies couldn't be built
error: build of '/nix/store/ihqyd787750aqv2l5yp93pqdl6676qnk-remmina-19.03pre-git.drv' failed

@oxij
Copy link
Member

oxij commented Oct 27, 2018 via email

@jtojnar
Copy link
Contributor Author

jtojnar commented Oct 27, 2018

We could add secretServiceSupport argument but libsecret is relatively light (42 MB closure, but all its dependencies are already included in remina’s closure). Moreover, unlike libgnome-keyring, it is a cross-DE standard. Is making the closure 1 MB smaller really worth making the expression more complicated?

Desktop file is included now, so no need to create it manually.
libgnome-keyring is not used anymore, libsecret replaced it.
@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: remmina

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.


@GrahamcOfBorg
Copy link

Timed out, unknown build status on x86_64-linux (full log)

Attempted: remmina

Partial log (click to expand)

[ 64%] Building CXX object lib/Target/ARM/CMakeFiles/LLVMARMCodeGen.dir/ARMISelLowering.cpp.o
[ 64%] Building CXX object lib/Target/ARM/CMakeFiles/LLVMARMCodeGen.dir/ARMInstrInfo.cpp.o
building of '/nix/store/j1yzzw5jg9dpxlrcp5mj8awfgh755byb-rustc-1.30.0.drv' timed out after 1800 seconds
cannot build derivation '/nix/store/amvxhnkmn7szrbgp5k6zrd9nrms8i7cj-cargo-1.30.0.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/s45nfy009nwq82bh7k6440z6q1ga7d82-librsvg-2.42.4.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/vqhk2zgl0hiy6s1k22mnb54xjlzbxf55-hook.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/payas4l8azg5lla3xk14cyp1vck9lf2a-icon-naming-utils-0.8.90.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/v31r6jjn5iang4gpw9bkbw91py43s308-adwaita-icon-theme-3.28.0.drv': 2 dependencies couldn't be built
cannot build derivation '/nix/store/ihqyd787750aqv2l5yp93pqdl6676qnk-remmina-19.03pre-git.drv': 2 dependencies couldn't be built
error: build of '/nix/store/ihqyd787750aqv2l5yp93pqdl6676qnk-remmina-19.03pre-git.drv' failed

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: remmina

Partial log (click to expand)

/nix/store/m22g86wvsybfr5cg31wjqzij3ik5s4sd-remmina-19.03pre-git/bin/.remmina-gnome-wrapped: interpreter directive changed from "/bin/sh" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/sh"
/nix/store/m22g86wvsybfr5cg31wjqzij3ik5s4sd-remmina-19.03pre-git/bin/.gnome-session-remmina-wrapped: interpreter directive changed from " /bin/sh" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/sh"
/nix/store/m22g86wvsybfr5cg31wjqzij3ik5s4sd-remmina-19.03pre-git/share/remmina/external_tools/remmina_traceroute.sh: interpreter directive changed from "/bin/sh" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/sh"
/nix/store/m22g86wvsybfr5cg31wjqzij3ik5s4sd-remmina-19.03pre-git/share/remmina/external_tools/remmina_ping.sh: interpreter directive changed from "/bin/sh" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/sh"
/nix/store/m22g86wvsybfr5cg31wjqzij3ik5s4sd-remmina-19.03pre-git/share/remmina/external_tools/remmina_nslookup.sh: interpreter directive changed from "/bin/sh" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/sh"
/nix/store/m22g86wvsybfr5cg31wjqzij3ik5s4sd-remmina-19.03pre-git/share/remmina/external_tools/remmina_filezilla_sftp_pki.sh: interpreter directive changed from "/bin/sh" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/sh"
/nix/store/m22g86wvsybfr5cg31wjqzij3ik5s4sd-remmina-19.03pre-git/share/remmina/external_tools/remmina_filezilla_sftp.sh: interpreter directive changed from "/bin/sh" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/sh"
/nix/store/m22g86wvsybfr5cg31wjqzij3ik5s4sd-remmina-19.03pre-git/share/remmina/external_tools/functions.sh: interpreter directive changed from "/bin/sh" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/sh"
/nix/store/m22g86wvsybfr5cg31wjqzij3ik5s4sd-remmina-19.03pre-git/share/remmina/external_tools/launcher.sh: interpreter directive changed from "/bin/sh" to "/nix/store/dsyc1z7ck08ga7l0b1jcxx35wj69qcii-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/m22g86wvsybfr5cg31wjqzij3ik5s4sd-remmina-19.03pre-git...

@Mic92
Copy link
Member

Mic92 commented Oct 28, 2018

@oxij can you make this an upstream patch instead. Then it would not require a patch from our side.

@oxij
Copy link
Member

oxij commented Oct 29, 2018 via email

@jtojnar
Copy link
Contributor Author

jtojnar commented Oct 29, 2018

Well, libsecret does not install any keyring for you (neither does libgnome-keyring). If remmina fails to work in the absence of a keyring, that is a bug and should be fixed upstream, just like a similar bug in network-manager-applet.

@jtojnar jtojnar merged commit 628b6cc into NixOS:master Oct 30, 2018
@jtojnar jtojnar deleted the remmina-cleanup branch October 30, 2018 20:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants