diff options
| author | Bastian Köcher <git@kchr.de> | 2018-06-06 20:21:22 +0200 |
|---|---|---|
| committer | Bastian Köcher <git@kchr.de> | 2018-06-06 20:27:14 +0200 |
| commit | 95ee1bc937c3813a7d1dfed7730b44fae5df6ca4 (patch) | |
| tree | 40fc4f9ffc64b2229be38cecb7525a98edd0429b /pkgs/os-specific/linux/nvidia-x11 | |
| parent | ca0e52edc3f15ce1fca5e7f8e4accc718ea93e1f (diff) | |
| download | nixlib-95ee1bc937c3813a7d1dfed7730b44fae5df6ca4.tar nixlib-95ee1bc937c3813a7d1dfed7730b44fae5df6ca4.tar.gz nixlib-95ee1bc937c3813a7d1dfed7730b44fae5df6ca4.tar.bz2 nixlib-95ee1bc937c3813a7d1dfed7730b44fae5df6ca4.tar.lz nixlib-95ee1bc937c3813a7d1dfed7730b44fae5df6ca4.tar.xz nixlib-95ee1bc937c3813a7d1dfed7730b44fae5df6ca4.tar.zst nixlib-95ee1bc937c3813a7d1dfed7730b44fae5df6ca4.zip | |
nvidia_x11: 390.48 -> 390.67
Diffstat (limited to 'pkgs/os-specific/linux/nvidia-x11')
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/fix_missing_symbol.patch | 19 |
2 files changed, 5 insertions, 26 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 11a97d420a83..8eeaf502020d 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -17,13 +17,11 @@ in rec { # Policy: use the highest stable version as the default (on our master). stable = generic { - version = "390.48"; - sha256_32bit = "1y6n2hfz9vd0h7gd31fgxcl76s5pjf8afwqyq5slqpcxpd78j5ai"; - sha256_64bit = "16a3blvizcksmaxr644s857yanw3i3vcvqvn7qnwbsbqpmxga09c"; - settingsSha256 = "058xaiw5g0kxrvc3lvy4424fqbjkvmsznj2v73cgbm25i1m83krl"; - persistencedSha256 = "0y86bhzl42lqyrbibqzf8a8yd49zbq3ryb78vgsl13i44f9sl79k"; - - patches = [ ./fix_missing_symbol.patch ]; + version = "390.67"; + sha256_32bit = "01c8fa80njyyr39c1pyf7ssmfq65ci8mapbs94fd6gnhwc7gfjkg"; + sha256_64bit = "0np6xj93fali2hss8xsdlmy5ykjgn4hx6mzjr8dpbdi0fhdcmwkd"; + settingsSha256 = "1wk4587czysnbj5yxijmv3bldcffzwp4yvfx133apsr31dqca0s7"; + persistencedSha256 = "1zia1r97lyj6fbmvsw4hv5qfcj84x3sz971m4430d8qyks2c4sdw"; }; beta = stable; # not enough interest to maintain beta ATM diff --git a/pkgs/os-specific/linux/nvidia-x11/fix_missing_symbol.patch b/pkgs/os-specific/linux/nvidia-x11/fix_missing_symbol.patch deleted file mode 100644 index ea783b4f011e..000000000000 --- a/pkgs/os-specific/linux/nvidia-x11/fix_missing_symbol.patch +++ /dev/null @@ -1,19 +0,0 @@ -https://devtalk.nvidia.com/default/topic/1030082/linux/kernel-4-16-rc1-breaks-latest-drivers-unknown-symbol-swiotlb_map_sg_attrs-/ ---- a/kernel/common/inc/nv-linux.h~ 2018-01-25 06:09:41.000000000 +0100 -+++ b/kernel/common/inc/nv-linux.h 2018-03-05 13:58:17.746725638 +0100 -@@ -1209,6 +1209,7 @@ static inline NvU32 nv_alloc_init_flags( - static inline NvBool nv_dma_maps_swiotlb(struct pci_dev *dev) - { - NvBool swiotlb_in_use = NV_FALSE; -+#if 0 - #if defined(CONFIG_SWIOTLB) - #if defined(NV_DMA_OPS_PRESENT) || defined(NV_GET_DMA_OPS_PRESENT) - /* -@@ -1251,7 +1252,7 @@ static inline NvBool nv_dma_maps_swiotlb - swiotlb_in_use = (swiotlb == 1); - #endif - #endif -- -+#endif - return swiotlb_in_use; - } |