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

pkgs/development/compilers/ghc/8.4.1.nix

@@ -24,7 +24,7 @@
   # platform). Static libs are always built.
   enableShared ? true
 
-, version ? "8.4.20180115"
+, version ? "8.4.20180122"
 }:
 
 assert !enableIntegerSimple -> gmp != null;
@@ -73,8 +73,8 @@ stdenv.mkDerivation rec {
 
   src = fetchgit {
     url = "git://git.haskell.org/ghc.git";
-    rev = "3e3a096885c0fcd0703edbeffb4e47f5cbd8f4cc";
-    sha256 = "06slymbsd7vsfp4hh40v7cxf7nmp0kvlni2wfq7ag5wlqh04slgs";
+    rev = "61db0b8941cfb7ed8941ed29bdb04bd8ef3b71a5";
+    sha256 = "15sbpgkal4854jc1xn3sprvpnxwdj0fyy43y5am0h9vja3pjhjyi";
   };
 
   enableParallelBuilding = true;

pkgs/development/compilers/ponyc/default.nix

@@ -86,6 +86,6 @@ stdenv.mkDerivation ( rec {
     homepage = http://www.ponylang.org;
     license = licenses.bsd2;
     maintainers = with maintainers; [ doublec kamilchm patternspandemic ];
-    platforms = subtractLists platforms.i686 platforms.unix;
+    platforms = [ "x86_64-linux" "x86_64-darwin" ];
   };
 })