From bed725db88c8163b9c5cd2186f34bed79e1add42 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Wed, 17 Jan 2024 15:17:01 +0000 Subject: [PATCH] cudaPackages_11_4.nsight_systems: clean up the deprecation comments --- nixos/doc/manual/release-notes/rl-2405.section.md | 2 +- pkgs/development/cuda-modules/cuda/overrides.nix | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 1ea2a6fbf27e..d2d72c5da41b 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -96,7 +96,7 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - If [`system.stateVersion`](#opt-system.stateVersion) is >=23.11, `pkgs.nextcloud27` will be installed by default. - Please note that an upgrade from v26 (or older) to v28 directly is not possible. Please upgrade to `nextcloud27` (or earlier) first. Nextcloud prohibits skipping major versions while upgrading. You can upgrade by declaring [`services.nextcloud.package = pkgs.nextcloud27;`](options.html#opt-services.nextcloud.package). -- The vendored third party libraries have been mostly removed from `cudaPackages.nsight_systems`, which we now only ship for `cudaPackages_11_8` and later due to outdated dependencies. Users comfortable with the vendored dependencies may use `overrideAttrs` to amend the `postPatch` phase and the `meta.broken` correspondingly. +- The vendored third party libraries have been mostly removed from `cudaPackages.nsight_systems`, which we now only ship for `cudaPackages_11_8` and later due to outdated dependencies. Users comfortable with the vendored dependencies may use `overrideAttrs` to amend the `postPatch` phase and the `meta.broken` correspondingly. Alternatively, one could package the deprecated `boost170` locally, as required for `cudaPackages_11_4.nsight_systems`. - The `cudaPackages` package scope has been updated to `cudaPackages_12`. diff --git a/pkgs/development/cuda-modules/cuda/overrides.nix b/pkgs/development/cuda-modules/cuda/overrides.nix index 214d64a0f3df..85b925e9ea35 100644 --- a/pkgs/development/cuda-modules/cuda/overrides.nix +++ b/pkgs/development/cuda-modules/cuda/overrides.nix @@ -245,7 +245,6 @@ attrsets.filterAttrs (attr: _: (builtins.hasAttr attr prev)) { buildInputs = prevAttrs.buildInputs ++ [ final.cuda_cudart.stubs final.pkgs.alsa-lib - # final.pkgs.boost170 # cudaPackages_11_4 final.pkgs.boost178 final.pkgs.e2fsprogs final.pkgs.gst_all_1.gst-plugins-base @@ -266,7 +265,7 @@ attrsets.filterAttrs (attr: _: (builtins.hasAttr attr prev)) { qtWaylandPlugins ]; - # Require boost 1.70 deprecated in Nixpkgs + # Older releases require boost 1.70 deprecated in Nixpkgs meta.broken = prevAttrs.meta.broken or false || lib.versionOlder final.cudaVersion "11.8"; } );