summary refs log tree commit diff
path: root/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
diff options
context:
space:
mode:
authorBen Wolsieffer <benwolsieffer@gmail.com>2019-07-21 15:40:18 -0400
committerBen Wolsieffer <benwolsieffer@gmail.com>2019-08-19 18:54:47 -0400
commitded7ec067fa4d05c6cbb6550a7f53fc27c60273a (patch)
treee310291bccd97e2d40cbd891f7bf4e5142d69f75 /pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
parent18e0f9d39feef3391fac1261b85d4d840eda756c (diff)
downloadnixpkgs-ded7ec067fa4d05c6cbb6550a7f53fc27c60273a.tar
nixpkgs-ded7ec067fa4d05c6cbb6550a7f53fc27c60273a.tar.gz
nixpkgs-ded7ec067fa4d05c6cbb6550a7f53fc27c60273a.tar.bz2
nixpkgs-ded7ec067fa4d05c6cbb6550a7f53fc27c60273a.tar.lz
nixpkgs-ded7ec067fa4d05c6cbb6550a7f53fc27c60273a.tar.xz
nixpkgs-ded7ec067fa4d05c6cbb6550a7f53fc27c60273a.tar.zst
nixpkgs-ded7ec067fa4d05c6cbb6550a7f53fc27c60273a.zip
adoptopenjdk-bin: add OpenJDK 8
Diffstat (limited to 'pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py')
-rwxr-xr-xpkgs/development/compilers/adoptopenjdk-bin/generate-sources.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
index 40080bcb77c..22a3c9cf468 100755
--- a/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
+++ b/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
@@ -6,10 +6,10 @@ import re
 import requests
 import sys
 
-releases = ["openjdk11"]
-oses = ["mac", "linux"]
-types = ["jre", "jdk"]
-impls = ["hotspot", "openj9"]
+releases = ("openjdk8", "openjdk11")
+oses = ("mac", "linux")
+types = ("jre", "jdk")
+impls = ("hotspot", "openj9")
 
 arch_to_nixos = {
     "x64": ("x86_64",),
@@ -24,7 +24,6 @@ def get_sha256(url):
         sys.exit(1)
     return resp.text.strip().split(" ")[0]
 
-RE_RELEASE_NAME = re.compile(r'[^-]+-([0-9.]+)\+([0-9]+)') # example release name: jdk-11.0.1+13
 def generate_sources(release, assets):
     out = {}
     for asset in assets:
@@ -34,7 +33,8 @@ def generate_sources(release, assets):
         if asset["heap_size"] != "normal": continue
         if asset["architecture"] not in arch_to_nixos: continue
 
-        version, build = RE_RELEASE_NAME.match(asset["release_name"]).groups()
+        # examples: 11.0.1+13, 8.0.222+10
+        version, build = asset["version_data"]["semver"].split("+")
 
         type_map = out.setdefault(asset["os"], {})
         impl_map = type_map.setdefault(asset["binary_type"], {})