From ab4b7452cbde73cffea1c4fbeca35a785085bdd5 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 13 Nov 2018 16:52:33 +0100 Subject: [PATCH] isso: 0.10.6 -> 0.11.1 (#50310) --- pkgs/servers/isso/default.nix | 43 ++++++++++++----------------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/pkgs/servers/isso/default.nix b/pkgs/servers/isso/default.nix index 9e8a9dc9ec60..b41115339873 100644 --- a/pkgs/servers/isso/default.nix +++ b/pkgs/servers/isso/default.nix @@ -1,43 +1,27 @@ { stdenv, python2, fetchFromGitHub }: -let python = python2.override { - packageOverrides = self: super: { - misaka = super.misaka.overridePythonAttrs (old: rec { - version = "1.0.2"; - src = old.src.override { - inherit version; - sha256 = "05rmjxlfhghj90m1kc55lx3z8igabw5y8wmly66p3hphdy4f95v1"; - }; - propagatedBuildInputs = [ ]; - }); - html5lib = super.html5lib.overridePythonAttrs (old: rec { - version = "0.9999999"; - src = old.src.override { - inherit version; - sha256 = "2612a191a8d5842bfa057e41ba50bbb9dcb722419d2408c78cff4758d0754868"; - }; - checkInputs = with self; [ nose flake8 ]; - propagatedBuildInputs = with self; [ six ]; - checkPhase = '' - nosetests - ''; - }); - }; -}; - -in with python.pkgs; buildPythonApplication rec { +with python2.pkgs; buildPythonApplication rec { pname = "isso"; - version = "0.10.6"; + version = "0.11.1"; # no tests on PyPI src = fetchFromGitHub { owner = "posativ"; repo = pname; rev = version; - sha256 = "19x9xbwd15fikhchyl4i1wrqx589hdmh279xhnxdszrq898igywb"; + sha256 = "0545vh0sb5i4cz9c0qgch77smpwgav3rhl1dxk9ij6rx4igjk03j"; }; - propagatedBuildInputs = [ misaka werkzeug ipaddr configparser html5lib ]; + propagatedBuildInputs = [ + bleach + cffi + configparser + html5lib + ipaddr + jinja2 + misaka + werkzeug + ]; checkInputs = [ nose ]; @@ -52,3 +36,4 @@ in with python.pkgs; buildPythonApplication rec { maintainers = with maintainers; [ fgaz ]; }; } +