Migrate mylibs to niv (work in progress)

4 files changed, 8 insertions, 23 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 @@
-{
-  "tag": "fb8641f-master",
-  "meta": {
-    "name": "buildslist",
-    "url": "https://git.immae.eu/perso/Immae/Projets/Buildbot/buildslist",
-    "branch": "master"
-  },
-  "git": {
-    "url": "https://git.immae.eu/perso/Immae/Projets/Buildbot/buildslist",
-    "rev": "fb8641f2badcec9f232cc5f727009911fc1c89b0",
-    "sha256": "0hgz5yaq0mz9lvfywbkbjap7z55839k18vfyg1yhx6l1mvvbq8zc",
-    "fetchSubmodules": true
-  }
-}
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 @@
-{ mylibs, stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, libsass, python, fetchurl, jq, yarn, nodejs, yarn2nix-moretea }:
+{ stdenv, runCommand, writeScriptBin, buildBowerComponents, pythonPackages, libsass, python, fetchurl, jq, yarn, nodejs, yarn2nix-moretea, sources }:
 let
-  buildslist_src = mylibs.fetchedGit ./buildslist.json;
+  buildslist_src = sources.buildbot-plugin-buildslist;
   packagejson = runCommand "package.json" { buildInputs = [ jq ]; } ''
-    cat ${buildslist_src.src}/package.json | jq -r '.version = "${pythonPackages.buildbot-pkg.version}"|.license= "MIT"' > $out
+    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";
@@ -13,7 +13,7 @@ let
     pname = name;
     inherit (pythonPackages.buildbot-pkg) version;
     packageJSON = packagejson;
-    yarnLock = "${buildslist_src.src}/yarn.lock";
+    yarnLock = "${buildslist_src}/yarn.lock";
     yarnNix = ./yarn-packages.nix;
     pkgConfig = {
       node-sass = {
@@ -28,7 +28,7 @@ let
   buildslist_bower = buildBowerComponents {
     name = "buildslist";
     generated = ./bower.nix;
-    src = "${buildslist_src.src}/guanlecoja/";
+    src = "${buildslist_src}/guanlecoja/";
   };
   # the buildbot-pkg calls yarn and screws up everything...
   fakeYarn = writeScriptBin "yarn" ''
@@ -57,5 +57,5 @@ pythonPackages.buildPythonPackage rec {
   buildInputs = [ buildslist_yarn buildslist_bower ];
 
   doCheck = false;
-  src = buildslist_src.src;
+  src = buildslist_src;
 }
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 @@
-{ mylibs, callPackage, python }:
+{ callPackage, python }:
 {
   buildslist = callPackage ./buildslist {
-    inherit mylibs;
     pythonPackages = python.pkgs;
   };
 }
diff --git a/pkgs/python-packages/default.nix b/pkgs/python-packages/default.nix
index 2616d64..9347a06 100644
--- a/pkgs/python-packages/default.nix
+++ b/pkgs/python-packages/default.nix
@@ -1,7 +1,7 @@
 { mylibs, callPackage, python }:
 {
   apprise = callPackage ./apprise { inherit mylibs; pythonPackages = python.pkgs; };
-  buildbot-plugins = callPackage ./buildbot/plugins { inherit mylibs python; };
+  buildbot-plugins = callPackage ./buildbot/plugins { inherit python; };
   wokkel = callPackage ./wokkel.nix { pythonPackages = python.pkgs; };
   pymilter = callPackage ./pymilter.nix { pythonPackages = python.pkgs; };
 }