aboutsummaryrefslogtreecommitdiff
path: root/modules/private/websites/isabelle/aten_app
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2020-04-20 02:59:22 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2020-04-20 02:59:22 +0200
commit71b4786dc43362b7820e3823b26e9152350cd388 (patch)
treec18b0a30bc79a00da63d9db8915cc7dff425d221 /modules/private/websites/isabelle/aten_app
parente94cd212b4a43296d44876b3c5f7113e9f5b9727 (diff)
downloadNix-71b4786dc43362b7820e3823b26e9152350cd388.tar.gz
Nix-71b4786dc43362b7820e3823b26e9152350cd388.tar.zst
Nix-71b4786dc43362b7820e3823b26e9152350cd388.zip
Remove yarn2nixPackage from lib
Diffstat (limited to 'modules/private/websites/isabelle/aten_app')
-rw-r--r--modules/private/websites/isabelle/aten_app/default.nix9
1 files changed, 3 insertions, 6 deletions
diff --git a/modules/private/websites/isabelle/aten_app/default.nix b/modules/private/websites/isabelle/aten_app/default.nix
index 9c4e29f..1f54ba2 100644
--- a/modules/private/websites/isabelle/aten_app/default.nix
+++ b/modules/private/websites/isabelle/aten_app/default.nix
@@ -1,12 +1,12 @@
1{ environment ? "prod" 1{ environment ? "prod"
2, varDir ? "/var/lib/aten_${environment}" 2, varDir ? "/var/lib/aten_${environment}"
3, mylibs, composerEnv, fetchgit, runCommand, nodejs, jq, libsass, python, fetchurl }: 3, mylibs, composerEnv, fetchgit, runCommand, nodejs, jq, libsass, python, fetchurl, yarn2nix-moretea }:
4let 4let
5 packagesource = mylibs.fetchedGitPrivate ./aten.json; 5 packagesource = mylibs.fetchedGitPrivate ./aten.json;
6 packagejson = runCommand "package.json" { buildInputs = [ jq ]; } '' 6 packagejson = runCommand "package.json" { buildInputs = [ jq ]; } ''
7 cat ${packagesource.src}/package.json | jq -r '.version = "v1.0.0"|.name="aten"' > $out 7 cat ${packagesource.src}/package.json | jq -r '.version = "v1.0.0"|.name="aten"' > $out
8 ''; 8 '';
9 yarnModules = mylibs.yarn2nixPackage.mkYarnModules rec { 9 yarnModules = yarn2nix-moretea.mkYarnModules rec {
10 name = "aten-yarn"; 10 name = "aten-yarn";
11 pname = name; 11 pname = name;
12 version = "v1.0.0"; 12 version = "v1.0.0";
@@ -14,9 +14,6 @@ let
14 yarnLock = "${packagesource.src}/yarn.lock"; 14 yarnLock = "${packagesource.src}/yarn.lock";
15 yarnNix = ./yarn-packages.nix; 15 yarnNix = ./yarn-packages.nix;
16 pkgConfig = { 16 pkgConfig = {
17 all = {
18 buildInputs = [ mylibs.yarn2nixPackage.src ];
19 };
20 node-sass = { 17 node-sass = {
21 buildInputs = [ libsass python ]; 18 buildInputs = [ libsass python ];
22 postInstall = let 19 postInstall = let
@@ -46,7 +43,7 @@ let
46 rm -rf var/{log,cache} 43 rm -rf var/{log,cache}
47 ln -sf ${varDir}/{log,cache} var/ 44 ln -sf ${varDir}/{log,cache} var/
48 ''; 45 '';
49 buildInputs = [ yarnModules mylibs.yarn2nixPackage.yarn ]; 46 buildInputs = [ yarnModules yarn2nix-moretea.yarn ];
50 passthru = { 47 passthru = {
51 inherit varDir; 48 inherit varDir;
52 inherit environment; 49 inherit environment;