-
-
Notifications
You must be signed in to change notification settings - Fork 16.7k
pkgs/top-level/config.nix: nixfmt, declare options #330753
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
pkgs/top-level/config.nix: nixfmt, declare options #330753
Conversation
@@ -140,9 +182,26 @@ let | |||
feature = "build packages with ROCm support by default"; | |||
}; | |||
|
|||
packageOverrides = mkOption { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We might also want to deprecate this.
@@ -140,9 +182,26 @@ let | |||
feature = "build packages with ROCm support by default"; | |||
}; | |||
|
|||
packageOverrides = mkOption { | |||
type = types.functionTo types.raw; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this be functionTo (lazyAttrsOf raw)
instead of functionTo raw
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I took a look at the updated nixpkgs-manual
as well. Looks good.
I plan on merging this on Monday unless I hear from others about Issues. |
…owInsecurePredicate}
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did a final nixpkgs-manual
build, diff'd it with master, looks good 👍🏻
@infinisil Hi! this breaks master's build |
@spiage could you provide a link to your system's flake.nix? I don't see an "a7" in https://github.com/spiage/nixos-config/blob/main/flake.nix |
well, I was not ready to open this machine's config, but OK, give me 2 minutes |
It's reproducible by adding an insecure package to a nixos config. Maybe we should revert for now? {
inputs = {
nixpkgs.url = "github:nixos/nixpkgs";
};
outputs =
{ nixpkgs, ... }:
{
nixosConfigurations.test = nixpkgs.lib.nixosSystem {
modules = [
(
{ modulesPath, pkgs, ... }:
{
imports = [ "${modulesPath}/profiles/minimal.nix" ];
boot.loader.grub.enable = false;
fileSystems."/".device = "nodev";
nixpkgs.hostPlatform = "x86_64-linux";
system.stateVersion = "24.05";
nixpkgs.config = {
warnUndeclaredOptions = true;
#permittedInsecurePackages = [ "electron" ];
#allowInsecurePredicate = _: false;
};
environment.systemPackages = [ pkgs.electron_27-bin ];
# custom config here
}
)
];
};
};
} |
I'm using yandex-browser
|
Yeah, unless the fix is super simple. FWIW, I have an unfree package in my flake and no issues. |
if it is my local problem I can use any walkthrough if you give me =) |
Basically I didn't notice that the |
That's pretty hefty search-and-replace, and definitely a breaking change for external users. Setting the |
I am very ashamed to show it, but here is the config |
Yes, I think setting |
I'm ready to help with tests if you need it =) |
Thanks for the super-fast report @spiage! I'm going to merge @eclairevoyant's revert and you'll be on your way. |
I have 10 minutes lag to react =) |
It's ok after revert
|
@eclairevoyant, I'd love to get this PR rolling again. What do you see as the set of steps to get it in without causing a hullabaloo? |
I need to find free time to write some tests 😩 |
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/community-team-updates/56458/11 |
Description of changes
Reformat with
nixfmt-rfc-style
, and declare some options:allowNonSource
allowUnfreePredicate
allowNonSourcePredicate
packageOverrides
permittedInsecurePackages
allowInsecurePredicate
checkMetaRecursively
handleEvalIssue
inHydra
allowlistedLicenses
,blocklistedLicenses
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.