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: 666be18aa32d
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 880de7a9bc1e
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Dec 27, 2018

  1. pythonPackages.sip: make sip-module name overridable 

    The author of sip wants it to be a private dependency of other packages by
making it importable under different names.
    @orivej
    orivej committed Dec 27, 2018
    Copy the full SHA
    bf1a563 View commit details
    Browse the repository at this point in the history

  2. pythonPackages.pyqt5: import sip as PyQt5.sip 

    pyqt5 5.11 has switched from sip to PyQt5.sip.
    @orivej
    orivej committed Dec 27, 2018
    Copy the full SHA
    4ec84c2 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #52956 from orivej/sip-module 

    pythonPackages.sip: make sip-module name overridable
    @orivej-nixos
    orivej-nixos committed Dec 27, 2018
    Copy the full SHA
    880de7a View commit details
    Browse the repository at this point in the history