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

Revert "python-generic: set meta.broken for disabled packages instead of raising an error during evaluation"

Browse Source 
This reverts commit 79a5fec9c0.

meta.broken uses 'throw' under the hood so it can not improve the
current situation. Reverting to previous behaviour gives us correct
error message to the user indicating that interpreter is not supported.

Correcting Hydra output is out of scope of Python packaging.
This commit is contained in:
Domen Kožar 2015-02-25 09:19:41 +01:00
parent b6d8d57905
commit b653e3f661
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/python-modules/generic/default.nix
View File

@ -51,7 +51,7 @@
# Keep extra attributes from `attrs`, e.g., `patchPhase', etc.
python.stdenv.mkDerivation (attrs // {
if disabled then throw "${name} not supported for interpreter ${python.executable}" else python.stdenv.mkDerivation (attrs // {
inherit doCheck;
name = namePrefix + name;
@ -167,7 +167,6 @@ python.stdenv.mkDerivation (attrs // {
meta = with lib.maintainers; {
# default to python's platforms
platforms = python.meta.platforms;
broken = disabled;
} // meta // {
# add extra maintainer(s) to every package
maintainers = (meta.maintainers or []) ++ [ chaoflow iElectric ];