config.{allow,block}listedLicenses: fixups

doc/release-notes/rl-2511.section.md

@@ -269,6 +269,8 @@
 
 - Added `gitConfig` and `gitConfigFile` option to the nixpkgs `config`, to allow for setting a default `gitConfigFile` for all `fetchgit` invocations.
 
+- Added options for `allowlistedLicenses` and `blocklistedLicenses` to the nixpkgs `config`. Options for `whitelistedLicenses` and `blacklistedLicenses` were also introduce to avoid changing the behavior of evaluation; these options should not be used because they deprecated and will be removed in a future release.
+
 - The `dockerTools.streamLayeredImage` builder now uses a better algorithm for generating layered docker images, such that much more sharing is possible when the number of store paths exceeds the layer limit. It gives each of the largest store paths its own layer and adds dependencies to those layers when they aren't used elsewhere.
 
 - The systemd initrd will now respect `x-systemd.wants` and `x-systemd.requires` for reliably unlocking multi-disk bcachefs volumes.

pkgs/top-level/config.nix

@@ -13,6 +13,7 @@ let
     literalExpression
     mapAttrsToList
     mkOption
+    mkRenamedOptionModuleWith
     optionals
     types
     ;
@@ -235,7 +236,10 @@ let
         `allowUnfree` is enabled. It is not a generic allowlist for all types of licenses.
       '';
       default = [ ];
-      type = types.listOf (types.attrsOf types.anything);
+      # NOTE: The type should be `types.listOf (types.attrsOf types.anything)` -- however, this causes infinite
+      # recursion when `config` is a function because bootstrapping the package set requires evaluating licenses.
+      # For now, we use types.raw, the same type used by `freeformType`.
+      type = types.raw;
       example = literalExpression ''
         with lib.licenses; [
           amd
@@ -250,7 +254,10 @@ let
         applies to all licenses.
       '';
       default = [ ];
-      type = types.listOf (types.attrsOf types.anything);
+      # NOTE: The type should be `types.listOf (types.attrsOf types.anything)` -- however, this causes infinite
+      # recursion when `config` is a function because bootstrapping the package set requires evaluating licenses.
+      # For now, we use types.raw, the same type used by `freeformType`.
+      type = types.raw;
       example = literalExpression ''
         with lib.licenses; [
           agpl3Only
@@ -368,6 +375,19 @@ let
 in
 {
 
+  imports = [
+    (mkRenamedOptionModuleWith {
+      from = [ "whitelistedLicenses" ];
+      to = [ "allowlistedLicenses" ];
+      sinceRelease = 2511;
+    })
+    (mkRenamedOptionModuleWith {
+      from = [ "blacklistedLicenses" ];
+      to = [ "blocklistedLicenses" ];
+      sinceRelease = 2511;
+    })
+  ];
+
   freeformType =
     let
       t = types.lazyAttrsOf types.raw;