Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cudaPackages.autoAddX: Deprecate #300321

Merged
merged 2 commits into from
Apr 10, 2024
Merged

cudaPackages.autoAddX: Deprecate #300321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
52eb885
cudaPackages.autoAdd{Driver,OpengGL}Runpath: deprecate
jonringer Mar 30, 2024
dadbcf9
nixos/rl-24.05: Add deprecation entry for cudaPackages.autoAdd{Driver…
jonringer Mar 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions nixos/doc/manual/release-notes/rl-2405.section.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,10 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m
- `programs.nix-ld.libraries` no longer sets `baseLibraries` via the option's default but in config and now merges any additional libraries with the default ones.
This means that `lib.mkForce` must be used to clear the list of default libraries.

- `cudaPackages.autoAddOpenGLRunpathHook` and `cudaPackages.autoAddDriverRunpath` have been deprecated for `pkgs.autoAddDriverRunpath`. Functionality has not changed, but the setuphook has been renamed and moved to the top-level package scope.

- `cudaPackages.autoFixElfFiles` has been deprecated for `pkgs.autoFixElfFiles`. Functionality has not changed, but the setuphook has been renamed and moved to the top-level package scope.

- `pdns` was updated to version [v4.9.x](https://doc.powerdns.com/authoritative/changelog/4.9.html), which introduces breaking changes. Check out the [Upgrade Notes](https://doc.powerdns.com/authoritative/upgrading.html#to-4-9-0) for details.

- `unrar` was updated to v7. See [changelog](https://www.rarlab.com/unrar7notes.htm) for more information.
Expand Down
16 changes: 15 additions & 1 deletion pkgs/development/cuda-modules/aliases.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
# Packges which have been deprecated or removed from cudaPackages
final: prev: {
final: prev:
let
mkRenamed =
oldName: newName: newPkg:
final.lib.warn "cudaPackages.${oldName} is deprecated, use ${newName} instead" newPkg;
in
{

# Deprecated: an alias kept for compatibility. Consider removing after 24.05
autoFixElfFiles = mkRenamed "autoFixElfFiles" "pkgs.autoFixElfFiles" final.pkgs.autoFixElfFiles; # Added 2024-03-30
autoAddDriverRunpath =
mkRenamed "autoAddDriverRunpath" "pkgs.autoAddDriverRunpath"
final.pkgs.autoAddDriverRunpath; # Added 2024-03-30
autoAddOpenGLRunpathHook =
mkRenamed "autoAddOpenGLRunpathHook" "pkgs.autoAddDriverRunpath"
final.pkgs.autoAddDriverRunpath; # Added 2024-03-30
}
7 changes: 0 additions & 7 deletions pkgs/development/cuda-modules/setup-hooks/extension.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
final: _: {
# TODO:
jonringer marked this conversation as resolved.
Show resolved Hide resolved
# - Move to cuda-modules/aliases.nix once
# https://github.com/NixOS/nixpkgs/issues/141803 is ready.
# - Consider removing after 24.11.
inherit (final.pkgs) autoAddDriverRunpath autoFixElfFiles;
autoAddOpenGLRunpathHook = final.autoAddDriverRunpath;

# Internal hook, used by cudatoolkit and cuda redist packages
# to accommodate automatic CUDAToolkit_ROOT construction
markForCudatoolkitRootHook = final.callPackage (
Expand Down