From 84fc0eae5e4fdc0335be56cf1d84e4eeed469e85 Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Tue, 16 Oct 2018 16:06:47 -0400 Subject: [PATCH] pythonPackages.forbiddenfruit: refactor move to python-modules --- .../python-modules/forbiddenfruit/default.nix | 21 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 16 +------------- 2 files changed, 22 insertions(+), 15 deletions(-) create mode 100644 pkgs/development/python-modules/forbiddenfruit/default.nix diff --git a/pkgs/development/python-modules/forbiddenfruit/default.nix b/pkgs/development/python-modules/forbiddenfruit/default.nix new file mode 100644 index 000000000000..4d2f656b36a3 --- /dev/null +++ b/pkgs/development/python-modules/forbiddenfruit/default.nix @@ -0,0 +1,21 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + version = "0.1.0"; + pname = "forbiddenfruit"; + + src = fetchPypi { + inherit pname version; + sha256 = "0xra2kw6m8ag29ifwmhi5zqksh4cr0yy1waqd488rm59kcr3zl79"; + }; + + meta = with stdenv.lib; { + description = "Patch python built-in objects"; + homepage = https://pypi.python.org/pypi/forbiddenfruit; + license = licenses.mit; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0aa1f56037bf..775f7f3dfd9d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2303,21 +2303,7 @@ in { foolscap = callPackage ../development/python-modules/foolscap { }; - forbiddenfruit = buildPythonPackage rec { - version = "0.1.0"; - name = "forbiddenfruit-${version}"; - - src = pkgs.fetchurl { - url= "mirror://pypi/f/forbiddenfruit/${name}.tar.gz"; - sha256 = "0xra2kw6m8ag29ifwmhi5zqksh4cr0yy1waqd488rm59kcr3zl79"; - }; - - meta = { - description = "Patch python built-in objects"; - homepage = https://pypi.python.org/pypi/forbiddenfruit; - license = licenses.mit; - }; - }; + forbiddenfruit = callPackage ../development/python-modules/forbiddenfruit { }; fs = buildPythonPackage rec { name = "fs-0.5.4";