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: 0244b2875339
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 87e65bcbeaba
Choose a head ref
  • 5 commits
  • 4 files changed
  • 2 contributors

Commits on Feb 14, 2019

  1. pythonPackages.pkgconfig: use same setupHook as pkgconfig 

    This setupHook is necessary for actually using pkgconfig. Without this
setupHook, you need to put both pythonPackages.pkgconfig and pkgconfig
into your buildInputs, just to get the setuphook of the latter.

Previously, pythonPackages.pkgconfig depended on pkgconfig as a
propagatedBuildInput, so this setupHook was propagated down to
dependents. That was changed to a regular nativeBuildInput, so now
this setupHook change is necessary for packages to only depend on
pythonPackages.pkgconfig.

A possible alternative is extracting out a common pkgconfigHook
package and having both pythonPackages.pkgconfig and pkgconfig depend
on that with propagatedBuildInputs. That might be necessary to avoid
the buildHook running twice?
    @catern @FRidh
    catern authored and FRidh committed Feb 14, 2019
    Copy the full SHA
    009ed7c View commit details
    Browse the repository at this point in the history

  2. Revert "python.pkgs.matplotlib: use pkgs.pkgconfig" 

    This reverts commit c78f98d.
    @FRidh
    FRidh committed Feb 14, 2019
    Copy the full SHA
    6be7c1c View commit details
    Browse the repository at this point in the history

  3. fixup Revert "python: jupyter_console: 5.2.0 -> 6.0.0" 

    This reverts commit 135e70e.
    @FRidh
    FRidh committed Feb 14, 2019
    Copy the full SHA
    6d678ec View commit details
    Browse the repository at this point in the history

  4. vulnix: ronn is a native build input

    @FRidh
    FRidh committed Feb 14, 2019
    Copy the full SHA
    f85e119 View commit details
    Browse the repository at this point in the history

  5. matplotlib: fix pkgconfig situation 

    We need pkgs.pkgconfig, and not pythonPackages.pkgconfig.
    @FRidh
    FRidh committed Feb 14, 2019
    Copy the full SHA
    87e65bc View commit details
    Browse the repository at this point in the history