summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/applications/networking/newsreaders/pan/default.nix1
-rw-r--r--pkgs/data/misc/iana-etc/default.nix1
-rw-r--r--pkgs/development/compilers/orc/default.nix2
-rw-r--r--pkgs/development/interpreters/perl/5.20/default.nix11
-rw-r--r--pkgs/development/libraries/keybinder/default.nix2
-rw-r--r--pkgs/development/libraries/keybinder3/default.nix2
-rw-r--r--pkgs/development/libraries/libvisual/default.nix2
-rw-r--r--pkgs/development/libraries/slang/default.nix2
-rw-r--r--pkgs/development/tools/misc/autoconf/default.nix2
-rw-r--r--pkgs/development/tools/misc/automake/automake-1.11.x.nix2
-rw-r--r--pkgs/development/tools/misc/automake/automake-1.12.x.nix2
-rw-r--r--pkgs/development/tools/misc/automake/automake-1.13.x.nix2
-rw-r--r--pkgs/development/tools/misc/automake/automake-1.14.x.nix2
-rw-r--r--pkgs/games/rogue/default.nix10
-rw-r--r--pkgs/os-specific/linux/kbd/default.nix1
-rw-r--r--pkgs/os-specific/linux/macchanger/default.nix6
-rw-r--r--pkgs/os-specific/linux/mingetty/default.nix5
-rw-r--r--pkgs/os-specific/linux/sysklogd/default.nix1
-rw-r--r--pkgs/os-specific/linux/sysvinit/default.nix1
-rw-r--r--pkgs/os-specific/linux/usbutils/default.nix1
-rw-r--r--pkgs/os-specific/linux/util-linux/default.nix1
-rw-r--r--pkgs/servers/gpm/default.nix4
-rw-r--r--pkgs/servers/portmap/default.nix1
-rw-r--r--pkgs/shells/bash/default.nix2
-rw-r--r--pkgs/tools/audio/liquidsoap/full.nix2
-rw-r--r--pkgs/tools/compression/gzip/default.nix2
-rw-r--r--pkgs/tools/filesystems/jfsutils/default.nix1
-rw-r--r--pkgs/tools/misc/coreutils/default.nix2
-rw-r--r--pkgs/tools/misc/findutils/default.nix2
-rw-r--r--pkgs/tools/misc/grub/default.nix3
-rw-r--r--pkgs/tools/misc/hddtemp/default.nix1
-rw-r--r--pkgs/tools/misc/rlwrap/default.nix2
-rw-r--r--pkgs/tools/networking/cksfv/default.nix1
-rw-r--r--pkgs/tools/networking/dnscrypt-proxy/default.nix2
-rw-r--r--pkgs/tools/networking/host/default.nix36
-rw-r--r--pkgs/tools/networking/i2pd/default.nix4
-rw-r--r--pkgs/tools/networking/par2cmdline/default.nix4
-rw-r--r--pkgs/tools/networking/tcpdump/default.nix1
-rw-r--r--pkgs/tools/package-management/rpm/default.nix5
-rw-r--r--pkgs/tools/security/sudo/default.nix2
-rw-r--r--pkgs/tools/system/at/default.nix1
-rw-r--r--pkgs/tools/system/cron/default.nix3
-rw-r--r--pkgs/tools/system/which/default.nix1
-rw-r--r--pkgs/tools/typesetting/tex/tetex/default.nix1
-rw-r--r--pkgs/top-level/release.nix54
45 files changed, 94 insertions, 102 deletions
diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix
index c9965a784e0..9ca5ace2caf 100644
--- a/pkgs/applications/networking/newsreaders/pan/default.nix
+++ b/pkgs/applications/networking/newsreaders/pan/default.nix
@@ -24,5 +24,6 @@ stdenv.mkDerivation {
     description = "A GTK+-based Usenet newsreader good at both text and binaries";
     homepage = http://pan.rebelbase.com/;
     maintainers = [ stdenv.lib.maintainers.eelco ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix
index a8935700166..cc676d0b35d 100644
--- a/pkgs/data/misc/iana-etc/default.nix
+++ b/pkgs/data/misc/iana-etc/default.nix
@@ -13,5 +13,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://sethwklein.net/projects/iana-etc/;
     description = "IANA protocol and port number assignments (/etc/protocols and /etc/services)";
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
index 83255824ac2..e6a418c1895 100644
--- a/pkgs/development/compilers/orc/default.nix
+++ b/pkgs/development/compilers/orc/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     # The source code implementing the Marsenne Twister algorithm is licensed
     # under the 3-clause BSD license. The rest is 2-clause BSD license.
     license = stdenv.lib.licenses.bsd3;
-    platform = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.linux;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
   };
 }
