summaryrefslogtreecommitdiff
path: root/pkgs/python-packages
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2020-04-20 02:59:22 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2020-04-25 00:04:58 +0200
commit84c6c827b76bd7296355fd5cc6c96eff25968f6e (patch)
treecadbeaf219eae063a196de402c23d548302c4f09 /pkgs/python-packages
parentb1566203381206632b4f00b7120c4484089ca924 (diff)
downloadNUR-84c6c827b76bd7296355fd5cc6c96eff25968f6e.tar.gz
NUR-84c6c827b76bd7296355fd5cc6c96eff25968f6e.tar.zst
NUR-84c6c827b76bd7296355fd5cc6c96eff25968f6e.zip
Remove yarn2nixPackage from lib
Diffstat (limited to 'pkgs/python-packages')
-rw-r--r--pkgs/python-packages/buildbot/plugins/buildslist/default.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/python-packages/buildbot/plugins/buildslist/default.nix b/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
index dc6104e4..273996ea 100644
--- a/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
+++ b/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
@@ -1,4 +1,4 @@
1{ mylibs, stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, libsass, python, fetchurl, jq, yarn, nodejs }: 1{ mylibs, stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, libsass, python, fetchurl, jq, yarn, nodejs, yarn2nix-moretea }:
2let 2let
3 buildslist_src = mylibs.fetchedGit ./buildslist.json; 3 buildslist_src = mylibs.fetchedGit ./buildslist.json;
4 packagejson = runCommand "package.json" { buildInputs = [ jq ]; } '' 4 packagejson = runCommand "package.json" { buildInputs = [ jq ]; } ''
@@ -8,7 +8,7 @@ let
8 url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz"; 8 url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz";
9 sha256 = "1df3yhlwlvai0m9kvjyknjg11hnw0kj0rnhyzbwvsfjnmr6z8r76"; 9 sha256 = "1df3yhlwlvai0m9kvjyknjg11hnw0kj0rnhyzbwvsfjnmr6z8r76";
10 }; 10 };
11 buildslist_yarn = mylibs.yarn2nixPackage.mkYarnModules rec { 11 buildslist_yarn = yarn2nix-moretea.mkYarnModules rec {
12 name = "buildslist-yarn-modules"; 12 name = "buildslist-yarn-modules";
13 pname = name; 13 pname = name;
14 inherit (pythonPackages.buildbot-pkg) version; 14 inherit (pythonPackages.buildbot-pkg) version;
@@ -16,7 +16,6 @@ let
16 yarnLock = "${buildslist_src.src}/yarn.lock"; 16 yarnLock = "${buildslist_src.src}/yarn.lock";
17 yarnNix = ./yarn-packages.nix; 17 yarnNix = ./yarn-packages.nix;
18 pkgConfig = { 18 pkgConfig = {
19 all = { buildInputs = [ mylibs.yarn2nixPackage.src ]; };
20 node-sass = { 19 node-sass = {
21 buildInputs = [ libsass python ]; 20 buildInputs = [ libsass python ];
22 postInstall = 21 postInstall =