From cca503b3891dab1cc2cf0dbd4a8095f87d1fcff9 Mon Sep 17 00:00:00 2001 From: wisut hantanong Date: Sat, 15 Jul 2017 15:33:16 +0700 Subject: [PATCH] python.pkgs.packaging: move to separate expression --- .../python-modules/packaging/default.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +------------ 2 files changed, 25 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/packaging/default.nix diff --git a/pkgs/development/python-modules/packaging/default.nix b/pkgs/development/python-modules/packaging/default.nix new file mode 100644 index 00000000000..776ec7ffc4b --- /dev/null +++ b/pkgs/development/python-modules/packaging/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildPythonPackage, fetchPypi +, pyparsing, six, pytest, pretend }: + +buildPythonPackage rec { + pname = "packaging"; + version = "16.8"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "5d50835fdf0a7edf0b55e311b7c887786504efea1177abd7e69329a8e5ea619e"; + }; + + propagatedBuildInputs = [ pyparsing six ]; + + buildInputs = [ pytest pretend ]; + + meta = with stdenv.lib; { + description = "Core utilities for Python packages"; + homepage = "https://github.com/pypa/packaging"; + license = [ licenses.bsd2 licenses.asl20 ]; + maintainers = with maintainers; [ bennofs ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ad1aa0eab45..e1a295d56ed 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -29892,22 +29892,7 @@ EOF }; }; - packaging = buildPythonPackage rec { - name = "packaging-16.8"; - src = pkgs.fetchurl { - url = "mirror://pypi/p/packaging/${name}.tar.gz"; - sha256 = "5d50835fdf0a7edf0b55e311b7c887786504efea1177abd7e69329a8e5ea619e"; - }; - propagatedBuildInputs = with self; [ pyparsing six ]; - buildInputs = with self; [ pytest pretend ]; - - meta = with pkgs.stdenv.lib; { - description = "Core utilities for Python packages"; - homepage = "https://github.com/pypa/packaging"; - license = [ licenses.bsd2 licenses.asl20 ]; - maintainers = with maintainers; [ bennofs ]; - }; - }; + packaging = callPackage ../development/python-modules/packaging { }; pytoml = callPackage ../development/python-modules/pytoml { };