alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Revert "all-packages: Remove unnecessary python3 overrides"

Browse source 
This reverts commit 95b5d8f752.
This commit is contained in:
Frederik Rietdijk 2016-10-26 15:42:17 +02:00
parent 9db03c1cf1
commit ef9eeb8a2c
1 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
pkgs/top-level/all-packages.nix
View file

@ -698,6 +698,7 @@ in
caddy = callPackage ../servers/caddy { };
calamares = qt5.callPackage ../tools/misc/calamares rec {
python = python3;
boost = pkgs.boost.override { python=python3; };
libyamlcpp = callPackage ../development/libraries/libyaml-cpp { boost=boost; };
};
@ -1032,7 +1033,9 @@ in
burp = callPackage ../tools/backup/burp { };
buku = callPackage ../applications/misc/buku {};
buku = callPackage ../applications/misc/buku {
pythonPackages = python3Packages;
};
byzanz = callPackage ../applications/video/byzanz {};
@ -1387,6 +1390,8 @@ in
diffoscope = callPackage ../tools/misc/diffoscope {
jdk = jdk7;
pythonPackages = python3Packages;
rpm = rpm.override { python = python3; };
};
diffstat = callPackage ../tools/text/diffstat { };
@ -2905,7 +2910,9 @@ in
notify-osd = callPackage ../applications/misc/notify-osd { };
nox = callPackage ../tools/package-management/nox {};
nox = callPackage ../tools/package-management/nox {
pythonPackages = python3Packages;
};
nq = callPackage ../tools/system/nq { };
@ -3758,6 +3765,7 @@ in
system-config-printer = callPackage ../tools/misc/system-config-printer {
libxml2 = libxml2Python;
pythonPackages = python3Packages;
};
sitecopy = callPackage ../tools/networking/sitecopy { };
@ -5562,7 +5570,7 @@ in
pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/cpython/docs {});
pypi2nix = callPackage ../development/tools/pypi2nix {};
pypi2nix = callPackage ../development/tools/pypi2nix { python = python35; };
svg2tikz = python27Packages.svg2tikz;
@ -6197,7 +6205,9 @@ in
ninja = callPackage ../development/tools/build-managers/ninja { };
nixbang = callPackage ../development/tools/misc/nixbang {};
nixbang = callPackage ../development/tools/misc/nixbang {
pythonPackages = python3Packages;
};
nexus = callPackage ../development/tools/repository-managers/nexus { };
@ -9199,7 +9209,7 @@ in
stlport = callPackage ../development/libraries/stlport { };
streamlink = callPackage ../applications/video/streamlink {};
streamlink = callPackage ../applications/video/streamlink { pythonPackages = python3Packages; };
strigi = callPackage ../development/libraries/strigi { clucene_core = clucene_core_2; };
@ -12170,6 +12180,7 @@ in
blender = callPackage ../applications/misc/blender {
cudatoolkit = cudatoolkit75;
python = python35;
};
bluefish = callPackage ../applications/editors/bluefish {
@ -12713,7 +12724,9 @@ in
eq10q = callPackage ../applications/audio/eq10q { };
errbot = callPackage ../applications/networking/errbot {};
errbot = callPackage ../applications/networking/errbot {
pythonPackages = python3Packages;
};
espeak-classic = callPackage ../applications/audio/espeak { };
@ -14110,7 +14123,9 @@ in
purple-facebook = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-facebook { };
pithos = callPackage ../applications/audio/pithos {};
pithos = callPackage ../applications/audio/pithos {
pythonPackages = python3Packages;
};
pinfo = callPackage ../applications/misc/pinfo { };
@ -15400,7 +15415,9 @@ in
bastet = callPackage ../games/bastet {};
beancount = callPackage ../applications/office/beancount {};
beancount = callPackage ../applications/office/beancount {
pythonPackages = python3Packages;
};
bean-add = callPackage ../applications/office/beancount/bean-add.nix { };
@ -17284,7 +17301,9 @@ in
webfs = callPackage ../servers/http/webfs { };
wikicurses = callPackage ../applications/misc/wikicurses {};
wikicurses = callPackage ../applications/misc/wikicurses {
pythonPackages = python3Packages;
};
wineMinimal = callPackage ../misc/emulators/wine {
wineRelease = config.wine.release or "stable";