public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix passing qt5 version to pythonInterpreters

Browse Source 
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.
This commit is contained in:
Johannes Rosenberger 2020-09-18 00:45:31 +02:00 committed by Frederik Rietdijk
parent e9364d1737
commit 7abb57c7b5
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/interpreters/python/default.nix
View File

@ -1,4 +1,4 @@
{ pkgs, lib }: { pkgs }:
with pkgs; with pkgs;

29
pkgs/top-level/all-packages.nix
View File

@ -10217,10 +10217,10 @@ in
pythonInterpreters = callPackage ./../development/interpreters/python { pythonInterpreters = callPackage ./../development/interpreters/python {
# Overrides that apply to all Python interpreters # Overrides that apply to all Python interpreters
pkgs = pkgs // { pkgs = pkgs.extend (final: _: {
qt5 = pkgs.qt514; qt5 = final.qt514;
libsForQt5 = pkgs.libsForQt514; libsForQt5 = final.libsForQt514;
}; });
}; };
inherit (pythonInterpreters) python27 python36 python37 python38 python39 python3Minimal pypy27 pypy36; inherit (pythonInterpreters) python27 python36 python37 python38 python39 python3Minimal pypy27 pypy36;
@ -22956,19 +22956,14 @@ in
quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; }; quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; };
qutebrowser = let qutebrowser = let
libsForQt5 = libsForQt515; pkgs_ = pkgs.extend(_: prev: {
qt5 = qt515; pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: {
python = python3.override { pkgs = oldAttrs.pkgs.extend(_: _: {
packageOverrides = self: super: { inherit (pkgs) qt5 libsForQt5;
pkgs = pkgs // { });
inherit libsForQt5 qt5; });
}; });
}; in pkgs_.libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { };
self = python3;
};
in libsForQt5.callPackage ../applications/networking/browsers/qutebrowser {
python3 = python;
};
rabbitvcs = callPackage ../applications/version-management/rabbitvcs {}; rabbitvcs = callPackage ../applications/version-management/rabbitvcs {};