diff --git a/pkgs/development/interpreters/perl/5.20/default.nix b/pkgs/development/interpreters/perl/5.20/default.nix
index 058b1776c66..7c5cb27e37f 100644
--- a/pkgs/development/interpreters/perl/5.20/default.nix
+++ b/pkgs/development/interpreters/perl/5.20/default.nix
@@ -18,9 +18,7 @@ let
 
 in
 
-with {
-  inherit (stdenv.lib) optional optionalString;
-};
+with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "perl-5.20.1";
@@ -79,4 +77,11 @@ stdenv.mkDerivation rec {
   setupHook = ./setup-hook.sh;
 
   passthru.libPrefix = "lib/perl5/site_perl";
+
+  meta = {
+    homepage = https://www.perl.org/;
+    description = "The standard implementation of the Perl 5 programmming language";
+    maintainers = [ maintainers.eelco ];
+    platforms = platforms.all;
+  };
 }
diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix
index 0cc875e2656..0ab24df57ba 100644
--- a/pkgs/development/libraries/keybinder/default.nix
+++ b/pkgs/development/libraries/keybinder/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = https://github.com/engla/keybinder/;
     license = licenses.gpl2Plus;
-    platform = platforms.linux;
+    platforms = platforms.linux;
     maintainers = [ maintainers.bjornfor ];
   };
 }
diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix
index 75704848f7f..581e6e70b71 100644
--- a/pkgs/development/libraries/keybinder3/default.nix
+++ b/pkgs/development/libraries/keybinder3/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     description = "Library for registering global key bindings";
     homepage = https://github.com/engla/keybinder/;
     license = licenses.mit;
-    platform = platforms.linux;
+    platforms = platforms.linux;
     maintainers = [ maintainers.cstrahan ];
   };
 }
diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix
index b831fd9bdd3..dc2f0338b48 100644
--- a/pkgs/development/libraries/libvisual/default.nix
+++ b/pkgs/development/libraries/libvisual/default.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
     description = "An abstraction library for audio visualisations";
     homepage = "http://sourceforge.net/projects/libvisual/";
     license = stdenv.lib.licenses.lgpl21Plus;
-    platform = stdenv.lib.platforms.unix;
+    platforms = stdenv.lib.platforms.unix;
   };
 }
diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix
index 69617c0345e..bf1f38fbb83 100644
--- a/pkgs/development/libraries/slang/default.nix
+++ b/pkgs/development/libraries/slang/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     description = "A multi-platform programmer's library designed to allow a developer to create robust software";
     homepage = http://www.jedsoft.org/slang/;
     license = stdenv.lib.licenses.gpl2Plus;
-    platform = stdenv.lib.platforms.unix;
+    platforms = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
   };
 }
diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix
index ef8e1628185..472f437978b 100644
--- a/pkgs/development/tools/misc/autoconf/default.nix
+++ b/pkgs/development/tools/misc/autoconf/default.nix
@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl2Plus;
 
-    maintainers = [ ];
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/tools/misc/automake/automake-1.11.x.nix b/pkgs/development/tools/misc/automake/automake-1.11.x.nix
index 7a4e2d7f44f..9b4864e92fe 100644
--- a/pkgs/development/tools/misc/automake/automake-1.11.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.11.x.nix
@@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl2Plus;
 
