about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChris Ostrouchov <chris.ostrouchov@gmail.com>2018-10-15 17:44:05 -0400
committerFrederik Rietdijk <fridh@fridh.nl>2018-10-17 07:46:56 +0200
commitd70a0fc07937b28843c8e552dafb63b68dda0a3c (patch)
tree38e5a95dd7d7fb827995316f3b7a733297fb5f56
parent1bbb17afe54afc8738263cbc05fb1bfc84439869 (diff)
downloadnixlib-d70a0fc07937b28843c8e552dafb63b68dda0a3c.tar
nixlib-d70a0fc07937b28843c8e552dafb63b68dda0a3c.tar.gz
nixlib-d70a0fc07937b28843c8e552dafb63b68dda0a3c.tar.bz2
nixlib-d70a0fc07937b28843c8e552dafb63b68dda0a3c.tar.lz
nixlib-d70a0fc07937b28843c8e552dafb63b68dda0a3c.tar.xz
nixlib-d70a0fc07937b28843c8e552dafb63b68dda0a3c.tar.zst
nixlib-d70a0fc07937b28843c8e552dafb63b68dda0a3c.zip
pythonPackages.mapsplotlib: refactor move to python-modules
-rw-r--r--pkgs/development/python-modules/mapsplotlib/default.nix32
-rw-r--r--pkgs/top-level/python-packages.nix20
2 files changed, 33 insertions, 19 deletions
diff --git a/pkgs/development/python-modules/mapsplotlib/default.nix b/pkgs/development/python-modules/mapsplotlib/default.nix
new file mode 100644
index 000000000000..861f3069bb02
--- /dev/null
+++ b/pkgs/development/python-modules/mapsplotlib/default.nix
@@ -0,0 +1,32 @@
+{ stdenv
+, buildPythonPackage
+, isPy3k
+, fetchPypi
+, matplotlib
+, scipy
+, pandas
+, requests
+, pillow
+}:
+
+buildPythonPackage rec {
+  pname = "mapsplotlib";
+  version = "1.0.6";
+
+  disabled = isPy3k;
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "09gpws3x0jd88n636baxx5izjffrpjy4j6jl8l7vj29yzvrdr2bp";
+  };
+
+  propagatedBuildInputs = [ matplotlib scipy pandas requests pillow ];
+
+  meta = with stdenv.lib; {
+    description = "Custom Python plots on a Google Maps background";
+    homepage = https://github.com/tcassou/mapsplotlib;
+    license = licenses.mit;
+    maintainers = [ maintainers.rob ];
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 94bdcf014a8d..95314d94d356 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5807,25 +5807,7 @@ in {
 
   manuel = callPackage ../development/python-modules/manuel { };
 
-  mapsplotlib = buildPythonPackage rec {
-    name = "mapsplotlib-${version}";
-    version = "1.0.6";
-
-    disabled = isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/m/mapsplotlib/${name}.tar.gz";
-      sha256 = "09gpws3x0jd88n636baxx5izjffrpjy4j6jl8l7vj29yzvrdr2bp";
-    };
-
-    propagatedBuildInputs = with self; [ matplotlib scipy pandas requests pillow ];
-
-    meta = {
-      description = "Custom Python plots on a Google Maps background";
-      homepage = https://github.com/tcassou/mapsplotlib;
-      maintainers = [ maintainers.rob ];
-    };
-  };
+  mapsplotlib = callPackage ../development/python-modules/mapsplotlib { };
 
   markdown = callPackage ../development/python-modules/markdown { };