cloud-hypervisor: use the old param syntax in >=36.0

astro · Nov 2, 2023 · d07c3ef · d07c3ef
1 parent 402333c
commit d07c3ef
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/runners/cloud-hypervisor.nix b/lib/runners/cloud-hypervisor.nix
@@ -42,10 +42,12 @@ let
     free_page_reporting = "on";
   };
 
-  # cloud-hypervisor >= 30.0 has a new command-line arguments syntax
-  hasNewArgSyntax = builtins.compareVersions pkgs.cloud-hypervisor.version "30.0" >= 0;
+  # cloud-hypervisor >= 30.0 < 36.0 temporarily replaced clap with argh
+  hasArghSyntax =
+    builtins.compareVersions pkgs.cloud-hypervisor.version "30.0" >= 0 &&
+    builtins.compareVersions pkgs.cloud-hypervisor.version "36.0" < 0;
   arg =
-    if hasNewArgSyntax
+    if hasArghSyntax
     then switch: params:
       # `--switch param0 --switch param1 ...`
       builtins.concatMap (param: [ switch param ]) params