diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-10 00:02:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-10 00:02:18 +0000 |
| commit | b5ff56aec743b9c83609fc0e26a6c439ee27f0df (patch) | |
| tree | f685ccec1c75baf307f966b6692324a727ce9e17 /pkgs/os-specific | |
| parent | 7c846b760dc09e6bf57b1f7c89f099c53f7a34c8 (diff) | |
| parent | 84536849e642d11780b35db7862b23cf4423aff0 (diff) | |
| download | nixlib-b5ff56aec743b9c83609fc0e26a6c439ee27f0df.tar nixlib-b5ff56aec743b9c83609fc0e26a6c439ee27f0df.tar.gz nixlib-b5ff56aec743b9c83609fc0e26a6c439ee27f0df.tar.bz2 nixlib-b5ff56aec743b9c83609fc0e26a6c439ee27f0df.tar.lz nixlib-b5ff56aec743b9c83609fc0e26a6c439ee27f0df.tar.xz nixlib-b5ff56aec743b9c83609fc0e26a6c439ee27f0df.tar.zst nixlib-b5ff56aec743b9c83609fc0e26a6c439ee27f0df.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/common-config.nix | 34 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/default.nix | 6 |
2 files changed, 20 insertions, 20 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 4b38ffc5069c..746991c00b7e 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -678,23 +678,23 @@ let VBOXGUEST = option no; DRM_VBOXVIDEO = option no; - XEN = option yes; - XEN_DOM0 = option yes; - PCI_XEN = option yes; - HVC_XEN = option yes; - HVC_XEN_FRONTEND = option yes; - XEN_SYS_HYPERVISOR = option yes; - SWIOTLB_XEN = option yes; - XEN_BACKEND = option yes; - XEN_BALLOON = option yes; - XEN_BALLOON_MEMORY_HOTPLUG = option yes; - XEN_EFI = option yes; - XEN_HAVE_PVMMU = option yes; - XEN_MCE_LOG = option yes; - XEN_PVH = option yes; - XEN_PVHVM = option yes; - XEN_SAVE_RESTORE = option yes; - XEN_SELFBALLOONING = whenOlder "5.3" yes; + XEN = mkIf stdenv.is64bit (option yes); + XEN_DOM0 = mkIf stdenv.is64bit (option yes); + PCI_XEN = mkIf stdenv.is64bit (option yes); + HVC_XEN = mkIf stdenv.is64bit (option yes); + HVC_XEN_FRONTEND = mkIf stdenv.is64bit (option yes); + XEN_SYS_HYPERVISOR = mkIf stdenv.is64bit (option yes); + SWIOTLB_XEN = mkIf stdenv.is64bit (option yes); + XEN_BACKEND = mkIf stdenv.is64bit (option yes); + XEN_BALLOON = mkIf stdenv.is64bit (option yes); + XEN_BALLOON_MEMORY_HOTPLUG = mkIf stdenv.is64bit (option yes); + XEN_EFI = mkIf stdenv.is64bit (option yes); + XEN_HAVE_PVMMU = mkIf stdenv.is64bit (option yes); + XEN_MCE_LOG = mkIf stdenv.is64bit (option yes); + XEN_PVH = mkIf stdenv.is64bit (option yes); + XEN_PVHVM = mkIf stdenv.is64bit (option yes); + XEN_SAVE_RESTORE = mkIf stdenv.is64bit (option yes); + XEN_SELFBALLOONING = mkIf stdenv.is64bit (whenOlder "5.3" yes); # Enable device detection on virtio-mmio hypervisors VIRTIO_MMIO_CMDLINE_DEVICES = yes; diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index 710e4ad9defb..54df7cbc6271 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -59,11 +59,11 @@ rec { # Vulkan developer beta driver # See here for more information: https://developer.nvidia.com/vulkan-driver vulkan_beta = generic rec { - version = "535.43.19"; + version = "535.43.20"; persistencedVersion = "535.98"; settingsVersion = "535.98"; - sha256_64bit = "sha256-zxyZnXpNQuYJ17NDm3s8P/7GzQ4xD4Q4oCZA0ei+Wqs="; - openSha256 = "sha256-K14Av5fCda1J9o5pkQBhmwW34d2hgqrF3J99FWPsNjM="; + sha256_64bit = "sha256-PVs+AnVbJhriAHlxVEV81fqT4n92edv0cQyAGvuUgPw="; + openSha256 = "sha256-xqjitZRsIvbE98zzSQNorkCguDJt53eCxKYBxIZQwVM="; settingsSha256 = "sha256-jCRfeB1w6/dA27gaz6t5/Qo7On0zbAPIi74LYLel34s="; persistencedSha256 = "sha256-WviDU6B50YG8dO64CGvU3xK8WFUX8nvvVYm/fuGyroM="; url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux"; |