From 05ff4d75d1ce4600497dbdd93d32a583e696a2c9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 31 Dec 2017 12:24:15 +0100 Subject: [PATCH] python.pkgs.decorator: move expression --- .../python-modules/decorator/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +-------------- 2 files changed, 21 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/decorator/default.nix diff --git a/pkgs/development/python-modules/decorator/default.nix b/pkgs/development/python-modules/decorator/default.nix new file mode 100644 index 00000000000..5cdbbfce77f --- /dev/null +++ b/pkgs/development/python-modules/decorator/default.nix @@ -0,0 +1,20 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "decorator"; + version = "4.0.11"; + + src = fetchPypi { + inherit pname version; + sha256 = "953d6bf082b100f43229cf547f4f97f97e970f5ad645ee7601d55ff87afdfe76"; + }; + + meta = { + homepage = https://pypi.python.org/pypi/decorator; + description = "Better living through Python with decorators"; + license = lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8ad57395fdd..f65a876894d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4101,21 +4101,7 @@ in { }; }; - decorator = buildPythonPackage rec { - name = "decorator-${version}"; - version = "4.0.11"; - - src = pkgs.fetchurl { - url = "mirror://pypi/d/decorator/${name}.tar.gz"; - sha256 = "953d6bf082b100f43229cf547f4f97f97e970f5ad645ee7601d55ff87afdfe76"; - }; - - meta = { - homepage = https://pypi.python.org/pypi/decorator; - description = "Better living through Python with decorators"; - license = licenses.mit; - }; - }; + decorator = callPackage ../development/python-modules/decorator { }; deform = buildPythonPackage rec { name = "deform-2.0a2";