Merge pull request #26030 from dtzWill/update/pelican

update pelican, feedgenerator
This commit is contained in:
Jörg Thalheim 2017-05-23 22:38:58 +01:00 committed by GitHub
commit 7bb98bb02c
2 changed files with 58 additions and 66 deletions

View file

@ -0,0 +1,53 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, isPy26
, glibcLocales, pandoc, git
, mock, nose, markdown, lxml, typogrify
, jinja2, pygments, docutils, pytz, unidecode, six, dateutil, feedgenerator
, blinker, pillow, beautifulsoup4, markupsafe }:
buildPythonPackage rec {
name = "pelican-${version}";
version = "3.7.1";
disabled = isPy26;
src = fetchFromGitHub {
owner = "getpelican";
repo = "pelican";
rev = version;
sha256 = "0nkxrb77k2bra7bqckg7f5k73wk98hcbz7rimxl8sw05b2bvd62g";
};
doCheck = true;
checkPhase = ''
python -Wd -m unittest discover
'';
buildInputs = [
glibcLocales
pandoc
git
mock
nose
markdown
typogrify
];
propagatedBuildInputs = [
jinja2 pygments docutils pytz unidecode six dateutil feedgenerator
blinker pillow beautifulsoup4 markupsafe lxml
];
postPatch= ''
substituteInPlace pelican/tests/test_pelican.py \
--replace "'git'" "'${git}/bin/git'"
'';
LC_ALL="en_US.UTF-8";
meta = with stdenv.lib; {
description = "A tool to generate a static blog from reStructuredText or Markdown input files";
homepage = "http://getpelican.com/";
license = licenses.agpl3;
maintainers = with maintainers; [ offline prikhi garbas ];
};
}

View file

@ -10798,26 +10798,9 @@ in {
};
};
feedgenerator = buildPythonPackage (rec {
name = "feedgenerator-1.7";
src = pkgs.fetchurl {
url = "mirror://pypi/f/feedgenerator/${name}.tar.gz";
sha256 = "5d6b0b10134ac392be0c0c3a39c0e1d7e9c17cc7894590f75981e3f497a4a60f";
};
buildInputs = [ pkgs.glibcLocales ];
LC_ALL="en_US.UTF-8";
propagatedBuildInputs = with self; [ six pytz ];
meta = {
description = "Standalone version of django.utils.feedgenerator, compatible with Py3k";
homepage = https://github.com/dmdm/feedgenerator-py3k.git;
maintainers = with maintainers; [ garbas ];
};
});
feedgenerator = callPackage ../development/python-modules/feedgenerator {
inherit (pkgs) glibcLocales;
};
feedparser = buildPythonPackage (rec {
name = "feedparser-5.2.1";
@ -17870,52 +17853,8 @@ in {
};
};
pelican = buildPythonPackage rec {
name = "pelican-${version}";
version = "3.6.3";
disabled = isPy26;
src = pkgs.fetchFromGitHub {
owner = "getpelican";
repo = "pelican";
rev = version;
sha256 = "1k572anw39rws67mvxl2w6y93y8w8q5smnwc0dd2gnnr16cc2vsh";
};
patches = [ ../development/python-modules/pelican-fix-tests-with-pygments-2.1.patch ];
# There's still some failing tests due to pygments 2.1.3
doCheck = false;
buildInputs = with self; [
pkgs.glibcLocales
pkgs.pandoc
pkgs.git
mock
nose
markdown
beautifulsoup4
lxml
typogrify
];
propagatedBuildInputs = with self; [
jinja2 pygments docutils pytz unidecode six dateutil feedgenerator
blinker pillow beautifulsoup4 markupsafe
];
postPatch= ''
sed -i -e "s|'git'|'${pkgs.git}/bin/git'|" pelican/tests/test_pelican.py
'';
LC_ALL="en_US.UTF-8";
meta = {
description = "A tool to generate a static blog from reStructuredText or Markdown input files";
homepage = "http://getpelican.com/";
license = licenses.agpl3;
maintainers = with maintainers; [ offline prikhi garbas ];
};
pelican = callPackage ../development/python-modules/pelican {
inherit (pkgs) glibcLocales pandoc git;
};
pep8 = buildPythonPackage rec {