Migrate mylibs to niv (work in progress)

2 files changed, 5 insertions, 16 deletions

diff --git a/modules/private/websites/piedsjaloux/app/default.nix b/modules/private/websites/piedsjaloux/app/default.nix
index 726d93c..a3d48bd 100644
--- a/modules/private/websites/piedsjaloux/app/default.nix
+++ b/modules/private/websites/piedsjaloux/app/default.nix
@@ -1,12 +1,15 @@
 { environment ? "prod"
 , varDir ? "/var/lib/piedsjaloux_${environment}"
 , secretsPath ? "/var/secrets/webapps/${environment}-piedsjaloux"
-, composerEnv, fetchurl, fetchgit, mylibs }:
+, composerEnv, fetchurl, fetchgit, sources }:
 let
   app = composerEnv.buildPackage (
     import ./php-packages.nix { inherit composerEnv fetchurl fetchgit; } //
-    mylibs.fetchedGitPrivate ./piedsjaloux.json //
     rec {
+      version = sources.websites-piedsjaloux-app.version;
+      pname = "piedsjaloux";
+      name = "${pname}-${version}";
+      src = sources.websites-piedsjaloux-app;
       noDev = (environment == "prod");
       preInstall = ''
         export SYMFONY_ENV="${environment}"
diff --git a/modules/private/websites/piedsjaloux/app/piedsjaloux.json b/modules/private/websites/piedsjaloux/app/piedsjaloux.json
deleted file mode 100644
index dc2c083..0000000
--- a/modules/private/websites/piedsjaloux/app/piedsjaloux.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "tag": "4ee4538-master",
-  "meta": {
-    "name": "piedsjaloux",
-    "url": "ssh://gitolite@git.immae.eu/Pieds_jaloux/NewSite",
-    "branch": "master"
-  },
-  "git": {
-    "url": "ssh://gitolite@git.immae.eu/Pieds_jaloux/NewSite",
-    "rev": "4ee45386ad9ec9c081234a2fbde66e5b0c3294be",
-    "sha256": "10a41chh4crn95z6lk6nhkx27089djkngypa9m76bg7ph508mvnq",
-    "fetchSubmodules": true
-  }
-}