BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #96137 from Moredread/pelican/bump

Browse source 
python37Packages.pelican: 4.2.0 -> 4.5.0
This commit is contained in:
Martin Weinelt 2020-08-24 06:14:10 +02:00 committed by GitHub
commit d285ed197d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
pkgs/development/python-modules/pelican/default.nix
View file

@ -1,18 +1,20 @@
{ stdenv, buildPythonPackage, fetchFromGitHub { stdenv, buildPythonPackage, fetchFromGitHub, isPy27
, glibcLocales, git , glibcLocales, git
, mock, nose, markdown, lxml, typogrify , mock, nose, markdown, lxml, typogrify
, jinja2, pygments, docutils, pytz, unidecode, six, dateutil, feedgenerator , jinja2, pygments, docutils, pytz, unidecode, six, dateutil, feedgenerator
, blinker, pillow, beautifulsoup4, markupsafe }: , blinker, pillow, beautifulsoup4, markupsafe, pandoc }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pelican"; pname = "pelican";
version = "4.2.0"; version = "4.5.0";
disabled = isPy27;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "getpelican"; owner = "getpelican";
repo = "pelican"; repo = "pelican";
rev = version; rev = version;
sha256 = "0w9nqdw2jmqc6kqwg4rh6irr5k6j7hk8axg6vgd137rs50v62yv5"; sha256 = "0p8p84fcpkr19d54dhxvldd8ijbg334wmrmkr99pnbrdl1gf64qi";
# Remove unicode file names which leads to different checksums on HFS+ # Remove unicode file names which leads to different checksums on HFS+
# vs. other filesystems because of unicode normalisation. # vs. other filesystems because of unicode normalisation.
extraPostFetch = '' extraPostFetch = ''
@ -24,15 +26,15 @@ buildPythonPackage rec {
# Exclude custom locale test, which files were removed above to fix the source checksum # Exclude custom locale test, which files were removed above to fix the source checksum
checkPhase = '' checkPhase = ''
nosetests -sv --exclude=test_custom_locale_generation_works pelican nosetests -s \
--exclude=test_custom_locale_generation_works \
--exclude=test_log_filter \
pelican
''; '';
buildInputs = [ buildInputs = [
glibcLocales glibcLocales
# Note: Pelican has to adapt to a changed CLI of pandoc before enabling this pandoc
# again. Compare https://github.com/getpelican/pelican/pull/2252.
# Version 4.2.0 is incompatible with our current pandoc version.
# pandoc
git git
mock mock
markdown markdown
@ -46,21 +48,16 @@ buildPythonPackage rec {
checkInputs = [ checkInputs = [
nose nose
pandoc
]; ];
postPatch= '' postPatch= ''
substituteInPlace pelican/tests/test_pelican.py \ substituteInPlace pelican/tests/test_pelican.py \
--replace "'git'" "'${git}/bin/git'" --replace "'git'" "'${git}/bin/git'"
# Markdown-3.1 changed footnote separator to colon
# https://github.com/getpelican/pelican/issues/2493#issuecomment-491723744
sed -i '/test_article_with_footnote/i\
@unittest.skip("")' pelican/tests/test_readers.py
''; '';
LC_ALL="en_US.UTF-8"; LC_ALL="en_US.UTF-8";
# We only want to patch shebangs in /bin, and not those # We only want to patch shebangs in /bin, and not those
# of the project scripts that are created by Pelican. # of the project scripts that are created by Pelican.
# See https://github.com/NixOS/nixpkgs/issues/30116 # See https://github.com/NixOS/nixpkgs/issues/30116