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

Commits on Oct 7, 2017

  1. python.pkgs.pyopenssl: use fetchPypi 

    (cherry picked from commit 360a5ef)
    @FRidh
    FRidh committed Oct 7, 2017
    Copy the full SHA
    2680907 View commit details
    Browse the repository at this point in the history

  2. mitmproxy: fix transitive cryptography dependency 

    pyopenssl-17.0.2 uses cyrptography-2.0.2 which collide with
the one used in mitmproxy

(cherry picked from commit ef52c95)
    @kamilchm @FRidh
    kamilchm authored and FRidh committed Oct 7, 2017
    Copy the full SHA
    9867ebc View commit details
    Browse the repository at this point in the history