From 6ca3651766ac0aa33d08af90cb848474cf738320 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Mon, 29 Oct 2018 15:05:19 -0400 Subject: [PATCH] pythonPackages.xlsx2csv: refactor move to python-modules --- .../python-modules/xlsx2csv/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 15 +------------ 2 files changed, 23 insertions(+), 14 deletions(-) create mode 100644 pkgs/development/python-modules/xlsx2csv/default.nix diff --git a/pkgs/development/python-modules/xlsx2csv/default.nix b/pkgs/development/python-modules/xlsx2csv/default.nix new file mode 100644 index 00000000000..d38506f185f --- /dev/null +++ b/pkgs/development/python-modules/xlsx2csv/default.nix @@ -0,0 +1,22 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "xlsx2csv"; + version = "0.7.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "7c6c8fa6c2774224d03a6a96049e116822484dccfa3634893397212ebcd23866"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/bitprophet/alabaster; + description = "Convert xlsx to csv"; + license = licenses.bsd3; + maintainers = with maintainers; [ jb55 ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eb826e61a13..b2b415d0b22 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4487,20 +4487,7 @@ in { xkcdpass = callPackage ../development/python-modules/xkcdpass { }; - xlsx2csv = buildPythonPackage rec { - name = "xlsx2csv-${version}"; - version = "0.7.2"; - src = pkgs.fetchurl { - url = "mirror://pypi/x/xlsx2csv/${name}.tar.gz"; - sha256 = "7c6c8fa6c2774224d03a6a96049e116822484dccfa3634893397212ebcd23866"; - }; - meta = { - homepage = https://github.com/bitprophet/alabaster; - description = "Convert xlsx to csv"; - license = licenses.bsd3; - maintainers = with maintainers; [ jb55 ]; - }; - }; + xlsx2csv = callPackage ../development/python-modules/xlsx2csv { }; xmpppy = callPackage ../development/python-modules/xmpppy {};