Set meta.hydraPlatforms instead of meta.platforms for some packages

This commit is contained in:
Eelco Dolstra 2013-11-05 00:04:36 +01:00
parent a2cbc77e4f
commit c88055e1a2
34 changed files with 52 additions and 43 deletions

View File

@ -39,6 +39,6 @@ pythonPackages.buildPythonPackage rec {
local hard drive. local hard drive.
''; '';
maintainers = [ stdenv.lib.maintainers.rickynils ]; maintainers = [ stdenv.lib.maintainers.rickynils ];
platforms = []; hydraPlatforms = [];
}; };
} }

View File

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
''; '';
meta = { meta = {
# Quicker to unpack locally than load Hydra # Quicker to unpack locally than load Hydra
platforms = []; hydraPlatforms = [];
maintainers = with stdenv.lib.maintainers; [raskin]; maintainers = with stdenv.lib.maintainers; [raskin];
license = with stdenv.lib.licenses; lgpl21Plus; license = with stdenv.lib.licenses; lgpl21Plus;
description = "GraphViz graph viewer/navigator"; description = "GraphViz graph viewer/navigator";

View File

@ -74,8 +74,7 @@ rec {
# A GiB of data. Installation is unpacking and editing a few files. # A GiB of data. Installation is unpacking and editing a few files.
# No sense in letting Hydra build it. # No sense in letting Hydra build it.
# Also, it is unclear what is covered by "verbatim" - we will edit configs # Also, it is unclear what is covered by "verbatim" - we will edit configs
platforms = with a.lib.platforms; hydraPlatforms = [];
[];
license = "verbatim-redistribution"; license = "verbatim-redistribution";
}; };
passthru = { passthru = {

View File

@ -43,8 +43,7 @@ rec {
[ [
raskin raskin
]; ];
platforms = with a.lib.platforms; hydraPlatforms = [];
[];
# There are multiple claims that the font is GPL, # There are multiple claims that the font is GPL,
# so I include the package; but I cannot find the # so I include the package; but I cannot find the
# original source, so use it on your own risk # original source, so use it on your own risk

View File

@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
meta = { meta = {
maintainers = [ stdenv.lib.maintainers.urkud ]; maintainers = [ stdenv.lib.maintainers.urkud ];
# Tries to install gwenhywfar plugin, thus `make install` fails # Tries to install gwenhywfar plugin, thus `make install` fails
platforms = []; hydraPlatforms = [];
}; };
} }

View File

@ -17,7 +17,7 @@ cabal.mkDerivation (self: {
homepage = "https://github.com/AccelerateHS/accelerate-cuda/"; homepage = "https://github.com/AccelerateHS/accelerate-cuda/";
description = "Accelerate backend for NVIDIA GPUs"; description = "Accelerate backend for NVIDIA GPUs";
license = self.stdenv.lib.licenses.bsd3; license = self.stdenv.lib.licenses.bsd3;
platforms = self.stdenv.lib.platforms.none; hydraPlatforms = [];
maintainers = [ self.stdenv.lib.maintainers.andres ]; maintainers = [ self.stdenv.lib.maintainers.andres ];
}; };
}) })

View File

@ -23,7 +23,7 @@ cabal.mkDerivation (self: {
homepage = "https://github.com/AccelerateHS/accelerate-examples"; homepage = "https://github.com/AccelerateHS/accelerate-examples";
description = "Examples using the Accelerate library"; description = "Examples using the Accelerate library";
license = self.stdenv.lib.licenses.bsd3; license = self.stdenv.lib.licenses.bsd3;
platforms = self.stdenv.lib.platforms.none; hydraPlatforms = [];
maintainers = [ self.stdenv.lib.maintainers.andres ]; maintainers = [ self.stdenv.lib.maintainers.andres ];
}; };
}) })

View File

@ -9,6 +9,6 @@ cabal.mkDerivation (self: {
homepage = "https://github.com/AccelerateHS/accelerate-fft"; homepage = "https://github.com/AccelerateHS/accelerate-fft";
description = "FFT using the Accelerate library"; description = "FFT using the Accelerate library";
license = self.stdenv.lib.licenses.bsd3; license = self.stdenv.lib.licenses.bsd3;
platforms = self.stdenv.lib.platforms.none; hydraPlatforms = [];
}; };
}) })

