lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

nix/pkgs/baserow, web/quotes: bump to node 18

Browse source
This commit is contained in:
Luke Granger-Brown 2023-05-28 01:28:20 +01:00
parent baad82f0c8
commit 32742506de
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nix/pkgs/baserow/default.nix
View file

@ -5,7 +5,7 @@
, makeWrapper , makeWrapper
, python3 , python3
, poetry2nix , poetry2nix
, nodejs-16_x , nodejs-18_x
, ossOnly ? true , ossOnly ? true
}: }:
@ -33,7 +33,7 @@ let
src = "${src}/web-frontend"; src = "${src}/web-frontend";
}; };
nodejs = nodejs-16_x; nodejs = nodejs-18_x;
poetry2nixOverrides = poetry2nix.defaultPoetryOverrides.overrideOverlay (self: super: let poetry2nixOverrides = poetry2nix.defaultPoetryOverrides.overrideOverlay (self: super: let
addBuildInputs = f: buildInputs: f.overridePythonAttrs (old: { addBuildInputs = f: buildInputs: f.overridePythonAttrs (old: {
buildInputs = (old.buildInputs or []) ++ buildInputs; buildInputs = (old.buildInputs or []) ++ buildInputs;

2
web/quotes/default.nix
View file

@ -26,7 +26,7 @@ pkgs.stdenvNoCC.mkDerivation rec {
buildInputs = with pkgs; [ makeWrapper nodejs ]; buildInputs = with pkgs; [ makeWrapper nodejs ];
propagatedBuildInputs = [ python ]; propagatedBuildInputs = [ python ];
nodeModules = (import ./node-default.nix { inherit pkgs; }).shell.nodeDependencies; nodeModules = (import ./node-default.nix { inherit pkgs; nodejs = pkgs.nodejs-18_x; }).shell.nodeDependencies;
buildPhase = '' buildPhase = ''
cp -R $nodeModules/lib/node_modules theme/static_src/node_modules cp -R $nodeModules/lib/node_modules theme/static_src/node_modules