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

treewide: fix config.allowAliases = false evaluation #46593

Merged
merged 1 commit into from Sep 13, 2018
Merged

Conversation

ryantm
Copy link
Member

@ryantm ryantm commented Sep 13, 2018

Motivation for this change

Our configuration options should evaluate!

Things done

tested evaluation with

nix-env -qa woeusb-3.2.2 -f . --attr-path --arg config '{ allowBroken = true; allowUnfree = true; allowAliases = false;}'
  • 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.

@@ -18201,7 +18201,9 @@ with pkgs;

qbittorrent = libsForQt5.callPackage ../applications/networking/p2p/qbittorrent { };

qcomicbook = libsForQt5.callPackage ../applications/graphics/qcomicbook { };
qcomicbook = libsForQt5.callPackage ../applications/graphics/qcomicbook {
poppler = libsForQt5.poppler;
Copy link
Contributor

Choose a reason for hiding this comment

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

This does not have any effect and can be removed. Because of qcomicbook = libsForQt5.callPackage ..., poppler is already the qt5 variant.

@@ -309,7 +309,7 @@ self = generated // (with generated; {
'';
});

yankring = yankring.overrideAttrs(old: {
YankRing-vim = YankRing-vim.overrideAttrs(old: {
Copy link
Member

Choose a reason for hiding this comment

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

Do you have an idea how to rewrite this so it would fail to evaluate also when allowAliases has its default value? Otherwise we will see this also in future.

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, we can do something like is done with top-level/aliases.nix. I will look into this, since I want to use this configuration option with r-ryantm/nixpkgs-update and it would be nice to not have to fix it all the time.

Copy link
Member Author

Choose a reason for hiding this comment

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

@Mic92 Another option would be to make a vim-specific alias configuration: config.allowVimPluginAliases then vim plugin people can break their own evaluation whenever they want.

Copy link
Member

Choose a reason for hiding this comment

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

@ryantm sounds like bandaid.

@xeji xeji merged commit ed7b654 into NixOS:master Sep 13, 2018
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