View File

@ -33,7 +33,7 @@ cabal.mkDerivation (self: {
meta = { meta = {
description = "FFI binding to the CUDA interface for programming NVIDIA GPUs"; description = "FFI binding to the CUDA interface for programming NVIDIA GPUs";
license = self.stdenv.lib.licenses.bsd3; license = self.stdenv.lib.licenses.bsd3;
platforms = self.stdenv.lib.platforms.none; hydraPlatforms = [];
maintainers = [ self.stdenv.lib.maintainers.andres ]; maintainers = [ self.stdenv.lib.maintainers.andres ];
}; };
}) })

View File

@ -10,6 +10,6 @@ cabal.mkDerivation (self: {
homepage = "http://github.com/robeverest/cufft"; homepage = "http://github.com/robeverest/cufft";
description = "Haskell bindings for the CUFFT library"; description = "Haskell bindings for the CUFFT library";
license = self.stdenv.lib.licenses.bsd3; license = self.stdenv.lib.licenses.bsd3;
platforms = self.stdenv.lib.platforms.none; hydraPlatforms = [];
}; };
}) })

View File

@ -33,6 +33,7 @@ stdenv.mkDerivation rec {
# Engine is under GPLv2, everything else is under # Engine is under GPLv2, everything else is under
license = [ "unfree-redistributable" ]; license = [ "unfree-redistributable" ];
maintainers = with stdenv.lib.maintainers; [ astsmtl ]; maintainers = with stdenv.lib.maintainers; [ astsmtl ];
#platforms = with stdenv.lib.platforms; linux; platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
}; };
} }

View File

@ -54,7 +54,8 @@ stdenv.mkDerivation rec {
description = "Tool to manage dwarves in in a running game of Dwarf Fortress"; description = "Tool to manage dwarves in in a running game of Dwarf Fortress";
maintainers = with stdenv.lib.maintainers; [ the-kenny ]; maintainers = with stdenv.lib.maintainers; [ the-kenny ];
license = "MIT"; license = "MIT";
platforms = stdenv.lib.platforms.none; platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
homepage = https://code.google.com/r/splintermind-attributes/; homepage = https://code.google.com/r/splintermind-attributes/;
}; };
} }

View File

@ -57,7 +57,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Flight simulator"; description = "Flight simulator";
maintainers = with maintainers; [ raskin ]; maintainers = with maintainers; [ raskin ];
#platforms = platforms.linux; # disabled from hydra because it's so big platforms = platforms.linux;
hydraPlatforms = []; # disabled from hydra because it's so big
license = licenses.gpl2; license = licenses.gpl2;
}; };
} }

View File

@ -36,6 +36,7 @@ stdenv.mkDerivation {
homepage = http://www.naev.org; homepage = http://www.naev.org;
license = "GPLv3+"; license = "GPLv3+";
maintainers = with stdenv.lib.maintainers; [viric]; maintainers = with stdenv.lib.maintainers; [viric];
#platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
}; };
} }

View File

@ -69,7 +69,8 @@ stdenv.mkDerivation {
homepage = http://oilrush-game.com/; homepage = http://oilrush-game.com/;
license = "unfree"; license = "unfree";
#maintainers = with stdenv.lib.maintainers; [ astsmtl ]; #maintainers = with stdenv.lib.maintainers; [ astsmtl ];
#platforms = with stdenv.lib.platforms; linux; platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
}; };
} }

View File

@ -66,7 +66,7 @@ rec {
[ [
raskin raskin
]; ];
platforms = with a.lib.platforms; hydraPlatforms =
# raskin: tested amd64-linux; # raskin: tested amd64-linux;
# not setting platforms because it is 0.5+ GiB of game data # not setting platforms because it is 0.5+ GiB of game data
[]; [];

View File

@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
homepage = http://speed-dreams.sourceforge.net/; homepage = http://speed-dreams.sourceforge.net/;
license = "GPLv2+"; license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [viric raskin]; maintainers = with stdenv.lib.maintainers; [viric raskin];
#platforms = with stdenv.lib.platforms; linux; platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
}; };
} }

View File

@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
homepage = http://torcs.sourceforge.net/; homepage = http://torcs.sourceforge.net/;
license = "GPLv2+"; license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [viric]; maintainers = with stdenv.lib.maintainers; [viric];
#platforms = with stdenv.lib.platforms; linux; platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
}; };
} }

