From b148467e9b673ad6c6634dfa1ec3e138466812a9 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 14:18:42 -0400 Subject: [PATCH] pythonPackages.dtopt: refactor move to python-modules --- .../python-modules/dtopt/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------ 2 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/dtopt/default.nix diff --git a/pkgs/development/python-modules/dtopt/default.nix b/pkgs/development/python-modules/dtopt/default.nix new file mode 100644 index 00000000000..601ebf6d9a9 --- /dev/null +++ b/pkgs/development/python-modules/dtopt/default.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, isPy3k +}: + +buildPythonPackage rec { + pname = "dtopt"; + version = "0.1"; + # Test contain Python 2 print + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "06ae07a12294a7ba708abaa63f838017d1a2faf6147a1e7a14ca4fa28f86da7f"; + }; + + meta = with stdenv.lib; { + description = "Add options to doctest examples while they are running"; + homepage = https://pypi.python.org/pypi/dtopt; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0660aec9a35..b60c24cc5f9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2338,22 +2338,7 @@ in { hg-git = callPackage ../development/python-modules/hg-git { }; - dtopt = buildPythonPackage rec { - name = "dtopt-0.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/dtopt/${name}.tar.gz"; - sha256 = "06ae07a12294a7ba708abaa63f838017d1a2faf6147a1e7a14ca4fa28f86da7f"; - }; - - meta = { - description = "Add options to doctest examples while they are running"; - homepage = https://pypi.python.org/pypi/dtopt; - }; - # Test contain Python 2 print - disabled = isPy3k; - }; - + dtopt = callPackage ../development/python-modules/dtopt { }; ecdsa = buildPythonPackage rec { name = "ecdsa-${version}";