-    maintainers = [ ];
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/tools/misc/automake/automake-1.12.x.nix b/pkgs/development/tools/misc/automake/automake-1.12.x.nix
index 70f3dbcbadc..34bffff23d4 100644
--- a/pkgs/development/tools/misc/automake/automake-1.12.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.12.x.nix
@@ -49,6 +49,6 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl2Plus;
 
-    maintainers = [ ];
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/tools/misc/automake/automake-1.13.x.nix b/pkgs/development/tools/misc/automake/automake-1.13.x.nix
index 7190985ed02..96a481ade1c 100644
--- a/pkgs/development/tools/misc/automake/automake-1.13.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.13.x.nix
@@ -37,5 +37,7 @@ stdenv.mkDerivation rec {
     '';
 
     maintainers = [ stdenv.lib.maintainers.simons ];
+
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/development/tools/misc/automake/automake-1.14.x.nix b/pkgs/development/tools/misc/automake/automake-1.14.x.nix
index 65c92954a27..c78e9e6c0a4 100644
--- a/pkgs/development/tools/misc/automake/automake-1.14.x.nix
+++ b/pkgs/development/tools/misc/automake/automake-1.14.x.nix
@@ -37,5 +37,7 @@ stdenv.mkDerivation rec {
     '';
 
     maintainers = [ stdenv.lib.maintainers.simons ];
+
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/games/rogue/default.nix b/pkgs/games/rogue/default.nix
index 16fb621d01d..6be9b06e907 100644
--- a/pkgs/games/rogue/default.nix
+++ b/pkgs/games/rogue/default.nix
@@ -2,16 +2,18 @@
 
 stdenv.mkDerivation {
   name = "rogue-5.4.4";
-  
+
   src = fetchurl {
     url = http://rogue.rogueforge.net/files/rogue5.4/rogue5.4.4-src.tar.gz;
     sha256 = "18g81274d0f7sr04p7h7irz0d53j6kd9j1y3zbka1gcqq0gscdvx";
   };
-  
-  buildInputs = [ncurses];
-  
+
+  buildInputs = [ ncurses ];
+
   meta = {
     homepage = http://rogue.rogueforge.net/rogue-5-4/;
     description = "The final version of the original Rogue game developed for the UNIX operating system";
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
   };
 }
diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix
index 673ad5d3165..d2413be6f5a 100644
--- a/pkgs/os-specific/linux/kbd/default.nix
+++ b/pkgs/os-specific/linux/kbd/default.nix
@@ -54,5 +54,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = ftp://ftp.altlinux.org/pub/people/legion/kbd/;
     description = "Linux keyboard utilities and keyboard maps";
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/macchanger/default.nix b/pkgs/os-specific/linux/macchanger/default.nix
index 1f046de40ed..1ab7a600fcd 100644
--- a/pkgs/os-specific/linux/macchanger/default.nix
+++ b/pkgs/os-specific/linux/macchanger/default.nix
@@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "A utility for viewing/manipulating the MAC address of network interfaces";
-    maintainers = with stdenv.lib.maintainers; [ joachifm ];
-    license = with stdenv.lib.licenses; gpl2Plus;
+    maintainers = [ stdenv.lib.maintainers.joachifm ];
+    license = stdenv.lib.licenses.gpl2Plus;
     homepage = "https://www.gnu.org/software/macchanger";
-    platform = with stdenv.lib.platforms; linux;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/mingetty/default.nix b/pkgs/os-specific/linux/mingetty/default.nix
index 192e2c7ac5f..4e2888fa942 100644
--- a/pkgs/os-specific/linux/mingetty/default.nix
+++ b/pkgs/os-specific/linux/mingetty/default.nix
@@ -1,8 +1,8 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "mingetty-1.08";
-  
+
   src = fetchurl {
     url = mirror://sourceforge/mingetty/mingetty-1.08.tar.gz;
     sha256 = "05yxrp44ky2kg6qknk1ih0kvwkgbn9fbz77r3vci7agslh5wjm8g";
@@ -19,5 +19,6 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://sourceforge.net/projects/mingetty;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/sysklogd/default.nix b/pkgs/os-specific/linux/sysklogd/default.nix
index b7bbdee369a..fd1d932990e 100644
--- a/pkgs/os-specific/linux/sysklogd/default.nix
+++ b/pkgs/os-specific/linux/sysklogd/default.nix
@@ -21,5 +21,6 @@ stdenv.mkDerivation {
 
   meta = {
     description = "A system logging daemon";
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/sysvinit/default.nix b/pkgs/os-specific/linux/sysvinit/default.nix
index 7b4ecbb027e..042e601ec14 100644
--- a/pkgs/os-specific/linux/sysvinit/default.nix
+++ b/pkgs/os-specific/linux/sysvinit/default.nix
@@ -43,5 +43,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://www.nongnu.org/sysvinit/;
     description = "Utilities related to booting and shutdown";
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix
index aff730e387a..ca1f698fa31 100644
--- a/pkgs/os-specific/linux/usbutils/default.nix
+++ b/pkgs/os-specific/linux/usbutils/default.nix
@@ -32,5 +32,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.linux-usb.org/;
     description = "Tools for working with USB devices, such as lsusb";
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index ae13b7b267c..62fb4976ad0 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -52,5 +52,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.kernel.org/pub/linux/utils/util-linux/;
     description = "A set of system utilities for Linux";
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/servers/gpm/default.nix b/pkgs/servers/gpm/default.nix
index 7c16153e9b5..6572e63a14f 100644
--- a/pkgs/servers/gpm/default.nix
+++ b/pkgs/servers/gpm/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "gpm-1.20.6";
-  
+
   src = fetchurl {
     url = "http://www.nico.schottelius.org/software/gpm/archives/${name}.tar.bz2";
     sha256 = "1990i19ddzn8gg5xwm53yn7d0mya885f48sd2hyvr7dvzyaw7ch8";
@@ -28,5 +28,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.nico.schottelius.org/software/gpm/;
     description = "A daemon that provides mouse support on the Linux console";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
   };
 }
diff --git a/pkgs/servers/portmap/default.nix b/pkgs/servers/portmap/default.nix
index f2152b65df3..e53690ebc11 100644
--- a/pkgs/servers/portmap/default.nix
+++ b/pkgs/servers/portmap/default.nix
@@ -40,5 +40,6 @@ stdenv.mkDerivation rec {
 
     homepage = http://neil.brown.name/portmap/;
     license = "BSD";
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix
index cc3108841b6..af51ab4e766 100644
--- a/pkgs/shells/bash/default.nix
+++ b/pkgs/shells/bash/default.nix
@@ -76,6 +76,8 @@ stdenv.mkDerivation rec {
 
     license = stdenv.lib.licenses.gpl3Plus;
 
+    platforms = stdenv.lib.platforms.all;
+
     maintainers = [ stdenv.lib.maintainers.simons ];
   };
 
diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix
index 30b608c5ba4..d310d5017ed 100644
--- a/pkgs/tools/audio/liquidsoap/full.nix
+++ b/pkgs/tools/audio/liquidsoap/full.nix
@@ -40,6 +40,6 @@ stdenv.mkDerivation {
     homepage = http://liquidsoap.fm/;
     maintainers = with maintainers; [ emery ];
     license = licenses.gpl2;
-    platform = ocaml.meta.platforms;
+    platforms = ocaml.meta.platforms;
   };
 }
diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index 196fce0d98a..44b121117ad 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
         is just a bonus.
       '';
 
+    platforms = stdenv.lib.platforms.all;
+
     license = stdenv.lib.licenses.gpl3Plus;
   };
 }
diff --git a/pkgs/tools/filesystems/jfsutils/default.nix b/pkgs/tools/filesystems/jfsutils/default.nix
index 9712721021e..46ded088c69 100644
--- a/pkgs/tools/filesystems/jfsutils/default.nix
+++ b/pkgs/tools/filesystems/jfsutils/default.nix
@@ -14,5 +14,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "IBM JFS utilities";
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index a15c78e0a81..ee85a4349c1 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -82,6 +82,8 @@ let
 
       license = stdenv.lib.licenses.gpl3Plus;
 
+      platforms = stdenv.lib.platforms.all;
+
       maintainers = [ stdenv.lib.maintainers.eelco ];
     };
   };
diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index a6ea96b77db..eb8c026ab0f 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -38,6 +38,8 @@ stdenv.mkDerivation rec {
           * xargs - build and execute command lines from standard input.
     '';
 
+    platforms = stdenv.lib.platforms.all;
+
     license = stdenv.lib.licenses.gpl3Plus;
   };
 }
diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix
index 00b0c31201a..cb561e8172f 100644
--- a/pkgs/tools/misc/grub/default.nix
+++ b/pkgs/tools/misc/grub/default.nix
@@ -52,4 +52,7 @@ stdenv.mkDerivation {
 
   passthru.grubTarget = "";
 
+  meta = {
+    platforms = stdenv.lib.platforms.linux;
+  };
 }
diff --git a/pkgs/tools/misc/hddtemp/default.nix b/pkgs/tools/misc/hddtemp/default.nix
index 835ceb32881..925ea13780a 100644
--- a/pkgs/tools/misc/hddtemp/default.nix
+++ b/pkgs/tools/misc/hddtemp/default.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation {
     description = "Tool for displaying hard disk temperature";
     homepage = https://savannah.nongnu.org/projects/hddtemp/;
     license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix
index ee330c0bee5..86d81fd2585 100644
--- a/pkgs/tools/misc/rlwrap/default.nix
+++ b/pkgs/tools/misc/rlwrap/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     description = "Readline wrapper for console programs";
     homepage = http://utopia.knoware.nl/~hlub/uck/rlwrap/;
     license = stdenv.lib.licenses.gpl2Plus;
-    platform = stdenv.lib.platforms.unix;
+    platforms = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
   };
 }
