diff options
Diffstat (limited to 'modules/private/websites/isabelle')
-rw-r--r-- | modules/private/websites/isabelle/aten_app/default.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/modules/private/websites/isabelle/aten_app/default.nix b/modules/private/websites/isabelle/aten_app/default.nix index 30d10ba..f967b9a 100644 --- a/modules/private/websites/isabelle/aten_app/default.nix +++ b/modules/private/websites/isabelle/aten_app/default.nix | |||
@@ -1,12 +1,16 @@ | |||
1 | { environment ? "prod" | 1 | { environment ? "prod" |
2 | , varDir ? "/var/lib/aten_${environment}" | 2 | , varDir ? "/var/lib/aten_${environment}" |
3 | , composerEnv, fetchgit, runCommand, nodejs, jq, libsass, python, fetchurl, yarn2nix-moretea, sources }: | 3 | , composerEnv, fetchgit, runCommand, nodejs-10_x, jq, libsass, python, fetchurl, yarn2nix-moretea, yarn, sources }: |
4 | let | 4 | let |
5 | yarn2nix-moretea' = yarn2nix-moretea.override({ | ||
6 | yarn = yarn.override({ nodejs = nodejs-10_x; }); | ||
7 | nodejs = nodejs-10_x; | ||
8 | }); | ||
5 | packagesource = sources.websites-isabelle-aten; | 9 | packagesource = sources.websites-isabelle-aten; |
6 | packagejson = runCommand "package.json" { buildInputs = [ jq ]; } '' | 10 | packagejson = runCommand "package.json" { buildInputs = [ jq ]; } '' |
7 | cat ${packagesource}/package.json | jq -r '.version = "v1.0.0"|.name="aten"' > $out | 11 | cat ${packagesource}/package.json | jq -r '.version = "v1.0.0"|.name="aten"' > $out |
8 | ''; | 12 | ''; |
9 | yarnModules = yarn2nix-moretea.mkYarnModules rec { | 13 | yarnModules = yarn2nix-moretea'.mkYarnModules rec { |
10 | name = "aten-yarn"; | 14 | name = "aten-yarn"; |
11 | pname = name; | 15 | pname = name; |
12 | version = "v1.0.0"; | 16 | version = "v1.0.0"; |
@@ -18,8 +22,8 @@ let | |||
18 | buildInputs = [ libsass python ]; | 22 | buildInputs = [ libsass python ]; |
19 | postInstall = let | 23 | postInstall = let |
20 | nodeHeaders = fetchurl { | 24 | nodeHeaders = fetchurl { |
21 | url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz"; | 25 | url = "https://nodejs.org/download/release/v${nodejs-10_x.version}/node-v${nodejs-10_x.version}-headers.tar.gz"; |
22 | sha256 = "1prvrcvbyal39k9axfwjixs4wfgs1m8xy4prsl0kq0s0n7r7nxzj"; | 26 | sha256 = "15hkcbs328d3rc1s14rmky8lh8d3rr86l8k0bia0ggxzwl23lj9c"; |
23 | }; | 27 | }; |
24 | in | 28 | in |
25 | '' | 29 | '' |
@@ -46,7 +50,7 @@ let | |||
46 | rm -rf var/{log,cache} | 50 | rm -rf var/{log,cache} |
47 | ln -sf ${varDir}/{log,cache} var/ | 51 | ln -sf ${varDir}/{log,cache} var/ |
48 | ''; | 52 | ''; |
49 | buildInputs = [ yarnModules yarn2nix-moretea.yarn ]; | 53 | buildInputs = [ yarnModules yarn2nix-moretea'.yarn ]; |
50 | passthru = { | 54 | passthru = { |
51 | inherit varDir; | 55 | inherit varDir; |
52 | inherit environment; | 56 | inherit environment; |