From c88055e1a2703fbc7dd1d072f273626afe1d6b97 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 5 Nov 2013 00:04:36 +0100 Subject: Set meta.hydraPlatforms instead of meta.platforms for some packages --- pkgs/applications/audio/mopidy/default.nix | 2 +- pkgs/applications/graphics/zgrviewer/default.nix | 2 +- pkgs/applications/science/logic/tptp/default.nix | 3 +-- pkgs/data/fonts/andagii/default.nix | 3 +-- pkgs/development/libraries/aqbanking/default.nix | 2 +- pkgs/development/libraries/haskell/accelerate-cuda/default.nix | 2 +- .../libraries/haskell/accelerate-examples/default.nix | 2 +- pkgs/development/libraries/haskell/accelerate-fft/default.nix | 2 +- pkgs/development/libraries/haskell/cuda/default.nix | 2 +- pkgs/development/libraries/haskell/cufft/default.nix | 2 +- pkgs/games/alienarena/default.nix | 3 ++- pkgs/games/dwarf-therapist/default.nix | 3 ++- pkgs/games/flightgear/default.nix | 3 ++- pkgs/games/naev/default.nix | 3 ++- pkgs/games/oilrush/default.nix | 3 ++- pkgs/games/sauerbraten/default.nix | 2 +- pkgs/games/speed-dreams/default.nix | 3 ++- pkgs/games/torcs/default.nix | 3 ++- pkgs/games/ufoai/default.nix | 3 ++- pkgs/games/unvanquished/default.nix | 3 ++- pkgs/games/urbanterror/default.nix | 3 ++- pkgs/games/vdrift/default.nix | 3 ++- pkgs/games/widelands/default.nix | 3 ++- pkgs/games/xonotic/default.nix | 3 ++- pkgs/os-specific/linux/ati-drivers/default.nix | 3 ++- pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix | 2 +- pkgs/servers/http/joseki/default.nix | 3 +-- pkgs/tools/graphics/welkin/default.nix | 3 +-- pkgs/tools/system/fdisk/default.nix | 3 +-- pkgs/tools/typesetting/tex/texlive/cm-super.nix | 2 +- pkgs/tools/typesetting/tex/texlive/extra.nix | 2 +- pkgs/tools/typesetting/tex/texlive/moderncv.nix | 2 +- pkgs/tools/typesetting/tex/texlive/moderntimeline.nix | 2 +- pkgs/top-level/all-packages.nix | 10 +++++----- 34 files changed, 52 insertions(+), 43 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 611d9f4226d..b684fee37d5 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -39,6 +39,6 @@ pythonPackages.buildPythonPackage rec { local hard drive. ''; maintainers = [ stdenv.lib.maintainers.rickynils ]; - platforms = []; + hydraPlatforms = []; }; } diff --git a/pkgs/applications/graphics/zgrviewer/default.nix b/pkgs/applications/graphics/zgrviewer/default.nix index 5fe30bd7a03..93d1b28854a 100644 --- a/pkgs/applications/graphics/zgrviewer/default.nix +++ b/pkgs/applications/graphics/zgrviewer/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { # Quicker to unpack locally than load Hydra - platforms = []; + hydraPlatforms = []; maintainers = with stdenv.lib.maintainers; [raskin]; license = with stdenv.lib.licenses; lgpl21Plus; description = "GraphViz graph viewer/navigator"; diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix index 5c8cb720324..68d1cca7e73 100644 --- a/pkgs/applications/science/logic/tptp/default.nix +++ b/pkgs/applications/science/logic/tptp/default.nix @@ -74,8 +74,7 @@ rec { # A GiB of data. Installation is unpacking and editing a few files. # No sense in letting Hydra build it. # Also, it is unclear what is covered by "verbatim" - we will edit configs - platforms = with a.lib.platforms; - []; + hydraPlatforms = []; license = "verbatim-redistribution"; }; passthru = { diff --git a/pkgs/data/fonts/andagii/default.nix b/pkgs/data/fonts/andagii/default.nix index 6e59e97171e..8b08708fb1d 100644 --- a/pkgs/data/fonts/andagii/default.nix +++ b/pkgs/data/fonts/andagii/default.nix @@ -43,8 +43,7 @@ rec { [ raskin ]; - platforms = with a.lib.platforms; - []; + hydraPlatforms = []; # There are multiple claims that the font is GPL, # so I include the package; but I cannot find the # original source, so use it on your own risk diff --git a/pkgs/development/libraries/aqbanking/default.nix b/pkgs/development/libraries/aqbanking/default.nix index 0ddb1aaa749..7dfc6a60a99 100644 --- a/pkgs/development/libraries/aqbanking/default.nix +++ b/pkgs/development/libraries/aqbanking/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { maintainers = [ stdenv.lib.maintainers.urkud ]; # Tries to install gwenhywfar plugin, thus `make install` fails - platforms = []; + hydraPlatforms = []; }; } diff --git a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix index cabfccc0266..49cb597b2a5 100644 --- a/pkgs/development/libraries/haskell/accelerate-cuda/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-cuda/default.nix @@ -17,7 +17,7 @@ cabal.mkDerivation (self: { homepage = "https://github.com/AccelerateHS/accelerate-cuda/"; description = "Accelerate backend for NVIDIA GPUs"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.stdenv.lib.platforms.none; + hydraPlatforms = []; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/accelerate-examples/default.nix b/pkgs/development/libraries/haskell/accelerate-examples/default.nix index b9536052dd2..8cb5433726f 100644 --- a/pkgs/development/libraries/haskell/accelerate-examples/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-examples/default.nix @@ -23,7 +23,7 @@ cabal.mkDerivation (self: { homepage = "https://github.com/AccelerateHS/accelerate-examples"; description = "Examples using the Accelerate library"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.stdenv.lib.platforms.none; + hydraPlatforms = []; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/accelerate-fft/default.nix b/pkgs/development/libraries/haskell/accelerate-fft/default.nix index b3c1cb90b29..ef378faa08f 100644 --- a/pkgs/development/libraries/haskell/accelerate-fft/default.nix +++ b/pkgs/development/libraries/haskell/accelerate-fft/default.nix @@ -9,6 +9,6 @@ cabal.mkDerivation (self: { homepage = "https://github.com/AccelerateHS/accelerate-fft"; description = "FFT using the Accelerate library"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.stdenv.lib.platforms.none; + hydraPlatforms = []; }; }) diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix index ac9e41fd628..98d97c82e51 100644 --- a/pkgs/development/libraries/haskell/cuda/default.nix +++ b/pkgs/development/libraries/haskell/cuda/default.nix @@ -33,7 +33,7 @@ cabal.mkDerivation (self: { meta = { description = "FFI binding to the CUDA interface for programming NVIDIA GPUs"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.stdenv.lib.platforms.none; + hydraPlatforms = []; maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/cufft/default.nix b/pkgs/development/libraries/haskell/cufft/default.nix index e9f1fe166bd..9de2cf9f80a 100644 --- a/pkgs/development/libraries/haskell/cufft/default.nix +++ b/pkgs/development/libraries/haskell/cufft/default.nix @@ -10,6 +10,6 @@ cabal.mkDerivation (self: { homepage = "http://github.com/robeverest/cufft"; description = "Haskell bindings for the CUFFT library"; license = self.stdenv.lib.licenses.bsd3; - platforms = self.stdenv.lib.platforms.none; + hydraPlatforms = []; }; }) diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix index d9852971adf..b3c2dd14718 100644 --- a/pkgs/games/alienarena/default.nix +++ b/pkgs/games/alienarena/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { # Engine is under GPLv2, everything else is under license = [ "unfree-redistributable" ]; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - #platforms = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/games/dwarf-therapist/default.nix b/pkgs/games/dwarf-therapist/default.nix index d8f39ceeea4..c7e594f89bd 100644 --- a/pkgs/games/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-therapist/default.nix @@ -54,7 +54,8 @@ stdenv.mkDerivation rec { description = "Tool to manage dwarves in in a running game of Dwarf Fortress"; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; license = "MIT"; - platforms = stdenv.lib.platforms.none; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; homepage = https://code.google.com/r/splintermind-attributes/; }; } diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index 71183d0ea2a..f3ddb633e87 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -57,7 +57,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Flight simulator"; 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; }; } diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix index 4516afaef6d..c2a7ee90a1f 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation { homepage = http://www.naev.org; license = "GPLv3+"; maintainers = with stdenv.lib.maintainers; [viric]; - #platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix index b96fd7c3e9f..f62570dbd08 100644 --- a/pkgs/games/oilrush/default.nix +++ b/pkgs/games/oilrush/default.nix @@ -69,7 +69,8 @@ stdenv.mkDerivation { homepage = http://oilrush-game.com/; license = "unfree"; #maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - #platforms = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/games/sauerbraten/default.nix b/pkgs/games/sauerbraten/default.nix index 8bec0f7b1a9..eb5d933e885 100644 --- a/pkgs/games/sauerbraten/default.nix +++ b/pkgs/games/sauerbraten/default.nix @@ -66,7 +66,7 @@ rec { [ raskin ]; - platforms = with a.lib.platforms; + hydraPlatforms = # raskin: tested amd64-linux; # not setting platforms because it is 0.5+ GiB of game data []; diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix index e920b8c633e..7a78235bdff 100644 --- a/pkgs/games/speed-dreams/default.nix +++ b/pkgs/games/speed-dreams/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { homepage = http://speed-dreams.sourceforge.net/; license = "GPLv2+"; maintainers = with stdenv.lib.maintainers; [viric raskin]; - #platforms = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index f5b713ae337..9f1fdedd577 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { homepage = http://torcs.sourceforge.net/; license = "GPLv2+"; maintainers = with stdenv.lib.maintainers; [viric]; - #platforms = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/games/ufoai/default.nix b/pkgs/games/ufoai/default.nix index d9955aec3eb..2fef444328c 100644 --- a/pkgs/games/ufoai/default.nix +++ b/pkgs/games/ufoai/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { description = "A squad-based tactical strategy game in the tradition of X-Com"; license = "GPLv2+"; maintainers = with stdenv.lib.maintainers; [viric]; - #platforms = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/games/unvanquished/default.nix index 2768d2fad9e..9ba3a442eb7 100644 --- a/pkgs/games/unvanquished/default.nix +++ b/pkgs/games/unvanquished/default.nix @@ -62,7 +62,8 @@ stdenv.mkDerivation rec { homepage = http://unvanquished.net; #license = "unknown"; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; + platforms = stdenv.lib.platforms.linux; # This package can take a lot of disk space, so unavailable from channel - #platforms = with stdenv.lib.platforms; linux; + hydraPlatforms = []; }; } diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index 535e575fdc4..020d60fa3fa 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -59,6 +59,7 @@ stdenv.mkDerivation rec { homepage = http://www.urbanterror.net; license = [ "unfree-redistributable" ]; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - #platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index 97bd1ab432d..af112c37af4 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { homepage = http://vdrift.net/; license = "GPLv2+"; maintainers = with stdenv.lib.maintainers; [viric]; - #platforms = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix index e20adc8faa7..65c99134072 100644 --- a/pkgs/games/widelands/default.nix +++ b/pkgs/games/widelands/default.nix @@ -64,7 +64,8 @@ rec { raskin jcumming ]; - #platforms = a.lib.platforms.linux; + platforms = a.lib.platforms.linux; + hydraPlatforms = []; license = a.lib.licenses.gpl2Plus; }; passthru = { diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 957d7b2c7f4..5245c12e6ce 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -56,6 +56,7 @@ stdenv.mkDerivation rec { homepage = http://www.xonotic.org; license = with stdenv.lib.licenses; gpl2Plus; maintainers = with stdenv.lib.maintainers; [ astsmtl ]; - #platforms = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.linux; + hydraPlatforms = []; }; } diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 326de9ed81a..ab95accd749 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -68,7 +68,8 @@ stdenv.mkDerivation rec { homepage = http://support.amd.com/us/gpudownload/Pages/index.aspx; license = "unfree"; 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 diff --git a/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix b/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix index fdf2f139c33..6d28c376078 100644 --- a/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-rpi-3.6.nix @@ -15,5 +15,5 @@ in import ./generic.nix (args // rec { features.iwlwifi = true; - extraMeta.platforms = []; + extraMeta.hydraPlatforms = []; }) diff --git a/pkgs/servers/http/joseki/default.nix b/pkgs/servers/http/joseki/default.nix index 6ca5caba944..f42ae81a700 100644 --- a/pkgs/servers/http/joseki/default.nix +++ b/pkgs/servers/http/joseki/default.nix @@ -105,8 +105,7 @@ rec { [ raskin ]; - platforms = with a.lib.platforms; - []; # Builder is just unpacking/mixing what is needed + hydraPlatforms = []; # Builder is just unpacking/mixing what is needed license = "free"; # mix of packages under different licenses homepage = "http://openjena.org/"; }; diff --git a/pkgs/tools/graphics/welkin/default.nix b/pkgs/tools/graphics/welkin/default.nix index d02b38b4127..23c5ec11aaa 100644 --- a/pkgs/tools/graphics/welkin/default.nix +++ b/pkgs/tools/graphics/welkin/default.nix @@ -46,8 +46,7 @@ rec { [ raskin ]; - platforms = with a.lib.platforms; - []; + hydraPlatforms = []; license = "free-noncopyleft"; }; passthru = { diff --git a/pkgs/tools/system/fdisk/default.nix b/pkgs/tools/system/fdisk/default.nix index 111408d1339..e72497cf7c4 100644 --- a/pkgs/tools/system/fdisk/default.nix +++ b/pkgs/tools/system/fdisk/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/fdisk/; - maintainers = [ ]; - #platforms = stdenv.lib.platforms.linux; # was failing for long without anyone complaining + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/cm-super.nix b/pkgs/tools/typesetting/tex/texlive/cm-super.nix index 4d161c3e053..066796ed39c 100644 --- a/pkgs/tools/typesetting/tex/texlive/cm-super.nix +++ b/pkgs/tools/typesetting/tex/texlive/cm-super.nix @@ -30,6 +30,6 @@ rec { maintainers = [ args.lib.maintainers.raskin ]; # Actually, arch-independent.. - platforms = [] ; + hydraPlatforms = []; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix index 6613578e2c6..b49f02d6fda 100644 --- a/pkgs/tools/typesetting/tex/texlive/extra.nix +++ b/pkgs/tools/typesetting/tex/texlive/extra.nix @@ -19,6 +19,6 @@ rec { maintainers = [ args.lib.maintainers.raskin ]; # Actually, arch-independent.. - platforms = [] ; + hydraPlatforms = []; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/moderncv.nix b/pkgs/tools/typesetting/tex/texlive/moderncv.nix index 0ce1afbb41b..f4db43f21f2 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderncv.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderncv.nix @@ -21,6 +21,6 @@ rec { maintainers = [ args.lib.maintainers.simons ]; # Actually, arch-independent.. - platforms = [] ; + hydraPlatforms = []; }; } diff --git a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix index 4cb93794edf..f7d8f1254c5 100644 --- a/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix +++ b/pkgs/tools/typesetting/tex/texlive/moderntimeline.nix @@ -24,6 +24,6 @@ rec { maintainers = [ args.lib.maintainers.simons ]; # Actually, arch-independent.. - platforms = [] ; + hydraPlatforms = []; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d870057043..8ed8524a027 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2290,7 +2290,7 @@ let cross = assert crossSystem != null; crossSystem; }; - gcc44_realCross = lib.addMetaAttrs { platforms = []; } + gcc44_realCross = lib.addMetaAttrs { hydraPlatforms = []; } (makeOverridable (import ../development/compilers/gcc/4.4) { inherit stdenv fetchurl texinfo gmp mpfr /* ppl cloogppl */ noSysDirs gettext which; @@ -2339,7 +2339,7 @@ let gcc47 = gcc47_real; - gcc45_realCross = lib.addMetaAttrs { platforms = []; } + gcc45_realCross = lib.addMetaAttrs { hydraPlatforms = []; } (makeOverridable (import ../development/compilers/gcc/4.5) { inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib ppl cloogppl gettext which noSysDirs; @@ -2351,7 +2351,7 @@ let cross = assert crossSystem != null; crossSystem; }); - gcc46_realCross = lib.addMetaAttrs { platforms = []; } + gcc46_realCross = lib.addMetaAttrs { hydraPlatforms = []; } (makeOverridable (import ../development/compilers/gcc/4.6) { inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib cloog ppl gettext which noSysDirs; @@ -2363,7 +2363,7 @@ let cross = assert crossSystem != null; crossSystem; }); - gcc47_realCross = lib.addMetaAttrs { platforms = []; } + gcc47_realCross = lib.addMetaAttrs { hydraPlatforms = []; } (makeOverridable (import ../development/compilers/gcc/4.7) { inherit fetchurl stdenv texinfo gmp mpfr mpc libelf zlib cloog ppl gettext which noSysDirs; @@ -2384,7 +2384,7 @@ let if isMingw then windows.mingw_headers1 else null; in wrapGCCCross { - gcc = forceNativeDrv (lib.addMetaAttrs { platforms = []; } ( + gcc = forceNativeDrv (lib.addMetaAttrs { hydraPlatforms = []; } ( gcc_realCross.override { crossStageStatic = true; langCC = false; -- cgit 1.4.1