alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

config.allowUnfree: define as option

Browse source
This commit is contained in:
Artturin 2022-05-02 15:49:04 +03:00
parent a585b1c709
commit 1c49b81263
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/hardware/all-firmware.nix
View file

@ -72,7 +72,7 @@ in {
}) })
(mkIf cfg.enableAllFirmware { (mkIf cfg.enableAllFirmware {
assertions = [{ assertions = [{
assertion = !cfg.enableAllFirmware || (config.nixpkgs.config.allowUnfree or false); assertion = !cfg.enableAllFirmware || config.nixpkgs.config.allowUnfree;
message = '' message = ''
the list of hardware.enableAllFirmware contains non-redistributable licensed firmware files. the list of hardware.enableAllFirmware contains non-redistributable licensed firmware files.
This requires nixpkgs.config.allowUnfree to be true. This requires nixpkgs.config.allowUnfree to be true.

2
pkgs/stdenv/generic/check-meta.nix
View file

@ -13,7 +13,7 @@ let
# for why this defaults to false, but I (@copumpkin) want to default it to true soon. # for why this defaults to false, but I (@copumpkin) want to default it to true soon.
shouldCheckMeta = config.checkMeta or false; shouldCheckMeta = config.checkMeta or false;
allowUnfree = config.allowUnfree or false allowUnfree = config.allowUnfree
|| builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1"; || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1";
allowlist = config.allowlistedLicenses or config.whitelistedLicenses or []; allowlist = config.allowlistedLicenses or config.whitelistedLicenses or [];

12
pkgs/top-level/config.nix
View file

@ -58,6 +58,18 @@ let
''; '';
}; };
allowUnfree = mkOption {
type = types.bool;
default = false;
# getEnv part is in check-meta.nix
defaultText = literalExpression ''false || builtins.getEnv "NIXPKGS_ALLOW_UNFREE" == "1"'';
description = ''
Whether to allow unfree packages.
See <link xlink:href="https://nixos.org/manual/nixpkgs/stable/#sec-allow-unfree">Installing unfree packages</link> in the NixOS manual.
'';
};
}; };
in { in {