aboutsummaryrefslogtreecommitdiff
path: root/pkgs/python-packages/buildbot
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2020-05-10 19:10:05 +0200
committerIsmaël Bouya <ismael.bouya@normalesup.org>2020-05-11 16:38:15 +0200
commitdb343436f0e678ef3a97e6f8ac559ffa0507e422 (patch)
tree882fd0a0fa2fa41fac62a929a93aba09f5eea4d5 /pkgs/python-packages/buildbot
parent34c7b88e16d1768b1b9a0cfa6dd21ea5d9b1b308 (diff)
downloadNix-db343436f0e678ef3a97e6f8ac559ffa0507e422.tar.gz
Nix-db343436f0e678ef3a97e6f8ac559ffa0507e422.tar.zst
Nix-db343436f0e678ef3a97e6f8ac559ffa0507e422.zip
Migrate mylibs to niv (work in progress)
Diffstat (limited to 'pkgs/python-packages/buildbot')
-rw-r--r--pkgs/python-packages/buildbot/plugins/buildslist/buildslist.json14
-rw-r--r--pkgs/python-packages/buildbot/plugins/buildslist/default.nix12
-rw-r--r--pkgs/python-packages/buildbot/plugins/default.nix3
3 files changed, 7 insertions, 22 deletions
diff --git a/pkgs/python-packages/buildbot/plugins/buildslist/buildslist.json b/pkgs/python-packages/buildbot/plugins/buildslist/buildslist.json
deleted file mode 100644
index e61d7ab..0000000
--- a/pkgs/python-packages/buildbot/plugins/buildslist/buildslist.json
+++ /dev/null
@@ -1,14 +0,0 @@
1{
2 "tag": "fb8641f-master",
3 "meta": {
4 "name": "buildslist",
5 "url": "https://git.immae.eu/perso/Immae/Projets/Buildbot/buildslist",
6 "branch": "master"
7 },
8 "git": {
9 "url": "https://git.immae.eu/perso/Immae/Projets/Buildbot/buildslist",
10 "rev": "fb8641f2badcec9f232cc5f727009911fc1c89b0",
11 "sha256": "0hgz5yaq0mz9lvfywbkbjap7z55839k18vfyg1yhx6l1mvvbq8zc",
12 "fetchSubmodules": true
13 }
14}
diff --git a/pkgs/python-packages/buildbot/plugins/buildslist/default.nix b/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
index ad87111..3f77f63 100644
--- a/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
+++ b/pkgs/python-packages/buildbot/plugins/buildslist/default.nix
@@ -1,8 +1,8 @@
1{ mylibs, stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, libsass, python, fetchurl, jq, yarn, nodejs, yarn2nix-moretea }: 1{ stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, libsass, python, fetchurl, jq, yarn, nodejs, yarn2nix-moretea, sources }:
2let 2let
3 buildslist_src = mylibs.fetchedGit ./buildslist.json; 3 buildslist_src = sources.buildbot-plugin-buildslist;
4 packagejson = runCommand "package.json" { buildInputs = [ jq ]; } '' 4 packagejson = runCommand "package.json" { buildInputs = [ jq ]; } ''
5 cat ${buildslist_src.src}/package.json | jq -r '.version = "${pythonPackages.buildbot-pkg.version}"|.license= "MIT"' > $out 5 cat ${buildslist_src}/package.json | jq -r '.version = "${pythonPackages.buildbot-pkg.version}"|.license= "MIT"' > $out
6 ''; 6 '';
7 nodeHeaders = fetchurl { 7 nodeHeaders = fetchurl {
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";
@@ -13,7 +13,7 @@ let
13 pname = name; 13 pname = name;
14 inherit (pythonPackages.buildbot-pkg) version; 14 inherit (pythonPackages.buildbot-pkg) version;
15 packageJSON = packagejson; 15 packageJSON = packagejson;
16 yarnLock = "${buildslist_src.src}/yarn.lock"; 16 yarnLock = "${buildslist_src}/yarn.lock";
17 yarnNix = ./yarn-packages.nix; 17 yarnNix = ./yarn-packages.nix;
18 pkgConfig = { 18 pkgConfig = {
19 node-sass = { 19 node-sass = {
@@ -28,7 +28,7 @@ let
28 buildslist_bower = buildBowerComponents { 28 buildslist_bower = buildBowerComponents {
29 name = "buildslist"; 29 name = "buildslist";
30 generated = ./bower.nix; 30 generated = ./bower.nix;
31 src = "${buildslist_src.src}/guanlecoja/"; 31 src = "${buildslist_src}/guanlecoja/";
32 }; 32 };
33 # the buildbot-pkg calls yarn and screws up everything... 33 # the buildbot-pkg calls yarn and screws up everything...
34 fakeYarn = writeScriptBin "yarn" '' 34 fakeYarn = writeScriptBin "yarn" ''
@@ -57,5 +57,5 @@ pythonPackages.buildPythonPackage rec {
57 buildInputs = [ buildslist_yarn buildslist_bower ]; 57 buildInputs = [ buildslist_yarn buildslist_bower ];
58 58
59 doCheck = false; 59 doCheck = false;
60 src = buildslist_src.src; 60 src = buildslist_src;
61} 61}
diff --git a/pkgs/python-packages/buildbot/plugins/default.nix b/pkgs/python-packages/buildbot/plugins/default.nix
index 4952819..22a8507 100644
--- a/pkgs/python-packages/buildbot/plugins/default.nix
+++ b/pkgs/python-packages/buildbot/plugins/default.nix
@@ -1,7 +1,6 @@
1{ mylibs, callPackage, python }: 1{ callPackage, python }:
2{ 2{
3 buildslist = callPackage ./buildslist { 3 buildslist = callPackage ./buildslist {
4 inherit mylibs;
5 pythonPackages = python.pkgs; 4 pythonPackages = python.pkgs;
6 }; 5 };
7} 6}