chore(frontend): migrate from npm to yarn, pipeline excluded (wip)
This commit is contained in:
parent
97b6cd83bd
commit
8062c89fc1
@ -107,7 +107,7 @@
|
||||
(final: prev: let
|
||||
pkgs = import nixpkgs { inherit system; };
|
||||
in {
|
||||
inherit (pkgs) dockerTools node2nix glibcLocalesUtf8 tzdata chromium minio minio-client skopeo; inherit (pkgs.stdenv) fetchurlBoot;
|
||||
inherit (pkgs) dockerTools node2nix yarn glibcLocalesUtf8 tzdata chromium minio minio-client skopeo; inherit (pkgs.stdenv) fetchurlBoot;
|
||||
stack = pkgs.symlinkJoin {
|
||||
inherit (pkgs.stack) name;
|
||||
paths = [pkgs.stack];
|
||||
|
||||
@ -1,10 +1,8 @@
|
||||
# SPDX-FileCopyrightText: 2022-2024 Sarah Vaupel <sarah.vaupel@uniworx.de>, Gregor Kleen <gregor@kleen.consulting>, Sarah Vaupel <sarah.vaupel@ifi.lmu.de>
|
||||
#
|
||||
# SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
# This file has been generated by node2nix 1.11.1. Do not edit!
|
||||
|
||||
{pkgs ? import <nixpkgs> {
|
||||
inherit system;
|
||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_21"}:
|
||||
}, system ? builtins.currentSystem, nodejs ? pkgs."nodejs_14"}:
|
||||
|
||||
let
|
||||
nodeEnv = import ./node-env.nix {
|
||||
@ -14,6 +12,6 @@ let
|
||||
};
|
||||
in
|
||||
import ./node-packages.nix {
|
||||
inherit (pkgs) fetchurl fetchurlBoot nix-gitignore stdenv lib fetchgit;
|
||||
inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit;
|
||||
inherit nodeEnv;
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
21752
package-lock.json
generated
21752
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -6,7 +6,7 @@
|
||||
"author": "",
|
||||
"license": "AGPL-3.0-or-later",
|
||||
"scripts": {
|
||||
"start": "npm-run-all frontend:build --parallel \"frontend:build:watch\" \"yesod:start\"",
|
||||
"start": "run-s frontend:build --parallel \"frontend:build:watch\" \"yesod:start\"",
|
||||
"test": "run-s frontend:test yesod:test i18n:test",
|
||||
"lint": "run-s frontend:lint yesod:lint",
|
||||
"build": "run-s frontend:build yesod:build",
|
||||
|
||||
@ -273,7 +273,7 @@ in pkgs.mkShell {
|
||||
'';
|
||||
nativeBuildInputs = [develop inDevelop killallUni2work diffRunning]
|
||||
++ (with pkgs;
|
||||
[ stack nodejs_21 postgresql_12 openldap exiftool expat memcached minio minio-client
|
||||
[ stack nodejs_21 yarn postgresql_12 openldap exiftool expat memcached minio minio-client
|
||||
gup reuse pre-commit
|
||||
node2nix
|
||||
# busybox # for print services, but interferes with build commands in develop-shell
|
||||
|
||||
Reference in New Issue
Block a user