From b653e3f6614fbe2664b1fd09d3baf5222b4de7f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 25 Feb 2015 09:19:41 +0100
Subject: [PATCH] Revert "python-generic: set meta.broken for disabled packages
 instead of raising an error during evaluation"

This reverts commit 79a5fec9c053a0b1303e121060a839d4b9ec2e55.

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.
---
 pkgs/development/python-modules/generic/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index f1bb496ac00..20fb2ec496b 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -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 ];