X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=pkgs%2Fpython-packages%2Fbuildbot%2Fplugins%2Fbuildslist%2Fdefault.nix;h=3f77f635b48b134b59eba5f340045e4f59984915;hb=db343436f0e678ef3a97e6f8ac559ffa0507e422;hp=273996ea7936af9665f5b16f5145afd2103eb305;hpb=71b4786dc43362b7820e3823b26e9152350cd388;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 273996e..3f77f63 100644 --- a/pkgs/python-packages/buildbot/plugins/buildslist/default.nix +++ b/pkgs/python-packages/buildbot/plugins/buildslist/default.nix @@ -1,19 +1,19 @@ -{ mylibs, stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, libsass, python, fetchurl, jq, yarn, nodejs, yarn2nix-moretea }: +{ stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, libsass, python, fetchurl, jq, yarn, nodejs, yarn2nix-moretea, sources }: let - buildslist_src = mylibs.fetchedGit ./buildslist.json; + 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 = "1df3yhlwlvai0m9kvjyknjg11hnw0kj0rnhyzbwvsfjnmr6z8r76"; + sha256 = "1prvrcvbyal39k9axfwjixs4wfgs1m8xy4prsl0kq0s0n7r7nxzj"; }; 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 = { node-sass = { @@ -28,7 +28,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" '' @@ -57,5 +57,5 @@ pythonPackages.buildPythonPackage rec { buildInputs = [ buildslist_yarn buildslist_bower ]; doCheck = false; - src = buildslist_src.src; + src = buildslist_src; }