From b2c75e7d7211a2d1406816e330595d397b2f7a49 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Fri, 26 Oct 2018 12:53:16 -0400 Subject: [PATCH] pythonPackages.squaremap: refactor move to python-modules --- .../python-modules/squaremap/default.nix | 23 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------ 2 files changed, 24 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/squaremap/default.nix diff --git a/pkgs/development/python-modules/squaremap/default.nix b/pkgs/development/python-modules/squaremap/default.nix new file mode 100644 index 000000000000..3a0e95ab77e3 --- /dev/null +++ b/pkgs/development/python-modules/squaremap/default.nix @@ -0,0 +1,23 @@ +{ stdenv +, buildPythonPackage +, isPy3k +, fetchPypi +}: + +buildPythonPackage rec { + pname = "squaremap"; + version = "1.0.4"; + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "feab6cb3b222993df68440e34825d8a16de2c74fdb290ae3974c86b1d5f3eef8"; + }; + + meta = with stdenv.lib; { + description = "Hierarchic visualization control for wxPython"; + homepage = https://launchpad.net/squaremap; + license = licenses.bsd3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b21c9141284e..6e4f400bcf96 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3652,21 +3652,7 @@ in { Rtree = callPackage ../development/python-modules/Rtree { inherit (pkgs) libspatialindex; }; - squaremap = buildPythonPackage rec { - name = "squaremap-1.0.4"; - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/S/SquareMap/SquareMap-1.0.4.tar.gz"; - sha256 = "feab6cb3b222993df68440e34825d8a16de2c74fdb290ae3974c86b1d5f3eef8"; - }; - - meta = { - description = "Hierarchic visualization control for wxPython"; - homepage = https://launchpad.net/squaremap; - license = licenses.bsd3; - }; - }; + squaremap = callPackage ../development/python-modules/squaremap { }; ruamel_base = buildPythonPackage rec { name = "ruamel.base-${version}";