Merge staging-next into staging

2020-01-28 10:48:36 +01:00
parent 6f1095b0ba dce0ca29d9
commit cdff57e1fc
887 changed files with 18829 additions and 16536 deletions
--- a/pkgs/development/compilers/openjdk/11.nix
+++ b/pkgs/development/compilers/openjdk/11.nix
@@ -10,7 +10,7 @@

 let
  major = "11";
-  update = ".0.4";
+  update = ".0.6";
  build = "ga";

  openjdk = stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ let

    src = fetchurl {
      url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz";
-      sha256 = "1v6pam38iidlhz46046h17hf5kki6n3kl302awjcyxzk7bmkvb8x";
+      sha256 = "1w6n0cnz9izpjb3sc870q7a0jz85a6c7fiszymxin10cnsajkzir";
    };

    nativeBuildInputs = [ pkgconfig autoconf ];