Skip to content

lib.types: Make functor.wrapped deprecation work in unprocessed types#382848

Merged
hsjobeki merged 2 commits intoNixOS:masterfrom
infinisil:wrapped-nested-deprecation
Feb 21, 2025
Merged

lib.types: Make functor.wrapped deprecation work in unprocessed types#382848
hsjobeki merged 2 commits intoNixOS:masterfrom
infinisil:wrapped-nested-deprecation

Conversation

@infinisil
Copy link
Member

Otherwise nested types such as attrsOf (attrsOf int) won't have a backwards compatible type.nestedTypes.elemType.functor.wrapped.

Follow-up work to #366015

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 6.topic: module system About "NixOS" module system internals 6.topic: lib The Nixpkgs function library 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Feb 17, 2025
Otherwise nested types such as `attrsOf (attrsOf int)` won't have a
backwards compatible `type.nestedTypes.elemType.functor.wrapped`.

Follow-up work to NixOS#366015
@hsjobeki hsjobeki force-pushed the wrapped-nested-deprecation branch from 529bf7b to e49bdf4 Compare February 19, 2025 09:50
@hsjobeki hsjobeki marked this pull request as ready for review February 19, 2025 09:50
@nix-owners nix-owners bot requested a review from roberth February 19, 2025 09:52
@hsjobeki hsjobeki force-pushed the wrapped-nested-deprecation branch from e49bdf4 to fb79705 Compare February 19, 2025 09:55
@hsjobeki
Copy link
Contributor

hsjobeki commented Feb 19, 2025

@infinisil I just added some more tests for the types that where already migrated. Once the tests succeed I think this is ready for merging.

@infinisil
Copy link
Member Author

infinisil commented Feb 20, 2025

Thanks, LGTM, feel free to merge!

@hsjobeki hsjobeki merged commit 0e46672 into NixOS:master Feb 21, 2025
27 of 29 checks passed
@infinisil infinisil deleted the wrapped-nested-deprecation branch February 21, 2025 10:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: lib The Nixpkgs function library 6.topic: module system About "NixOS" module system internals 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants