X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=pkgs%2Fpython-packages%2Fbuildbot%2Fplugins%2Fbuildslist%2Fdefault.nix;fp=pkgs%2Fpython-packages%2Fbuildbot%2Fplugins%2Fbuildslist%2Fdefault.nix;h=273996ea7936af9665f5b16f5145afd2103eb305;hb=71b4786dc43362b7820e3823b26e9152350cd388;hp=dc6104e4803be16ddc35d1999cc00277e2e61b35;hpb=e94cd212b4a43296d44876b3c5f7113e9f5b9727;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 dc6104e..273996e 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, 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 ]; } '' @@ -8,7 +8,7 @@ let url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz"; sha256 = "1df3yhlwlvai0m9kvjyknjg11hnw0kj0rnhyzbwvsfjnmr6z8r76"; }; - 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 =