From 1b08b2b9fe174d85b8c30de97f9df3a6ed4c40d0 Mon Sep 17 00:00:00 2001 From: zeme Date: Fri, 27 Oct 2023 14:38:01 +0200 Subject: [PATCH] WIP --- flake.lock | 23 ++++++++++++++++++++--- flake.nix | 4 ++++ nix/marlowe-playground-client.nix | 6 +++--- nix/project.nix | 2 +- nix/scripts.nix | 9 --------- nix/shell.nix | 13 +++---------- 6 files changed, 31 insertions(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index d5f5f47bb..af14f2f1b 100644 --- a/flake.lock +++ b/flake.lock @@ -622,15 +622,16 @@ "nixpkgs": [ "nixpkgs" ], + "nixpkgs-with-working-prefetch-npm-deps": "nixpkgs-with-working-prefetch-npm-deps", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "sphinxcontrib-haddock": "sphinxcontrib-haddock" }, "locked": { - "lastModified": 1698065888, - "narHash": "sha256-5MC+MsarxLwlJsI+Rwm29OfNL/ph4aqiNRWBZ9sB1wM=", + "lastModified": 1698409584, + "narHash": "sha256-zqY9WIjs6ELYbyRwDx2w0hAgsV27b6TiAlMkCAQzSJ4=", "owner": "input-output-hk", "repo": "iogx", - "rev": "81476eb708f525324050f03cd1cf064ba80e02fc", + "rev": "da8ab3dc6d1500d4fe0aefe8fb7331edb3d49231", "type": "github" }, "original": { @@ -896,6 +897,22 @@ "type": "github" } }, + "nixpkgs-with-working-prefetch-npm-deps": { + "locked": { + "lastModified": 1690680713, + "narHash": "sha256-NXCWA8N+GfSQyoN7ZNiOgq/nDJKOp5/BHEpiZP8sUZw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b81af66deb21f73a70c67e5ea189568af53b1e8c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b81af66deb21f73a70c67e5ea189568af53b1e8c", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1689261696, diff --git a/flake.nix b/flake.nix index 100a93c6b..62151afb6 100644 --- a/flake.nix +++ b/flake.nix @@ -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" + ]; }; diff --git a/nix/marlowe-playground-client.nix b/nix/marlowe-playground-client.nix index e0c7aba6e..bcab67292 100644 --- a/nix/marlowe-playground-client.nix +++ b/nix/marlowe-playground-client.nix @@ -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 = '' diff --git a/nix/project.nix b/nix/project.nix index 20f54d18c..1aa1489df 100644 --- a/nix/project.nix +++ b/nix/project.nix @@ -28,7 +28,7 @@ let shellArgs = repoRoot.nix.shell; readTheDocs = { enable = true; - siteFolder = "docs"; + siteFolder = "doc"; }; }; diff --git a/nix/scripts.nix b/nix/scripts.nix index 3ebe301d6..56f758645 100644 --- a/nix/scripts.nix +++ b/nix/scripts.nix @@ -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)" diff --git a/nix/shell.nix b/nix/shell.nix index 7c1086e32..b120809a9 100644 --- a/nix/shell.nix +++ b/nix/shell.nix @@ -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"; @@ -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 = {