Merge staging-next into staging

2019-11-11 12:09:26 +01:00
parent 539e94030c cf27abf534
commit 73b88e17dd
442 changed files with 23507 additions and 19144 deletions
@@ -201,4 +201,4 @@ let result = stdenv.mkDerivation rec {
    platforms = [ "i686-linux" "x86_64-linux" "armv7l-linux" "aarch64-linux" ]; # some inherit jre.meta.platforms
  };

-}; in stdenv.lib.trivial.warn "Public updates for Oracle Java SE 8 released after January 2019 will not be available for business, commercial or production use without a commercial license. See https://java.com/en/download/release_notice.jsp for more information." result
+}; in result