From 0c5eced78dd49c02186fcf99a0fbdcdf1a07e27a Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Fri, 26 Oct 2018 13:14:28 -0400 Subject: [PATCH] pythonPackages.setuptoolsDarcs: refactor move to python-modules --- .../setuptoolsdarcs/default.nix | 30 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 25 +--------------- 2 files changed, 31 insertions(+), 24 deletions(-) create mode 100644 pkgs/development/python-modules/setuptoolsdarcs/default.nix diff --git a/pkgs/development/python-modules/setuptoolsdarcs/default.nix b/pkgs/development/python-modules/setuptoolsdarcs/default.nix new file mode 100644 index 00000000000..d696a5be08f --- /dev/null +++ b/pkgs/development/python-modules/setuptoolsdarcs/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, darcsver +}: + +buildPythonPackage rec { + pname = "setuptools_darcs"; + version = "1.2.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "1wsh0g1fn10msqk87l5jrvzs0yj5mp6q9ld3gghz6zrhl9kqzdn1"; + }; + + # In order to break the dependency on darcs -> ghc, we don't add + # darcs as a propagated build input. + propagatedBuildInputs = [ darcsver ]; + + # ugly hack to specify version that should otherwise come from darcs + patchPhase = '' + substituteInPlace setup.py --replace "name=PKG" "name=PKG, version='${version}'" + ''; + + meta = with stdenv.lib; { + description = "Setuptools plugin for the Darcs version control system"; + homepage = http://allmydata.org/trac/setuptools_darcs; + license = licenses.bsd0; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bdaec829cfc..75634c88c48 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3708,30 +3708,7 @@ in { setuptools_scm = callPackage ../development/python-modules/setuptools_scm { }; - setuptoolsDarcs = buildPythonPackage rec { - name = "setuptools_darcs-${version}"; - version = "1.2.11"; - - src = pkgs.fetchurl { - url = "mirror://pypi/s/setuptools_darcs/${name}.tar.gz"; - sha256 = "1wsh0g1fn10msqk87l5jrvzs0yj5mp6q9ld3gghz6zrhl9kqzdn1"; - }; - - # In order to break the dependency on darcs -> ghc, we don't add - # darcs as a propagated build input. - propagatedBuildInputs = with self; [ darcsver ]; - - # ugly hack to specify version that should otherwise come from darcs - patchPhase = '' - substituteInPlace setup.py --replace "name=PKG" "name=PKG, version='${version}'" - ''; - - meta = { - description = "Setuptools plugin for the Darcs version control system"; - homepage = http://allmydata.org/trac/setuptools_darcs; - license = "BSD"; - }; - }; + setuptoolsDarcs = callPackage ../development/python-modules/setuptoolsdarcs { }; setuptoolsTrial = buildPythonPackage rec { name = "${pname}-${version}";