diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md index 6a9a70ea60de..c1907d6f1342 100644 --- a/doc/release-notes/rl-2511.section.md +++ b/doc/release-notes/rl-2511.section.md @@ -297,6 +297,8 @@ - `reaction` has been updated to version 2, which includes some breaking changes. For more information, [check the release article](https://blog.ppom.me/en-reaction-v2). +- `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 an explicit `format` attribute. Previously the default format used setuptools and called `setup.py` from the source tree, which is deprecated. diff --git a/lib/default.nix b/lib/default.nix index de38409b8c67..3e8fdd1c762d 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -505,7 +505,6 @@ let unknownModule mkOption mkPackageOption - mkPackageOptionMD literalMD ; inherit (self.types) diff --git a/lib/options.nix b/lib/options.nix index 0771c5cc2d7d..75f8bfa2535c 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -344,13 +344,6 @@ rec { } ); - /** - Deprecated alias of mkPackageOption, to be removed in 25.05. - - Previously used to create options with markdown documentation, which is no longer required. - */ - mkPackageOptionMD = lib.warn "mkPackageOptionMD is deprecated and will be removed in 25.05; please use mkPackageOption." mkPackageOption; - /** This option accepts arbitrary definitions, but it does not produce an option value. diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index f0fac1194f2f..76b414a871ca 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -1066,7 +1066,7 @@ Module System: ### Deprecations {#sec-release-24.11-lib-deprecations} -- [`lib.options.mkPackageOptionMD`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.options.mkPackageOptionMD) is now obsolete; use the identical [`lib.options.mkPackageOption`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.options.mkPackageOption) instead. +- `lib.options.mkPackageOptionMD` is now obsolete; use the identical [`lib.options.mkPackageOption`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.options.mkPackageOption) instead. - `lib.misc.mapAttrsFlatten` is now formally deprecated and will be removed in future releases; use the identical [`lib.attrsets.mapAttrsToList`](https://nixos.org/manual/nixpkgs/unstable#function-library-lib.attrsets.mapAttrsToList) instead. - `lib.isInOldestRelease`: Renamed to [`oldestSupportedReleaseIsAtLeast`](https://nixos.org/manual/nixpkgs/unstable/#function-library-lib.trivial.oldestSupportedReleaseIsAtLeast) and deprecated.