Merge staging-next into staging

pkgs/development/compilers/cc65/default.nix

@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cc65";
-  version = "2.18";
+  version = "2.19";
 
   src = fetchFromGitHub {
     owner = "cc65";
     repo = pname;
     rev = "V${version}";
-    sha256 = "sha256-XRGhukYite1GtPkO9clmkwvvU62OnYphO8V1Rrr7yMg=";
+    sha256 = "01a15yvs455qp20hri2pbg2wqvcip0d50kb7dibi9427hqk9cnj4";
   };
 
   makeFlags = [ "PREFIX=${placeholder "out"}"];

pkgs/development/compilers/gcc-arm-embedded/9/default.nix

@@ -6,8 +6,8 @@
 
 stdenv.mkDerivation rec {
   pname = "gcc-arm-embedded";
-  version = "9-2019-q4-major";
-  subdir = "9-2019q4/RC2.1";
+  version = "9-2020-q2-update";
+  subdir = "9-2020q2";
 
   suffix = {
     aarch64-linux = "aarch64-linux";
@@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     url = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${subdir}/gcc-arm-none-eabi-${version}-${suffix}.tar.bz2";
     sha256 = {
-      aarch64-linux = "1f5b9309006737950b2218250e6bb392e2d68d4f1a764fe66be96e2a78888d83";
-      x86_64-darwin = "1249f860d4155d9c3ba8f30c19e7a88c5047923cea17e0d08e633f12408f01f0";
-      x86_64-linux  = "bcd840f839d5bf49279638e9f67890b2ef3a7c9c7a9b25271e83ec4ff41d177a";
+      aarch64-linux = "1b5q2y710hy7lddj8vj3zl54gfl74j30kx3hk3i81zrcbv16ah8z";
+      x86_64-darwin = "1ils9z16wrvglh72m428y5irmd36biq79yj86756whib8izbifdv";
+      x86_64-linux  = "07zi2yr5gvhpbij5pnj49zswb9g2gw7zqp4xwwniqmq477h2xp2s";
     }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };
 

pkgs/development/compilers/ghc/8.10.2.nix

@@ -2,7 +2,7 @@
 
 # build-tools
 , bootPkgs
-, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx
+, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx
 , bash
 
 , libiconv ? null, ncurses
@@ -110,6 +110,12 @@ stdenv.mkDerivation (rec {
   # https://gitlab.haskell.org/ghc/ghc/-/issues/18549
   patches = [
     ./issue-18549.patch
+  ] ++ stdenv.lib.optionals stdenv.isDarwin [
+    # Make Block.h compile with c++ compilers. Remove with the next release
+    (fetchpatch {
+      url = "https://gitlab.haskell.org/ghc/ghc/-/commit/97d0b0a367e4c6a52a17c3299439ac7de129da24.patch";
+      sha256 = "0r4zjj0bv1x1m2dgxp3adsf2xkr94fjnyj1igsivd9ilbs5ja0b5";
+    })
   ];
 
   postPatch = "patchShebangs .";

pkgs/development/compilers/picat/default.nix

@@ -1,5 +1,12 @@
 { stdenv, fetchurl, zlib }:
 
+let
+  ARCH = {
+    i686-linux    = "linux32";
+    x86_64-linux  = "linux64";
+    aarch64-linux = "linux64";
+  }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+in
 stdenv.mkDerivation {
   pname = "picat";
   version = "3.0p3";
@@ -11,19 +18,13 @@ stdenv.mkDerivation {
 
   buildInputs = [ zlib ];
 
-  ARCH = if stdenv.hostPlatform.system == "i686-linux" then "linux32"
-         else if stdenv.hostPlatform.system == "x86_64-linux" then "linux64"
-         else throw "Unsupported system";
+  inherit ARCH;
 
   hardeningDisable = [ "format" ];
   enableParallelBuilding = true;
 
   buildPhase = "cd emu && make -j $NIX_BUILD_CORES -f Makefile.$ARCH";
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp picat $out/bin/picat
-  '';
+  installPhase = "mkdir -p $out/bin && cp picat $out/bin/picat";
 
   meta = with stdenv.lib; {
     description = "Logic-based programming langage";

pkgs/development/compilers/qbe/default.nix

@@ -1,6 +1,9 @@
-{ stdenv, fetchgit }:
+{ stdenv
+, fetchgit
+, unstableGitUpdater
+}:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "qbe";
   version = "unstable-2019-07-11";
 
@@ -11,6 +14,9 @@ stdenv.mkDerivation {
   };
 
   makeFlags = [ "PREFIX=$(out)" ];
+
+  passthru.updateScript = unstableGitUpdater { };
+
   meta = with stdenv.lib; {
     homepage = "https://c9x.me/compile/";
     description = "A small compiler backend written in C";