Merge pull request #224673 from figsoda/jdk

javaPackages.compiler.openjdk15: fix eval

Sandro 92c5308e 2fb1affc

Changed files
+11 -8
pkgs
development
compilers
openjdk
+11 -8
pkgs/development/compilers/openjdk/15.nix
···
}:
let
-
major = "15";
-
update = ".0.1";
-
build = "-ga";
-
openjdk = stdenv.mkDerivation rec {
pname = "openjdk" + lib.optionalString headless "-headless";
-
version = "${major}${update}${build}";
src = fetchurl {
-
url = "https://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz";
sha256 = "1h8n5figc9q0k9p8b0qggyhvqagvxanfih1lj5j492c74cd1mx1l";
};
···
disallowedReferences = [ openjdk15-bootstrap ];
-
pos = builtins.unsafeGetAttrPos "feature" version;
-
meta = import ./meta.nix lib version;
passthru = {
architecture = "";
···
}:
let
+
version = {
+
major = "15";
+
update = ".0.1";
+
build = "-ga";
+
__toString = self: "${self.major}${self.update}${self.build}";
+
};
+
openjdk = stdenv.mkDerivation {
pname = "openjdk" + lib.optionalString headless "-headless";
+
inherit version;
src = fetchurl {
+
url = "https://hg.openjdk.java.net/jdk-updates/jdk${version.major}u/archive/jdk-${version}.tar.gz";
sha256 = "1h8n5figc9q0k9p8b0qggyhvqagvxanfih1lj5j492c74cd1mx1l";
};
···
disallowedReferences = [ openjdk15-bootstrap ];
+
pos = builtins.unsafeGetAttrPos "major" version;
+
meta = import ./meta.nix lib version.major;
passthru = {
architecture = "";