From 8a7f3c36185ddb801372b3461ff65109978ab46b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 8 Aug 2014 17:58:34 +0200 Subject: Mark a bunch of packages as broken or not supported on Darwin --- .../editors/emacs-modes/emms/default.nix | 1 + .../editors/emacs-modes/jdee/default.nix | 2 + pkgs/applications/graphics/hugin/default.nix | 1 + pkgs/applications/misc/robomongo/default.nix | 1 + pkgs/applications/misc/xfe/default.nix | 2 +- .../networking/browsers/netsurf/libnsbmp.nix | 1 + .../instant-messengers/ekiga/default.nix | 1 + .../instant-messengers/twinkle/default.nix | 4 +- .../applications/science/biology/plink/default.nix | 1 + .../applications/science/logic/opensmt/default.nix | 9 +-- pkgs/applications/science/math/content/default.nix | 1 + pkgs/applications/science/misc/root/default.nix | 2 +- pkgs/applications/virtualization/xen/default.nix | 3 +- pkgs/development/compilers/gcc/3.3/default.nix | 1 + pkgs/development/compilers/mit-scheme/default.nix | 2 + pkgs/development/compilers/rustc/common.nix | 3 +- pkgs/development/compilers/strategoxt/0.18.nix | 2 + pkgs/development/interpreters/lua-4/default.nix | 3 +- pkgs/development/interpreters/lua-5/5.1.nix | 2 +- pkgs/development/libraries/SDL/default.nix | 2 +- pkgs/development/libraries/SDL_image/default.nix | 2 +- pkgs/development/libraries/SDL_mixer/default.nix | 2 +- pkgs/development/libraries/ffmpeg/0.6.90.nix | 1 + pkgs/development/libraries/ffmpeg/2.x.nix | 1 + pkgs/development/libraries/kerberos/heimdal.nix | 4 ++ pkgs/development/libraries/libav/default.nix | 2 +- pkgs/development/libraries/libc++/default.nix | 2 +- pkgs/development/libraries/libc++abi/default.nix | 2 +- pkgs/development/libraries/libtiff/default.nix | 1 + pkgs/development/libraries/libzrtpcpp/1.6.nix | 1 + pkgs/development/libraries/opal/default.nix | 9 +-- pkgs/development/libraries/pcl/default.nix | 1 + pkgs/development/libraries/ptlib/default.nix | 9 +-- .../libraries/science/math/openblas/default.nix | 1 + .../development/libraries/speech-tools/default.nix | 1 + pkgs/development/libraries/wayland/default.nix | 2 +- .../libraries/xcb-util-cursor/default.nix | 2 +- .../tools/analysis/valgrind/default.nix | 2 +- .../tools/analysis/valkyrie/default.nix | 3 +- pkgs/development/tools/misc/dejagnu/default.nix | 2 +- pkgs/games/0ad/default.nix | 1 + pkgs/games/glestae/default.nix | 9 +-- pkgs/games/tremulous/default.nix | 1 + pkgs/misc/emulators/hatari/default.nix | 2 +- pkgs/os-specific/linux/kernel/perf.nix | 8 +-- pkgs/servers/http/myserver/default.nix | 69 +++++++++++----------- pkgs/servers/mail/freepops/default.nix | 1 + pkgs/servers/mediatomb/default.nix | 4 +- pkgs/tools/X11/winswitch/default.nix | 2 +- pkgs/tools/X11/xpra/default.nix | 2 +- pkgs/tools/graphics/pngquant/default.nix | 1 + pkgs/tools/misc/rrdtool/default.nix | 2 +- pkgs/tools/networking/lsh/default.nix | 1 + pkgs/tools/video/rtmpdump/default.nix | 4 +- pkgs/top-level/release.nix | 1 - 55 files changed, 108 insertions(+), 94 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/emms/default.nix b/pkgs/applications/editors/emacs-modes/emms/default.nix index 078907d7bb59..a44be28399dc 100644 --- a/pkgs/applications/editors/emacs-modes/emms/default.nix +++ b/pkgs/applications/editors/emacs-modes/emms/default.nix @@ -68,5 +68,6 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.unix; + broken = true; }; } diff --git a/pkgs/applications/editors/emacs-modes/jdee/default.nix b/pkgs/applications/editors/emacs-modes/jdee/default.nix index 4c347f27e681..e47da7a41934 100644 --- a/pkgs/applications/editors/emacs-modes/jdee/default.nix +++ b/pkgs/applications/editors/emacs-modes/jdee/default.nix @@ -93,5 +93,7 @@ in maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice + + broken = true; }; } diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index a98e60d6fea0..7972efe429a1 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + broken = true; }; } diff --git a/pkgs/applications/misc/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix index c36d9254670a..ab8a803b7cb4 100644 --- a/pkgs/applications/misc/robomongo/default.nix +++ b/pkgs/applications/misc/robomongo/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.amorsillo ]; + broken = true; }; } diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix index 9a35cef08243..d09a899b897f 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 = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.bbenoist ]; - platforms = stdenv.lib.platforms.mesaPlatforms; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix index 9c16ff9b89c5..d370002543ce 100644 --- a/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix +++ b/pkgs/applications/networking/browsers/netsurf/libnsbmp.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.mit; maintainers = [args.lib.maintainers.marcweber]; platforms = args.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index 9de14cae6f0f..ebcd98e99e89 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -54,6 +54,7 @@ rec { ''); meta = { + broken = true; description = "Ekiga SIP client"; maintainers = with a.lib.maintainers; [ diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix index 0824210c4b56..060c844980bb 100644 --- a/pkgs/applications/networking/instant-messengers/twinkle/default.nix +++ b/pkgs/applications/networking/instant-messengers/twinkle/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, commoncpp2, ccrtp, openssl, boost , libsndfile, libxml2, libjpeg, readline, qt3, perl, file , alsaLib, speex, libzrtpcpp, xorg }: - + stdenv.mkDerivation { name = "twinkle-1.4.2"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { speex libzrtpcpp xorg.libX11 xorg.libXaw xorg.libICE xorg.libXext ]; - meta = { + meta = { homepage = http://www.xs4all.nl/~mfnboer/twinkle/index.html; license = "GPL"; maintainers = [ stdenv.lib.maintainers.marcweber ]; diff --git a/pkgs/applications/science/biology/plink/default.nix b/pkgs/applications/science/biology/plink/default.nix index 4396ab463c6d..009e12aa02f0 100644 --- a/pkgs/applications/science/biology/plink/default.nix +++ b/pkgs/applications/science/biology/plink/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation { homepage = "http://pngu.mgh.harvard.edu/~purcell/plink/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; + broken = true; }; } diff --git a/pkgs/applications/science/logic/opensmt/default.nix b/pkgs/applications/science/logic/opensmt/default.nix index 2dc4b9934296..62e11651175f 100644 --- a/pkgs/applications/science/logic/opensmt/default.nix +++ b/pkgs/applications/science/logic/opensmt/default.nix @@ -33,14 +33,11 @@ rec { meta = { description = "A satisfiability modulo theory (SMT) solver"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; + maintainers = [ a.lib.maintainers.raskin ]; + platforms = a.lib.platforms.linux; license = a.stdenv.lib.licenses.gpl3; homepage = "http://code.google.com/p/opensmt/"; + broken = true; }; passthru = { updateInfo = { diff --git a/pkgs/applications/science/math/content/default.nix b/pkgs/applications/science/math/content/default.nix index 87c047c29957..177efd667a39 100644 --- a/pkgs/applications/science/math/content/default.nix +++ b/pkgs/applications/science/math/content/default.nix @@ -93,5 +93,6 @@ rec { a.lib.maintainers.raskin ]; platforms = a.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 53a045ac6f0e..1227e76ac0c5 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://root.cern.ch/drupal/"; description = "A data analysis framework"; - platforms = stdenv.lib.platforms.mesaPlatforms; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/virtualization/xen/default.nix b/pkgs/applications/virtualization/xen/default.nix index 3cb16a6b4425..55ef83901484 100644 --- a/pkgs/applications/virtualization/xen/default.nix +++ b/pkgs/applications/virtualization/xen/default.nix @@ -30,7 +30,7 @@ let } ]; -in +in stdenv.mkDerivation { name = "xen-${version}"; @@ -136,5 +136,6 @@ stdenv.mkDerivation { description = "Xen hypervisor and management tools for Dom0"; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.eelco ]; + broken = true; }; } diff --git a/pkgs/development/compilers/gcc/3.3/default.nix b/pkgs/development/compilers/gcc/3.3/default.nix index 23501489925a..bbb527333375 100644 --- a/pkgs/development/compilers/gcc/3.3/default.nix +++ b/pkgs/development/compilers/gcc/3.3/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation { homepage = "http://gcc.gnu.org/"; license = "GPL/LGPL"; description = "GNU Compiler Collection, 3.3.x"; + broken = true; }; } diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index f6a52b52e1d5..c025fc8073bb 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -85,5 +85,7 @@ stdenv.mkDerivation { # Build fails on Cygwin and Darwin: # . platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.freebsd; + + broken = true; }; } diff --git a/pkgs/development/compilers/rustc/common.nix b/pkgs/development/compilers/rustc/common.nix index 7af19a40c790..d766f22c6adb 100644 --- a/pkgs/development/compilers/rustc/common.nix +++ b/pkgs/development/compilers/rustc/common.nix @@ -28,8 +28,7 @@ description = "A safe, concurrent, practical language"; maintainers = with maintainers; [ madjar cstrahan ]; license = map (builtins.getAttr "shortName") [ licenses.mit licenses.asl20 ]; - # platforms as per http://static.rust-lang.org/doc/master/tutorial.html#getting-started - platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ]; + platforms = platforms.linux; }; name = "rustc-${version}"; diff --git a/pkgs/development/compilers/strategoxt/0.18.nix b/pkgs/development/compilers/strategoxt/0.18.nix index 7e58c561739f..611586c5d932 100644 --- a/pkgs/development/compilers/strategoxt/0.18.nix +++ b/pkgs/development/compilers/strategoxt/0.18.nix @@ -55,6 +55,7 @@ rec { meta = { homepage = http://strategoxt.org/; meta = "A language and toolset for program transformation"; + broken = true; }; }; @@ -104,6 +105,7 @@ rec { meta = { homepage = http://strategoxt.org/Stratego/TheDryad; meta = "A collection of tools for developing transformation systems for Java source and bytecode"; + broken = true; }; }; diff --git a/pkgs/development/interpreters/lua-4/default.nix b/pkgs/development/interpreters/lua-4/default.nix index 51ddcd8f2906..835b71f38bf6 100644 --- a/pkgs/development/interpreters/lua-4/default.nix +++ b/pkgs/development/interpreters/lua-4/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation { for configuration, scripting, and rapid prototyping. ''; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = [ ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/interpreters/lua-5/5.1.nix b/pkgs/development/interpreters/lua-5/5.1.nix index 74f80b911a0c..065a7bb35b2d 100644 --- a/pkgs/development/interpreters/lua-5/5.1.nix +++ b/pkgs/development/interpreters/lua-5/5.1.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { for configuration, scripting, and rapid prototyping. ''; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 110bfc01520f..3f1fbfcd6a9c 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -72,6 +72,6 @@ stdenv.mkDerivation rec { description = "A cross-platform multimedia library"; homepage = http://www.libsdl.org/; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix index a1d839504770..2aa122a8fb28 100644 --- a/pkgs/development/libraries/SDL_image/default.nix +++ b/pkgs/development/libraries/SDL_image/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { description = "SDL image library"; homepage = http://www.libsdl.org/projects/SDL_image/; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix index 82d0821667d8..7aca033c147b 100644 --- a/pkgs/development/libraries/SDL_mixer/default.nix +++ b/pkgs/development/libraries/SDL_mixer/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { description = "SDL multi-channel audio mixer library"; homepage = http://www.libsdl.org/projects/SDL_mixer/; maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/ffmpeg/0.6.90.nix b/pkgs/development/libraries/ffmpeg/0.6.90.nix index 79d7816d7822..7455410d51ac 100644 --- a/pkgs/development/libraries/ffmpeg/0.6.90.nix +++ b/pkgs/development/libraries/ffmpeg/0.6.90.nix @@ -73,5 +73,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.ffmpeg.org/; description = "A complete, cross-platform solution to record, convert and stream audio and video"; + broken = true; }; } diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix index 7b40f48c8dfd..7a35ecca9a3b 100644 --- a/pkgs/development/libraries/ffmpeg/2.x.nix +++ b/pkgs/development/libraries/ffmpeg/2.x.nix @@ -101,5 +101,6 @@ stdenv.mkDerivation rec { homepage = http://www.ffmpeg.org/; description = "A complete, cross-platform solution to record, convert and stream audio and video"; license = if (fdkAACSupport || faacSupport) then stdenv.lib.licenses.unfree else stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix index 8f4138282f0f..d4285db1efb7 100644 --- a/pkgs/development/libraries/kerberos/heimdal.nix +++ b/pkgs/development/libraries/kerberos/heimdal.nix @@ -24,4 +24,8 @@ stdenv.mkDerivation rec { ''; propagatedBuildInputs = [ readline db openssl openldap cyrus_sasl sqlite]; + + meta = { + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index cd80d61d1916..247c3666e15d 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -105,7 +105,7 @@ let description = "A complete, cross-platform solution to record, convert and stream audio and video (fork of ffmpeg)"; license = with licenses; if enableUnfree then unfree #ToDo: redistributable or not? else if enableGPL then gpl2Plus else lgpl21Plus; - platforms = platforms.all; + platforms = platforms.linux; maintainers = [ maintainers.vcunat ]; }; }; # libavFun diff --git a/pkgs/development/libraries/libc++/default.nix b/pkgs/development/libraries/libc++/default.nix index 2268801bad5b..32035709d8f9 100644 --- a/pkgs/development/libraries/libc++/default.nix +++ b/pkgs/development/libraries/libc++/default.nix @@ -26,6 +26,6 @@ in stdenv.mkDerivation rec { description = "A new implementation of the C++ standard library, targeting C++11"; license = "BSD"; maintainers = stdenv.lib.maintainers.shlevy; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libc++abi/default.nix b/pkgs/development/libraries/libc++abi/default.nix index 51d18a7b907f..8218cbb966f0 100644 --- a/pkgs/development/libraries/libc++abi/default.nix +++ b/pkgs/development/libraries/libc++abi/default.nix @@ -34,6 +34,6 @@ in stdenv.mkDerivation { description = "A new implementation of low level support for a standard C++ library"; license = "BSD"; maintainers = stdenv.lib.maintainers.shlevy; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 2c99199664de..04e2bc7175e6 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { description = "Library and utilities for working with the TIFF image file format"; homepage = http://www.remotesensing.org/libtiff/; license = "bsd"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/libzrtpcpp/1.6.nix b/pkgs/development/libraries/libzrtpcpp/1.6.nix index 8ca872864bd9..79d95e07bb81 100644 --- a/pkgs/development/libraries/libzrtpcpp/1.6.nix +++ b/pkgs/development/libraries/libzrtpcpp/1.6.nix @@ -16,5 +16,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.marcweber ]; platforms = stdenv.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/development/libraries/opal/default.nix b/pkgs/development/libraries/opal/default.nix index 23615d6646d2..83f3dcf8b265 100644 --- a/pkgs/development/libraries/opal/default.nix +++ b/pkgs/development/libraries/opal/default.nix @@ -40,12 +40,9 @@ rec { meta = { description = "OPAL VoIP library"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; + maintainers = [ a.lib.maintainers.raskin ]; + platforms = a.lib.platforms.linux; + broken = true; }; passthru = { updateInfo = { diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 1a3484c2ee5e..b9943b443318 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -18,5 +18,6 @@ stdenv.mkDerivation { license = "BSD"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + broken = true; }; } diff --git a/pkgs/development/libraries/ptlib/default.nix b/pkgs/development/libraries/ptlib/default.nix index be1e6fdb4a58..484e5b10d7ac 100644 --- a/pkgs/development/libraries/ptlib/default.nix +++ b/pkgs/development/libraries/ptlib/default.nix @@ -34,12 +34,9 @@ rec { meta = { description = "Portable Tools from OPAL VoIP"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; + maintainers = [ a.lib.maintainers.raskin ]; + platforms = a.lib.platforms.linux; + broken = true; }; passthru = { updateInfo = { diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 5ceedd674f53..6ea7333f6986 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { description = "Basic Linear Algebra Subprograms"; license = stdenv.lib.licenses.bsd3; homepage = "https://github.com/xianyi/OpenBLAS"; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/development/libraries/speech-tools/default.nix b/pkgs/development/libraries/speech-tools/default.nix index 8874a672ead0..48168ceb92dd 100644 --- a/pkgs/development/libraries/speech-tools/default.nix +++ b/pkgs/development/libraries/speech-tools/default.nix @@ -47,6 +47,7 @@ rec { fixPaths = a.doPatchShebangs "$out/bin"; meta = { + broken = true; description = "Text-to-speech engine"; maintainers = with a.lib.maintainers; [ diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index 14397c609b80..ae9fac06eeec 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { description = "Reference implementation of the wayland protocol"; homepage = http://wayland.freedesktop.org/; license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/xcb-util-cursor/default.nix b/pkgs/development/libraries/xcb-util-cursor/default.nix index a0e71724fb91..984f192e4c9b 100644 --- a/pkgs/development/libraries/xcb-util-cursor/default.nix +++ b/pkgs/development/libraries/xcb-util-cursor/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { homepage = http://cgit.freedesktop.org/xcb/util-cursor; license = licenses.mit; maintainer = with maintainers; [ lovek323 ]; - platforms = platforms.unix; + platforms = platforms.linux; }; buildInputs = [ diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index a7e55de7d47d..5ffc287d114b 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -55,6 +55,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/tools/analysis/valkyrie/default.nix b/pkgs/development/tools/analysis/valkyrie/default.nix index 18481d16f17f..76becca74cff 100644 --- a/pkgs/development/tools/analysis/valkyrie/default.nix +++ b/pkgs/development/tools/analysis/valkyrie/default.nix @@ -15,9 +15,8 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.valgrind.org/; description = "Qt4-based GUI for the Valgrind 3.6.x series"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/development/tools/misc/dejagnu/default.nix b/pkgs/development/tools/misc/dejagnu/default.nix index bc22752fe7ed..d3c2e7e63890 100644 --- a/pkgs/development/tools/misc/dejagnu/default.nix +++ b/pkgs/development/tools/misc/dejagnu/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/dejagnu/; license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.ludo ]; }; } diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix index efbd59dbbe3f..c0dfe723c81e 100644 --- a/pkgs/games/0ad/default.nix +++ b/pkgs/games/0ad/default.nix @@ -116,5 +116,6 @@ stdenv.mkDerivation rec { homepage = "http://wildfiregames.com/0ad/"; license = [ "GPLv2" "LGPLv2.1" "MIT" "CC BY-SA 3.0" "zlib" ]; platforms = [ "x86_64-linux" "i686-linux" ]; + broken = true; }; } diff --git a/pkgs/games/glestae/default.nix b/pkgs/games/glestae/default.nix index 89790bfacec5..2fa9cd35f76a 100644 --- a/pkgs/games/glestae/default.nix +++ b/pkgs/games/glestae/default.nix @@ -40,14 +40,11 @@ rec { meta = { description = "A 3D RTS - fork of inactive Glest project"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; + maintainers = [ a.lib.maintainers.raskin ]; + platforms = a.lib.platforms.linux; # Note that some data seems to be under separate redistributable licenses license = a.lib.licenses.gpl2Plus; + broken = true; }; passthru = { updateInfo = { diff --git a/pkgs/games/tremulous/default.nix b/pkgs/games/tremulous/default.nix index bef4b63b0cc8..5c175be8af06 100644 --- a/pkgs/games/tremulous/default.nix +++ b/pkgs/games/tremulous/default.nix @@ -73,5 +73,6 @@ stdenv.mkDerivation rec { license = [ "GPLv2" ]; # media under cc by-sa 2.5 maintainers = with stdenv.lib.maintainers; [ astsmtl ]; platforms = with stdenv.lib.platforms; linux; + broken = true; }; } diff --git a/pkgs/misc/emulators/hatari/default.nix b/pkgs/misc/emulators/hatari/default.nix index 7ef63f93026d..5c9138ed2e23 100644 --- a/pkgs/misc/emulators/hatari/default.nix +++ b/pkgs/misc/emulators/hatari/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { homepage = "http://hatari.tuxfamily.org/"; description = "Atari ST/STE/TT/Falcon emulator"; license = stdenv.lib.licenses.gpl2Plus; - platforms = with stdenv.lib.platforms; all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index a7337760b79e..8b8f7e1e78db 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -1,12 +1,12 @@ -{ stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto +{ lib, stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto , docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig , withGtk ? false, gtk ? null }: +with lib; + assert withGtk -> gtk != null; +assert versionAtLeast kernel.version "3.12"; -let optionalString = stdenv.lib.optionalString; - versionOlder = stdenv.lib.versionOlder; -in stdenv.mkDerivation { name = "perf-linux-${kernel.version}"; diff --git a/pkgs/servers/http/myserver/default.nix b/pkgs/servers/http/myserver/default.nix index a86f924346bc..3e1c94e79b4b 100644 --- a/pkgs/servers/http/myserver/default.nix +++ b/pkgs/servers/http/myserver/default.nix @@ -1,53 +1,50 @@ -{ fetchurl, stdenv, libgcrypt, libevent, libidn, gnutls +{ lib, fetchurl, stdenv, libgcrypt, libevent, libidn, gnutls , libxml2, zlib, guile, texinfo, cppunit, psmisc }: let version = "0.11"; in - stdenv.mkDerivation (rec { - name = "myserver-${version}"; - src = fetchurl { - url = "mirror://gnu/myserver/${version}/${name}.tar.xz"; - sha256 = "02y3vv4hxpy5h710y79s8ipzshhc370gbz1wm85x0lnq5nqxj2ax"; - }; +stdenv.mkDerivation rec { + name = "myserver-${version}"; - patches = - [ ./disable-dns-lookup-in-chroot.patch ]; + src = fetchurl { + url = "mirror://gnu/myserver/${version}/${name}.tar.xz"; + sha256 = "02y3vv4hxpy5h710y79s8ipzshhc370gbz1wm85x0lnq5nqxj2ax"; + }; - buildInputs = - [ libgcrypt libevent libidn gnutls libxml2 zlib guile texinfo ] - ++ stdenv.lib.optional doCheck cppunit; + patches = + [ ./disable-dns-lookup-in-chroot.patch ]; - makeFlags = [ "V=1" ]; + buildInputs = + [ libgcrypt libevent libidn gnutls libxml2 zlib guile texinfo ] + ++ lib.optional doCheck cppunit; - doCheck = true; + makeFlags = [ "V=1" ]; - enableParallelBuilding = true; + doCheck = true; - meta = { - description = "GNU MyServer, a powerful and easy to configure web server"; + enableParallelBuilding = true; - longDescription = '' - GNU MyServer is a powerful and easy to configure web server. Its - multi-threaded architecture makes it extremely scalable and usable in - large scale sites as well as in small networks, it has a lot of - built-in features. Share your files in minutes! - ''; + # On GNU/Linux the `test_suite' process sometimes stays around, so + # forcefully terminate it. + postCheck = lib.optionalString stdenv.isLinux "${psmisc}/bin/killall test_suite || true"; - homepage = http://www.gnu.org/software/myserver/; + meta = { + description = "GNU MyServer, a powerful and easy to configure web server"; - license = stdenv.lib.licenses.gpl3Plus; + longDescription = '' + GNU MyServer is a powerful and easy to configure web server. Its + multi-threaded architecture makes it extremely scalable and usable in + large scale sites as well as in small networks, it has a lot of + built-in features. Share your files in minutes! + ''; - maintainers = [ ]; + homepage = http://www.gnu.org/software/myserver/; - # libevent fails to build on Cygwin and Guile has troubles on Darwin. - platforms = stdenv.lib.platforms.gnu; - }; - } + license = lib.licenses.gpl3Plus; - // + # libevent fails to build on Cygwin and Guile has troubles on Darwin. + platforms = lib.platforms.gnu; - # On GNU/Linux the `test_suite' process sometimes stays around, so - # forcefully terminate it. - (if stdenv.isLinux - then { postCheck = "${psmisc}/bin/killall test_suite || true"; } - else { })) + broken = true; # needs patch for gets() + }; +} diff --git a/pkgs/servers/mail/freepops/default.nix b/pkgs/servers/mail/freepops/default.nix index c80d0f04bda9..a96e4cb37c01 100644 --- a/pkgs/servers/mail/freepops/default.nix +++ b/pkgs/servers/mail/freepops/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation { homepage = http://www.freepops.org/; platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [ pierron ]; + broken = true; }; } diff --git a/pkgs/servers/mediatomb/default.nix b/pkgs/servers/mediatomb/default.nix index e531f6160ff3..d88e1dd9e141 100644 --- a/pkgs/servers/mediatomb/default.nix +++ b/pkgs/servers/mediatomb/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl , sqlite, expat, spidermonkey, taglib, libexif, curl, ffmpeg, file }: + stdenv.mkDerivation rec { name = "mediatomb-${version}"; @@ -18,9 +19,10 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://mediatomb.cc; - description = "UPnP MediaServer with a web user interface,"; + description = "UPnP MediaServer with a web user interface"; license = licenses.gpl2; maintainers = [ maintainers.phreedom ]; platforms = platforms.linux; + broken = true; }; } diff --git a/pkgs/tools/X11/winswitch/default.nix b/pkgs/tools/X11/winswitch/default.nix index 2db0d1721735..ad7ac7c64c82 100644 --- a/pkgs/tools/X11/winswitch/default.nix +++ b/pkgs/tools/X11/winswitch/default.nix @@ -37,7 +37,7 @@ let doCheck = false; - meta.platforms = stdenv.lib.platforms.mesaPlatforms; + meta.platforms = stdenv.lib.platforms.linux; }; 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 e6b2f78332d7..688c0e12d938 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -47,6 +47,6 @@ buildPythonPackage rec { meta = { homepage = http://xpra.org/; description = "Persistent remote applications for X"; - platforms = stdenv.lib.platforms.mesaPlatforms; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/graphics/pngquant/default.nix b/pkgs/tools/graphics/pngquant/default.nix index 560352c481ea..77cc898ef2ad 100644 --- a/pkgs/tools/graphics/pngquant/default.nix +++ b/pkgs/tools/graphics/pngquant/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { description = "pngquant converts 24/32-bit RGBA PNGs to 8-bit palette with alpha channel preserved"; platforms = platforms.all; license = licenses.bsd2; # Not exactly bsd2, but alike + broken = true; }; } diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index 7bc4701bb2fd..aa14087dfc85 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -12,6 +12,6 @@ stdenv.mkDerivation { homepage = http://oss.oetiker.ch/rrdtool/; description = "High performance logging in Round Robin Databases"; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/lsh/default.nix b/pkgs/tools/networking/lsh/default.nix index b7146342b9f1..6be4119469ea 100644 --- a/pkgs/tools/networking/lsh/default.nix +++ b/pkgs/tools/networking/lsh/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/tools/video/rtmpdump/default.nix b/pkgs/tools/video/rtmpdump/default.nix index 156fac03d09c..4dec3282fce9 100644 --- a/pkgs/tools/video/rtmpdump/default.nix +++ b/pkgs/tools/video/rtmpdump/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { homepage = http://rtmpdump.mplayerhq.hu/; description = "Toolkit for RTMP streams"; license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; all; + maintainers = [ stdenv.lib.maintainers. viric ]; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index fd94b405f6e4..799b01c467c1 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -183,7 +183,6 @@ let libtool = all; libtool_2 = all; lout = linux; - lsh = linux; lsof = linux; ltrace = linux; lvm2 = linux; -- cgit v1.2.3