View File

@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
description = "A squad-based tactical strategy game in the tradition of X-Com"; description = "A squad-based tactical strategy game in the tradition of X-Com";
license = "GPLv2+"; license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [viric]; maintainers = with stdenv.lib.maintainers; [viric];
#platforms = with stdenv.lib.platforms; linux; platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
}; };
} }

View File

@ -62,7 +62,8 @@ stdenv.mkDerivation rec {
homepage = http://unvanquished.net; homepage = http://unvanquished.net;
#license = "unknown"; #license = "unknown";
maintainers = with stdenv.lib.maintainers; [ astsmtl ]; maintainers = with stdenv.lib.maintainers; [ astsmtl ];
platforms = stdenv.lib.platforms.linux;
# This package can take a lot of disk space, so unavailable from channel # This package can take a lot of disk space, so unavailable from channel
#platforms = with stdenv.lib.platforms; linux; hydraPlatforms = [];
}; };
} }

View File

@ -59,6 +59,7 @@ stdenv.mkDerivation rec {
homepage = http://www.urbanterror.net; homepage = http://www.urbanterror.net;
license = [ "unfree-redistributable" ]; license = [ "unfree-redistributable" ];
maintainers = with stdenv.lib.maintainers; [ astsmtl ]; maintainers = with stdenv.lib.maintainers; [ astsmtl ];
#platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
}; };
} }

View File

@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
homepage = http://vdrift.net/; homepage = http://vdrift.net/;
license = "GPLv2+"; license = "GPLv2+";
maintainers = with stdenv.lib.maintainers; [viric]; maintainers = with stdenv.lib.maintainers; [viric];
#platforms = with stdenv.lib.platforms; linux; platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
}; };
} }

View File

@ -64,7 +64,8 @@ rec {
raskin raskin
jcumming jcumming
]; ];
#platforms = a.lib.platforms.linux; platforms = a.lib.platforms.linux;
hydraPlatforms = [];
license = a.lib.licenses.gpl2Plus; license = a.lib.licenses.gpl2Plus;
}; };
passthru = { passthru = {

View File

@ -56,6 +56,7 @@ stdenv.mkDerivation rec {
homepage = http://www.xonotic.org; homepage = http://www.xonotic.org;
license = with stdenv.lib.licenses; gpl2Plus; license = with stdenv.lib.licenses; gpl2Plus;
maintainers = with stdenv.lib.maintainers; [ astsmtl ]; maintainers = with stdenv.lib.maintainers; [ astsmtl ];
#platforms = with stdenv.lib.platforms; linux; platforms = stdenv.lib.platforms.linux;
hydraPlatforms = [];
}; };
} }

View File

@ -68,7 +68,8 @@ stdenv.mkDerivation rec {
homepage = http://support.amd.com/us/gpudownload/Pages/index.aspx; homepage = http://support.amd.com/us/gpudownload/Pages/index.aspx;
license = "unfree"; license = "unfree";
maintainers = [stdenv.lib.maintainers.marcweber]; maintainers = [stdenv.lib.maintainers.marcweber];
#platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
hydraPlatforms = [];
}; };
# moved assertions here because the name is evaluated when the NixOS manual is generated # moved assertions here because the name is evaluated when the NixOS manual is generated

View File

@ -15,5 +15,5 @@ in import ./generic.nix (args // rec {
features.iwlwifi = true; features.iwlwifi = true;
extraMeta.platforms = []; extraMeta.hydraPlatforms = [];
}) })

View File

@ -105,8 +105,7 @@ rec {
[ [
raskin raskin
]; ];
platforms = with a.lib.platforms; hydraPlatforms = []; # Builder is just unpacking/mixing what is needed
[]; # Builder is just unpacking/mixing what is needed
license = "free"; # mix of packages under different licenses license = "free"; # mix of packages under different licenses
homepage = "http://openjena.org/"; homepage = "http://openjena.org/";
}; };

View File

@ -46,8 +46,7 @@ rec {
[ [
raskin raskin
]; ];
platforms = with a.lib.platforms; hydraPlatforms = [];
[];
license = "free-noncopyleft"; license = "free-noncopyleft";
}; };
passthru = { passthru = {

View File

@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
homepage = http://www.gnu.org/software/fdisk/; homepage = http://www.gnu.org/software/fdisk/;
maintainers = [ ]; platforms = stdenv.lib.platforms.linux;
#platforms = stdenv.lib.platforms.linux; # was failing for long without anyone complaining
}; };
} }

