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

profanity: enable python and gpg support, parallel builds and enforcement of enabled features #30366

Merged
merged 4 commits into from Oct 25, 2017

Conversation

Moredread
Copy link
Contributor

@Moredread Moredread commented Oct 12, 2017

Motivation for this change

Enabling python and gpg support, parallel builds and enforcement of enabled features.

If wanted, I can split up the PR or squash commits as needed.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

@Moredread
Copy link
Contributor Author

cc @devhell

++ optionals traySupport [ gnome2.gtk ];
++ optionals traySupport [ gnome2.gtk ]
++ optionals gpgSupport [ gpgme ]
++ optionals pythonSupport [ python ];
Copy link
Member

@Mic92 Mic92 Oct 13, 2017

Choose a reason for hiding this comment

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

What python version is preferred here? Archlinux builds against python3.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@FRidh
Copy link
Member

FRidh commented Oct 14, 2017

python support

Does that mean Python bindings? In that case, can you add the package also to python-packages.nix. See #30167 as an example.

@Moredread Moredread force-pushed the profanity-options branch 2 times, most recently from 76ae104 to 024fb42 Compare October 14, 2017 09:07
@Moredread
Copy link
Contributor Author

@FRidh I think it's only for plugin support, i.e. interacting from python is not possible as far as I can see. I renamed the option so it is more clear.

@Moredread
Copy link
Contributor Author

Mhh, it seems that it doesn't compile with the tray icon feature flag (so the last commit actually catches the problem, until now it just wasn't compiled in). Can someone on MacOS have a look whether tray support works on that platform or needs to be disabled?

@Moredread
Copy link
Contributor Author

I renamed the gpgSupport option to pgpOption to match the usage in the package

autoAwaySupport = config.profanity.autoAwaySupport or true;
pgpSupport = config.profanity.pgpSupport or true;
pythonPluginSupport = config.profanity.pythonPluginSupport or true;
python = config.profanity.pythonPackage or python3;
};
Copy link
Member

Choose a reason for hiding this comment

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

Can you get rid of these config options. If one wants to change an option one can just override the expression.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

All of them, or only those I've added?

When the feature flags during configuration are not set explicitly the
build will continue even when needed libs are missing, disabling the
feature. To get notified of problems, we set the feature flags
explicitly.
@fpletz fpletz merged commit ff63d38 into NixOS:master Oct 25, 2017
@Moredread Moredread deleted the profanity-options branch February 5, 2018 03:20
@Moredread Moredread restored the profanity-options branch February 5, 2018 03:20
@Moredread Moredread deleted the profanity-options branch February 5, 2018 03:20
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

4 participants