Merge remote-tracking branch 'upstream/master' into staging

2016-08-29 00:24:47 +00:00
parent 2958ec7d6f c004c6e14d
commit e17bc25943
22 changed files with 204 additions and 662 deletions
--- a/pkgs/development/interpreters/gnu-apl/default.nix
+++ b/pkgs/development/interpreters/gnu-apl/default.nix
@@ -2,11 +2,11 @@

 stdenv.mkDerivation rec {
  name = "gnu-apl-${version}";
-  version = "1.5";
+  version = "1.6";

  src = fetchurl {
    url = "mirror://gnu/apl/apl-${version}.tar.gz";
-    sha256 = "0h4diq3wfbdwxp5nm0z4b0p1zq13lwip0y7v28r9v0mbbk8xsfh1";
+    sha256 = "057zwzvvgcrrwsl52a27w86hgy31jqq6avqq629xj7yq90qah3ay";
  };

  buildInputs = [ readline gettext ncurses ];
--- a/pkgs/development/interpreters/io/default.nix
+++ b/pkgs/development/interpreters/io/default.nix
@@ -47,6 +47,6 @@ stdenv.mkDerivation {
      z77z
      vrthra
    ];
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" ];
  };
 }