diff options
| author | figsoda <figsoda@pm.me> | 2022-12-01 11:20:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-01 11:20:11 -0500 |
| commit | 5195ca234686708d662bc7f3b26f83f7408788b5 (patch) | |
| tree | bb693746a553eb125f415d1703da55efb250a9e9 /nixos/modules/misc | |
| parent | 6065d768e145ca5782e961774b5f06f0a0520729 (diff) | |
| parent | b865b96b9734658add24b41bf002fd8053ec8f73 (diff) | |
Merge pull request #203826 from figsoda/lint
nixos/*: apply some lints from statix and nil
Diffstat (limited to 'nixos/modules/misc')
| -rw-r--r-- | nixos/modules/misc/nixpkgs.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 7f7417226d174..7f44c3f6f3f0e 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -23,12 +23,12 @@ let optionalAttrs (lhs ? packageOverrides) { packageOverrides = pkgs: optCall lhs.packageOverrides pkgs // - optCall (attrByPath ["packageOverrides"] ({}) rhs) pkgs; + optCall (attrByPath [ "packageOverrides" ] { } rhs) pkgs; } // optionalAttrs (lhs ? perlPackageOverrides) { perlPackageOverrides = pkgs: optCall lhs.perlPackageOverrides pkgs // - optCall (attrByPath ["perlPackageOverrides"] ({}) rhs) pkgs; + optCall (attrByPath [ "perlPackageOverrides" ] { } rhs) pkgs; }; configType = mkOptionType { @@ -67,11 +67,6 @@ let # Context for messages hostPlatformLine = optionalString hasHostPlatform "${showOptionWithDefLocs opt.hostPlatform}"; buildPlatformLine = optionalString hasBuildPlatform "${showOptionWithDefLocs opt.buildPlatform}"; - platformLines = optionalString hasPlatform '' - Your system configuration configures nixpkgs with platform parameters: - ${hostPlatformLine - }${buildPlatformLine - }''; legacyOptionsDefined = optional (opt.localSystem.highestPrio < (mkDefault {}).priority) opt.system |