lib.attrsets: remove deprecated names
- `lib.attrsets.cartesianProductOfSets` was deprecated in228621e42d- `lib.attrsets.zip` was deprecated infcbc4fe9ff(2013!) - `lib.attrsets.zipWithNames` was deprecated in00127bef3f(2009!) The time has come.
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -232,12 +232,9 @@ let
|
||||
getInclude
|
||||
getMan
|
||||
chooseDevOutputs
|
||||
zipWithNames
|
||||
zip
|
||||
recurseIntoAttrs
|
||||
dontRecurseIntoAttrs
|
||||
cartesianProduct
|
||||
cartesianProductOfSets
|
||||
mapCartesianProduct
|
||||
updateManyAttrsByPath
|
||||
listToAttrs
|
||||
|
||||
Reference in New Issue
Block a user