From 560394db48d63b86df8425112ef35e4bc7c700f4 Mon Sep 17 00:00:00 2001 From: pacien Date: Fri, 25 Aug 2023 02:16:42 +0200 Subject: sandbox-system: remove upstreamed qemu 9p perf patch --- lib/mk-sandbox-system.nix | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/lib/mk-sandbox-system.nix b/lib/mk-sandbox-system.nix index 3bbc488..1e1c596 100644 --- a/lib/mk-sandbox-system.nix +++ b/lib/mk-sandbox-system.nix @@ -6,7 +6,6 @@ flake: , tools ? [] , envVars ? { } , restrictNetwork ? true # to be replaced with virtualisation.restrictNetwork -, patchQemu9p ? false # until qemu 7.2.0 becomes available in nixpkgs }@params: let @@ -116,21 +115,6 @@ in rec { # https://github.com/NixOS/nixpkgs/pull/200225 #restrictNetwork = lib.mkDefault true; - # Patched QEMU to fix slow 9p file share. - # https://linus.schreibt.jetzt/posts/qemu-9p-performance.html - qemu.package = lib.mkDefault ( - if patchQemu9p then - assert !(pkgs.lib.versionAtLeast pkgs.qemu_kvm.version "7.2.0"); - pkgs.qemu_kvm.overrideAttrs (o: { - patches = o.patches ++ [ (pkgs.fetchpatch { - name = "qemu-9p-performance-fix.patch"; - url = "https://github.com/qemu/qemu/commit/f5265c8.patch"; - sha256 = "sha256-PSOv0dhiEq9g6B1uIbs6vbhGr7BQWCtAoLHnk4vnvVg="; - }) ]; - }) - else pkgs.qemu_kvm - ); - }; }); -- cgit v1.2.3