diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-08-02 12:01:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-02 12:01:37 +0000 |
| commit | 1093a01c99ac111d0fb9d9d40a7d73fc21caacda (patch) | |
| tree | 4e1b10dbc196695df802ff73150821c3bea74c81 /pkgs/os-specific/linux | |
| parent | 0f0010fda33b7082197495df475d02f64d7e5050 (diff) | |
| parent | 48f4befd440d272d8405d06f5ef0867300eebc64 (diff) | |
| download | nixpkgs-1093a01c99ac111d0fb9d9d40a7d73fc21caacda.tar nixpkgs-1093a01c99ac111d0fb9d9d40a7d73fc21caacda.tar.gz nixpkgs-1093a01c99ac111d0fb9d9d40a7d73fc21caacda.tar.bz2 nixpkgs-1093a01c99ac111d0fb9d9d40a7d73fc21caacda.tar.lz nixpkgs-1093a01c99ac111d0fb9d9d40a7d73fc21caacda.tar.xz nixpkgs-1093a01c99ac111d0fb9d9d40a7d73fc21caacda.tar.zst nixpkgs-1093a01c99ac111d0fb9d9d40a7d73fc21caacda.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/apfs/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/open.nix | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/apfs/default.nix b/pkgs/os-specific/linux/apfs/default.nix index 44cfefe6808..6b911142f58 100644 --- a/pkgs/os-specific/linux/apfs/default.nix +++ b/pkgs/os-specific/linux/apfs/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { homepage = "https://github.com/linux-apfs/linux-apfs-rw"; license = licenses.gpl2Only; platforms = platforms.linux; - broken = kernel.kernelOlder "4.9"; + broken = kernel.kernelOlder "4.9" || kernel.kernelAtLeast "5.19"; maintainers = with maintainers; [ Luflosi ]; }; } diff --git a/pkgs/os-specific/linux/nvidia-x11/open.nix b/pkgs/os-specific/linux/nvidia-x11/open.nix index 18b699221ef..5f8715aa736 100644 --- a/pkgs/os-specific/linux/nvidia-x11/open.nix +++ b/pkgs/os-specific/linux/nvidia-x11/open.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation { homepage = "https://github.com/NVIDIA/open-gpu-kernel-modules"; license = with licenses; [ gpl2Plus mit ]; platforms = platforms.linux; + broken = kernel.kernelAtLeast "5.19"; maintainers = with maintainers; [ nickcao ]; }; } |