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

addOpenGLRunpath: deprecate #275241

Merged
merged 2 commits into from
Jul 1, 2024
Merged

addOpenGLRunpath: deprecate #275241

merged 2 commits into from
Jul 1, 2024

Conversation

Scrumplex
Copy link
Member

@Scrumplex Scrumplex commented Dec 18, 2023 •
edited
Loading

Description of changes

Now that #269475 is merged, let's go ahead and

  1. deprecate addOpenGLRunpath
  2. update all packages (and modules) in the tree to use addDriverRunPath

It looks like the last PR didn't introduce an autoAddDriverRunpathHook helper for cuda packages. If desired, I can move it into a separate PR. See #301176

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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 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: python 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Dec 18, 2023
@SomeoneSerge SomeoneSerge added the 6.topic: cuda Parallel computing platform and API label Dec 24, 2023
@SomeoneSerge SomeoneSerge mentioned this pull request Dec 24, 2023
Closed
10 tasks
@Scrumplex Scrumplex marked this pull request as draft February 10, 2024 12:07
@Scrumplex Scrumplex force-pushed the treewide/use-addDriverRunpath branch 3 times, most recently from 5004111 to d972a62 Compare February 10, 2024 12:22
@Scrumplex
Copy link
Member Author

Looks like by-name packages can not be used in aliases.nix? Not sure how to fix this

@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Mar 20, 2024
@Scrumplex Scrumplex force-pushed the treewide/use-addDriverRunpath branch from 52af22e to c09be86 Compare May 25, 2024 15:58
@Scrumplex Scrumplex marked this pull request as ready for review May 25, 2024 15:58
@Scrumplex
Copy link
Member Author

As #301176 already dealt with the CUDA part, I rebased and reduced the scope of this PR to addOpenGLRunpath

@Scrumplex Scrumplex removed the 6.topic: cuda Parallel computing platform and API label May 25, 2024
@Scrumplex Scrumplex changed the title treewide: deprecate addOpenGLRunpath addOpenGLRunpath: deprecate May 25, 2024
@ofborg ofborg bot added 8.has: clean-up 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ and removed 2.status: merge conflict This PR has merge conflicts with the target branch labels May 25, 2024
@Scrumplex Scrumplex force-pushed the treewide/use-addDriverRunpath branch from c09be86 to bd25f10 Compare June 14, 2024 18:38
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/4089

@Scrumplex Scrumplex force-pushed the treewide/use-addDriverRunpath branch from bd25f10 to 416ba88 Compare June 30, 2024 19:01
SomeoneSerge
SomeoneSerge reviewed Jun 30, 2024
View reviewed changes
pkgs/top-level/aliases.nix
@@ -69,6 +69,8 @@ mapAliases ({
adtool = throw "'adtool' has been removed, as it was broken and unmaintained";
adom = throw "'adom' has been removed, as it was broken and unmaintained"; # added 2024-05-09
advcpmv = throw "'advcpmv' has been removed, as it is not being actively maintained and break recent coreutils."; # Added 2024-03-29
# Post 24.11 branch-off, this should throw an error
addOpenGLRunpath = addDriverRunpath; # Added 2024-05-25
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's OK to make this a lib.warn even

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried that in the first iteration of this PR, but ofborg will complain as it'll try to evaluate addOpenGLRunpath

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we could ensure it doesn't complain later in other people's PRs... regardless, let's just merge this as is

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually. I'm pretty sure warns in aliases.nix are allowed. Ofborg should only complain if there's a derivation left that actually asks for addOpenGLRunpath instead of addDriverRunpath

@SomeoneSerge SomeoneSerge merged commit c5a1cae into NixOS:staging Jul 1, 2024
20 checks passed
@SomeoneSerge
Copy link
Contributor

Thank you @Scrumplex

@Scrumplex Scrumplex deleted the treewide/use-addDriverRunpath branch September 29, 2024 09:01
@Scrumplex Scrumplex mentioned this pull request Oct 13, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SomeoneSerge SomeoneSerge SomeoneSerge approved these changes

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: python 8.has: clean-up 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
CUDA Team
Status: ✅ Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Scrumplex @nixos-discourse @SomeoneSerge @wegank