X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=pkgs%2Fpython-packages%2Fbuildbot%2Fplugins%2Fbuildslist%2Fdefault.nix;h=4ab4c5474689db480f61c0263d6da98e0f03a6a6;hb=2053ddac783c931053676ebc2b02bc8b82d89399;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..4ab4c54 100644
--- a/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
+++ b/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
@@ -1,22 +1,25 @@
-{ mylibs, stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, libsass, python, python2, fetchurl, jq, yarn, nodejs }:
+{ stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, libsass, python, fetchurl, jq, yarn, nodejs-10_x, yarn2nix-moretea, sources }:
 let
-  buildslist_src = mylibs.fetchedGit ./buildslist.json;
+  yarn2nix-moretea' = yarn2nix-moretea.override({
+    yarn = yarn.override({ nodejs = nodejs-10_x; });
+    nodejs = nodejs-10_x;
+  });
+  buildslist_src = sources.buildbot-plugin-buildslist;
   packagejson = runCommand "package.json" { buildInputs = [ jq ]; } ''
-    cat ${buildslist_src.src}/package.json | jq -r '.version = "${pythonPackages.buildbot-pkg.version}"|.license= "MIT"' > $out
+    cat ${buildslist_src}/package.json | jq -r '.version = "${pythonPackages.buildbot-pkg.version}"|.license= "MIT"' > $out
     '';
   nodeHeaders = fetchurl {
-    url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz";
-    sha256 = "1g6zi96k8sbim8wa8rzskxy44mgpcv1mn2bs8p4mq36w3kwglwyj";
+    url = "https://nodejs.org/download/release/v${nodejs-10_x.version}/node-v${nodejs-10_x.version}-headers.tar.gz";
+    sha256 = "15hkcbs328d3rc1s14rmky8lh8d3rr86l8k0bia0ggxzwl23lj9c";
   };
-  buildslist_yarn = mylibs.yarn2nixPackage.mkYarnModules rec {
+  buildslist_yarn = yarn2nix-moretea'.mkYarnModules rec {
     name = "buildslist-yarn-modules";
     pname = name;
     inherit (pythonPackages.buildbot-pkg) version;
     packageJSON = packagejson;
-    yarnLock = "${buildslist_src.src}/yarn.lock";
+    yarnLock = "${buildslist_src}/yarn.lock";
     yarnNix = ./yarn-packages.nix;
     pkgConfig = {
-      all = { buildInputs = [ mylibs.yarn2nixPackage.src ]; };
       node-sass = {
         buildInputs = [ libsass python ];
         postInstall =
@@ -29,7 +32,7 @@ let
   buildslist_bower = buildBowerComponents {
     name = "buildslist";
     generated = ./bower.nix;
-    src = "${buildslist_src.src}/guanlecoja/";
+    src = "${buildslist_src}/guanlecoja/";
   };
   # the buildbot-pkg calls yarn and screws up everything...
   fakeYarn = writeScriptBin "yarn" ''
@@ -54,9 +57,9 @@ pythonPackages.buildPythonPackage rec {
     (klein.overridePythonAttrs(old: { checkPhase = ""; }))
     buildbot-pkg
   ];
-  nativeBuildInputs = [ fakeYarn nodejs ];
+  nativeBuildInputs = [ fakeYarn nodejs-10_x ];
   buildInputs = [ buildslist_yarn buildslist_bower ];
 
   doCheck = false;
-  src = buildslist_src.src;
+  src = buildslist_src;
 }