From 95d05603d3683c1ac2d08bf7396e315f9b164c15 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Thu, 25 Oct 2018 20:29:48 -0400 Subject: [PATCH] pythonPackages.retrying: refactor move to python-modules --- .../python-modules/retrying/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 19 +------------ 2 files changed, 28 insertions(+), 18 deletions(-) create mode 100644 pkgs/development/python-modules/retrying/default.nix diff --git a/pkgs/development/python-modules/retrying/default.nix b/pkgs/development/python-modules/retrying/default.nix new file mode 100644 index 000000000000..9074634e9b6a --- /dev/null +++ b/pkgs/development/python-modules/retrying/default.nix @@ -0,0 +1,27 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, six +}: + +buildPythonPackage rec { + pname = "retrying"; + version = "1.3.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "0fwp86xv0rvkncjdvy2mwcvbglw4w9k0fva25i7zx8kd19b3kh08"; + }; + + propagatedBuildInputs = [ six ]; + + # doesn't ship tests in tarball + doCheck = false; + + meta = with stdenv.lib; { + homepage = https://github.com/rholder/retrying; + description = "General-purpose retrying library"; + license = licenses.asl20; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 97bfb994c9b4..cc10d2ea6d23 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3049,24 +3049,7 @@ in { lz4 = callPackage ../development/python-modules/lz4 { }; - retrying = buildPythonPackage rec { - name = "retrying-${version}"; - version = "1.3.3"; - - src = pkgs.fetchurl { - url = "mirror://pypi/r/retrying/retrying-1.3.3.tar.gz"; - sha256 = "0fwp86xv0rvkncjdvy2mwcvbglw4w9k0fva25i7zx8kd19b3kh08"; - }; - - propagatedBuildInputs = with self; [ six ]; - - # doesn't ship tests in tarball - doCheck = false; - - meta = with stdenv.lib; { - homepage = https://github.com/rholder/retrying; - }; - }; + retrying = callPackage ../development/python-modules/retrying { }; fasteners = buildPythonPackage rec { name = "fasteners-${version}";