diff --git a/pkgs/tools/networking/cksfv/default.nix b/pkgs/tools/networking/cksfv/default.nix
index 90f421f56ba..c14770fb32b 100644
--- a/pkgs/tools/networking/cksfv/default.nix
+++ b/pkgs/tools/networking/cksfv/default.nix
@@ -11,5 +11,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://zakalwe.fi/~shd/foss/cksfv/;
     description = "A tool for verifying files against a SFV checksum file";
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix
index 818c764b1be..bdd2c4a0c24 100644
--- a/pkgs/tools/networking/dnscrypt-proxy/default.nix
+++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
     homepage = http://dnscrypt.org/;
     license = with stdenv.lib.licenses; [ isc ];
     maintainers = with stdenv.lib.maintainers; [ joachifm ];
-    platform = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/tools/networking/host/default.nix b/pkgs/tools/networking/host/default.nix
index 54cb8b21aaf..85f94ccba10 100644
--- a/pkgs/tools/networking/host/default.nix
+++ b/pkgs/tools/networking/host/default.nix
@@ -1,24 +1,26 @@
 { fetchurl, stdenv }:
 
 let version = "20000331"; in
-  stdenv.mkDerivation {
-    name = "host-${version}";
 
-    src = fetchurl {
-      url = "mirror://debian/pool/main/h/host/host_${version}.orig.tar.gz";
-      sha256 = "1g352k80arhwyidsa95nk28xjvzyypmwv3kga2451m3g7fmdqki1";
-    };
+stdenv.mkDerivation {
+  name = "host-${version}";
 
-    preConfigure = ''
-      makeFlagsArray=(DESTBIN=$out/bin DESTMAN=$out/share/man OWNER=$(id -u) GROUP=$(id -g))
-      mkdir -p "$out/bin"
-      mkdir -p "$out/share/man/man1"
-    '';
+  src = fetchurl {
+    url = "mirror://debian/pool/main/h/host/host_${version}.orig.tar.gz";
+    sha256 = "1g352k80arhwyidsa95nk28xjvzyypmwv3kga2451m3g7fmdqki1";
+  };
 
-    installTargets = "install man";
+  preConfigure = ''
+    makeFlagsArray=(DESTBIN=$out/bin DESTMAN=$out/share/man OWNER=$(id -u) GROUP=$(id -g))
+    mkdir -p "$out/bin"
+    mkdir -p "$out/share/man/man1"
+  '';
 
-    meta = {
-      description = "DNS resolution utility";
-      license = "BSD-style";
-    };
-  }
+  installTargets = "install man";
+
+  meta = {
+    description = "DNS resolution utility";
+    license = "BSD-style";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index aee26c63bb3..b8d2deb626b 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     description = "Minimal I2P router written in C++";
     licenses = licenses.gpl2;
     maintainers = with maintainers; [ edwtjo ];
-    platform = platforms.linux;
+    platforms = platforms.linux;
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/tools/networking/par2cmdline/default.nix
index 20446387f4a..68f1f763297 100644
--- a/pkgs/tools/networking/par2cmdline/default.nix
+++ b/pkgs/tools/networking/par2cmdline/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
       any kind of file.
     '';
     license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [ muflax ];
-
+    maintainers = [ stdenv.lib.maintainers.muflax ];
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix
index 6744fb7c551..179908a1007 100644
--- a/pkgs/tools/networking/tcpdump/default.nix
+++ b/pkgs/tools/networking/tcpdump/default.nix
@@ -21,5 +21,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.tcpdump.org/;
     license = "BSD-style";
     maintainers = [ stdenv.lib.maintainers.mornfall ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index 7997603a706..0d537a1c30c 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -15,13 +15,14 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${elfutils}/include";
 
   NIX_CFLAGS_LINK = "-L${elfutils}/lib";
-  
+
   configureFlags = "--with-external-db --without-lua --enable-python";
 
   meta = with stdenv.lib; {
     homepage = http://www.rpm.org/;
     license = licenses.gpl2;
     description = "The RPM Package Manager";
-    maintainers = with maintainers; [ mornfall ];
+    maintainers = [ maintainers.mornfall ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index 0d9ec876720..3a710d56406 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -61,5 +61,7 @@ stdenv.mkDerivation rec {
     license = http://www.sudo.ws/sudo/license.html;
 
     maintainers = [ stdenv.lib.maintainers.eelco ];
+
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/system/at/default.nix b/pkgs/tools/system/at/default.nix
index 9a6e610389b..9991adf4013 100644
--- a/pkgs/tools/system/at/default.nix
+++ b/pkgs/tools/system/at/default.nix
@@ -33,5 +33,6 @@ stdenv.mkDerivation {
     description = ''The classical Unix `at' job scheduling command'';
     license = stdenv.lib.licenses.gpl2Plus;
     homepage = http://packages.qa.debian.org/at;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/tools/system/cron/default.nix
index e465b16b614..998be45d9c6 100644
--- a/pkgs/tools/system/cron/default.nix
+++ b/pkgs/tools/system/cron/default.nix
@@ -20,8 +20,9 @@ stdenv.mkDerivation {
   '';
 
   preInstall = "mkdir -p $out/bin $out/sbin $out/share/man/man1 $out/share/man/man5 $out/share/man/man8";
-  
+
   meta = {
     description = "Daemon for running commands at specific times (Vixie Cron)";
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/system/which/default.nix b/pkgs/tools/system/which/default.nix
index fc40cd4722b..6662d90e8bd 100644
--- a/pkgs/tools/system/which/default.nix
+++ b/pkgs/tools/system/which/default.nix
@@ -10,5 +10,6 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = http://ftp.gnu.org/gnu/which/;
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/tools/typesetting/tex/tetex/default.nix b/pkgs/tools/typesetting/tex/tetex/default.nix
index 173571eda23..79f768a086d 100644
--- a/pkgs/tools/typesetting/tex/tetex/default.nix
+++ b/pkgs/tools/typesetting/tex/tetex/default.nix
@@ -42,6 +42,7 @@ stdenv.mkDerivation {
     homepage     = http://www.tug.org/tetex/;
     matintainers = with maintainers; [ lovek323 ];
     platforms    = platforms.unix;
+    hydraPlatforms = platforms.linux;
   };
 }
 
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 4d5237504ca..f2c3f88e6bd 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -50,25 +50,15 @@ let
     } // (mapTestOn ((packagePlatforms pkgs) // rec {
 
       abcde = linux;
-      apacheHttpd = linux;
       aspell = all;
-      at = linux;
       atlas = linux;
-      autoconf = all;
-      automake = all;
-      bash = all;
-      bashInteractive = all;
       bazaar = linux; # first let sqlite3 work on darwin
       binutils = linux;
       bind = linux;
       bvi = all;
       castle_combat = linux;
       cdrkit = linux;
-      cksfv = all;
       classpath = linux;
-      coreutils = all;
-      cron = linux;
-      cvs = linux;
       ddrescue = linux;
       dhcp = linux;
       dico = linux;
@@ -91,13 +81,11 @@ let
       eprover = linux;
       expect = linux;
       exult = linux;
-      findutils = all;
       flex = all;
       fontforge = linux;
       gajim = linux;
       gawk = all;
       gcc = linux;
-      gcc34 = linux;
       gcc44 = linux;
       gcj = linux;
       ghostscript = linux;
@@ -113,29 +101,16 @@ let
       gnutls = linux;
       gogoclient = linux;
       gphoto2 = linux;
-      gpm = linux;
       gpscorrelate = linux;
       gqview = gtkSupported;
-      graphviz = all;
-      grub = linux;
       gsl = linux;
       guile = linux;  # tests fail on Cygwin
-      gzip = all;
-      hddtemp = linux;
-      host = linux;
       html-tidy = all;
-      iana_etc = linux;
       icewm = linux;
-      ifplugd = linux;
       inkscape = linux;
       irssi = linux;
-      jfsutils = linux;
       jnettop = linux;
-      jwhois = linux;
-      kbd = linux;
       keen4 = ["i686-linux"];
-    #  klibc = linux;
-      less = all;
       lftp = all;
       libarchive = linux;
       libtool = all;
@@ -155,11 +130,9 @@ let
       mercurial = unix;
       mercurialFull = linux;
       mesa = mesaPlatforms;
-      mingetty = linux;
       mk = linux;
       mktemp = all;
       mod_python = linux;
-      module_init_tools = linux;
       mupen64plus = linux;
       mutt = linux;
       mysql = linux;
@@ -171,17 +144,12 @@ let
       nss_ldap = linux;
       nssmdns = linux;
       ocaml = linux;
-      pan = gtkSupported;
-      par2cmdline = all;
       pciutils = linux;
       pdf2xml = all;
-      perl = all;
       php = linux;
       pinentry = linux;
       pltScheme = linux;
       pmccabe = linux;
-      portmap = linux;
-      postgresql = all;
       ppl = all;
       procps = linux;
       pthreadmanpages = linux;
@@ -192,13 +160,8 @@ let
       qt3 = linux;
       quake3demo = linux;
       reiserfsprogs = linux;
-      rlwrap = all;
-      rogue = all;
-      rpm = linux;
-      rsync = linux;
       rubber = allBut cygwin;
       rxvt_unicode = linux;
-      screen = linux ++ darwin;
       scrot = linux;
       sdparm = linux;
       seccure = linux;
@@ -209,32 +172,16 @@ let
       ssmtp = linux;
       stdenv = all;
       stlport = linux;
-      su = linux;
-      sudo = linux;
       superTuxKart = linux;
       swig = linux;
-      sysklogd = linux;
-      syslinux = ["i686-linux"];
-      sysvinit = linux;
-      sysvtools = linux;
       tahoelafs = linux;
       tangogps = linux;
       tcl = linux;
-      tcpdump = linux;
       teeworlds = linux;
-      tetex = linux;
-      texLive = linux;
-      texLiveBeamer = linux;
-      texLiveExtra = linux;
       tightvnc = linux;
       time = linux;
       tinycc = linux;
       uae = linux;
-      unrar = linux;
-      upstart = linux;
-      usbutils = linux;
-      utillinux = linux;
-      utillinuxCurses = linux;
       viking = linux;
       vice = linux;
       vim = linux;
@@ -244,7 +191,6 @@ let
       vsftpd = linux;
       w3m = all;
       weechat = linux;
-      which = all;
       wicd = linux;
       wine = ["i686-linux"];
       wirelesstools = linux;