Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-08-03 13:34:44 +00:00
parent 3f9e8601f2 d93f917182
commit 1b979d8384
1099 changed files with 2664 additions and 513 deletions
--- a/pkgs/development/compilers/dev86/default.nix
+++ b/pkgs/development/compilers/dev86/default.nix
@@ -16,5 +16,6 @@ stdenv.mkDerivation rec {
  meta = {
    description = "Linux 8086 development environment";
    homepage = http://v3.sk/~lkundrak/dev86/;
+    platforms = stdenv.lib.platforms.linux;
  };
 }