From a5d75f0f18a0af23fe6b01fc971fe2db39db151d Mon Sep 17 00:00:00 2001 From: wisut hantanong Date: Sat, 15 Jul 2017 16:53:43 +0700 Subject: [PATCH] python.pkgs.yapf: move to separate expression fixes #27379 --- .../python-modules/yapf/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 17 +--------------- 2 files changed, 21 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/python-modules/yapf/default.nix diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix new file mode 100644 index 00000000000..b7f9d713927 --- /dev/null +++ b/pkgs/development/python-modules/yapf/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "yapf"; + version = "0.11.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "14kb9gxw39zhvrijhp066b4bm6bgv35iw56c394y4dyczpha0dij"; + }; + + meta = with stdenv.lib; { + description = "A formatter for Python code."; + homepage = "https://github.com/google/yapf"; + license = licenses.asl20; + maintainers = with maintainers; [ siddharthist ]; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f8e7f4c3bf5..4b6d1bf82e3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -29752,22 +29752,7 @@ EOF }; }; - yapf = buildPythonPackage rec { - name = "yapf-${version}"; - version = "0.11.0"; - - meta = { - description = "A formatter for Python code."; - homepage = "https://github.com/google/yapf"; - license = licenses.asl20; - maintainers = with maintainers; [ siddharthist ]; - }; - - src = pkgs.fetchurl { - url = "mirror://pypi/y/yapf/${name}.tar.gz"; - sha256 = "14kb9gxw39zhvrijhp066b4bm6bgv35iw56c394y4dyczpha0dij"; - }; - }; + yapf = callPackage ../development/python-modules/yapf { }; autobahn = callPackage ../development/python-modules/autobahn { };