Merge branch 'master' into core-updates-frozen

Conflicts:
	gnu/packages/bioinformatics.scm
	gnu/packages/cmake.scm
	gnu/packages/curl.scm
	gnu/packages/emacs-xyz.scm
	gnu/packages/gpodder.scm
	gnu/packages/music.scm
	gnu/packages/patches/glibc-bootstrap-system.patch
	gnu/packages/python-xyz.scm
	gnu/packages/shells.scm
	gnu/packages/statistics.scm
This commit is contained in:
Marius Bakke 2021-07-29 22:34:57 +02:00
commit b029be2ee0
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
100 changed files with 5664 additions and 43929 deletions

View file

@ -1051,6 +1051,31 @@ Origin Resource Sharing}, making cross-origin AJAX possible.")
into Jinja2 by default.")
(license license:bsd-3)))
(define-public python-flask-misaka
(package
(name "python-flask-misaka")
(version "1.0.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "Flask-Misaka" version))
(sha256
(base32
"12gm6hq3lvlj0ddw8p6lk5pky8jk3pw758ihffjl49shnnzc68zl"))))
(build-system python-build-system)
(native-inputs
`(("python-coverage" ,python-coverage)
("python-mock" ,python-mock)))
(propagated-inputs
`(("python-flask" ,python-flask)
("python-misaka" ,python-misaka)))
(home-page "https://github.com/singingwolfboy/flask-misaka/")
(synopsis "Flask interface to Misaka, a Markdown parsing library")
(description
"This package provides an interface between the Flask web framework and
the Misaka Markdown parser.")
(license license:expat)))
(define-public python-flask-session
(package
(name "python-flask-session")