linuxPackages.nvidia_x11: 545.29.02 -> 545.29.06 #269262
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
And the patch can be dropped? |
This comment was marked as outdated.
This comment was marked as outdated.
Kiskae
force-pushed
the
nvidia/545.29.06
branch
from
7d42710
to
f409967
Compare
|
@NickCao Yeah, was just waiting for the review to finish before adding that change. Now we just need to wait for the settings/persistenced sources to be pushed to github. |
ofborg
bot
added
10.rebuild-darwin: 0
|
Still waiting for official github releases, but I decided to see if I could convince the fetcher to fall back to nvidia's CDN. The following code works, but depends on the implementation of src = let
cdn = fetchFromGitHub {
owner = "NVIDIA";
repo = "nvidia-settings";
rev = nvidia_x11.settingsVersion;
inherit sha256;
};
in
cdn.override {
urls = cdn.urls ++ [
"https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${nvidia_x11.settingsVersion}.tar.bz2"
];
url = "";
# distributions use different compression, force unpack to guess
extension = "tar.??";
}; |
Kiskae
force-pushed
the
nvidia/545.29.06
branch
from
da464cb
to
a6f698c
Compare
|
Decided to add CDN fallback for nvidia-settings and nvidia-persistenced. If the source is available on github it will prioritize that release to avoid breaking old releases. |
Kiskae
force-pushed
the
nvidia/545.29.06
branch
from
a6f698c
to
6958b7e
Compare
|
The hack feels really uncomfortable to me, may we just replace |
|
That'd be something like: fetchFromGithubOrNvidia = { owner, repo, rev, ... }@args:
let
args' = builtins.removeAttrs args [ "owner" "repo" "rev" ];
baseUrl = "https://github.com/${owner}/${repo}";
in
fetchzip (args' // {
urls = [
"${baseUrl}/archive/${rev}.tar.gz"
"https://download.nvidia.com/XFree86/${repo}/${repo}-${rev}.tar.bz2"
];
# github and nvidia use different compression algorithms,
# use an invalid file extension to force detection.
extension = "tar.??";
}); |
|
And another concern is if their contents do match, which should be the case, but better be safe than sorry. |
Kiskae
force-pushed
the
nvidia/545.29.06
branch
from
6958b7e
to
9c24e11
Compare
As far as I can tell that is the case for these sources, the open-gpu-kernel-modules don't match because the github mirror contains extra If https://github.com/aaronp24/nvidia-versions is still true, those repositories are literally emptied and overwritten with the tarballs from the cdn for each release. |
|
Result of 113 packages built:
|
NickCao
approved these changes
Nov 28, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Priorities
Add a 👍 reaction to pull requests you find important.