From 2053ddac783c931053676ebc2b02bc8b82d89399 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Sat, 8 Aug 2020 21:40:31 +0200 Subject: Upgrade nixos-unstable --- .../buildbot/plugins/buildslist/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'pkgs/python-packages') diff --git a/pkgs/python-packages/buildbot/plugins/buildslist/default.nix b/pkgs/python-packages/buildbot/plugins/buildslist/default.nix index 3f77f63..4ab4c54 100644 --- a/pkgs/python-packages/buildbot/plugins/buildslist/default.nix +++ b/pkgs/python-packages/buildbot/plugins/buildslist/default.nix @@ -1,14 +1,18 @@ -{ stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, libsass, python, fetchurl, jq, yarn, nodejs, yarn2nix-moretea, sources }: +{ stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, libsass, python, fetchurl, jq, yarn, nodejs-10_x, yarn2nix-moretea, sources }: 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.version}/node-v${nodejs.version}-headers.tar.gz"; - sha256 = "1prvrcvbyal39k9axfwjixs4wfgs1m8xy4prsl0kq0s0n7r7nxzj"; + url = "https://nodejs.org/download/release/v${nodejs-10_x.version}/node-v${nodejs-10_x.version}-headers.tar.gz"; + sha256 = "15hkcbs328d3rc1s14rmky8lh8d3rr86l8k0bia0ggxzwl23lj9c"; }; - buildslist_yarn = yarn2nix-moretea.mkYarnModules rec { + buildslist_yarn = yarn2nix-moretea'.mkYarnModules rec { name = "buildslist-yarn-modules"; pname = name; inherit (pythonPackages.buildbot-pkg) version; @@ -53,7 +57,7 @@ pythonPackages.buildPythonPackage rec { (klein.overridePythonAttrs(old: { checkPhase = ""; })) buildbot-pkg ]; - nativeBuildInputs = [ fakeYarn nodejs ]; + nativeBuildInputs = [ fakeYarn nodejs-10_x ]; buildInputs = [ buildslist_yarn buildslist_bower ]; doCheck = false; -- cgit v1.2.3