gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib.attrsets: remove deprecated names

Browse Source 
- `lib.attrsets.cartesianProductOfSets` was deprecated in 228621e42d
- `lib.attrsets.zip` was deprecated in fcbc4fe9ff (2013!)
- `lib.attrsets.zipWithNames` was deprecated in 00127bef3f (2009!)

The time has come.
This commit is contained in:
Philip Taron
2025-10-09 12:10:07 -07:00
parent 3050865cc3
commit 3aefc14aca
3 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/release-notes/rl-2511.section.md
View File

@@ -303,6 +303,12 @@
- `lib.mapAttrsFlatten` has been removed, following its deprecation in NixOS 24.11. Use `lib.attrsets.mapAttrsToList` instead. - `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. - `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 - The `buildPythonPackage` and `buildPythonApplication` functions now require

19
lib/attrsets.nix
View File

@@ -6,12 +6,7 @@
let let
inherit (builtins) head length typeOf; inherit (builtins) head length typeOf;
inherit (lib.asserts) assertMsg; inherit (lib.asserts) assertMsg;
inherit (lib.trivial) inherit (lib.trivial) oldestSupportedReleaseIsAtLeast mergeAttrs;
oldestSupportedReleaseIsAtLeast
mergeAttrs
warn
warnIf
;
inherit (lib.strings) inherit (lib.strings)
concatStringsSep concatStringsSep
concatMapStringsSep concatMapStringsSep
@@ -2234,16 +2229,4 @@ rec {
) intersection; ) intersection;
in in
(x // y) // mask; (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;
} }

3
lib/default.nix
View File

@@ -232,12 +232,9 @@ let
getInclude getInclude
getMan getMan
chooseDevOutputs chooseDevOutputs
zipWithNames
zip
recurseIntoAttrs recurseIntoAttrs
dontRecurseIntoAttrs dontRecurseIntoAttrs
cartesianProduct cartesianProduct
cartesianProductOfSets
mapCartesianProduct mapCartesianProduct
updateManyAttrsByPath updateManyAttrsByPath
listToAttrs listToAttrs