Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
zeme-wana committed Oct 27, 2023
1 parent 322d6e6 commit 1b08b2b
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 26 deletions.
23 changes: 20 additions & 3 deletions flake.lock

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

4 changes: 4 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@
repoRoot = ./.;
systems = [ "x86_64-linux" "x86_64-darwin" ];
outputs = import ./nix/outputs.nix;
nixpkgsArgs.config.permittedInsecurePackages = [
"nodejs-14.21.3"
"openssl-1.1.1w"
];
};


Expand Down
6 changes: 3 additions & 3 deletions nix/marlowe-playground-client.nix
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ pkgs.buildNpmPackage {
spago-pkgs.buildSpagoStyle
repoRoot.nix.easy-purescript-nix.purs
repoRoot.nix.easy-purescript-nix.spago2nix
pkgs.nodejs_18
pkgs.nodejs_18.pkgs.webpack
pkgs.nodejs_18.pkgs.webpack-cli
pkgs.nodejs_14
pkgs.nodejs_14.pkgs.webpack
pkgs.nodejs_14.pkgs.webpack-cli
];

buildPhase = ''
Expand Down
2 changes: 1 addition & 1 deletion nix/project.nix
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ let
shellArgs = repoRoot.nix.shell;
readTheDocs = {
enable = true;
siteFolder = "docs";
siteFolder = "doc";
};
};

Expand Down
9 changes: 0 additions & 9 deletions nix/scripts.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,6 @@
'';


update-client-deps = ''
cd "$(git rev-parse --show-toplevel)"
cd marlowe-playground-client
${repoRoot.nix.easy-purescript-nix.spago2nix}/bin/spago2nix generate
'';


gen-nix-lockfiles = ''
repo_root="$(git rev-parse --show-toplevel)"
Expand Down
13 changes: 3 additions & 10 deletions nix/shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,6 @@ _cabalProject:
group = "marlowe-playground";
};

scripts.update-client-deps = {
exec = repoRoot.nix.scripts.update-client-deps;
description = "Run spago2nix in marlowe-playground-client";
group = "marlowe-playground";
};

scripts.start-backend = {
exec = repoRoot.nix.scripts.start-backend;
description = "Start the Marlowe Playground server";
Expand Down Expand Up @@ -57,11 +51,10 @@ _cabalProject:
pkgs.nil
pkgs.z3
pkgs.which
pkgs.python38
pkgs.prefetch-npm-deps
pkgs.nodejs-18_x
pkgs.nodejs-18_x.pkgs.webpack
pkgs.nodejs-18_x.pkgs.webpack-cli
pkgs.nodejs-14_x
pkgs.nodejs-14_x.pkgs.webpack
pkgs.nodejs-14_x.pkgs.webpack-cli
];

preCommit = {
Expand Down

0 comments on commit 1b08b2b

Please sign in to comment.