diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-05-10 19:10:05 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-05-11 16:38:15 +0200 |
commit | db343436f0e678ef3a97e6f8ac559ffa0507e422 (patch) | |
tree | 882fd0a0fa2fa41fac62a929a93aba09f5eea4d5 /modules/private/websites/isabelle/aten_app/default.nix | |
parent | 34c7b88e16d1768b1b9a0cfa6dd21ea5d9b1b308 (diff) | |
download | Nix-db343436f0e678ef3a97e6f8ac559ffa0507e422.tar.gz Nix-db343436f0e678ef3a97e6f8ac559ffa0507e422.tar.zst Nix-db343436f0e678ef3a97e6f8ac559ffa0507e422.zip |
Migrate mylibs to niv (work in progress)
Diffstat (limited to 'modules/private/websites/isabelle/aten_app/default.nix')
-rw-r--r-- | modules/private/websites/isabelle/aten_app/default.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/modules/private/websites/isabelle/aten_app/default.nix b/modules/private/websites/isabelle/aten_app/default.nix index ba98394..30d10ba 100644 --- a/modules/private/websites/isabelle/aten_app/default.nix +++ b/modules/private/websites/isabelle/aten_app/default.nix | |||
@@ -1,17 +1,17 @@ | |||
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, yarn2nix-moretea }: | 3 | , composerEnv, fetchgit, runCommand, nodejs, jq, libsass, python, fetchurl, yarn2nix-moretea, sources }: |
4 | let | 4 | let |
5 | packagesource = mylibs.fetchedGitPrivate ./aten.json; | 5 | packagesource = sources.websites-isabelle-aten; |
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}/package.json | jq -r '.version = "v1.0.0"|.name="aten"' > $out |
8 | ''; | 8 | ''; |
9 | yarnModules = yarn2nix-moretea.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"; |
13 | packageJSON = packagejson; | 13 | packageJSON = packagejson; |
14 | yarnLock = "${packagesource.src}/yarn.lock"; | 14 | yarnLock = "${packagesource}/yarn.lock"; |
15 | yarnNix = ./yarn-packages.nix; | 15 | yarnNix = ./yarn-packages.nix; |
16 | pkgConfig = { | 16 | pkgConfig = { |
17 | node-sass = { | 17 | node-sass = { |
@@ -30,8 +30,11 @@ let | |||
30 | }; | 30 | }; |
31 | app = composerEnv.buildPackage ( | 31 | app = composerEnv.buildPackage ( |
32 | import ./php-packages.nix { inherit composerEnv fetchurl fetchgit; } // | 32 | import ./php-packages.nix { inherit composerEnv fetchurl fetchgit; } // |
33 | packagesource // | ||
34 | rec { | 33 | rec { |
34 | version = packagesource.version; | ||
35 | pname = "aten"; | ||
36 | name = "${pname}-${version}"; | ||
37 | src = packagesource; | ||
35 | noDev = (environment == "prod"); | 38 | noDev = (environment == "prod"); |
36 | preInstall = '' | 39 | preInstall = '' |
37 | export SYMFONY_ENV="${environment}" | 40 | export SYMFONY_ENV="${environment}" |