Migrate mylibs to niv (work in progress)

2 files changed, 7 insertions, 16 deletions

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
-  }
-}