From dd98a297d0026103279d18341aa78c58c5afc96b 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 | 7 ++----- deployment/morph/default.nix | 5 +++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/default.nix b/default.nix index dee1f229004..bf28d5be95e 100644 --- a/default.nix +++ b/default.nix @@ -91,16 +91,13 @@ 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 { + deployment = pkgs.callPackage ./deployment/morph { plutus = { plutus-docs = docs; inherit plutus-pab marlowe-app marlowe-companion-app marlowe-dashboard marlowe-playground plutus-playground web-ghc; }; - }); + }; # This builds a vscode devcontainer that can be used with the plutus-starter project (or probably the plutus project itself). devcontainer = import ./nix/devcontainer/plutus-devcontainer.nix { inherit pkgs plutus; }; 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; -} +})