From 2147a07938751a5cd0ea69b9be31f53d4dd21eed Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 7 Oct 2013 17:36:47 +0200 Subject: Fix a bunch of Hydra evaluation errors --- pkgs/applications/editors/flpsed/default.nix | 3 +-- pkgs/applications/misc/xfe/default.nix | 2 +- pkgs/applications/networking/browsers/dwb/default.nix | 4 ++-- pkgs/applications/science/chemistry/avogadro/default.nix | 2 +- pkgs/development/libraries/cogl/default.nix | 2 +- pkgs/development/libraries/fox/fox-1.6.nix | 2 +- pkgs/development/libraries/libdevil/default.nix | 2 +- pkgs/development/libraries/phonon-backend-vlc/default.nix | 2 +- pkgs/development/python-modules/blivet/default.nix | 1 + pkgs/games/anki/default.nix | 2 +- pkgs/games/spring/default.nix | 4 ++-- pkgs/tools/X11/winswitch/default.nix | 2 ++ pkgs/tools/X11/xpra/default.nix | 1 + pkgs/tools/filesystems/nixpart/default.nix | 1 + pkgs/tools/networking/mu/default.nix | 2 +- pkgs/top-level/python-packages.nix | 7 ++++++- 16 files changed, 24 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/editors/flpsed/default.nix b/pkgs/applications/editors/flpsed/default.nix index 1bae58cfaaee..15605218b741 100644 --- a/pkgs/applications/editors/flpsed/default.nix +++ b/pkgs/applications/editors/flpsed/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation { description = "WYSIWYG PostScript annotator"; homepage = "http://http://flpsed.org/flpsed.html"; license = "GPLv3"; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.mesaPlatforms; }; - } diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix index ce10b8791995..9b1385d9d6ad 100644 --- a/pkgs/applications/misc/xfe/default.nix +++ b/pkgs/applications/misc/xfe/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = "http://sourceforge.net/projects/xfe/"; license = "GPLv2"; maintainers = [ stdenv.lib.maintainers.bbenoist ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix index dd0cbc4eb4e1..b120ebcac54e 100644 --- a/pkgs/applications/networking/browsers/dwb/default.nix +++ b/pkgs/applications/networking/browsers/dwb/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation { meta = { homepage = http://portix.bitbucket.org/dwb/; description = "A lightweight web browser based on the webkit web browser engine and the gtk toolkit"; - platforms = with stdenv.lib.platforms; all; - maintainers = with stdenv.lib.maintainers; [pSub]; + platforms = stdenv.lib.platforms.mesaPlatforms; + maintainers = [ stdenv.lib.maintainers.pSub ]; license = "GPL"; }; } diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix index dd6c0eaa3763..e45f5b645fd9 100644 --- a/pkgs/applications/science/chemistry/avogadro/default.nix +++ b/pkgs/applications/science/chemistry/avogadro/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = { description = "Molecule editor and visualizer"; maintainers = [ stdenv.lib.maintainers.urkud ]; - inherit (qt4.meta) platforms; + platforms = stdenv.lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 9c3a1a4d6747..abb92f7b08b4 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { render without stepping on each other's toes. ''; - inherit (glib.meta) platforms; + platforms = stdenv.lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index 540c2c61d946..2a7bb1dc31a1 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = "http://fox-toolkit.org"; license = "LGPLv3"; maintainers = [ stdenv.lib.maintainers.bbenoist ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index 6efb785b6577..d3053b4d2a5f 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { homepage = http://openil.sourceforge.net/; description = "An image library which can can load, save, convert, manipulate, filter and display a wide variety of image formats"; license = licenses.lgpl2; - platforms = platforms.all; + platforms = platforms.mesaPlatforms; maintainers = [ maintainers.phreedom maintainers.urkud ]; }; } diff --git a/pkgs/development/libraries/phonon-backend-vlc/default.nix b/pkgs/development/libraries/phonon-backend-vlc/default.nix index 97e778cc1f58..257c80f0b118 100644 --- a/pkgs/development/libraries/phonon-backend-vlc/default.nix +++ b/pkgs/development/libraries/phonon-backend-vlc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "VideoLAN backend for Phonon multimedia framework"; - inherit (qt4.meta) platforms; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.urkud ]; }; } diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index 922594bc3dc9..c1b36bf909de 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -53,5 +53,6 @@ in buildPythonPackage rec { homepage = "https://fedoraproject.org/wiki/Blivet"; description = "Module for management of a system's storage configuration"; license = [ "GPLv2+" "LGPLv2.1+" ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index b904a6b5dcdb..7437e2e2262c 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -66,6 +66,6 @@ stdenv.mkDerivation rec { * even practicing guitar chords! ''; license = "GPLv3"; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index ba45360ccb6d..109cb239d2be 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -27,9 +27,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://springrts.com/; - description = "A powerful real-time strategy(RTS) game engine"; + description = "A powerful real-time strategy (RTS) game engine"; license = licenses.gpl2; maintainers = [ maintainers.phreedom maintainers.qknight ]; - platforms = platforms.unix; + platforms = platforms.mesaPlatforms; }; } diff --git a/pkgs/tools/X11/winswitch/default.nix b/pkgs/tools/X11/winswitch/default.nix index b53db509dafe..bd160940b573 100644 --- a/pkgs/tools/X11/winswitch/default.nix +++ b/pkgs/tools/X11/winswitch/default.nix @@ -38,6 +38,8 @@ let ''; doCheck = false; + + meta.platforms = stdenv.lib.platforms.mesaPlatforms; }; in stdenv.lib.overrideDerivation base (b: { postFixup = b.postFixup + '' diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 71c5d5f3a44e..b8995430f92a 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -40,5 +40,6 @@ buildPythonPackage rec { meta = { homepage = http://xpra.org/; description = "Persistent remote applications for X"; + platforms = stdenv.lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix index 2cd40bb08675..633f04320c37 100644 --- a/pkgs/tools/filesystems/nixpart/default.nix +++ b/pkgs/tools/filesystems/nixpart/default.nix @@ -24,5 +24,6 @@ in buildPythonPackage rec { description = "NixOS storage manager/partitioner"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.aszlig ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 6b316321afde..e42dfee7cae2 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { description = "A collection of utilties for indexing and searching Maildirs"; license = "GPLv3+"; homepage = "http://www.djcbsoftware.nl/code/mu/"; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.mesaPlatforms; maintainers = with stdenv.lib.maintainers; [ antono the-kenny ]; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9d0b7d80f769..a33103cccb84 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1347,6 +1347,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { homepage = http://pythonhosted.org/evdev; license = licenses.bsd3; maintainers = [ maintainers.goibhniu ]; + platforms = stdenv.lib.platforms.linux; }; }; @@ -4628,6 +4629,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { homepage = "http://www.pyglet.org/"; description = "A cross-platform windowing and multimedia library"; license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.mesaPlatforms; }; }; @@ -4795,7 +4797,8 @@ pythonPackages = modules // import ./python-packages-generated.nix { meta = { homepage = "https://fedorahosted.org/pyparted/"; description = "Python interface for libparted"; - license = pkgs.lib.licenses.gpl2Plus; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; }; @@ -4851,6 +4854,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { homepage = "http://pyudev.readthedocs.org/"; description = "Pure Python libudev binding"; license = stdenv.lib.licenses.lgpl21Plus; + platforms = stdenv.lib.platforms.linux; }; }; @@ -4974,6 +4978,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { ''; license = "BSD-style"; + platforms = stdenv.lib.platforms.mesaPlatforms; }; }; -- cgit 1.4.1