diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-04-20 02:59:22 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-04-20 02:59:22 +0200 |
commit | 71b4786dc43362b7820e3823b26e9152350cd388 (patch) | |
tree | c18b0a30bc79a00da63d9db8915cc7dff425d221 /pkgs/python-packages/buildbot | |
parent | e94cd212b4a43296d44876b3c5f7113e9f5b9727 (diff) | |
download | Nix-71b4786dc43362b7820e3823b26e9152350cd388.tar.gz Nix-71b4786dc43362b7820e3823b26e9152350cd388.tar.zst Nix-71b4786dc43362b7820e3823b26e9152350cd388.zip |
Remove yarn2nixPackage from lib
Diffstat (limited to 'pkgs/python-packages/buildbot')
-rw-r--r-- | pkgs/python-packages/buildbot/plugins/buildslist/default.nix | 5 |
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 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 @@ | |||
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 }: |
2 | let | 2 | let |
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 = |