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: da9dc6167598
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 54ef32d2c6e7
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Sep 27, 2020

  1. fix passing qt5 version to pythonInterpreters 

    fixes c88f3ad, which resulted in
qt 5.15 being used in pythonPackages, despite 5.14 being
declared, and adapts qutebrowser accordingly.

'callPackage { pkgs = pkgs // { … }; }' does not work, because
it does not take into account the recursive evaluation of nixpkgs:

`pkgs/development/interpreters/python/default.nix` calls
`pkgs/top-level/python-packages.nix` with `callPackage`.
Thus, even if the former gets passed the updated `pkgs`,
the latter always gets passed `pkgs.pkgs`.

For the change in the qt5 version to apply consistently, 'pkgs.extend'
must be used.

qutebrowser only used the right qt5 version (5.15) because all
pythonPackages used it anyway.

(cherry picked from commit 626ce32)
    @jorsn @FRidh
    jorsn authored and FRidh committed Sep 27, 2020
    Configuration menu
    Copy the full SHA
    54ef32d View commit details
    Browse the repository at this point in the history