diff options
| author | Johannes Rosenberger <johannes@jorsn.eu> | 2020-09-18 00:45:31 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-09-22 21:03:43 +0200 |
| commit | 7abb57c7b5eaa9aa34ea289fc1e23ed259547bdb (patch) | |
| tree | 623c1eb95a5bc96dab95afd1008390d31db4c9ed /pkgs/development/interpreters/python/default.nix | |
| parent | Merge pull request #98442 from danieldk/weather-cleanups (diff) | |
| download | nixpkgs-7abb57c7b5eaa9aa34ea289fc1e23ed259547bdb.tar.gz | |
fix passing qt5 version to pythonInterpreters
fixes c88f3adb1793cd3b007baff0292cf1fa8d0ab1e6, 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.
Diffstat (limited to 'pkgs/development/interpreters/python/default.nix')
| -rw-r--r-- | pkgs/development/interpreters/python/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index e4230093e9c3..94422518b255 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -1,4 +1,4 @@ -{ pkgs, lib }: +{ pkgs }: with pkgs; |