summary refs log tree commit diff
path: root/pkgs/development/python-modules/generic/default.nix
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2015-02-25 09:19:41 +0100
committerDomen Kožar <domen@dev.si>2015-02-25 09:23:31 +0100
commitb653e3f6614fbe2664b1fd09d3baf5222b4de7f2 (patch)
treea5514495df6c294d2722c16bb4274f98eece01dc /pkgs/development/python-modules/generic/default.nix
parentb6d8d579056c37791a9975245f11cc70bfec9689 (diff)
downloadnixpkgs-b653e3f6614fbe2664b1fd09d3baf5222b4de7f2.tar
nixpkgs-b653e3f6614fbe2664b1fd09d3baf5222b4de7f2.tar.gz
nixpkgs-b653e3f6614fbe2664b1fd09d3baf5222b4de7f2.tar.bz2
nixpkgs-b653e3f6614fbe2664b1fd09d3baf5222b4de7f2.tar.lz
nixpkgs-b653e3f6614fbe2664b1fd09d3baf5222b4de7f2.tar.xz
nixpkgs-b653e3f6614fbe2664b1fd09d3baf5222b4de7f2.tar.zst
nixpkgs-b653e3f6614fbe2664b1fd09d3baf5222b4de7f2.zip
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.
Diffstat (limited to 'pkgs/development/python-modules/generic/default.nix')
-rw-r--r--pkgs/development/python-modules/generic/default.nix3
1 files changed, 1 insertions, 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 ];