X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=pkgs%2Fpython-packages%2Fbuildbot%2Fplugins%2Fbuildslist%2Fdefault.nix;h=ad87111b28dbab266112d5b58bcb797571af631d;hb=f5761aac8dbfb4af91c232f2b52d1353c899abda;hp=e5087e4af23e7b9fc0e82b0622b569727bf0490f;hpb=5400b9b6f65451d41a9106fae6fc00f97d83f4ef;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/pkgs/python-packages/buildbot/plugins/buildslist/default.nix b/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
index e5087e4..ad87111 100644
--- a/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
+++ b/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
@@ -1,4 +1,4 @@
-{ mylibs, stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, libsass, python, python2, fetchurl, jq, yarn, nodejs }:
+{ mylibs, stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, libsass, python, fetchurl, jq, yarn, nodejs, yarn2nix-moretea }:
 let
   buildslist_src = mylibs.fetchedGit ./buildslist.json;
   packagejson = runCommand "package.json" { buildInputs = [ jq ]; } ''
@@ -6,9 +6,9 @@ let
     '';
   nodeHeaders = fetchurl {
     url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz";
-    sha256 = "1g6zi96k8sbim8wa8rzskxy44mgpcv1mn2bs8p4mq36w3kwglwyj";
+    sha256 = "1prvrcvbyal39k9axfwjixs4wfgs1m8xy4prsl0kq0s0n7r7nxzj";
   };
-  buildslist_yarn = mylibs.yarn2nixPackage.mkYarnModules rec {
+  buildslist_yarn = yarn2nix-moretea.mkYarnModules rec {
     name = "buildslist-yarn-modules";
     pname = name;
     inherit (pythonPackages.buildbot-pkg) version;
@@ -16,7 +16,6 @@ let
     yarnLock = "${buildslist_src.src}/yarn.lock";
     yarnNix = ./yarn-packages.nix;
     pkgConfig = {
-      all = { buildInputs = [ mylibs.yarn2nixPackage.src ]; };
       node-sass = {
         buildInputs = [ libsass python ];
         postInstall =