View File

@ -30,6 +30,6 @@ rec {
maintainers = [ args.lib.maintainers.raskin ]; maintainers = [ args.lib.maintainers.raskin ];
# Actually, arch-independent.. # Actually, arch-independent..
platforms = [] ; hydraPlatforms = [];
}; };
} }

View File

@ -19,6 +19,6 @@ rec {
maintainers = [ args.lib.maintainers.raskin ]; maintainers = [ args.lib.maintainers.raskin ];
# Actually, arch-independent.. # Actually, arch-independent..
platforms = [] ; hydraPlatforms = [];
}; };
} }

View File

@ -21,6 +21,6 @@ rec {
maintainers = [ args.lib.maintainers.simons ]; maintainers = [ args.lib.maintainers.simons ];
# Actually, arch-independent.. # Actually, arch-independent..
platforms = [] ; hydraPlatforms = [];
}; };
} }

View File

@ -24,6 +24,6 @@ rec {
maintainers = [ args.lib.maintainers.simons ]; maintainers = [ args.lib.maintainers.simons ];
# Actually, arch-independent.. # Actually, arch-independent..
platforms = [] ; hydraPlatforms = [];
}; };
} }

View File

@ -2290,7 +2290,7 @@ let
cross = assert crossSystem != null; crossSystem; cross = assert crossSystem != null; crossSystem;
}; };
gcc44_realCross = lib.addMetaAttrs { platforms = []; } gcc44_realCross = lib.addMetaAttrs { hydraPlatforms = []; }
(makeOverridable (import ../development/compilers/gcc/4.4) { (makeOverridable (import ../development/compilers/gcc/4.4) {
inherit stdenv fetchurl texinfo gmp mpfr /* ppl cloogppl */ noSysDirs inherit stdenv fetchurl texinfo gmp mpfr /* ppl cloogppl */ noSysDirs
gettext which; gettext which;
@ -2339,7 +2339,7 @@ let
gcc47 = gcc47_real; gcc47 = gcc47_real;
gcc45_realCross = lib.addMetaAttrs { platforms = []; } gcc45_realCross = lib.addMetaAttrs { hydraPlatforms = []; }
(makeOverridable (import ../development/compilers/gcc/4.5) { (makeOverridable (import ../development/compilers/gcc/4.5) {
inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib
ppl cloogppl gettext which noSysDirs; ppl cloogppl gettext which noSysDirs;
@ -2351,7 +2351,7 @@ let
cross = assert crossSystem != null; crossSystem; cross = assert crossSystem != null; crossSystem;
}); });
gcc46_realCross = lib.addMetaAttrs { platforms = []; } gcc46_realCross = lib.addMetaAttrs { hydraPlatforms = []; }
(makeOverridable (import ../development/compilers/gcc/4.6) { (makeOverridable (import ../development/compilers/gcc/4.6) {
inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib
cloog ppl gettext which noSysDirs; cloog ppl gettext which noSysDirs;
@ -2363,7 +2363,7 @@ let
cross = assert crossSystem != null; crossSystem; cross = assert crossSystem != null; crossSystem;
}); });
gcc47_realCross = lib.addMetaAttrs { platforms = []; } gcc47_realCross = lib.addMetaAttrs { hydraPlatforms = []; }
(makeOverridable (import ../development/compilers/gcc/4.7) { (makeOverridable (import ../development/compilers/gcc/4.7) {
inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib
cloog ppl gettext which noSysDirs; cloog ppl gettext which noSysDirs;
@ -2384,7 +2384,7 @@ let
if isMingw then windows.mingw_headers1 else null; if isMingw then windows.mingw_headers1 else null;
in in
wrapGCCCross { wrapGCCCross {
gcc = forceNativeDrv (lib.addMetaAttrs { platforms = []; } ( gcc = forceNativeDrv (lib.addMetaAttrs { hydraPlatforms = []; } (
gcc_realCross.override { gcc_realCross.override {
crossStageStatic = true; crossStageStatic = true;
langCC = false; langCC = false;