Commit f6a38f9a authored by Connor Baker's avatar Connor Baker
Browse files

Revert "config: add and document {allow,block}listedLicenses" 

This reverts commit f5deefd4.

See:

- https://github.com/NixOS/nixpkgs/pull/437723 (introduced commit)
- https://github.com/NixOS/nixpkgs/issues/456994 (reported breakage)
- https://github.com/NixOS/nixpkgs/pull/457038 (attempted fix, closed in favor of this revert)
- https://github.com/NixOS/nixpkgs/pull/457120 (fix which would require more breaking changes)
parent 66a437eb

pkgs/stdenv/generic/check-meta.nix

+2 −2
Original line number Diff line number Diff line
@@ -64,8 +64,8 @@ let 
    in

    if envVar != "" then envVar != "0" else config.allowNonSource or true;



  allowlist = config.allowlistedLicenses;

  blocklist = config.blocklistedLicenses;

  allowlist = config.allowlistedLicenses or config.whitelistedLicenses or [ ];

  blocklist = config.blocklistedLicenses or config.blacklistedLicenses or [ ];



  areLicenseListsValid =

    if mutuallyExclusive allowlist blocklist then

pkgs/top-level/config.nix

+0 −30
Original line number Diff line number Diff line
@@ -229,36 +229,6 @@ let 
      '';

    };



    allowlistedLicenses = mkOption {

      description = ''

        Allow licenses that are specifically acceptable. `allowlistedLicenses` only applies to unfree licenses unless

        `allowUnfree` is enabled. It is not a generic allowlist for all types of licenses.

      '';

      default = [ ];

      type = types.listOf (types.attrsOf types.anything);

      example = literalExpression ''

        with lib.licenses; [

          amd

          wtfpl

        ]

      '';

    };



    blocklistedLicenses = mkOption {

      description = ''

        Block licenses that are specifically unacceptable. Unlike `allowlistedLicenses`, `blocklistedLicenses`

        applies to all licenses.

      '';

      default = [ ];

      type = types.listOf (types.attrsOf types.anything);

      example = literalExpression ''

        with lib.licenses; [

          agpl3Only

          gpl3Only

        ]

      '';

    };



    cudaSupport = mkMassRebuild {

      feature = "build packages with CUDA support by default";

    };