Make darwin build default the latest minus virtd plugin

input-output-hk · Jan 14, 2021 · 982d8e1 · 982d8e1
1 parent d00951c
commit 982d8e1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/flake.nix b/flake.nix
@@ -86,6 +86,7 @@
     in rec {
       overlay = import ./overlay.nix { inherit self system pkgs; };
 
+      defaultPackage = packages.nixops_2_0-2021-01-unstable;
       defaultApp = apps.info;
 
       legacyPackages = import nixpkgs {
@@ -161,12 +162,5 @@
         };
       };
     }
-  ) // {
-    hydraJobs = self.packages;
-    defaultPackage = {
-      # Separate the default job based on architecture until the Darwin bug on the latest nixops package is fixed
-      x86_64-linux = self.packages.x86_64-linux.nixops_2_0-2021-01-unstable;
-      x86_64-darwin = self.packages.x86_64-darwin.nixops_1_8-nixos-unstable;
-    };
-  };
+  ) // { hydraJobs = self.packages; };
 }
diff --git a/overlay.nix b/overlay.nix
@@ -7,7 +7,11 @@ let
 
   mkNixops_2 = patches: pkgs.callPackage ./pkgs/nixops_2-unstable.nix {
     inherit self system pkgs patches;
-    validPlugins = [ "aws" "encrypted-links" "gcp" "packet" "packet" "virtd" "vbox" ];
+    # Remove libvirtd plugin from Darwin until the compile error is fixed
+    validPlugins = if pkgs.stdenv.isLinux then
+      [ "aws" "encrypted-links" "gcp" "packet" "packet" "virtd" "vbox" ]
+    else
+      [ "aws" "encrypted-links" "gcp" "packet" "packet" "vbox" ];
   };
 in final: prev: {
   nixops_1_6_1-preplugin = self.inputs.nixpkgs-pin.legacyPackages.${system}.nixops_1_6_1;