diff options
Diffstat (limited to 'modules/private/websites/chloe/app')
-rw-r--r-- | modules/private/websites/chloe/app/chloe.json | 14 | ||||
-rw-r--r-- | modules/private/websites/chloe/app/default.nix | 9 |
2 files changed, 6 insertions, 17 deletions
diff --git a/modules/private/websites/chloe/app/chloe.json b/modules/private/websites/chloe/app/chloe.json deleted file mode 100644 index d0021b6..0000000 --- a/modules/private/websites/chloe/app/chloe.json +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | { | ||
2 | "tag": "882f166-master", | ||
3 | "meta": { | ||
4 | "name": "chloe", | ||
5 | "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Chloe", | ||
6 | "branch": "master" | ||
7 | }, | ||
8 | "git": { | ||
9 | "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Chloe", | ||
10 | "rev": "882f166999a59081ad896f26318e6a04db9f9f43", | ||
11 | "sha256": "131095y1bjnslipq90w9345cmgyk2bfiz5pfpkbg1jbj2ypl4haj", | ||
12 | "fetchSubmodules": true | ||
13 | } | ||
14 | } | ||
diff --git a/modules/private/websites/chloe/app/default.nix b/modules/private/websites/chloe/app/default.nix index 92a5e42..d23e3e0 100644 --- a/modules/private/websites/chloe/app/default.nix +++ b/modules/private/websites/chloe/app/default.nix | |||
@@ -1,8 +1,11 @@ | |||
1 | { environment ? "prod" | 1 | { environment ? "prod" |
2 | , varDir ? "/var/lib/chloe_${environment}" | 2 | , varDir ? "/var/lib/chloe_${environment}" |
3 | , spip, stdenv, mylibs, sassc }: | 3 | , spip, stdenv, sassc, sources }: |
4 | let | 4 | let |
5 | siteDir = stdenv.mkDerivation (mylibs.fetchedGitPrivate ./chloe.json // rec { | 5 | siteDir = stdenv.mkDerivation { |
6 | version = sources.websites-chloe-app.version; | ||
7 | pname = "chloe"; | ||
8 | src = sources.websites-chloe-app; | ||
6 | buildPhase = '' | 9 | buildPhase = '' |
7 | make | 10 | make |
8 | ''; | 11 | ''; |
@@ -10,7 +13,7 @@ let | |||
10 | cp -a . $out | 13 | cp -a . $out |
11 | ''; | 14 | ''; |
12 | buildInputs = [ sassc ]; | 15 | buildInputs = [ sassc ]; |
13 | }); | 16 | }; |
14 | in | 17 | in |
15 | spip.override { | 18 | spip.override { |
16 | ldap = true; | 19 | ldap = true; |