From bf2d945a027ac3c00785fd5108dc763b61cd56bc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 9 May 2012 21:10:12 +0000 Subject: [PATCH] * Disable some failing builds on specific platforms. svn path=/nixpkgs/trunk/; revision=34033 --- .../science/math/eukleides/default.nix | 2 +- .../libraries/SDL_image/default.nix | 2 +- pkgs/development/libraries/pango/1.29.x.nix | 2 +- pkgs/top-level/release.nix | 28 ++++++------------- 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/science/math/eukleides/default.nix b/pkgs/applications/science/math/eukleides/default.nix index d15bed8476e7..55ea4c6216c6 100644 --- a/pkgs/applications/science/math/eukleides/default.nix +++ b/pkgs/applications/science/math/eukleides/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { circles and conics. ''; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index deedbdfc751f..1ecb2f830826 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { meta = { description = "SDL image library"; homepage = http://www.libsdl.org/projects/SDL_image/; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/pango/1.29.x.nix b/pkgs/development/libraries/pango/1.29.x.nix index 4d6e5411e24c..6c5d0f4cebcc 100644 --- a/pkgs/development/libraries/pango/1.29.x.nix +++ b/pkgs/development/libraries/pango/1.29.x.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { license = "LGPLv2+"; maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 6172e57b73f9..3eda6a98d928 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -94,7 +94,7 @@ with (import ./release-lib.nix); fuse = linux; gajim = linux; gawk = all; - gcc = all; + gcc = linux; gcc33 = linux; gcc34 = linux; gcc41 = linux; @@ -183,7 +183,7 @@ with (import ./release-lib.nix); man = linux; manpages = linux; maxima = linux; - mc = all; + mc = linux; mcabber = linux; mcron = linux; mdadm = linux; @@ -241,12 +241,12 @@ with (import ./release-lib.nix); ppl = all; procps = linux; pwdutils = linux; - pthreadmanpages = all; + pthreadmanpages = linux; pygtk = linux; pyqt4 = linux; python = allBut "i686-cygwin"; pythonFull = linux; - sbcl = all; + sbcl = linux; qt3 = linux; quake3demo = linux; readline = all; @@ -257,7 +257,7 @@ with (import ./release-lib.nix); rsync = linux; rubber = allBut "i686-cygwin"; ruby = all; - rxvt_unicode = all; + rxvt_unicode = linux; samba = linux; screen = linux ++ darwin; scrot = linux; @@ -267,7 +267,7 @@ with (import ./release-lib.nix); sharutils = all; slim = linux; sloccount = allBut "i686-cygwin"; - smartmontools = all; + smartmontools = linux; socat = linux; spidermonkey = linux; splashutils = linux; @@ -410,23 +410,13 @@ with (import ./release-lib.nix); */ strategoPackages = { - sdf = all; - strategoxt = all; - javafront = all; + sdf = linux; + strategoxt = linux; + javafront = linux; strategoShell = linux ++ darwin; dryad = linux; }; - strategoPackages018 = { - sdfStatic = all; - sdf = all; - strategoxt = all; - javafront = all; - aspectjfront = all; - strategoShell = all; - dryad = linux; - }; - pythonPackages = { zfec = linux; };