diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-19 09:01:43 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-06-19 09:01:43 +0200 |
| commit | 301847a7e5254bae0443374884bd433ada66cb2c (patch) | |
| tree | 9f7a881dca853de352b305c3cbe90e86169aee55 /pkgs/development/compilers | |
| parent | 79f9ef8752276d3490fbf222d11e0966f488e221 (diff) | |
| parent | bd3bf7ee766fe371b87f1277961a055f20eb0e3e (diff) | |
| download | nixpkgs-301847a7e5254bae0443374884bd433ada66cb2c.tar nixpkgs-301847a7e5254bae0443374884bd433ada66cb2c.tar.gz nixpkgs-301847a7e5254bae0443374884bd433ada66cb2c.tar.bz2 nixpkgs-301847a7e5254bae0443374884bd433ada66cb2c.tar.lz nixpkgs-301847a7e5254bae0443374884bd433ada66cb2c.tar.xz nixpkgs-301847a7e5254bae0443374884bd433ada66cb2c.tar.zst nixpkgs-301847a7e5254bae0443374884bd433ada66cb2c.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/openjdk/11.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix index 72ed184357c..b62b9c95ef6 100644 --- a/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix +++ b/pkgs/development/compilers/adoptopenjdk-icedtea-web/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "adoptopenjdk-icedtea-web"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "AdoptOpenJDK"; repo = "IcedTea-Web"; rev = "icedtea-web-${version}"; - sha256 = "0bm5k11i2vgb54ch1bawsmjbwnqnp04saadwm2f2mggmmdc6b1qq"; + sha256 = "0pxijw9v5k4j840jczglx9qyfd57df390g5jdaz3qafblfg0k10n"; }; nativeBuildInputs = [ autoreconfHook pkgconfig bc ]; diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index ef496f5f7c5..9edb70074c7 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -10,7 +10,7 @@ let major = "11"; - update = ".0.6"; + update = ".0.7"; 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 = "1w6n0cnz9izpjb3sc870q7a0jz85a6c7fiszymxin10cnsajkzir"; + sha256 = "14daacng9ndxf4kmvsn7nracwfiwwmw5rha8rkk3723pfk9g8q7p"; }; nativeBuildInputs = [ pkgconfig autoconf ]; @@ -135,7 +135,7 @@ let homepage = "http://openjdk.java.net/"; license = licenses.gpl2; description = "The open-source Java Development Kit"; - maintainers = with maintainers; [ edwtjo ]; + maintainers = with maintainers; [ edwtjo asbachb ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; }; |