tensorboardX: move to python-modules

mweinelt · Jun 13, 2020 · 8f978e3 · 8f978e3
1 parent a96108b
commit 8f978e3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git a/pkgs/tools/misc/tensorboardx/default.nix → ...t/python-modules/tensorboardx/default.nix b/pkgs/tools/misc/tensorboardx/default.nix → ...t/python-modules/tensorboardx/default.nix
@@ -1,6 +1,19 @@
-{ lib, pkgs, python3Packages, fetchFromGitHub, glibcLocales }:
+{ lib, pkgs
+, buildPythonPackage
+, fetchFromGitHub
+, crc32c
+, matplotlib
+, numpy
+, protobuf
+, pytest
+, pytorch
+, boto3
+, moto
+, visdom
+, wget
+}:
 
-python3Packages.buildPythonApplication rec {
+buildPythonPackage rec {
   pname = "tensorboardX";
   version = "2.0";
 
@@ -11,22 +24,21 @@ python3Packages.buildPythonApplication rec {
     sha256 = "0qqalq0fhbx0wnd8wdwhyhkkv2brvj9qbk3373vk3wjxbribf5c7";
   };
 
-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = [
     crc32c
     matplotlib
     numpy
     protobuf
   ];
 
-  checkInputs = with python3Packages; [
+  checkInputs = [
     pytest
     pytorch
     boto3
     moto
-  ] ++ (with pkgs; [
     visdom
     wget
-  ]);
+  ];
 
   doCheck = false;
 
@@ -36,4 +48,3 @@ python3Packages.buildPythonApplication rec {
     license = lib.licenses.mit;
   };
 }
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -1293,8 +1293,6 @@ in
     then python.pkgs.tensorflow.libtensorflow
     else libtensorflow-bin;
 
-  tensorboardx = callPackage ../tools/misc/tensorboardx { };
-
   behdad-fonts = callPackage ../data/fonts/behdad-fonts { };
 
   bless = callPackage ../applications/editors/bless { };

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
@@ -6952,6 +6952,8 @@ in {
 
   tensorflow-tensorboard_2 = callPackage ../development/python-modules/tensorflow-tensorboard/2 { };
 
+  tensorboardx = callPackage ../development/python-modules/tensorboardx { };
+
   tensorflow-bin = self.tensorflow-bin_1;
 
   tensorflow-bin_1 = callPackage ../development/python-modules/tensorflow/1/bin.nix {