From 65d71d574f66e035fc9348b5250dbe9560eee41a Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 13:08:57 -0400 Subject: [PATCH] pythonPackages.setuptools-git: refactor move to python-modules --- .../python-modules/setuptools-git/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +-------------- 2 files changed, 26 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/setuptools-git/default.nix diff --git a/pkgs/development/python-modules/setuptools-git/default.nix b/pkgs/development/python-modules/setuptools-git/default.nix new file mode 100644 index 000000000000..c68ba10a3209 --- /dev/null +++ b/pkgs/development/python-modules/setuptools-git/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pkgs +}: + +buildPythonPackage rec { + pname = "setuptools-git"; + version = "1.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "047d7595546635edebef226bc566579d422ccc48a8a91c7d32d8bd174f68f831"; + }; + + propagatedBuildInputs = [ pkgs.git ]; + doCheck = false; + + meta = with stdenv.lib; { + description = "Setuptools revision control system plugin for Git"; + homepage = https://pypi.python.org/pypi/setuptools-git; + license = licenses.bsd3; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 849e956178f3..a386448dc7f9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2191,25 +2191,7 @@ in { repoze_sphinx_autointerface = callPackage ../development/python-modules/repoze_sphinx_autointerface { }; - setuptools-git = buildPythonPackage rec { - name = "setuptools-git-${version}"; - version = "1.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/setuptools-git/${name}.tar.gz"; - sha256 = "047d7595546635edebef226bc566579d422ccc48a8a91c7d32d8bd174f68f831"; - }; - - propagatedBuildInputs = [ pkgs.git ]; - doCheck = false; - - meta = { - description = "Setuptools revision control system plugin for Git"; - homepage = https://pypi.python.org/pypi/setuptools-git; - license = licenses.bsd3; - }; - }; - + setuptools-git = callPackage ../development/python-modules/setuptools-git { }; watchdog = buildPythonPackage rec { name = "watchdog-${version}";