Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 529cd9020f02
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a3b15e50ce7c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 15, 2019

  1. allowInsecureDefaultPredicate: fix to use getName

    this allows correct operation with packages only having pname and version
    specified, resolving issue #73737
    risicle committed Dec 15, 2019
    Copy the full SHA
    e1e3df4 View commit details

Commits on Dec 17, 2019

  1. Merge pull request #75702 from risicle/ris-allow-insecure-predicate-n…

    …ame-fix
    
    allowInsecureDefaultPredicate: fix to use getName
    matthewbauer authored Dec 17, 2019
    Copy the full SHA
    a3b15e5 View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 pkgs/stdenv/generic/check-meta.nix
2 changes: 1 addition & 1 deletion pkgs/stdenv/generic/check-meta.nix
Original file line number Diff line number Diff line change
@@ -67,7 +67,7 @@ let
isUnfree (lib.lists.toList attrs.meta.license) &&
!allowUnfreePredicate attrs;

allowInsecureDefaultPredicate = x: builtins.elem x.name (config.permittedInsecurePackages or []);
allowInsecureDefaultPredicate = x: builtins.elem (getName x) (config.permittedInsecurePackages or []);
allowInsecurePredicate = x: (config.allowInsecurePredicate or allowInsecureDefaultPredicate) x;

hasAllowedInsecure = attrs: