X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=pkgs%2Fpython-packages%2Fbuildbot%2Fplugins%2Fbuildslist%2Fdefault.nix;h=273996ea7936af9665f5b16f5145afd2103eb305;hb=84c6c827b76bd7296355fd5cc6c96eff25968f6e;hp=a1a87b2bd8951df4c1bb3a766582003717767b79;hpb=fcc5798571bf76e7267673bea824746570e0d66d;p=perso%2FImmae%2FConfig%2FNix%2FNUR.git

diff --git a/pkgs/python-packages/buildbot/plugins/buildslist/default.nix b/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
index a1a87b2b..273996ea 100644
--- a/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
+++ b/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
@@ -1,10 +1,14 @@
-{ mylibs, runCommand, buildBowerComponents, pythonPackages, libsass, python, 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 ]; } ''
-    cat ${buildslist_src.src}/package.json | jq -r '.version = "${pythonPackages.buildbot-pkg.version}"' > $out
+    cat ${buildslist_src.src}/package.json | jq -r '.version = "${pythonPackages.buildbot-pkg.version}"|.license= "MIT"' > $out
     '';
-  buildslist_yarn = mylibs.yarn2nixPackage.mkYarnModules rec {
+  nodeHeaders = fetchurl {
+    url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz";
+    sha256 = "1df3yhlwlvai0m9kvjyknjg11hnw0kj0rnhyzbwvsfjnmr6z8r76";
+  };
+  buildslist_yarn = yarn2nix-moretea.mkYarnModules rec {
     name = "buildslist-yarn-modules";
     pname = name;
     inherit (pythonPackages.buildbot-pkg) version;
@@ -12,15 +16,9 @@ let
     yarnLock = "${buildslist_src.src}/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 = "16f20ya3ys6w5w6y6l4536f7jrgk4gz46bf71w1r1xxb26a54m32";
-          };
-        in
+        postInstall =
           ''
             node scripts/build.js --tarball=${nodeHeaders}
           '';
@@ -32,6 +30,13 @@ let
     generated = ./bower.nix;
     src = "${buildslist_src.src}/guanlecoja/";
   };
+  # the buildbot-pkg calls yarn and screws up everything...
+  fakeYarn = writeScriptBin "yarn" ''
+    #!${stdenv.shell}
+    if [ "$1" = "--version" ]; then
+      echo "1.17"
+    fi
+    '';
 in
 pythonPackages.buildPythonPackage rec {
   pname = "buildbot-buildslist";
@@ -41,13 +46,14 @@ pythonPackages.buildPythonPackage rec {
     export HOME=$PWD
     ln -s ${buildslist_yarn}/node_modules .
     cp -a ${buildslist_bower}/bower_components ./libs
+    PATH=${buildslist_yarn}/node_modules/.bin:$PATH
     chmod -R u+w libs
     '';
   propagatedBuildInputs = with pythonPackages; [
     (klein.overridePythonAttrs(old: { checkPhase = ""; }))
     buildbot-pkg
   ];
-  nativeBuildInputs = [ yarn nodejs ];
+  nativeBuildInputs = [ fakeYarn nodejs ];
   buildInputs = [ buildslist_yarn buildslist_bower ];
 
   doCheck = false;