ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-18 13:19:10 +03:00
Code Issues Projects Releases Wiki Activity

Remove top-level pyqt4

Browse Source 
See #11567.
This commit is contained in:
Frederik Rietdijk 2016-08-14 12:37:20 +02:00
parent 4b2120f5b8
commit 6842a24b21
13 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/audio/picard/default.nix
View File

@ -1,10 +1,10 @@
{ stdenv, buildPythonApplication, fetchurl, gettext
{ stdenv, pythonPackages, fetchurl, gettext
, pkgconfig, libofa, ffmpeg, chromaprint
, pyqt4, mutagen, python-libdiscid
}:
let version = "1.3.2"; in
buildPythonApplication {
let
version = "1.3.2";
in pythonPackages.buildPythonApplication {
name = "picard-${version}";
namePrefix = "";
@ -20,10 +20,10 @@ buildPythonApplication {
gettext
];
propagatedBuildInputs = [
propagatedBuildInputs = with pythonPackages; [
pyqt4
mutagen
python-libdiscid
discid
];
installPhase = ''

6
pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, python, pythonPackages, pyqt4, openssl }:
{ stdenv, fetchFromGitHub, pythonPackages, openssl }:
stdenv.mkDerivation rec {
name = "pybitmessage-${version}";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1f4h0yc1mfjnxzvxiv9hxgak59mgr3a5ykv50vlyiay82za20jax";
};
buildInputs = [ python pyqt4 openssl pythonPackages.wrapPython pythonPackages.sqlite3 ];
buildInputs = with pythonPackages; [ python pyqt4 wrapPython sqlite3 ] ++ [ openssl ];
preConfigure = ''
substituteInPlace Makefile \
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
postInstall = ''
substituteInPlace $out/bin/pybitmessage \
--replace "exec python2" "exec ${python}/bin/python" \
--replace "exec python2" "exec ${pythonPackages.python}/bin/python" \
--replace "/opt/openssl-compat-bitcoin/lib/" "${openssl.out}/lib/"
wrapProgram $out/bin/pybitmessage \
--prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH"

7
pkgs/applications/video/qarte/default.nix
View File

@ -1,6 +1,9 @@
{ stdenv, fetchbzr, python, pyqt4, sip, rtmpdump, makeWrapper }:
{ stdenv, fetchbzr, pythonPackages, rtmpdump, makeWrapper }:
stdenv.mkDerivation {
let
inherit (pythonPackages) python pyqt4;
sip = pythonPackages.sip_4_16;
in stdenv.mkDerivation {
name = "qarte-2.4.0";
src = fetchbzr {
url = http://bazaar.launchpad.net/~vincent-vandevyvre/qarte/trunk;

4
pkgs/desktops/kde-4.14/applications/kate.nix
View File

@ -1,8 +1,8 @@
{ stdenv, kde, kdelibs, kactivities, qjson, pyqt4, python, pykde4}:
{ stdenv, kde, kdelibs, kactivities, qjson, pythonPackages, pykde4}:
kde {
buildInputs = [ kdelibs kactivities qjson pyqt4 python pykde4 ];
buildInputs = [ kdelibs kactivities qjson pythonPackages.pyqt4 pythonPackages.python pykde4 ];
meta = {
description = "Kate, the KDE Advanced Text Editor, as well as KWrite";

9
pkgs/desktops/kde-4.14/kdebindings/pykde4.nix
View File

@ -1,9 +1,10 @@
{ kde, kdelibs, python, pyqt4, kdepimlibs, shared_desktop_ontologies,
{ kde, kdelibs, pythonPackages, kdepimlibs, shared_desktop_ontologies,
polkit_qt4, boost, lndir, pkgconfig }:
let pydir = "lib/python${python.majorVersion}"; in
kde {
let
inherit (pythonPackages) python pyqt4;
pydir = "lib/python${python.majorVersion}";
in kde {
patches = [ ./pykde4-gcc-5.patch ];

4
pkgs/desktops/kde-4.14/kdeutils/print-manager.nix
View File

@ -1,5 +1,5 @@
{ kde, kdelibs
, pythonPackages, cups, pyqt4, pykde4, pycups, system-config-printer }:
, pythonPackages, cups, pykde4, pycups, system-config-printer }:
let s_c_p = system-config-printer.override { withGUI = false; }; in
@ -7,7 +7,7 @@ kde rec {
buildInputs = [ kdelibs pythonPackages.python pythonPackages.wrapPython
] ++ pythonPath;
pythonPath = [ cups pyqt4 pykde4 pycups s_c_p ];
pythonPath = [ cups pythonPackages.pyqt4 pykde4 pycups s_c_p ];
# system-config-printer supplies some D-Bus policy that we need.
propagatedUserEnvPkgs = [ s_c_p ];

5
pkgs/development/python-modules/pyqt/4.x.nix
View File

@ -40,7 +40,10 @@ stdenv.mkDerivation {
enableParallelBuilding = true;
passthru.pythonPath = [];
passthru = {
pythonPath = [];
qt = qt4;
};
meta = {
description = "Python bindings for Qt";

4
pkgs/games/mnemosyne/default.nix
View File

@ -1,12 +1,10 @@
{ stdenv
, fetchurl
, buildPythonApplication
, pyqt4
, pythonPackages
}:
let
version = "2.3.2";
in buildPythonApplication rec {
in pythonPackages.buildPythonApplication rec {
name = "mnemosyne-${version}";
src = fetchurl {
url = "http://sourceforge.net/projects/mnemosyne-proj/files/mnemosyne/${name}/Mnemosyne-${version}.tar.gz";

2
pkgs/misc/drivers/hplip/3.15.9.nix
View File

@ -3,7 +3,7 @@
, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils
, net_snmp, polkit
, bash, coreutils, utillinux
, qtSupport ? true, qt4, pyqt4
, qtSupport ? true, qt4
, withPlugin ? false
}:

2
pkgs/misc/drivers/hplip/default.nix
View File

@ -3,7 +3,7 @@
, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils
, net_snmp, openssl, polkit
, bash, coreutils, utillinux
, qtSupport ? true, qt4, pyqt4
, qtSupport ? true, qt4
, withPlugin ? false
}:

2
pkgs/misc/frescobaldi/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pythonPackages, lilypond, pyqt4, pygame }:
{ stdenv, fetchurl, pythonPackages, lilypond}:
pythonPackages.buildPythonApplication rec {
name = "frescobaldi-${version}";

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

@ -3220,9 +3220,7 @@ in
openmodelica = callPackage ../applications/science/misc/openmodelica { };
qarte = callPackage ../applications/video/qarte {
sip = pythonPackages.sip_4_16;
};
qarte = callPackage ../applications/video/qarte { };
qnial = callPackage ../development/interpreters/qnial {};
@ -10085,8 +10083,6 @@ in
rhpl = pythonPackages.rhpl;
pyqt4 = pythonPackages.pyqt4;
pysideApiextractor = pythonPackages.pysideApiextractor;
pysideGeneratorrunner = pythonPackages.pysideGeneratorrunner;
@ -10930,7 +10926,9 @@ in
fatrace = callPackage ../os-specific/linux/fatrace { };
ffadoFull = callPackage ../os-specific/linux/ffado { };
ffadoFull = callPackage ../os-specific/linux/ffado {
inherit (pythonPackages) python pyqt4;
};
libffado = self.ffadoFull.override { prefix = "lib"; };
fbterm = callPackage ../os-specific/linux/fbterm { };
@ -13071,7 +13069,7 @@ in
gksu = callPackage ../applications/misc/gksu { };
gnuradio = callPackage ../applications/misc/gnuradio {
inherit (pythonPackages) lxml numpy scipy matplotlib pyopengl wxPython;
inherit (pythonPackages) lxml matplotlib numpy python pyopengl pyqt4 scipy wxPython;
fftw = fftwFloat;
};
@ -14290,10 +14288,7 @@ in
pianobooster = callPackage ../applications/audio/pianobooster { };
picard = callPackage ../applications/audio/picard {
python-libdiscid = pythonPackages.discid;
mutagen = pythonPackages.mutagen;
};
picard = callPackage ../applications/audio/picard { };
picocom = callPackage ../tools/misc/picocom { };
@ -15539,7 +15534,7 @@ in
angband = callPackage ../games/angband { };
anki = callPackage ../games/anki {
inherit (pythonPackages) wrapPython pysqlite sqlalchemy pyaudio beautifulsoup httplib2 matplotlib;
inherit (pythonPackages) wrapPython pysqlite sqlalchemy pyaudio beautifulsoup httplib2 matplotlib pyqt4;
};
armagetronad = callPackage ../games/armagetronad { };

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

@ -7744,7 +7744,7 @@ in modules // {
sha256 = "00e3f89f4e23a844844d082918a89c2cbb1e8231ecb011b81d592e7e3c33a74c";
};
propagatedBuildInputs = [ pkgs.pyqt4 pkgs.pkgconfig pkgs.poppler_qt4 ];
propagatedBuildInputs = [ self.pyqt4 pkgs.pkgconfig pkgs.poppler_qt4 ];
preBuild = "${python}/bin/${python.executable} setup.py build_ext" +
" --include-dirs=${pkgs.poppler_qt4.dev}/include/poppler/";
@ -20376,11 +20376,11 @@ in modules // {
src = pkgs.qscintilla.src;
buildInputs = with pkgs; [ xorg.lndir qt4 pyqt4 python ];
buildInputs = with self; [ pkgs.xorg.lndir pyqt4.qt pyqt4 python ];
preConfigure = ''
mkdir -p $out
lndir ${pkgs.pyqt4} $out
lndir ${self.pyqt4} $out
cd Python
${python.executable} ./configure-old.py \
--destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \