From 71b4786dc43362b7820e3823b26e9152350cd388 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Mon, 20 Apr 2020 02:59:22 +0200
Subject: Remove yarn2nixPackage from lib

---
 modules/private/websites/isabelle/aten_app/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'modules/private/websites/isabelle')

diff --git a/modules/private/websites/isabelle/aten_app/default.nix b/modules/private/websites/isabelle/aten_app/default.nix
index 9c4e29f..1f54ba2 100644
--- a/modules/private/websites/isabelle/aten_app/default.nix
+++ b/modules/private/websites/isabelle/aten_app/default.nix
@@ -1,12 +1,12 @@
 { environment ? "prod"
 , varDir ? "/var/lib/aten_${environment}"
-, mylibs, composerEnv, fetchgit, runCommand, nodejs, jq, libsass, python, fetchurl }:
+, mylibs, composerEnv, fetchgit, runCommand, nodejs, jq, libsass, python, fetchurl, yarn2nix-moretea }:
 let
   packagesource = mylibs.fetchedGitPrivate ./aten.json;
   packagejson = runCommand "package.json" { buildInputs = [ jq ]; } ''
     cat ${packagesource.src}/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";
@@ -14,9 +14,6 @@ let
     yarnLock = "${packagesource.src}/yarn.lock";
     yarnNix = ./yarn-packages.nix;
     pkgConfig = {
-      all = {
-        buildInputs = [ mylibs.yarn2nixPackage.src ];
-      };
       node-sass = {
         buildInputs = [ libsass python ];
         postInstall = let
@@ -46,7 +43,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;
-- 
cgit v1.2.3