Migrate mylibs to niv (work in progress)

2 files changed, 5 insertions, 16 deletions

diff --git a/modules/private/websites/florian/app/default.nix b/modules/private/websites/florian/app/default.nix
index b31e12d..2ef0e86 100644
--- a/modules/private/websites/florian/app/default.nix
+++ b/modules/private/websites/florian/app/default.nix
@@ -1,12 +1,15 @@
 { environment ? "prod"
 , varDir ? "/var/lib/tellesflorian_${environment}"
 , secretsPath ? "/var/secrets/webapps/${environment}-tellesflorian"
-, composerEnv, fetchurl, mylibs }:
+, composerEnv, fetchurl, sources }:
 let
   app = composerEnv.buildPackage (
     import ./php-packages.nix { inherit composerEnv fetchurl; } //
-    mylibs.fetchedGitPrivate ./tellesflorian.json //
     rec {
+      version = sources.websites-florian-app.version;
+      pname = "tellesflorian";
+      name = "${pname}-${version}";
+      src = sources.websites-florian-app;
       noDev = (environment == "prod");
       preInstall = ''
         export SYMFONY_ENV="${environment}"
diff --git a/modules/private/websites/florian/app/tellesflorian.json b/modules/private/websites/florian/app/tellesflorian.json
deleted file mode 100644
index 693336d..0000000
--- a/modules/private/websites/florian/app/tellesflorian.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "tag": "1793d5c-master",
-  "meta": {
-    "name": "tellesflorian",
-    "url": "ssh://gitolite@git.immae.eu/perso/florian_telles/stabilo",
-    "branch": "master"
-  },
-  "git": {
-    "url": "ssh://gitolite@git.immae.eu/perso/florian_telles/stabilo",
-    "rev": "1793d5c7912d1b20ad1df1ac59be9d7f1220e919",
-    "sha256": "1zhxcrbglbjb6xfr8sfm4m2miabbkkb0a7543va3b5akrn6yk0cb",
-    "fetchSubmodules": true
-  }
-}