Merge master into staging-next

pkgs/development/compilers/avian/default.nix

@@ -1,43 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, zlib, jdk, CoreServices, Foundation }:
-
-stdenv.mkDerivation rec {
-  pname = "avian";
-  version = "1.2.0";
-
-  src = fetchFromGitHub {
-    owner = "readytalk";
-    repo = "avian";
-    rev = "v${version}";
-    sha256 = "1j2y45cpqk3x6a743mgpg7z3ivwm7qc9jy6xirvay7ah1qyxmm48";
-  };
-
-  buildInputs = [ zlib jdk ]
-    ++ lib.optionals stdenv.isDarwin [ CoreServices Foundation ];
-
-  NIX_CFLAGS_COMPILE = "-Wno-error";
-
-  postPatch = ''
-    substituteInPlace makefile \
-        --replace 'g++' 'c++' \
-        --replace 'gcc' 'cc'
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp build/*/avian $out/bin/
-    cp build/*/avian-dynamic $out/bin/
-  '';
-
-  meta = {
-    description = "Lightweight Java virtual machine";
-    longDescription = ''
-      Avian is a lightweight virtual machine and class library designed
-      to provide a useful subset of Java’s features, suitable for
-      building self-contained applications.
-    '';
-    homepage = "https://readytalk.github.io/avian/";
-    license = lib.licenses.isc;
-    platforms = lib.platforms.all;
-    maintainers = [ lib.maintainers.earldouglas ];
-  };
-}

pkgs/development/compilers/go/1.15.nix

@@ -11,7 +11,7 @@ let
 
   inherit (lib) optionals optionalString;
 
-  version = "1.15.11";
+  version = "1.15.12";
 
   go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://dl.google.com/go/go${version}.src.tar.gz";
-    sha256 = "1rb1s130yqy80kcl140k5a53xhvw4fmrpmclvqygcv67si0j8nzj";
+    sha256 = "sha256-HGkRk330onf6dOe378PQhZRJjExK3AtsSuNWYTdSgJE=";
   };
 
   # perl is used for testing go vet

pkgs/development/compilers/go/1.16.nix

@@ -11,7 +11,7 @@ let
 
   inherit (lib) optionals optionalString;
 
-  version = "1.16.3";
+  version = "1.16.4";
 
   go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };
 
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://dl.google.com/go/go${version}.src.tar.gz";
-    sha256 = "sha256-spjSnekjbKR6Aj44IxO8wtLu0x36cGtgoEEDzoOnGiU=";
+    sha256 = "sha256-rk9rbioWd9MYF5hGVadiB0tTVtpQ+1hyK5kQSHDUNQM=";
   };
 
   # perl is used for testing go vet