diff --git a/nixos/modules/system/boot/systemd/logind.nix b/nixos/modules/system/boot/systemd/logind.nix index d0878542514d..22d9195536b3 100644 --- a/nixos/modules/system/boot/systemd/logind.nix +++ b/nixos/modules/system/boot/systemd/logind.nix @@ -52,9 +52,6 @@ ++ lib.optionals config.systemd.package.withMachined [ "dbus-org.freedesktop.machine1.service" ] - ++ lib.optionals config.systemd.package.withPortabled [ - "dbus-org.freedesktop.portable1.service" - ] ++ [ "dbus-org.freedesktop.login1.service" "user@.service" diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index df176c2b84d9..9fd672be28de 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -249,8 +249,7 @@ stdenv.mkDerivation (finalAttrs: { dontAddStaticConfigureFlags = true; outputs = [ "out" ] ++ lib.optional enableDocs "doc" ++ lib.optional guestAgentSupport "ga"; - # On aarch64-linux we would shoot over the Hydra's 2G output limit. - separateDebugInfo = !(stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux); + separateDebugInfo = true; patches = [ ./fix-qemu-ga.patch diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index fa6d9bde9a48..121b8e175905 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -5,33 +5,33 @@ "lts": false }, "6.1": { - "version": "6.1.162", - "hash": "sha256:12fhqsz61g64wdx3hx637fx4zn7ks7kv9h7b26llx8mr94m44rlp", + "version": "6.1.163", + "hash": "sha256:1siq1jacl4xrlqn536h5rg73rygk8dp8n839asny05dx44rh6bgx", "lts": true }, "5.15": { - "version": "5.15.199", - "hash": "sha256:0bmx5y10mbn05qv0cvh7w6zhgzar88vj2kdm3j4m32hk9jpd7h01", + "version": "5.15.200", + "hash": "sha256:16193h91mc51p68gsjs6afaai47krf05hxcgp8r0k248cv4b3r7w", "lts": true }, "5.10": { - "version": "5.10.249", - "hash": "sha256:0ihh9pjnaz3lq9my6yhlikacadc5lldsypifjcpm8j8i4qsfv45r", + "version": "5.10.250", + "hash": "sha256:0afmjzlkx5ry8w01p7mafy3zq0xf9md5fpdy2ywn9wm94fi4sxa7", "lts": true }, "6.6": { - "version": "6.6.123", - "hash": "sha256:1ca5x6ri5i8xcm4dc5hv6b0xyv9npb9dy0wfvzi9g44al6sx85m6", + "version": "6.6.124", + "hash": "sha256:0kkri7y9g5c7hylwsdc2wq2drhniay171nnccr533qlvisgzpbm7", "lts": true }, "6.12": { - "version": "6.12.69", - "hash": "sha256:0rbnbynhm7w4ig8snq97px4ljr5k4zq1a97jqhwk4w0qy9bkcjab", + "version": "6.12.70", + "hash": "sha256:1w1flq4phr3i51c85bz8d9a8cg780vn7dr29y4j4izyfv33wwk4v", "lts": true }, "6.18": { - "version": "6.18.9", - "hash": "sha256:0y05jg6126h946pac5mkl5myh573qgml1p29hinm7jxlizzia083", + "version": "6.18.10", + "hash": "sha256:1plfwknqh5831kjq6f2yxcm4lqvp68a6kvcfnbxa5ba12wb7glyn", "lts": false }, "6.19": {