Skip to content

Commit

Permalink
Build deployments on linux only
Browse files Browse the repository at this point in the history
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).
  • Loading branch information
gilligan committed Apr 16, 2021
1 parent 6a5dae8 commit dd98a29
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
7 changes: 2 additions & 5 deletions default.nix
Expand Up @@ -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; };
Expand Down
5 changes: 3 additions & 2 deletions deployment/morph/default.nix
Expand Up @@ -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;
}
})

0 comments on commit dd98a29

Please sign in to comment.