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.

Sign up for GitHub

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

Jump to bottom

protonmail-bridge: init at 1.0.5-1 #44346

Merged
merged 2 commits into from Aug 3, 2018
Merged

protonmail-bridge: init at 1.0.5-1 #44346

merged 2 commits into from Aug 3, 2018

Conversation

lightdiscord
Copy link
Member

Motivation for this change

Add a new package to nixpkgs.

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.

@lightdiscord
Copy link
Member Author

lightdiscord commented Aug 2, 2018 •
edited

I'm not sure if the icon (in the Desktop Entry) is working, i'll check that.

@lightdiscord lightdiscord changed the title protonmail-bridge: init at 1.0.5-1 [wip] protonmail-bridge: init at 1.0.5-1 Aug 2, 2018
@lightdiscord lightdiscord changed the title [wip] protonmail-bridge: init at 1.0.5-1 protonmail-bridge: init at 1.0.5-1 Aug 2, 2018
infinisil
infinisil reviewed Aug 2, 2018
View reviewed changes
pkgs/applications/networking/protonmail-bridge/default.nix Outdated
desktopName = "ProtonMail Bridge";
genericName = "ProtonMail Bridge for Linux";
categories = "Utility;Security;Network;Email";
};
Copy link
Member

Choose a reason for hiding this comment

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

Minor thing: Can you move the desktopItem declaration into the let in? It's not actually needed as an attribute to the derivation, not sure why a lot of derivations do it nonetheless.

Other than that this PR looks perfect :)

Copy link
Member Author

Choose a reason for hiding this comment

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

It was a way to have access to meta.description. But yep, I'm moving the declaration.

Copy link
Member

Choose a reason for hiding this comment

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

Oh I see, didn't notice, well it's fine either way

@lightdiscord
Copy link
Member Author

cc @xeji

xeji
xeji reviewed Aug 3, 2018
View reviewed changes
Copy link
Contributor

@xeji xeji left a comment

Choose a reason for hiding this comment

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

Please modify according to nixpkgs conventions for qt applications.

@lightdiscord
Copy link
Member Author

lightdiscord commented Aug 3, 2018 •
edited

It should be ok

@xeji
Copy link
Contributor

xeji commented Aug 3, 2018 via email

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: protonmail-bridge

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

No attempt on x86_64-darwin (full log)

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

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 x86_64-linux (full log)

Attempted: protonmail-bridge

Partial log (click to expand)

installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/8lj129ijlw2l4smah3wid8qz45ikq8bs-protonmail-bridge-1.0.5-1
shrinking /nix/store/8lj129ijlw2l4smah3wid8qz45ikq8bs-protonmail-bridge-1.0.5-1/lib/Desktop-Bridge
strip is /nix/store/1hi76hr87bd1y1q1qjk0lv8nmcjip1c8-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/8lj129ijlw2l4smah3wid8qz45ikq8bs-protonmail-bridge-1.0.5-1/lib  /nix/store/8lj129ijlw2l4smah3wid8qz45ikq8bs-protonmail-bridge-1.0.5-1/bin
patching script interpreter paths in /nix/store/8lj129ijlw2l4smah3wid8qz45ikq8bs-protonmail-bridge-1.0.5-1
/nix/store/8lj129ijlw2l4smah3wid8qz45ikq8bs-protonmail-bridge-1.0.5-1/lib/Desktop-Bridge.sh: interpreter directive changed from "/bin/bash" to "/nix/store/dkh7l9a4sx7zqh8riqbj3z21sz25p8xy-bash-4.4-p23/bin/bash"
checking for references to /build in /nix/store/8lj129ijlw2l4smah3wid8qz45ikq8bs-protonmail-bridge-1.0.5-1...
/nix/store/8lj129ijlw2l4smah3wid8qz45ikq8bs-protonmail-bridge-1.0.5-1

@xeji xeji merged commit 725f253 into NixOS:master Aug 3, 2018
@lightdiscord lightdiscord deleted the package/protonmail-bridge branch August 3, 2018 19:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@infinisil infinisil infinisil left review comments

@xeji xeji xeji left review comments

Assignees
No one assigned
Labels
8.has: package (new) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@lightdiscord @xeji @GrahamcOfBorg @infinisil