From 25938251de2f5c83abece47d92460a0d7dafd9e3 Mon Sep 17 00:00:00 2001 From: Tobias Pflug Date: Wed, 14 Apr 2021 09:12:13 +0200 Subject: [PATCH] Build deployments on linux only Evaluate deployments to {} (empty attribute set) for darwin since our release.nix doesn't filter this out and hydra fails to evaluate this on darin (cannot build nixos machines on darwin of course). --- default.nix | 3 --- deployment/morph/default.nix | 5 +++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/default.nix b/default.nix index dee1f229004..314f962922b 100644 --- a/default.nix +++ b/default.nix @@ -91,9 +91,6 @@ rec { docs = import ./nix/docs.nix { inherit pkgs plutus; }; - # Note: nix-build is not eager enough in evaluating `nix-build -A deployment` so - # you need to specify a specific host. On hydra `pkgs.recurseIntoAttrs` solves - # this problem deployment = pkgs.recurseIntoAttrs (pkgs.callPackage ./deployment/morph { plutus = { plutus-docs = docs; diff --git a/deployment/morph/default.nix b/deployment/morph/default.nix index a23d42cb1a0..414bf1baf81 100644 --- a/deployment/morph/default.nix +++ b/deployment/morph/default.nix @@ -30,8 +30,9 @@ let # in a `pkgs.nixos` call to build the machine outside of morph. mkMachine = pkgs.callPackage ./mk-machine.nix { inherit plutus tfinfo; extraImports = [ fakeDeploymentOption ]; }; buildMachine = { config, name }: (pkgs.nixos (mkMachine { inherit config name; })).toplevel; + linuxOnly = x: if pkgs.stdenv.isDarwin then { } else x; in -import ./machines.nix { +linuxOnly (import ./machines.nix { inherit pkgs tfinfo; mkMachine = buildMachine; -} +})