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

all-packages: Remove unnecessary python3 overrides 

These are unnecessary with Python3 as default Python.
This commit is contained in:
Aneesh Agrawal 2016-10-14 13:47:03 -04:00 committed by Frederik Rietdijk
parent 708822250e
commit 95b5d8f752
1 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -691,7 +691,6 @@ in
caddy = callPackage ../servers/caddy { }; caddy = callPackage ../servers/caddy { };
calamares = qt5.callPackage ../tools/misc/calamares rec { calamares = qt5.callPackage ../tools/misc/calamares rec {
python = python3;
boost = pkgs.boost.override { python=python3; }; boost = pkgs.boost.override { python=python3; };
libyamlcpp = callPackage ../development/libraries/libyaml-cpp { boost=boost; }; libyamlcpp = callPackage ../development/libraries/libyaml-cpp { boost=boost; };
}; };
@ -1022,9 +1021,7 @@ in
burp = callPackage ../tools/backup/burp { }; burp = callPackage ../tools/backup/burp { };
buku = callPackage ../applications/misc/buku { buku = callPackage ../applications/misc/buku {};
pythonPackages = python3Packages;
};
byzanz = callPackage ../applications/video/byzanz {}; byzanz = callPackage ../applications/video/byzanz {};
@ -1379,8 +1376,7 @@ in
diffoscope = callPackage ../tools/misc/diffoscope { diffoscope = callPackage ../tools/misc/diffoscope {
jdk = jdk7; jdk = jdk7;
pythonPackages = python3Packages; rpm = rpm.override;
rpm = rpm.override { python = python3; };
}; };
diffstat = callPackage ../tools/text/diffstat { }; diffstat = callPackage ../tools/text/diffstat { };
@ -2889,9 +2885,7 @@ in
notify-osd = callPackage ../applications/misc/notify-osd { }; 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 { }; nq = callPackage ../tools/system/nq { };
@ -3742,7 +3736,6 @@ in
system-config-printer = callPackage ../tools/misc/system-config-printer { system-config-printer = callPackage ../tools/misc/system-config-printer {
libxml2 = libxml2Python; libxml2 = libxml2Python;
pythonPackages = python3Packages;
}; };
sitecopy = callPackage ../tools/networking/sitecopy { }; sitecopy = callPackage ../tools/networking/sitecopy { };
@ -5533,7 +5526,7 @@ in
pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/cpython/docs {}); pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/cpython/docs {});
pypi2nix = callPackage ../development/tools/pypi2nix { python = python35; }; pypi2nix = callPackage ../development/tools/pypi2nix {};
svg2tikz = python27Packages.svg2tikz; svg2tikz = python27Packages.svg2tikz;
@ -6160,9 +6153,7 @@ in
ninja = callPackage ../development/tools/build-managers/ninja { }; 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 { }; nexus = callPackage ../development/tools/repository-managers/nexus { };
@ -9123,7 +9114,7 @@ in
stlport = callPackage ../development/libraries/stlport { }; stlport = callPackage ../development/libraries/stlport { };
streamlink = callPackage ../applications/video/streamlink { pythonPackages = python3Packages; }; streamlink = callPackage ../applications/video/streamlink {};
strigi = callPackage ../development/libraries/strigi { clucene_core = clucene_core_2; }; strigi = callPackage ../development/libraries/strigi { clucene_core = clucene_core_2; };
@ -12091,7 +12082,6 @@ in
blender = callPackage ../applications/misc/blender { blender = callPackage ../applications/misc/blender {
cudatoolkit = cudatoolkit75; cudatoolkit = cudatoolkit75;
python = python35;
}; };
bluefish = callPackage ../applications/editors/bluefish { bluefish = callPackage ../applications/editors/bluefish {
@ -12633,9 +12623,7 @@ in
eq10q = callPackage ../applications/audio/eq10q { }; eq10q = callPackage ../applications/audio/eq10q { };
errbot = callPackage ../applications/networking/errbot { errbot = callPackage ../applications/networking/errbot {};
pythonPackages = python3Packages;
};
espeak-classic = callPackage ../applications/audio/espeak { }; espeak-classic = callPackage ../applications/audio/espeak { };
@ -14020,9 +14008,7 @@ in
purple-facebook = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-facebook { }; 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 { }; pinfo = callPackage ../applications/misc/pinfo { };
@ -15306,9 +15292,7 @@ in
bastet = callPackage ../games/bastet {}; 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 { }; bean-add = callPackage ../applications/office/beancount/bean-add.nix { };
@ -17142,9 +17126,7 @@ in
webfs = callPackage ../servers/http/webfs { }; webfs = callPackage ../servers/http/webfs { };
wikicurses = callPackage ../applications/misc/wikicurses { wikicurses = callPackage ../applications/misc/wikicurses {};
pythonPackages = python3Packages;
};
wineMinimal = callPackage ../misc/emulators/wine { wineMinimal = callPackage ../misc/emulators/wine {
wineRelease = config.wine.release or "stable"; wineRelease = config.wine.release or "stable";