git.iko.soy/typeable/nixpkgs
on master help sign in
nvidia-x11.vulkan_beta: init at 450.56.11 (#97882)

- This is fetched from a different URL, so allow passing that explicitly. - There also isn't an nvidia-persistenced or nvidia-settings release for this version, so use 450.57 instead. Also implement passing persistenced and settings version explicitly. Co-authored-by: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>

commit99d2db8dce032a47430117f27f6c4fe97e8b07ff authorJoe Hermaszewski <git@monoid.al> dateThu 24 Sep 2020, 22:53 (6 years ago) parentf506111
6 files changed+32−14
compare with master
unifiedsplit
nixos/modules/hardware/video/nvidia.nix+2 pkgs/os-specific/linux/nvidia-x11/default.nix+11 pkgs/os-specific/linux/nvidia-x11/generic.nix+7−3 pkgs/os-specific/linux/nvidia-x11/persistenced.nix+3−3 pkgs/os-specific/linux/nvidia-x11/settings.nix+3−3 pkgs/top-level/all-packages.nix+6−5
nixos/modules/hardware/video/nvidia.nix+2
@@ -16,6 +16,8 @@ let
1616 kernelPackages.nvidia_x11
1717 else if elem "nvidiaBeta" drivers then
1818 kernelPackages.nvidia_x11_beta
19+ else if elem "nvidiaVulkanBeta" drivers then
20+ kernelPackages.nvidia_x11_vulkan_beta
1921 else if elem "nvidiaLegacy304" drivers then
2022 kernelPackages.nvidia_x11_legacy304
2123 else if elem "nvidiaLegacy340" drivers then
pkgs/os-specific/linux/nvidia-x11/default.nix+11
@@ -32,6 +32,17 @@ rec {
3232 # No active beta right now
3333 beta = stable;
3434
35+ # Vulkan developer beta driver
36+ vulkan_beta = generic {
37+ version = "450.56.11";
38+ persistencedVersion = "450.57";
39+ settingsVersion = "450.57";
40+ sha256_64bit = "1k64h8sp4rf6kc7liypznjgkmxi67njy1s8xy2r341fhl62pl010";
41+ settingsSha256 = "1clbj9a3kv3j8jg35c197gd7b3f9f9f4h9ll5hlax95hdg12lgan";
42+ persistencedSha256 = "17747z1fsbiznfsmahxmz8kmhwwcjanpfih60v5mwzk63gy4i3d5";
43+ url = "https://developer.nvidia.com/vulkan-beta-4505611-linux";
44+ };
45+
3546 # Last one supporting x86
3647 legacy_390 = generic {
3748 version = "390.138";
pkgs/os-specific/linux/nvidia-x11/generic.nix+7−3
@@ -1,8 +1,11 @@
11{ version
2+, url ? null
23, sha256_32bit ? null
34, sha256_64bit
45, settingsSha256
6+, settingsVersion ? version
57, persistencedSha256
8+, persistencedVersion ? version
69, useGLVND ? true
710, useProfiles ? true
811, preferGtk2 ? false
@@ -11,7 +14,7 @@
1114, prePatch ? ""
1215, patches ? []
1316, broken ? false
14−}:
17+}@args:
1518
1619{ stdenv, callPackage, pkgs, pkgsi686Linux, fetchurl
1720, kernel ? null, perl, nukeReferences
@@ -46,12 +49,12 @@ let
4649 src =
4750 if stdenv.hostPlatform.system == "x86_64-linux" then
4851 fetchurl {
49− url = "https://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run";
52+ url = args.url or "https://download.nvidia.com/XFree86/Linux-x86_64/${version}/NVIDIA-Linux-x86_64-${version}${pkgSuffix}.run";
5053 sha256 = sha256_64bit;
5154 }
5255 else if stdenv.hostPlatform.system == "i686-linux" then
5356 fetchurl {
54− url = "https://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run";
57+ url = args.url or "https://download.nvidia.com/XFree86/Linux-x86/${version}/NVIDIA-Linux-x86-${version}${pkgSuffix}.run";
5558 sha256 = sha256_32bit;
5659 }
5760 else throw "nvidia-x11 does not support platform ${stdenv.hostPlatform.system}";
@@ -89,6 +92,7 @@ let
8992 withGtk3 = !preferGtk2;
9093 };
9194 persistenced = mapNullable (hash: callPackage (import ./persistenced.nix self hash) { }) persistencedSha256;
95+ inherit persistencedVersion settingsVersion;
9296 };
9397
9498 meta = with stdenv.lib; {
pkgs/os-specific/linux/nvidia-x11/persistenced.nix+3−3
@@ -2,14 +2,14 @@ nvidia_x11: sha256:
22
33{ stdenv, fetchFromGitHub, m4 }:
44
5−stdenv.mkDerivation {
5+stdenv.mkDerivation rec {
66 pname = "nvidia-persistenced";
7− inherit (nvidia_x11) version;
7+ version = nvidia_x11.persistencedVersion;
88
99 src = fetchFromGitHub {
1010 owner = "NVIDIA";
1111 repo = "nvidia-persistenced";
12− rev = nvidia_x11.version;
12+ rev = nvidia_x11.persistencedVersion;
1313 inherit sha256;
1414 };
1515
pkgs/os-specific/linux/nvidia-x11/settings.nix+3−3
@@ -9,13 +9,13 @@ let
99 src = fetchFromGitHub {
1010 owner = "NVIDIA";
1111 repo = "nvidia-settings";
12− rev = nvidia_x11.version;
12+ rev = nvidia_x11.settingsVersion;
1313 inherit sha256;
1414 };
1515
1616 libXNVCtrl = stdenv.mkDerivation {
1717 pname = "libXNVCtrl";
18− inherit (nvidia_x11) version;
18+ version = nvidia_x11.settingsVersion;
1919 inherit src;
2020
2121 buildInputs = [ libXrandr libXext ];
@@ -42,7 +42,7 @@ in
4242
4343stdenv.mkDerivation {
4444 pname = "nvidia-settings";
45− inherit (nvidia_x11) version;
45+ version = nvidia_x11.settingsVersion;
4646 inherit src;
4747
4848 nativeBuildInputs = [ pkgconfig m4 ];
pkgs/top-level/all-packages.nix+6−5
@@ -17919,11 +17919,12 @@ in
1791917919
1792017920 nvidiaPackages = dontRecurseIntoAttrs (callPackage ../os-specific/linux/nvidia-x11 { });
1792117921
17922− nvidia_x11_legacy304 = nvidiaPackages.legacy_304;
17923− nvidia_x11_legacy340 = nvidiaPackages.legacy_340;
17924− nvidia_x11_legacy390 = nvidiaPackages.legacy_390;
17925− nvidia_x11_beta = nvidiaPackages.beta;
17926− nvidia_x11 = nvidiaPackages.stable;
17922+ nvidia_x11_legacy304 = nvidiaPackages.legacy_304;
17923+ nvidia_x11_legacy340 = nvidiaPackages.legacy_340;
17924+ nvidia_x11_legacy390 = nvidiaPackages.legacy_390;
17925+ nvidia_x11_beta = nvidiaPackages.beta;
17926+ nvidia_x11_vulkan_beta = nvidiaPackages.vulkan_beta;
17927+ nvidia_x11 = nvidiaPackages.stable;
1792717928
1792817929 openrazer = callPackage ../os-specific/linux/openrazer/driver.nix { };
1792917930