From f1c7f024f3351904bf81349d111e7d7c9c8ab78d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 7 Jan 2018 11:01:38 +0100
Subject: [PATCH] python.pkgs.bleach: move expression
---
.../python-modules/bleach/default.nix | 40 +++++++++++++++++++
pkgs/top-level/python-packages.nix | 33 +--------------
2 files changed, 41 insertions(+), 32 deletions(-)
create mode 100644 pkgs/development/python-modules/bleach/default.nix
diff --git a/pkgs/development/python-modules/bleach/default.nix b/pkgs/development/python-modules/bleach/default.nix
new file mode 100644
index 00000000000..dc417a54ca3
--- /dev/null
+++ b/pkgs/development/python-modules/bleach/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytest
+, pytestrunner
+, six
+, html5lib
+}:
+
+buildPythonPackage rec {
+ pname = "bleach";
+ version = "2.0.0";
+
+ src = fetchPypi {
+ inherit pname version;
+ sha256 = "0c5w7hh70lqzca7ir71j891csvch1899r8q09zgswk1y00q22lmr";
+ };
+
+ checkInputs = [ pytest pytestrunner ];
+ propagatedBuildInputs = [ six html5lib ];
+
+ meta = {
+ description = "An easy, HTML5, whitelisting HTML sanitizer";
+ longDescription = ''
+ Bleach is an HTML sanitizing library that escapes or strips markup and
+ attributes based on a white list. Bleach can also linkify text safely,
+ applying filters that Django's urlize filter cannot, and optionally
+ setting rel attributes, even on links already in the text.
+
+ Bleach is intended for sanitizing text from untrusted sources. If you
+ find yourself jumping through hoops to allow your site administrators
+ to do lots of things, you're probably outside the use cases. Either
+ trust those users, or don't.
+ '';
+ homepage = https://github.com/mozilla/bleach;
+ downloadPage = https://github.com/mozilla/bleach/releases;
+ license = lib.licenses.asl20;
+ maintainers = with lib.maintainers; [ prikhi ];
+ };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4524663e609..be2d2fbede4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1746,38 +1746,7 @@ in {
httpserver = callPackage ../development/python-modules/httpserver {};
- bleach = buildPythonPackage rec {
- pname = "bleach";
- version = "2.0.0";
- name = "${pname}-${version}";
-
- src = pkgs.fetchurl {
- url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
- sha256 = "0c5w7hh70lqzca7ir71j891csvch1899r8q09zgswk1y00q22lmr";
- };
-
- buildInputs = with self; [ pytest pytestrunner ];
- propagatedBuildInputs = with self; [ six html5lib ];
-
- meta = {
- description = "An easy, HTML5, whitelisting HTML sanitizer";
- longDescription = ''
- Bleach is an HTML sanitizing library that escapes or strips markup and
- attributes based on a white list. Bleach can also linkify text safely,
- applying filters that Django's urlize filter cannot, and optionally
- setting rel attributes, even on links already in the text.
-
- Bleach is intended for sanitizing text from untrusted sources. If you
- find yourself jumping through hoops to allow your site administrators
- to do lots of things, you're probably outside the use cases. Either
- trust those users, or don't.
- '';
- homepage = https://github.com/mozilla/bleach;
- downloadPage = https://github.com/mozilla/bleach/releases;
- license = licenses.asl20;
- maintainers = with maintainers; [ prikhi ];
- };
- };
+ bleach = callPackage ../development/python-modules/bleach { };
# needed for tensorflow-tensorboard
bleach_1_5_0 = self.bleach.overridePythonAttrs rec {