X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=flakes%2Fprivate%2Fbuildbot%2Fbuildslist%2Fdefault.nix;fp=pkgs%2Fpython-packages%2Fbuildbot%2Fplugins%2Fbuildslist%2Fdefault.nix;h=7f725033ecc1a88ccca86c1f9dcc53b465561289;hp=4ab4c5474689db480f61c0263d6da98e0f03a6a6;hb=1a64deeb894dc95e2645a75771732c6cc53a79ad;hpb=fa25ffd4583cc362075cd5e1b4130f33306103f0

diff --git a/pkgs/python-packages/buildbot/plugins/buildslist/default.nix b/flakes/private/buildbot/buildslist/default.nix
similarity index 88%
rename from pkgs/python-packages/buildbot/plugins/buildslist/default.nix
rename to flakes/private/buildbot/buildslist/default.nix
index 4ab4c54..7f72503 100644
--- a/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
+++ b/flakes/private/buildbot/buildslist/default.nix
@@ -1,16 +1,15 @@
-{ stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, libsass, python, fetchurl, jq, yarn, nodejs-10_x, yarn2nix-moretea, sources }:
+{ stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, fetchurl, jq, yarn, nodejs-10_x, yarn2nix-moretea, buildslist_src }:
 let
   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}/package.json | jq -r '.version = "${pythonPackages.buildbot-pkg.version}"|.license= "MIT"' > $out
     '';
   nodeHeaders = fetchurl {
     url = "https://nodejs.org/download/release/v${nodejs-10_x.version}/node-v${nodejs-10_x.version}-headers.tar.gz";
-    sha256 = "15hkcbs328d3rc1s14rmky8lh8d3rr86l8k0bia0ggxzwl23lj9c";
+    sha256 = "sha256-LEk6BOW/vwdUXGAialDOoyFIkZ81k6ADy6MhMfRiE5Y=";
   };
   buildslist_yarn = yarn2nix-moretea'.mkYarnModules rec {
     name = "buildslist-yarn-modules";
@@ -21,7 +20,7 @@ let
     yarnNix = ./yarn-packages.nix;
     pkgConfig = {
       node-sass = {
-        buildInputs = [ libsass python ];
+        buildInputs = with yarn2nix-moretea'.pkgs; [ libsass python2 ];
         postInstall =
           ''
             node scripts/build.js --tarball=${nodeHeaders}