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: e493bf64cf21
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 4f2ba1354f49
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Feb 2, 2018

  1. pythonPackages.pwntools: fix build 

    pypandoc is broken (it does not work properly with pandoc 2), so we
remove the dependency as it was only used for generating PyPI docs.
The patch will be included upstream in the next version, so it should
be removed next time this package is updated.
    @kristoff3r
    kristoff3r committed Feb 2, 2018
    Copy the full SHA
    d834ae3 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2018

  1. Merge pull request #34537 from kristoff3r/fix-pwntools 

    pythonPackages.pwntools: fix build
    @Mic92
    Mic92 committed Feb 3, 2018
    Copy the full SHA
    4f2ba13 View commit details
    Browse the repository at this point in the history