diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index eab01e012993..45af6fe007a7 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -88,6 +88,8 @@ tpmSupport ? !minimal, uringSupport ? stdenv.hostPlatform.isLinux && !userOnly, liburing, + fuseSupport ? stdenv.hostPlatform.isLinux && !minimal, + fuse3, canokeySupport ? false, canokey-qemu, capstoneSupport ? !minimal, @@ -241,6 +243,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals libiscsiSupport [ libiscsi ] ++ lib.optionals smbdSupport [ samba ] ++ lib.optionals uringSupport [ liburing ] + ++ lib.optionals fuseSupport [ fuse3 ] ++ lib.optionals canokeySupport [ canokey-qemu ] ++ lib.optionals capstoneSupport [ capstone ] ++ lib.optionals valgrindSupport [ valgrind-light ]; @@ -324,6 +327,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional libiscsiSupport "--enable-libiscsi" ++ lib.optional smbdSupport "--smbd=${samba}/bin/smbd" ++ lib.optional uringSupport "--enable-linux-io-uring" + ++ lib.optional fuseSupport "--enable-fuse" ++ lib.optional canokeySupport "--enable-canokey" ++ lib.optional capstoneSupport "--enable-capstone" ++ lib.optional (!pluginsSupport) "--disable-plugins" diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index fad7f3538163..0dd8cc79f635 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -30,13 +30,13 @@ "lts": true }, "6.18": { - "version": "6.18.14", - "hash": "sha256:1f3wv9vdg43cy1lnqd60zqgki6px67mdhfkfnpk1npqq5akk86cd", - "lts": true + "version": "6.18.13", + "hash": "sha256:0zv8qml075jpk2i58cxp61hm3yb74mpkbkjg15n87riqzmakqb7d", + "lts": false }, "6.19": { - "version": "6.19.4", - "hash": "sha256:1b68i7z91fbs1zayzzzf71g9ilfk0wi2fr8nralha60xq723p6r7", + "version": "6.19.3", + "hash": "sha256:1glf369wfr66lmv9wmijin6idlfgijfsh0gx2qly7gpwmml4jiqf", "lts": false } }