Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PLT-5930: Add dependencies needed for e2e tests. #37

Open
wants to merge 1 commit into
base: PLT-5884/e2e-tests
Choose a base branch
from
Open

PLT-5930: Add dependencies needed for e2e tests. #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions flake.lock
View file
Open in desktop

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
View file
Open in desktop
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
View file
Open in desktop
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