Commit 7abb57c7 authored by Johannes Rosenberger's avatar Johannes Rosenberger Committed by Frederik Rietdijk
Browse files

fix passing qt5 version to pythonInterpreters 

fixes c88f3adb, 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.
parent e9364d17

pkgs/development/interpreters/python/default.nix

+1 −1
Original line number Diff line number Diff line 
{ pkgs, lib }:

{ pkgs }:



with pkgs;

pkgs/top-level/all-packages.nix

+12 −17
Original line number Diff line number Diff line
@@ -10217,10 +10217,10 @@ in 














  pythonInterpreters = callPackage ./../development/interpreters/python {















    # Overrides that apply to all Python interpreters













    pkgs = pkgs // {













      qt5 = pkgs.qt514;













      libsForQt5 = pkgs.libsForQt514;













    };













    pkgs = pkgs.extend (final: _: {













      qt5 = final.qt514;













      libsForQt5 = final.libsForQt514;













    });















  };















  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"; };





























  qutebrowser = let













    libsForQt5 = libsForQt515;













    qt5 = qt515;













    python = python3.override {













      packageOverrides = self: super: {













        pkgs = pkgs // {













          inherit libsForQt5 qt5;













        };













      };













      self = python3;













    };













  in libsForQt5.callPackage ../applications/networking/browsers/qutebrowser {













    python3 = python;













  };













    pkgs_ = pkgs.extend(_: prev: {













      pythonInterpreters = prev.pythonInterpreters.override(oldAttrs: {













        pkgs = oldAttrs.pkgs.extend(_: _: {













          inherit (pkgs) qt5 libsForQt5;













        });













      });













    });













  in pkgs_.libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { };





























  rabbitvcs = callPackage ../applications/version-management/rabbitvcs {};