From d8fbac99a4bf7e84e6aeaed445ed469fbeb19dce Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Tue, 19 Oct 2021 05:29:20 +0100 Subject: [PATCH] 3p/nixpkgs: add pr142117 --- .../nixpkgs/patches/pr142117-fix-hyperv.patch | 22 +++++++++++++++++++ third_party/nixpkgs/patches/series | 1 + 2 files changed, 23 insertions(+) create mode 100644 third_party/nixpkgs/patches/pr142117-fix-hyperv.patch diff --git a/third_party/nixpkgs/patches/pr142117-fix-hyperv.patch b/third_party/nixpkgs/patches/pr142117-fix-hyperv.patch new file mode 100644 index 0000000000..a661f73859 --- /dev/null +++ b/third_party/nixpkgs/patches/pr142117-fix-hyperv.patch @@ -0,0 +1,22 @@ +From d6e1fb43c4e61e7f3df7c72d167758d48aae4647 Mon Sep 17 00:00:00 2001 +From: Sam Hug +Date: Mon, 18 Oct 2021 11:22:53 -0700 +Subject: [PATCH] nixos/hyperv: fix evaluation of kernelParams + +--- + nixos/modules/virtualisation/hyperv-guest.nix | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/nixos/modules/virtualisation/hyperv-guest.nix b/nixos/modules/virtualisation/hyperv-guest.nix +index b3bcfff19807..fb6502644b80 100644 +--- a/nixos/modules/virtualisation/hyperv-guest.nix ++++ b/nixos/modules/virtualisation/hyperv-guest.nix +@@ -34,7 +34,7 @@ in { + initrd.availableKernelModules = [ "hyperv_keyboard" ]; + + kernelParams = [ +- "video=hyperv_fb:${cfg.videoMode} elevator=noop" ++ "video=hyperv_fb:${cfg.videoMode}" "elevator=noop" + ]; + }; + diff --git a/third_party/nixpkgs/patches/series b/third_party/nixpkgs/patches/series index 324117f1f0..d50a1219e7 100644 --- a/third_party/nixpkgs/patches/series +++ b/third_party/nixpkgs/patches/series @@ -1,2 +1,3 @@ patch-cherrypy.patch pomerium-fix.patch +pr142117-fix-hyperv.patch