aboutsummaryrefslogtreecommitdiff
path: root/modules/private/websites/isabelle
diff options
context:
space:
mode:
Diffstat (limited to 'modules/private/websites/isabelle')
-rw-r--r--modules/private/websites/isabelle/aten_app/aten.json14
-rw-r--r--modules/private/websites/isabelle/aten_app/default.nix13
-rw-r--r--modules/private/websites/isabelle/iridologie_app/default.nix10
-rw-r--r--modules/private/websites/isabelle/iridologie_app/iridologie.json13
4 files changed, 15 insertions, 35 deletions
diff --git a/modules/private/websites/isabelle/aten_app/aten.json b/modules/private/websites/isabelle/aten_app/aten.json
deleted file mode 100644
index 10a315a..0000000
--- a/modules/private/websites/isabelle/aten_app/aten.json
+++ /dev/null
@@ -1,14 +0,0 @@
1{
2 "tag": "b99537f-master",
3 "meta": {
4 "name": "aten",
5 "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Aten",
6 "branch": "master"
7 },
8 "git": {
9 "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Aten",
10 "rev": "b99537fdad41291afb4f1bb8b2e2aa4081c71fae",
11 "sha256": "15mlyik6zivxwry6zc906bqnivxhby27yr8kj4lg5n68pvb877dn",
12 "fetchSubmodules": true
13 }
14}
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 }:
4let 4let
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}"
diff --git a/modules/private/websites/isabelle/iridologie_app/default.nix b/modules/private/websites/isabelle/iridologie_app/default.nix
index 604d250..edb7eef 100644
--- a/modules/private/websites/isabelle/iridologie_app/default.nix
+++ b/modules/private/websites/isabelle/iridologie_app/default.nix
@@ -1,12 +1,16 @@
1{ environment ? "prod" 1{ environment ? "prod"
2, varDir ? "/var/lib/iridologie_${environment}" 2, varDir ? "/var/lib/iridologie_${environment}"
3, spip, stdenv, mylibs, sassc }: 3, spip, stdenv, sassc, sources }:
4let 4let
5 siteDir = stdenv.mkDerivation (mylibs.fetchedGitPrivate ./iridologie.json // rec { 5 siteDir = stdenv.mkDerivation rec {
6 version = sources.websites-isabelle-iridologie.version;
7 pname = "iridologie";
8 name = "${pname}-${version}";
9 src = sources.websites-isabelle-iridologie;
6 installPhase = '' 10 installPhase = ''
7 cp -a . $out 11 cp -a . $out
8 ''; 12 '';
9 }); 13 };
10in 14in
11spip.override { 15spip.override {
12 ldap = true; 16 ldap = true;
diff --git a/modules/private/websites/isabelle/iridologie_app/iridologie.json b/modules/private/websites/isabelle/iridologie_app/iridologie.json
deleted file mode 100644
index 5cc7f91..0000000
--- a/modules/private/websites/isabelle/iridologie_app/iridologie.json
+++ /dev/null
@@ -1,13 +0,0 @@
1{
2 "tag": "2f2ec6b-master",
3 "meta": {
4 "name": "iridologie",
5 "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Iridologie",
6 "branch": "master"
7 },
8 "git": {
9 "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Iridologie",
10 "rev": "2f2ec6b003f4de97e9f8651db540c9114ac877c2",
11 "fetchSubmodules": true
12 }
13}