Unverified Commit 4fe25460 authored by Johannes Kirschbauer's avatar Johannes Kirschbauer
Browse files

lib/types: types.nullOr deprecate functor.wrapped in favor of functor.payload.elemType

parent 05958f27

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

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ 
    - `lib.types.attrsWith`

    - `lib.types.listOf`

    - `lib.types.unique` and `lib.types.uniq`

    - `lib.types.nullOr`



- Plasma 5 and Qt 5 based versions of associated software are deprecated in NixOS 25.05, and will be removed in NixOS 25.11. Users are encouraged to upgrade to Plasma 6.

lib/tests/modules.sh

+8 −2
Original line number Diff line number Diff line
@@ -413,14 +413,20 @@ NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribu 
NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.listOf.type.functor.wrapped ./deprecated-wrapped.nix

NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedListOf.type.functor.wrapped ./deprecated-wrapped.nix



NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.unique.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix

NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedUnique.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix

NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.listOf.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix

NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedListOf.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix

# unique / uniq

NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.unique.type.functor.wrapped ./deprecated-wrapped.nix

NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedUnique.type.functor.wrapped ./deprecated-wrapped.nix



NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.unique.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix

NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedUnique.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix

# nullOr

NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.nullOr.type.functor.wrapped ./deprecated-wrapped.nix

NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedNullOr.type.functor.wrapped ./deprecated-wrapped.nix



NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.nullOr.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix

NIX_ABORT_ON_WARN=1 checkConfigError 'The deprecated `.*functor.wrapped` attribute .*is accessed, use `.*nestedTypes.elemType` instead.' options.mergedNullOr.type.nestedTypes.elemType.functor.wrapped ./deprecated-wrapped.nix



# Even with multiple assignments, a type error should be thrown if any of them aren't valid

checkConfigError 'A definition for option .* is not of type .*' \

lib/tests/modules/deprecated-wrapped.nix

+11 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ let 
    attrsOf

    listOf

    unique

    nullOr

    ;

in

{
@@ -34,6 +35,13 @@ in 
        options.mergedUnique = mkOption {

          type = unique { message = ""; } (listOf types.str);

        };

        # nullOr

        options.nullOr = mkOption {

          type = nullOr (listOf types.str);

        };

        options.mergedNullOr = mkOption {

          type = nullOr (listOf types.str);

        };

      }

    )

    # Module B
@@ -49,6 +57,9 @@ in 
        options.mergedUnique = mkOption {

          type = unique { message = ""; } (listOf types.str);

        };

        options.mergedNullOr = mkOption {

          type = nullOr (listOf types.str);

        };

      }

    )

  ];

lib/types.nix

+3 −1
Original line number Diff line number Diff line
@@ -866,7 +866,9 @@ rec { 
      getSubOptions = elemType.getSubOptions;

      getSubModules = elemType.getSubModules;

      substSubModules = m: nullOr (elemType.substSubModules m);

      functor = (defaultFunctor name) // { wrapped = elemType; };

      functor = (elemTypeFunctor name { inherit elemType; }) // {

        type = payload: types.nullOr payload.elemType;

      };

      nestedTypes.elemType = elemType;

    };