X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fisabelle%2Faten_app%2Fdefault.nix;h=30d10bafa00a129322231f4637f9eba283064939;hb=db343436f0e678ef3a97e6f8ac559ffa0507e422;hp=9c4e29fa08aa5afd7f8dba2777154ebc9aaf87c0;hpb=d3452fc59b9839846225fd254926c64a9c71f071;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/websites/isabelle/aten_app/default.nix b/modules/private/websites/isabelle/aten_app/default.nix
index 9c4e29f..30d10ba 100644
--- a/modules/private/websites/isabelle/aten_app/default.nix
+++ b/modules/private/websites/isabelle/aten_app/default.nix
@@ -1,28 +1,25 @@
 { environment ? "prod"
 , varDir ? "/var/lib/aten_${environment}"
-, mylibs, composerEnv, fetchgit, runCommand, nodejs, jq, libsass, python, fetchurl }:
+, 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 = mylibs.yarn2nixPackage.mkYarnModules rec {
+  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 = {
-      all = {
-        buildInputs = [ mylibs.yarn2nixPackage.src ];
-      };
       node-sass = {
         buildInputs = [ libsass python ];
         postInstall = let
           nodeHeaders = fetchurl {
             url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz";
-            sha256 = "1df3yhlwlvai0m9kvjyknjg11hnw0kj0rnhyzbwvsfjnmr6z8r76";
+            sha256 = "1prvrcvbyal39k9axfwjixs4wfgs1m8xy4prsl0kq0s0n7r7nxzj";
           };
         in
           ''
@@ -33,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}"
@@ -46,7 +46,7 @@ let
         rm -rf var/{log,cache}
         ln -sf ${varDir}/{log,cache} var/
         '';
-      buildInputs = [ yarnModules mylibs.yarn2nixPackage.yarn ];
+      buildInputs = [ yarnModules yarn2nix-moretea.yarn ];
       passthru = {
         inherit varDir;
         inherit environment;