Migrate mylibs to niv (work in progress)

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 @@
-{
-  "tag": "882f166-master",
-  "meta": {
-    "name": "chloe",
-    "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Chloe",
-    "branch": "master"
-  },
-  "git": {
-    "url": "ssh://gitolite@git.immae.eu/perso/Immae/Sites/Chloe",
-    "rev": "882f166999a59081ad896f26318e6a04db9f9f43",
-    "sha256": "131095y1bjnslipq90w9345cmgyk2bfiz5pfpkbg1jbj2ypl4haj",
-    "fetchSubmodules": true
-  }
-}
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 @@
 { environment ? "prod"
 , varDir ? "/var/lib/chloe_${environment}"
-, spip, stdenv, mylibs, sassc }:
+, spip, stdenv, sassc, sources }:
 let
-  siteDir = stdenv.mkDerivation (mylibs.fetchedGitPrivate ./chloe.json // rec {
+  siteDir = stdenv.mkDerivation {
+    version = sources.websites-chloe-app.version;
+    pname = "chloe";
+    src = sources.websites-chloe-app;
     buildPhase = ''
       make
       '';
@@ -10,7 +13,7 @@ let
       cp -a . $out
       '';
     buildInputs = [ sassc ];
-  });
+  };
 in
 spip.override {
   ldap = true;