Skip to content

Commit

Permalink
PLT-5930: Add dependencies needed for e2e tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
shlevy authored and ladamesny committed Jun 3, 2023
1 parent 32a1a17 commit bda368d
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 0 deletions.
17 changes: 17 additions & 0 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
url = "github:NixOS/nixpkgs";
follows = "haskell-nix/nixpkgs-unstable";
};
nixpkgs-babel.url = "github:NixOS/nixpkgs?rev=39addc620d1585c4d95246f4e47c83467ae3e62a";
haskell-nix = {
url = "github:input-output-hk/haskell.nix";
inputs.hackage.follows = "hackage";
Expand Down
17 changes: 17 additions & 0 deletions nix/cells/marlowe-playground/devshells.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@
let
inherit (cell) library packages scripts;
inherit (library) pkgs haskell-nix cabal-project;
pkgs-babel =
if pkgs.nodePackages ? "@babel/cli"
then
throw "The main nixpkgs input now contains the babel command.\nPlease remove nixpkgs-babel from flake.nix, delete the pkgs-babel definition in devshells.nix, and replace the reference to pkgs-babel.nodePackages.\"@babel-cli\" with pkgs.nodePackages.\"@babel-cli\""
else
import inputs.nixpkgs-babel {
system = pkgs.system;
};
haskell-devshell = haskell-nix.haskellLib.devshellFor cabal-project.shell;

shell = inputs.std.lib.dev.mkShell {
Expand Down Expand Up @@ -162,6 +170,15 @@ let
pkgs.gawk
pkgs.nil
pkgs.z3
] ++ pkgs.lib.optionals pkgs.stdenv.isLinux [
# None of these browsers build on Darwin, so limit e2e test-specific deps to Linux
pkgs.chromium
pkgs.firefox
pkgs.webkitgtk
pkgs.yarn
pkgs.nodePackages.rimraf
pkgs-babel.nodePackages."@babel/cli"
pkgs.nodePackages.ts-node
];

devshell.startup."pre-commit-check".text = cell.library.pre-commit-check.shellHook;
Expand Down

0 comments on commit bda368d

Please sign in to comment.