Unverified Commit 3aefc14a authored by Philip Taron's avatar Philip Taron
Browse files

lib.attrsets: remove deprecated names 

- `lib.attrsets.cartesianProductOfSets` was deprecated in 228621e4
- `lib.attrsets.zip` was deprecated in fcbc4fe9 (2013!)
- `lib.attrsets.zipWithNames` was deprecated in 00127bef (2009!)

The time has come.
parent 3050865c

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

+6 −0
Original line number Diff line number Diff line
@@ -303,6 +303,12 @@ 


- `lib.mapAttrsFlatten` has been removed, following its deprecation in NixOS 24.11. Use `lib.attrsets.mapAttrsToList` instead.



- `lib.attrsets.cartesianProductOfSets` has been removed, following its deprecation in NixOS 24.11. Use `lib.attrsets.cartesianProduct` instead.



- `lib.attrsets.zip` has been removed, following its deprecation in 2013. Use `lib.attrsets.zipAttrsWith` instead.



- `lib.attrsets.zipWithNames` has been removed, following its deprecation in 2009. Use `lib.attrsets.zipAttrsWithNames` instead.



- `lib.options.mkPackageOptionMD` has been removed, following its deprecation in NixOS 24.11. Use `lib.options.mkPackageOption` instead.



- The `buildPythonPackage` and `buildPythonApplication` functions now require

lib/attrsets.nix

+1 −18
Original line number Diff line number Diff line
@@ -6,12 +6,7 @@ 
let

  inherit (builtins) head length typeOf;

  inherit (lib.asserts) assertMsg;

  inherit (lib.trivial)

    oldestSupportedReleaseIsAtLeast

    mergeAttrs

    warn

    warnIf

    ;

  inherit (lib.trivial) oldestSupportedReleaseIsAtLeast mergeAttrs;

  inherit (lib.strings)

    concatStringsSep

    concatMapStringsSep
@@ -2234,16 +2229,4 @@ rec { 
      ) intersection;

    in

    (x // y) // mask;



  # DEPRECATED

  zipWithNames = warn "lib.zipWithNames is a deprecated alias of lib.zipAttrsWithNames." zipAttrsWithNames;



  # DEPRECATED

  zip = warn "lib.zip is a deprecated alias of lib.zipAttrsWith." zipAttrsWith;



  # DEPRECATED

  cartesianProductOfSets =

    warnIf (oldestSupportedReleaseIsAtLeast 2405)

      "lib.cartesianProductOfSets is a deprecated alias of lib.cartesianProduct."

      cartesianProduct;

}

lib/default.nix

+0 −3
Original line number Diff line number Diff line
@@ -232,12 +232,9 @@ let 
        getInclude

        getMan

        chooseDevOutputs

        zipWithNames

        zip

        recurseIntoAttrs

        dontRecurseIntoAttrs

        cartesianProduct

        cartesianProductOfSets

        mapCartesianProduct

        updateManyAttrsByPath

        listToAttrs