Skip to content

nv-codec-headers: adopt and refactor#287918

Merged
SuperSandro2000 merged 1 commit intoNixOS:stagingfrom
atorres1985-contrib:nv-codec-headers
Feb 23, 2024
Merged

nv-codec-headers: adopt and refactor#287918
SuperSandro2000 merged 1 commit intoNixOS:stagingfrom
atorres1985-contrib:nv-codec-headers

Conversation

@AndersonTorres
Copy link
Member

Description of changes

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.

@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Feb 11, 2024
@AndersonTorres AndersonTorres changed the base branch from master to staging February 11, 2024 21:55
@AndersonTorres
Copy link
Member Author

@infinisil it looks like a bug to me! Can you verify?

I am using an external file to parameterize the nv-codec-headers-${version}.

@AndersonTorres AndersonTorres marked this pull request as ready for review February 12, 2024 17:32
@infinisil
Copy link
Member

Not a bug I'm afraid! To CI, the nv-codec-headers-9 looks just like a new package defined with pkgs.callPackage.

Since pkgs/by-name can't yet handle package sets, I recommend refactoring this to:

  inherit (callPackages ../development/libraries/nv-codec-headers { })
    nv-codec-headers-9 nv-codec-headers-10;

or if you want to also expose the set of versions:

  nv-codec-headers-versions = callPackages ../development/libraries/nv-codec-headers { };
  inherit (nv-codec-headers-versions)
    nv-codec-headers-9 nv-codec-headers-10;

See also #285922 (comment) or #287081 for some discussion on this.

@AndersonTorres
Copy link
Member Author

callPackages in plural? Oh jeez

@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/3486

It globs all versions of nv-codec-headers kept/needed on Nixpkgs.

The default is kept at 9, as before.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

0.kind: package adoption Requests or PRs for adopting packages that have no maintainers 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants