aboutsummaryrefslogtreecommitdiff
path: root/pkgs/python-packages
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2020-08-08 21:40:31 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2020-08-16 00:21:02 +0200
commit2053ddac783c931053676ebc2b02bc8b82d89399 (patch)
tree2f5a9533bc41a482533993f00c9fd3ca4d2b108b /pkgs/python-packages
parent69e6151c0c324f920eccb34568ed7ff523592589 (diff)
downloadNix-2053ddac783c931053676ebc2b02bc8b82d89399.tar.gz
Nix-2053ddac783c931053676ebc2b02bc8b82d89399.tar.zst
Nix-2053ddac783c931053676ebc2b02bc8b82d89399.zip
Upgrade nixos-unstable
Diffstat (limited to 'pkgs/python-packages')
-rw-r--r--pkgs/python-packages/buildbot/plugins/buildslist/default.nix14
1 files changed, 9 insertions, 5 deletions
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 @@
1{ stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, libsass, python, fetchurl, jq, yarn, nodejs, yarn2nix-moretea, sources }: 1{ stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, libsass, python, fetchurl, jq, yarn, nodejs-10_x, yarn2nix-moretea, sources }:
2let 2let
3 yarn2nix-moretea' = yarn2nix-moretea.override({
4 yarn = yarn.override({ nodejs = nodejs-10_x; });
5 nodejs = nodejs-10_x;
6 });
3 buildslist_src = sources.buildbot-plugin-buildslist; 7 buildslist_src = sources.buildbot-plugin-buildslist;
4 packagejson = runCommand "package.json" { buildInputs = [ jq ]; } '' 8 packagejson = runCommand "package.json" { buildInputs = [ jq ]; } ''
5 cat ${buildslist_src}/package.json | jq -r '.version = "${pythonPackages.buildbot-pkg.version}"|.license= "MIT"' > $out 9 cat ${buildslist_src}/package.json | jq -r '.version = "${pythonPackages.buildbot-pkg.version}"|.license= "MIT"' > $out
6 ''; 10 '';
7 nodeHeaders = fetchurl { 11 nodeHeaders = fetchurl {
8 url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz"; 12 url = "https://nodejs.org/download/release/v${nodejs-10_x.version}/node-v${nodejs-10_x.version}-headers.tar.gz";
9 sha256 = "1prvrcvbyal39k9axfwjixs4wfgs1m8xy4prsl0kq0s0n7r7nxzj"; 13 sha256 = "15hkcbs328d3rc1s14rmky8lh8d3rr86l8k0bia0ggxzwl23lj9c";
10 }; 14 };
11 buildslist_yarn = yarn2nix-moretea.mkYarnModules rec { 15 buildslist_yarn = yarn2nix-moretea'.mkYarnModules rec {
12 name = "buildslist-yarn-modules"; 16 name = "buildslist-yarn-modules";
13 pname = name; 17 pname = name;
14 inherit (pythonPackages.buildbot-pkg) version; 18 inherit (pythonPackages.buildbot-pkg) version;
@@ -53,7 +57,7 @@ pythonPackages.buildPythonPackage rec {
53 (klein.overridePythonAttrs(old: { checkPhase = ""; })) 57 (klein.overridePythonAttrs(old: { checkPhase = ""; }))
54 buildbot-pkg 58 buildbot-pkg
55 ]; 59 ];
56 nativeBuildInputs = [ fakeYarn nodejs ]; 60 nativeBuildInputs = [ fakeYarn nodejs-10_x ];
57 buildInputs = [ buildslist_yarn buildslist_bower ]; 61 buildInputs = [ buildslist_yarn buildslist_bower ];
58 62
59 doCheck = false; 63 doCheck = false;