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 @@
-{
-  "tag": "b99537f-master",
-  "meta": {
-    "name": "aten",
-    "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Aten",
-    "branch": "master"
-  },
-  "git": {
-    "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Aten",
-    "rev": "b99537fdad41291afb4f1bb8b2e2aa4081c71fae",
-    "sha256": "15mlyik6zivxwry6zc906bqnivxhby27yr8kj4lg5n68pvb877dn",
-    "fetchSubmodules": true
-  }
-}
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 @@
 { environment ? "prod"
 , varDir ? "/var/lib/aten_${environment}"
-, mylibs, composerEnv, fetchgit, runCommand, nodejs, jq, libsass, python, fetchurl, yarn2nix-moretea }:
+, composerEnv, fetchgit, runCommand, nodejs, jq, libsass, python, fetchurl, yarn2nix-moretea, sources }:
 let
-  packagesource = mylibs.fetchedGitPrivate ./aten.json;
+  packagesource = sources.websites-isabelle-aten;
   packagejson = runCommand "package.json" { buildInputs = [ jq ]; } ''
-    cat ${packagesource.src}/package.json | jq -r '.version = "v1.0.0"|.name="aten"' > $out
+    cat ${packagesource}/package.json | jq -r '.version = "v1.0.0"|.name="aten"' > $out
     '';
   yarnModules = yarn2nix-moretea.mkYarnModules rec {
     name = "aten-yarn";
     pname = name;
     version = "v1.0.0";
     packageJSON = packagejson;
-    yarnLock = "${packagesource.src}/yarn.lock";
+    yarnLock = "${packagesource}/yarn.lock";
     yarnNix = ./yarn-packages.nix;
     pkgConfig = {
       node-sass = {
@@ -30,8 +30,11 @@ let
   };
   app = composerEnv.buildPackage (
     import ./php-packages.nix { inherit composerEnv fetchurl fetchgit; } //
-    packagesource //
     rec {
+      version = packagesource.version;
+      pname = "aten";
+      name = "${pname}-${version}";
+      src = packagesource;
       noDev = (environment == "prod");
       preInstall = ''
         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 @@
 { environment ? "prod"
 , varDir ? "/var/lib/iridologie_${environment}"
-, spip, stdenv, mylibs, sassc }:
+, spip, stdenv, sassc, sources }:
 let
-  siteDir = stdenv.mkDerivation (mylibs.fetchedGitPrivate ./iridologie.json // rec {
+  siteDir = stdenv.mkDerivation rec {
+    version = sources.websites-isabelle-iridologie.version;
+    pname = "iridologie";
+    name = "${pname}-${version}";
+    src = sources.websites-isabelle-iridologie;
     installPhase = ''
       cp -a . $out
       '';
-  });
+  };
 in
 spip.override {
   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 @@
-{
-  "tag": "2f2ec6b-master",
-  "meta": {
-    "name": "iridologie",
-    "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Iridologie",
-    "branch": "master"
-  },
-  "git": {
-    "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Iridologie",
-    "rev": "2f2ec6b003f4de97e9f8651db540c9114ac877c2",
-    "fetchSubmodules": true
-  }
-}