From e72154ab6534fe5d2f67fd977942bca8527f1f07 Mon Sep 17 00:00:00 2001 From: Andreas Schaafsma Date: Thu, 2 Apr 2026 05:25:13 +0200 Subject: [PATCH] delete libvirt python fix and downgraded qemu-full to prevent recompilation every time --- overlays/libvirt-python313-fix/default.nix | 28 ------------------- .../drivebystation-nix/configuration.nix | 4 +-- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 overlays/libvirt-python313-fix/default.nix diff --git a/overlays/libvirt-python313-fix/default.nix b/overlays/libvirt-python313-fix/default.nix deleted file mode 100644 index 69cc318..0000000 --- a/overlays/libvirt-python313-fix/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ ... }: - -final: prev: -let - python313ForCeph = - let - base = final.python313; - in - base - // { - override = args: - base.override (args // { - packageOverrides = self: super: - (if args ? packageOverrides then args.packageOverrides self super else { }) - // { - # Ceph still references cython_0 in nixpkgs; map it to modern cython on py3.13. - cython_0 = super.cython; - }; - }); - }; -in { - # Work around nixos-unstable eval failure: - # sphinx-9.1.0 not supported for interpreter python3.11 - # (seen through libvirtd -> qemu_full -> ceph Python dependency chain). - ceph = prev.ceph.override { - python311 = python313ForCeph; - }; -} diff --git a/systems/x86_64-linux/drivebystation-nix/configuration.nix b/systems/x86_64-linux/drivebystation-nix/configuration.nix index 84d9787..f7f47ba 100644 --- a/systems/x86_64-linux/drivebystation-nix/configuration.nix +++ b/systems/x86_64-linux/drivebystation-nix/configuration.nix @@ -171,9 +171,7 @@ virtualisation.libvirtd = { enable = true; qemu = { - package = pkgs.qemu_full.override { - cephSupport = false; - }; + package = pkgs.qemu; runAsRoot = true; swtpm.enable = true; vhostUserPackages = [ pkgs.virtiofsd ];