From 351688f53e5407f3c7cab9ef3769334858f4a50c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 25 Mar 2018 00:41:17 -0400 Subject: [PATCH] zulu: 9.0.4 -> 10 --- pkgs/development/compilers/zulu/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index 040af83ece2..908aa29e178 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -4,11 +4,11 @@ , swingSupport ? true }: let - version = "9.0.0.15"; - openjdk = "9.0.0"; + version = "10.1+11"; + openjdk = "10"; - sha256_linux = "0s9vr135yhdnxqds4hfafyrlh33j6g78v6l1v0ap2y6yqgabh9qi"; - sha256_darwin = "104w1msrwijf8dv3n65hjinp7i47z6ygzjipdzqriqam2zljxn4b"; + sha256_linux = "0g51n2zc7inal29n5ly3mrrfj15c7vl87zb6b2r1q67n4mnbrgm8"; + sha256_darwin = "1c5ib136nv6gz7ij31mg15nhzrl6zr7kp8spm17zwm1ib82bc73y"; platform = if stdenv.isDarwin then "macosx" else "linux"; hash = if stdenv.isDarwin then sha256_darwin else sha256_linux; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be80143d29d..10d230a4e8d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6894,8 +6894,7 @@ with pkgs; z88dk = callPackage ../development/compilers/z88dk { }; zulu8 = callPackage ../development/compilers/zulu/8.nix { }; - zulu9 = callPackage ../development/compilers/zulu { }; - zulu = zulu9; + zulu = callPackage ../development/compilers/zulu { }; ### DEVELOPMENT / INTERPRETERS