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

Revert "qutebrowser: use qt515 (#97586)"

Browse Source 
We are not going to add parameters to `python-packages.nix`.
The proper way to do this is override Python, and pass in a
custom `pkgs`.

This reverts commit c1a0dfadea3c0f56d5213a677dbbd7b3e89ee98f.
This commit is contained in:
Frederik Rietdijk 2020-09-16 20:29:23 +02:00
parent 8a715e2522
commit a4e50bb197
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22829,12 +22829,7 @@ in
quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; }; quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; };
qutebrowser = libsForQt515.callPackage ../applications/networking/browsers/qutebrowser { qutebrowser = libsForQt514.callPackage ../applications/networking/browsers/qutebrowser { };
python3Packages = python3Packages.override {
qt5 = qt515;
libsForQt5 = libsForQt515;
};
};
rabbitvcs = callPackage ../applications/version-management/rabbitvcs {}; rabbitvcs = callPackage ../applications/version-management/rabbitvcs {};

7
pkgs/top-level/python-packages.nix
View File

@ -9,13 +9,16 @@
{ pkgs { pkgs
, stdenv , stdenv
, python , python
, qt5
, libsForQt5
, overrides ? (self: super: {}) , overrides ? (self: super: {})
}: }:
with pkgs.lib; with pkgs.lib;
let
qt5 = pkgs.qt514;
libsForQt5 = pkgs.libsForQt514;
in
let let
packages = ( self: packages = ( self: