Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 327c52ec706e
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 312d4cb545c7
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 18, 2019

  1. pythonPackages.markdown: add missing setuptools to propagatedBuildInput 

    Fixes the following ImportError on application startup:

/nix/store/qh7ndfsar3icmwqbiwcla7pc8x1133vg-python2.7-Markdown-3.1.1/bin/markdown_py README.md > README.html.new
Traceback (most recent call last):
  File "/nix/store/qh7ndfsar3icmwqbiwcla7pc8x1133vg-python2.7-Markdown-3.1.1/bin/.markdown_py-wrapped", line 7, in <module>
    from markdown.__main__ import run
  File "/nix/store/qh7ndfsar3icmwqbiwcla7pc8x1133vg-python2.7-Markdown-3.1.1/lib/python2.7/site-packages/markdown/__init__.py", line 25, in <module>
    from .core import Markdown, markdown, markdownFromFile
  File "/nix/store/qh7ndfsar3icmwqbiwcla7pc8x1133vg-python2.7-Markdown-3.1.1/lib/python2.7/site-packages/markdown/core.py", line 29, in <module>
    import pkg_resources
ImportError: No module named pkg_resources
make: *** [Makefile:53: README.html] Error 1
    @mweinelt
    mweinelt committed Sep 18, 2019
    Copy the full SHA
    2b239b5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #68994 from mweinelt/pr/pythonPackages/markdown 

    pythonPackages.markdown: add missing setuptools to propagatedBuildInput
    @worldofpeace
    worldofpeace committed Sep 18, 2019
    Copy the full SHA
    312d4cb View commit details
    Browse the repository at this point in the history