From 3df4461e21084669eaa8ad225f66f0397f678160 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 17 Oct 2018 14:51:14 -0400 Subject: [PATCH] pythonPackages.ordereddict: refactor move to python-modules --- .../python-modules/ordereddict/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------- 2 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/ordereddict/default.nix diff --git a/pkgs/development/python-modules/ordereddict/default.nix b/pkgs/development/python-modules/ordereddict/default.nix new file mode 100644 index 000000000000..27bdd728bbe6 --- /dev/null +++ b/pkgs/development/python-modules/ordereddict/default.nix @@ -0,0 +1,21 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "ordereddict"; + version = "1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "07qvy11nvgxpzarrni3wrww3vpc9yafgi2bch4j2vvvc42nb8d8w"; + }; + + meta = with stdenv.lib; { + description = "A drop-in substitute for Py2.7's new collections.OrderedDict that works in Python 2.4-2.6"; + license = licenses.bsd3; + maintainers = with maintainers; [ garbas ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 92da550b7cdb..322096dcb3cf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2996,21 +2996,7 @@ in { opentimestamps = callPackage ../development/python-modules/opentimestamps { }; - ordereddict = buildPythonPackage rec { - name = "ordereddict-${version}"; - version = "1.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/o/ordereddict/${name}.tar.gz"; - sha256 = "07qvy11nvgxpzarrni3wrww3vpc9yafgi2bch4j2vvvc42nb8d8w"; - }; - - meta = { - description = "A drop-in substitute for Py2.7's new collections.OrderedDict that works in Python 2.4-2.6"; - license = licenses.bsd3; - maintainers = with maintainers; [ garbas ]; - }; - }; + ordereddict = callPackage ../development/python-modules/ordereddict { }; orderedset = callPackage ../development/python-modules/orderedset { };