JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #60121 from eadwu/nvidia_x11_beta/430.09

Browse Source 
nvidia_x11_beta: stable -> 430.09
This commit is contained in:
Austin Seipp 2019-05-03 15:33:04 -05:00 committed by GitHub
commit f60936d14d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/os-specific/linux/nvidia-x11/default.nix
View File

@ -19,13 +19,18 @@ rec {
stable = if stdenv.hostPlatform.system == "x86_64-linux" then stable_418 else legacy_390;
# No active beta right now
beta = stable;
beta = generic {
version = "430.09";
sha256_64bit = "0k59ahljya286ararncf3mc7sfgsw82vnrszczqicpysn3qfar95";
settingsSha256 = "082v0xmz83sf4wdvcb2zawddy5vh3pbwjz0fda1rayc7fdadni05";
persistencedSha256 = "028vs23mnb345sxjxqqmln9pwq8n6cc6dhfzq4hj21ghc6l6fg54";
};
stable_418 = generic {
version = "418.56";
sha256_64bit = "1cg7927g5ml1rwgpydlrjzr55gza5dfkqkch29bbarpzd7dh0mf4";
settingsSha256 = "1dai4dh6g3arkgicbjwhfr948i1xc13a7s0xcgalan0pn5zd56z6";
persistencedSha256 = "1r13jjpqg9ri5mw633k01dq2ivblc8nrbsnh7709v1xibaydwnhn";
settingsSha256 = "150c64wbijwyq032ircl1b78q0gwdvfq35gxaqw00d3ac2hjwpsg";
persistencedSha256 = "07wh6v8c2si0zwy9j60yzrdn1b1pm0vr9kfvql3jkyjqfn4np44z";
};
# Last one supporting x86
@ -33,8 +38,8 @@ rec {
version = "390.116";
sha256_32bit = "0aavzi99ps7r6nrchf4h9gw3fkvm2z6wppkqkz5fwcy7x03ky4qk";
sha256_64bit = "106qc62a7m9imchqfq8rfn8fwyrjxg383354q7z2wr8112fyhyg1";
settingsSha256 = "0inmzjhnlal5ih2iyv2x4y3jx7c4lz9xln8sy9j20yj9azp51qz0";
persistencedSha256 = "04ycijijlcbib2afcxjsyyzza1i3adh17sddrz3sah7rj38mrlgx";
settingsSha256 = "0n4pj8dzkr7ccwrn5p46mn59cnijdhg8zmn3idjzrk56pq0hbgjr";
persistencedSha256 = "0bnjr0smhlwlqpyg9m6lca3b7brl2mw8aypc6p7525dn9d9kv6kb";
patches = lib.optional (kernel.meta.branch == "4.19") ./drm_mode_connector.patch;
};
@ -43,8 +48,8 @@ rec {
version = "340.107";
sha256_32bit = "0mh83affz6bim26ws7kkwwcfj2s6vkdy4d45hifsbshr82qd52wd";
sha256_64bit = "0pv9yv3x0kg9hfkmc50xb54ahxkbnyy2vyy4hj2h0s6m9sb5kqz3";
settingsSha256 = "1rgaa24acdyqa1rqrx56293vxpskr792njqqpigqmps04llsx703";
persistencedSha256 = "0nwv6kh4gxgy80x1zs6gcg5hy3amg25xhsfa2v4mwqa36sblxz6l";
settingsSha256 = "1zf0fy9jj6ipm5vk153swpixqm75iricmx7x49pmr97kzyczaxa7";
persistencedSha256 = "0v225jkiqk9rma6whxs1a4fyr4haa75bvi52ss3vsyn62zzl24na";
useGLVND = false;
patches = [ ./vm_operations_struct-fault.patch ];
@ -54,7 +59,7 @@ rec {
version = "304.137";
sha256_32bit = "1y34c2gvmmacxk2c72d4hsysszncgfndc4s1nzldy2q9qagkg66a";
sha256_64bit = "1qp3jv6279k83k3z96p6vg3dd35y9bhmlyyyrkii7sib7bdmc7zb";
settingsSha256 = "0i5znfq6jkabgi8xpcy12pdpww6a67i8mq60z1kjq36mmnb25pmi";
settingsSha256 = "129f0j0hxzjd7g67qwxn463rxp295fsq8lycwm6272qykmab46cj";
persistencedSha256 = null;
useGLVND = false;
useProfiles = false;

5
pkgs/os-specific/linux/nvidia-x11/generic.nix
View File

@ -41,7 +41,10 @@ let
src =
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run";
urls = [
"https://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run"
"https://us.download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run"
];
sha256 = sha256_64bit;
}
else if stdenv.hostPlatform.system == "i686-linux" then

10
pkgs/os-specific/linux/nvidia-x11/persistenced.nix
View File

@ -1,13 +1,15 @@
nvidia_x11: sha256:
{ stdenv, fetchurl, m4 }:
{ stdenv, fetchFromGitHub, m4 }:
stdenv.mkDerivation rec {
name = "nvidia-persistenced-${nvidia_x11.version}";
pname = "nvidia-persistenced";
inherit (nvidia_x11) version;
src = fetchurl {
url = "https://download.nvidia.com/XFree86/nvidia-persistenced/${name}.tar.bz2";
src = fetchFromGitHub {
owner = "NVIDIA";
repo = "nvidia-persistenced";
rev = nvidia_x11.version;
inherit sha256;
};

12
pkgs/os-specific/linux/nvidia-x11/settings.nix
View File

@ -1,18 +1,20 @@
nvidia_x11: sha256:
{ stdenv, lib, fetchurl, pkgconfig, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libXext, libXxf86vm, libvdpau
{ stdenv, lib, fetchFromGitHub, pkgconfig, m4, jansson, gtk2, dbus, gtk3, libXv, libXrandr, libXext, libXxf86vm, libvdpau
, librsvg, wrapGAppsHook
, withGtk2 ? false, withGtk3 ? true
}:
let
src = fetchurl {
url = "https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${nvidia_x11.version}.tar.bz2";
src = fetchFromGitHub {
owner = "NVIDIA";
repo = "nvidia-settings";
rev = nvidia_x11.version;
inherit sha256;
};
libXNVCtrl = stdenv.mkDerivation {
name = "libXNVCtrl-${nvidia_x11.version}";
pname = "libXNVCtrl";
inherit (nvidia_x11) version;
inherit src;
@ -35,7 +37,7 @@ let
in
stdenv.mkDerivation rec {
name = "nvidia-settings-${nvidia_x11.version}";
pname = "nvidia-settings";
inherit (nvidia_x11) version;
inherit src;