Merge pull request #141812 from thiagokokada/remove-graalvm

14 files changed, 4 insertions, 1107 deletions

diff --git a/pkgs/development/compilers/graalvm/001_mx.py.patch b/pkgs/development/compilers/graalvm/001_mx.py.patch
deleted file mode 100644
index 0477c6c556f..00000000000
--- a/pkgs/development/compilers/graalvm/001_mx.py.patch
+++ /dev/null
@@ -1,291 +0,0 @@
-diff --git a/mx.py b/mx.py
-index a0b9315..b7d67a0 100755
---- a/mx.py
-+++ b/mx.py
-@@ -238,21 +238,7 @@ def _check_file_with_sha1(path, sha1, sha1path, mustExist=True, newFile=False, l
-             f.write(value or sha1OfFile(path))
- 
-     if exists(path):
--        if sha1Check and sha1:
--            if not _sha1CachedValid() or (newFile and sha1 != _sha1Cached()):
--                logv('Create/update SHA1 cache file ' + sha1path)
--                _writeSha1Cached()
--
--            if sha1 != _sha1Cached():
--                computedSha1 = sha1OfFile(path)
--                if sha1 == computedSha1:
--                    warn('Fixing corrupt SHA1 cache file ' + sha1path)
--                    _writeSha1Cached(computedSha1)
--                    return True
--                if logErrors:
--                    size = os.path.getsize(path)
--                    log_error('SHA1 of {} [size: {}] ({}) does not match expected value ({})'.format(TimeStampFile(path), size, computedSha1, sha1))
--                return False
-+        return True
-     elif mustExist:
-         if logErrors:
-             log_error("'{}' does not exist".format(path))
-@@ -1057,46 +1043,8 @@ class SuiteImport:
-         version = import_dict.get("version")
-         suite_dir = None
-         version_from = import_dict.get("versionFrom")
--        if version_from and version:
--            abort("In import for '{}': 'version' and 'versionFrom' can not be both set".format(name), context=context)
--        if version is None and version_from is None:
--            if not (in_subdir and (importer.vc_dir != importer.dir or isinstance(importer, BinarySuite))):
--                abort("In import for '{}': No version given and not a 'subdir' suite of the same repository".format(name), context=context)
--            if importer.isSourceSuite():
--                suite_dir = join(importer.vc_dir, name)
--            version = importer.version()
--        if urls is None:
--            if not in_subdir:
--                if import_dict.get("subdir") is None and importer.vc_dir != importer.dir:
--                    warn("In import for '{}': No urls given but 'subdir' is not set, assuming 'subdir=True'".format(name), context)
--                    in_subdir = True
--                else:
--                    abort("In import for '{}': No urls given and not a 'subdir' suite".format(name), context=context)
--            return SuiteImport(name, version, None, None, dynamicImport=dynamicImport, in_subdir=in_subdir, version_from=version_from, suite_dir=suite_dir)
--        # urls a list of alternatives defined as dicts
--        if not isinstance(urls, list):
--            abort('suite import urls must be a list', context=context)
--        urlinfos = []
--        mainKind = None
--        for urlinfo in urls:
--            if isinstance(urlinfo, dict) and urlinfo.get('url') and urlinfo.get('kind'):
--                kind = urlinfo.get('kind')
--                if not VC.is_valid_kind(kind):
--                    abort('suite import kind ' + kind + ' illegal', context=context)
--            else:
--                abort('suite import url must be a dict with {"url", kind", attributes', context=context)
--            vc = vc_system(kind)
--            if kind != 'binary':
--                assert not mainKind or mainKind == kind, "Only expecting one non-binary kind"
--                mainKind = kind
--            url = mx_urlrewrites.rewriteurl(urlinfo.get('url'))
--            urlinfos.append(SuiteImportURLInfo(url, kind, vc))
--        vc_kind = None
--        if mainKind:
--            vc_kind = mainKind
--        elif urlinfos:
--            vc_kind = 'binary'
--        return SuiteImport(name, version, urlinfos, vc_kind, dynamicImport=dynamicImport, in_subdir=in_subdir, version_from=version_from, suite_dir=suite_dir)
-+        suite_dir = join(get_env('MX_GIT_CACHE_DIR'), name)
-+        return SuiteImport(name, version, [], None, True, in_subdir=in_subdir, version_from=version_from, suite_dir=suite_dir)
- 
-     @staticmethod
-     def get_source_urls(source, kind=None):
-@@ -1467,8 +1415,6 @@ class Suite(object):
-     :type dists: list[Distribution]
-     """
-     def __init__(self, mxDir, primary, internal, importing_suite, load, vc, vc_dir, dynamicallyImported=False):
--        if primary is True and vc_dir is None:
--            abort("The primary suite must be in a vcs repository")
-         self.imported_by = [] if primary else [importing_suite]
-         self.mxDir = mxDir
-         self.dir = dirname(mxDir)
-@@ -1496,7 +1442,7 @@ class Suite(object):
-         self._outputRoot = None
-         self._preloaded_suite_dict = None
-         self.vc = vc
--        self.vc_dir = vc_dir
-+        self.vc_dir = get_env('MX_GIT_CACHE_DIR')
-         self._preload_suite_dict()
-         self._init_imports()
-         if load:
-@@ -2405,7 +2351,9 @@ class Repository(SuiteConstituent):
- class SourceSuite(Suite):
-     """A source suite"""
-     def __init__(self, mxDir, primary=False, load=True, internal=False, importing_suite=None, dynamicallyImported=False):
--        vc, vc_dir = VC.get_vc_root(dirname(mxDir), abortOnError=False)
-+        vc, vc_dir_test = VC.get_vc_root(dirname(mxDir), abortOnError=False)
-+        vc_dir = get_env('MX_GIT_CACHE_DIR')
-+        warn("LOOKING FOR: " + mxDir)
-         Suite.__init__(self, mxDir, primary, internal, importing_suite, load, vc, vc_dir, dynamicallyImported=dynamicallyImported)
-         logvv("SourceSuite.__init__({}), got vc={}, vc_dir={}".format(mxDir, self.vc, self.vc_dir))
-         self.projects = []
-@@ -2454,17 +2402,7 @@ class SourceSuite(Suite):
-         """
-         Gets the release tag from VC or create a time based once if VC is unavailable
-         """
--        if snapshotSuffix not in self._releaseVersion:
--            _version = self._get_early_suite_dict_property('version')
--            if _version and self.getMxCompatibility().addVersionSuffixToExplicitVersion():
--                if not self.is_release():
--                    _version = _version + '-' + snapshotSuffix
--            if not _version:
--                _version = self.vc.release_version_from_tags(self.vc_dir, self.name, snapshotSuffix=snapshotSuffix)
--            if not _version:
--                _version = 'unknown-{0}-{1}'.format(platform.node(), time.strftime('%Y-%m-%d_%H-%M-%S_%Z'))
--            self._releaseVersion[snapshotSuffix] = _version
--        return self._releaseVersion[snapshotSuffix]
-+        return get_env('version')
- 
-     def scm_metadata(self, abortOnError=False):
-         scm = self.scm
-@@ -2993,12 +2931,35 @@ def _find_suite_import(importing_suite, suite_import, fatalIfMissing=True, load=
-         Attempts to locate an existing suite in the local context
-         Returns the path to the mx.name dir if found else None
-         """
--        if mode == 'binary':
--            # binary suites are always stored relative to the importing suite in mx-private directory
--            return importing_suite._find_binary_suite_dir(suite_import.name)
-+        warn("FAKE CLONE: " + str(suite_import))
-+        if (suite_import.name == "truffle"):
-+            return join(get_env('TMP'), "source", "truffle", "mx.truffle")
-+        if (suite_import.name == "graal-nodejs"):
-+            return join(get_env('MX_GIT_CACHE_DIR'), "graaljs", "graal-nodejs", "mx.graal-nodejs")
-+        if (suite_import.name == "truffleruby"):
-+            return join(get_env('MX_GIT_CACHE_DIR'), "truffleruby", "mx.truffleruby")
-+        if (suite_import.name == "graalpython"):
-+            return join(get_env('MX_GIT_CACHE_DIR'), "graalpython", "mx.graalpython")
-+        if (suite_import.name == "vm"):
-+            return join(get_env('TMP'), "source", "vm", "mx.vm")
-+        if (suite_import.name == "fastr"):
-+            return join(get_env('MX_GIT_CACHE_DIR'), "fastr", "mx.fastr")
-+        if (suite_import.name == "sdk"):
-+            return join(get_env('TMP'), "source", "sdk", "mx.sdk")
-+        if (suite_import.name == "graal-js"):
-+            return join(get_env('MX_GIT_CACHE_DIR'), "graaljs", "graal-js", "mx.graal-js")
-+        if (suite_import.name == "regex"):
-+            return join(get_env('TMP'), "source", "regex", "mx.regex")
-+        if (suite_import.name == "substratevm"):
-+            return join(get_env('TMP'), "source", "substratevm", "mx.substratevm")
-+        if (suite_import.name == "tools"):
-+            return join(get_env('TMP'), "source", "tools", "mx.tools")
-+        if (suite_import.name == "sulong"):
-+            return join(get_env('TMP'), "source", "sulong", "mx.sulong")
-+        if (suite_import.name == "compiler"):
-+            return join(get_env('TMP'), "source", "compiler", "mx.compiler")
-         else:
--            # use the SuiteModel to locate a local source copy of the suite
--            return _suitemodel.find_suite_dir(suite_import)
-+            return join(get_env('MX_GIT_CACHE_DIR'), suite_import.name)
- 
-     def _get_import_dir(url, mode):
-         """Return directory where the suite will be cloned to"""
-@@ -3816,7 +3777,7 @@ def getmtime(name):
-     """
-     Wrapper for builtin open function that handles long path names on Windows.
-     """
--    return os.path.getmtime(_safe_path(name))
-+    return 315532800
- 
- 
- def stat(name):
-@@ -4062,57 +4023,8 @@ def _attempt_download(url, path, jarEntryName=None):
-     return False
- 
- def download(path, urls, verbose=False, abortOnError=True, verifyOnly=False):
--    """
--    Attempts to downloads content for each URL in a list, stopping after the first successful download.
--    If the content cannot be retrieved from any URL, the program is aborted, unless abortOnError=False.
--    The downloaded content is written to the file indicated by `path`.
--    """
--    if not verifyOnly:
--        ensure_dirname_exists(path)
--        assert not path.endswith(os.sep)
--
--    # https://docs.oracle.com/javase/7/docs/api/java/net/JarURLConnection.html
--    jarURLPattern = re.compile('jar:(.*)!/(.*)')
--    verify_errors = {}
--    for url in urls:
--        if not verifyOnly or verbose:
--            log('Downloading ' + url + ' to ' + path)
--        m = jarURLPattern.match(url)
--        jarEntryName = None
--        if m:
--            url = m.group(1)
--            jarEntryName = m.group(2)
--
--        if not _opts.trust_http and (url.lower().startswith('http://') or url.lower().startswith('ftp://')):
--            warn('Downloading from non-https URL {}. Use --trust-http mx option to suppress this warning.'.format(url))
--
--        if verifyOnly:
--            try:
--                conn = _urlopen(url, timeout=10)
--                conn.close()
--            except (IOError, socket.timeout) as e:
--                _suggest_tlsv1_error(e)
--                verify_errors[url] = e
--        else:
--            for i in range(4):
--                if i != 0:
--                    time.sleep(1)
--                    warn('Retry {} to download from {}'.format(i, url))
--                if _attempt_download(url, path, jarEntryName):
--                    return True # Download was successful
--
--    if verifyOnly and len(verify_errors) < len(urls): # verify-mode at least one success -> success
--        return True
--    else: # Either verification error or no download was successful
--        msg = 'Could not download to ' + path + ' from any of the following URLs: ' + ', '.join(urls)
--        if verifyOnly: # verify-mode -> print error details
--            for url, e in verify_errors.items():
--                msg += '\n  ' + url + ': ' + str(e)
--        if abortOnError:
--            abort(msg)
--        else:
--            warn(msg)
--            return False
-+    print("FAKE download(path={} urls={} verbose={} abortOnError={} verifyOnly={})".format(path, urls, verbose, abortOnError, verifyOnly))
-+    return True
- 
- def update_file(path, content, showDiff=False):
-     """
-@@ -7887,30 +7799,6 @@ class PackedResourceLibrary(ResourceLibrary):
- 
-     def get_path(self, resolve):
-         extract_path = _make_absolute(self.extract_path, self.suite.dir)
--        download_path = super(PackedResourceLibrary, self).get_path(resolve)
--        if resolve and self._check_extract_needed(extract_path, download_path):
--            extract_path_tmp = tempfile.mkdtemp(suffix=basename(extract_path), dir=dirname(extract_path))
--            try:
--                # extract archive
--                Extractor.create(download_path).extract(extract_path_tmp)
--                # ensure modification time is up to date
--                os.utime(extract_path_tmp, None)
--                logv("Moving temporary directory {} to {}".format(extract_path_tmp, extract_path))
--                try:
--                    # attempt atomic overwrite
--                    os.rename(extract_path_tmp, extract_path)
--                except OSError:
--                    # clean destination & re-try for cases where atomic overwrite doesn't work
--                    rmtree(extract_path, ignore_errors=True)
--                    os.rename(extract_path_tmp, extract_path)
--            except OSError as ose:
--                # Rename failed. Race with other process?
--                if self._check_extract_needed(extract_path, download_path):
--                    # ok something really went wrong
--                    abort("Extracting {} failed!".format(download_path), context=ose)
--            finally:
--                rmtree(extract_path_tmp, ignore_errors=True)
--
-         return extract_path
- 
-     def _check_download_needed(self):
-@@ -8430,7 +8318,7 @@ class VC(_with_metaclass(ABCMeta, object)):
-         :param str branch: a branch name
-         :param bool abortOnError: if True abort on error
-         """
--        abort(self.kind + " update_to_branch is not implemented")
-+        self.run(['hg', vcdir] + cmd)
- 
-     def is_release_from_tags(self, vcdir, prefix):
-         """
-@@ -8831,7 +8719,7 @@ class HgConfig(VC):
-                 return None
- 
-     def parent_info(self, vcdir, abortOnError=True):
--        out = self.hg_command(vcdir, ["log", "-r", ".", "--template", "{author}|||{date|hgdate}"], abortOnError=abortOnError)
-+        out = _check_output_str(["hg", '-R', vcdir, "log", "-r", ".", "--template", "{author}|||{date|hgdate}"])
-         author, date = out.split("|||")
-         ts, _ = date.split(" ")
-         return self._sanitize_parent_info({
-@@ -14069,6 +13957,7 @@ class Archiver(SafeFileCreation):
- 
-     def _add_zip(self, filename, archive_name, provenance):
-         self._add_provenance(archive_name, provenance)
-+        os.utime(filename, (315532800, 315532800))
-         self.zf.write(filename, archive_name)
- 
-     def _add_str_zip(self, data, archive_name, provenance):
diff --git a/pkgs/development/compilers/graalvm/002_setjmp.c.patch b/pkgs/development/compilers/graalvm/002_setjmp.c.patch
deleted file mode 100644
index 38a29fd8fbf..00000000000
--- a/pkgs/development/compilers/graalvm/002_setjmp.c.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/src/setjmp.c b/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/src/setjmp.c
-index 16b869354d8..3691739d13b 100644
---- a/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/src/setjmp.c
-+++ b/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/src/setjmp.c
-@@ -41,11 +41,3 @@ int sigsetjmp(sigjmp_buf env, int savesigs) {
-   WARN_UNSUPPORTED(sigsetjmp);
-   return 0;
- }
--
--void longjmp(jmp_buf env, int val) {
--  ERR_UNSUPPORTED(longjmp);
--}
--
--void siglongjmp(sigjmp_buf env, int val) {
--  ERR_UNSUPPORTED(siglongjmp);
--}
diff --git a/pkgs/development/compilers/graalvm/003_mx_truffle.py.patch b/pkgs/development/compilers/graalvm/003_mx_truffle.py.patch
deleted file mode 100644
index bb9a0068712..00000000000
--- a/pkgs/development/compilers/graalvm/003_mx_truffle.py.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/truffle/mx.truffle/mx_truffle.py b/truffle/mx.truffle/mx_truffle.py
-index 8889c5ad810..add211a45c5 100644
---- a/truffle/mx.truffle/mx_truffle.py
-+++ b/truffle/mx.truffle/mx_truffle.py
-@@ -695,6 +695,7 @@ class LibffiBuildTask(mx.AbstractNativeBuildTask):
-                      os.path.relpath(self.subject.delegate.dir, self.subject.suite.vc_dir)]
-         for patch in self.subject.patches:
-             mx.run(git_apply + [patch], cwd=self.subject.suite.vc_dir)
-+        mx.run(['cp', os.path.join(os.getenv('TMP'), 'truffle.make'), os.path.join(self.subject.delegate.dir, 'Makefile')])
- 
-         self.delegate.logBuild()
-         self.delegate.build()
diff --git a/pkgs/development/compilers/graalvm/004_mx_jvmci.py.patch b/pkgs/development/compilers/graalvm/004_mx_jvmci.py.patch
deleted file mode 100644
index 0aa1bc9b88d..00000000000
--- a/pkgs/development/compilers/graalvm/004_mx_jvmci.py.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/mx.jvmci/mx_jvmci.py b/mx.jvmci/mx_jvmci.py
-index 491fc19ab9..b4ddc03abb 100644
---- a/mx.jvmci/mx_jvmci.py
-+++ b/mx.jvmci/mx_jvmci.py
-@@ -192,6 +192,7 @@ class HotSpotVMJDKDeployedDist(JDKDeployedDist):
-                 if m.name in _hs_deploy_map:
-                     targetDir = join(jdkDir, _hs_deploy_map[m.name])
-                     mx.logv('Deploying {} from {} to {}'.format(m.name, dist.name, targetDir))
-+                    subprocess.call(["chmod", "-R", "+rw", targetDir])
-                     tar.extract(m, targetDir)
- 
- """
diff --git a/pkgs/development/compilers/graalvm/005_tool_jt.rb.patch b/pkgs/development/compilers/graalvm/005_tool_jt.rb.patch
deleted file mode 100644
index 06f693db9f6..00000000000
--- a/pkgs/development/compilers/graalvm/005_tool_jt.rb.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/tool/jt.rb b/tool/jt.rb
-index 870d88edcb..0a6e4c367b 100755
---- a/tool/jt.rb
-+++ b/tool/jt.rb
-@@ -152,13 +152,16 @@ module Utilities
-   end
- 
-   def find_mx
--    if which('mx')
--      'mx'
-+    if ENV.key?("MX_GIT_CACHE_DIR")
-+      "mx-internal"
-     else
--      mx_repo = find_or_clone_repo("https://github.com/graalvm/mx.git")
--      "#{mx_repo}/mx"
-+      if which('mx')
-+        'mx'
-+      else
-+        mx_repo = find_or_clone_repo("https://github.com/graalvm/mx.git")
-+        "#{mx_repo}/mx"
-+      end
-     end
--  end
- 
-   def find_launcher(use_native)
-     if use_native
-@@ -444,8 +447,8 @@ module Commands
-           --no-sforceimports                         do not run sforceimports before building
-           parser                                     build the parser
-           options                                    build the options
--          graalvm                                    build a minimal JVM-only GraalVM containing only TruffleRuby, 
--                                                     available by default in mxbuild/truffleruby-jvm, 
-+          graalvm                                    build a minimal JVM-only GraalVM containing only TruffleRuby,
-+                                                     available by default in mxbuild/truffleruby-jvm,
-                                                      the Ruby is symlinked into rbenv or chruby if available
-               --graal      include the GraalVM Compiler in the build
-               --native     build native ruby image as well, available in mxbuild/truffleruby-native
-@@ -491,7 +494,7 @@ module Commands
-       jt test compiler                               run compiler tests
-       jt test integration [TESTS]                    run integration tests
-       jt test bundle [--jdebug]                      tests using bundler
--      jt test gems [TESTS]                           tests using gems 
-+      jt test gems [TESTS]                           tests using gems
-       jt test ecosystem [TESTS]                      tests using the wider ecosystem such as bundler, Rails, etc
-       jt test cexts [--no-openssl] [--no-gems] [test_names...]
-                                                      run C extension tests (set GEM_HOME)
diff --git a/pkgs/development/compilers/graalvm/006_mx_copylib.py.patch b/pkgs/development/compilers/graalvm/006_mx_copylib.py.patch
deleted file mode 100644
index 43ca3e16832..00000000000
--- a/pkgs/development/compilers/graalvm/006_mx_copylib.py.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/mx.fastr/mx_copylib.py b/mx.fastr/mx_copylib.py
-index 4f57e1954..db45220d9 100644
---- a/mx.fastr/mx_copylib.py
-+++ b/mx.fastr/mx_copylib.py
-@@ -54,6 +54,9 @@ def _copylib(lib, libpath, plain_libpath_base, target):
-     else:
-         try:
-             if platform.system() == 'Linux':
-+                # https://github.com/oracle/fastr/issues/110
-+                if libpath.endswith("libgcc_s.so"):
-+                    libpath = libpath + ".1"
-                 output = subprocess.check_output(['objdump', '-p', libpath])
-             elif platform.system() == 'SunOS':
-                 output = subprocess.check_output(['elfdump', '-d', libpath])
diff --git a/pkgs/development/compilers/graalvm/007_unimplemented.c.patch b/pkgs/development/compilers/graalvm/007_unimplemented.c.patch
deleted file mode 100644
index 96cca7ed239..00000000000
--- a/pkgs/development/compilers/graalvm/007_unimplemented.c.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff --git a/com.oracle.truffle.r.native/fficall/src/common/unimplemented.c b/com.oracle.truffle.r.native/fficall/src/common/unimplemented.c
-index dcf081316..c2cb4879b 100644
---- a/com.oracle.truffle.r.native/fficall/src/common/unimplemented.c
-+++ b/com.oracle.truffle.r.native/fficall/src/common/unimplemented.c
-@@ -20,8 +20,10 @@
- 
- #include <Rinternals.h>
- #include <stdlib.h>
-+#include <rlocale.h>
- 
- #include <R_ext/eventloop.h>
-+#include <R_ext/GraphicsEngine.h>
- #include <Defn.h>
- 
- Rboolean known_to_be_latin1 = FALSE;
-@@ -166,3 +168,69 @@ int Scollate(SEXP a, SEXP b) {
- void z_prec_r(Rcomplex *r, Rcomplex *x, double digits) {
-     unimplemented("z_prec_r");
- }
-+
-+int Rf_AdobeSymbol2ucs2(int n) {
-+  unimplemented("Rf_AdobeSymbol2ucs2");
-+  return 0;
-+}
-+
-+size_t Mbrtowc(wchar_t *wc, const char *s, size_t n, mbstate_t *ps) {
-+  unimplemented("Mbrtowc");
-+  return 0;
-+}
-+
-+double R_GE_VStrHeight(const char *s, cetype_t enc, const pGEcontext gc, pGEDevDesc dd) {
-+  unimplemented("R_GE_VStrHeight");
-+  return 0;
-+}
-+
-+void R_GE_VText(double x, double y, const char * const s, cetype_t enc,
-+		double x_justify, double y_justify, double rotation,
-+		const pGEcontext gc, pGEDevDesc dd) {
-+  unimplemented("R_GE_VText");
-+}
-+
-+double R_GE_VStrWidth(const char *s, cetype_t enc, const pGEcontext gc, pGEDevDesc dd) {
-+  unimplemented("R_GE_VStrWidth");
-+}
-+
-+void setulb(int n, int m, double *x, double *l, double *u, int *nbd,
-+	    double *f, double *g, double factr, double *pgtol,
-+	    double *wa, int * iwa, char *task, int iprint, int *isave) {
-+  unimplemented("setulb");
-+}
-+
-+void genptry(int n, double *p, double *ptry, double scale, void *ex) {
-+  unimplemented("genptry");
-+}
-+
-+double EXP(double x) {
-+  unimplemented("EXP");
-+  return 0;
-+}
-+
-+double LOG(double x) {
-+  unimplemented("LOG");
-+  return 0;
-+}
-+
-+Rwchar_t Rf_utf8toucs32(wchar_t high, const char *s) {
-+  unimplemented("Rf_utf8toucs32");
-+  return 0;
-+}
-+
-+size_t mbtoucs(unsigned int *wc, const char *s, size_t n) {
-+  unimplemented("mbtoucs");
-+  return (size_t) 0;
-+}
-+
-+
-+int DispatchOrEval(SEXP call, SEXP op, const char *generic, SEXP args,
-+		   SEXP rho, SEXP *ans, int dropmissing, int argsevald) {
-+  unimplemented("DispatchOrEval");
-+  return 0;
-+}
-+
-+void ENSURE_NAMEDMAX (SEXP x) {
-+  unimplemented("ENSURE_NAMEDMAX");
-+}
diff --git a/pkgs/development/compilers/graalvm/008_remove_jfr.patch b/pkgs/development/compilers/graalvm/008_remove_jfr.patch
deleted file mode 100644
index 1aea044c802..00000000000
--- a/pkgs/development/compilers/graalvm/008_remove_jfr.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/mx.jvmci/suite.py b/mx.jvmci/suite.py
-index 9690c0a38f..fa1d36b7e1 100644
---- a/mx.jvmci/suite.py
-+++ b/mx.jvmci/suite.py
-@@ -241,18 +241,7 @@ suite = {
-       "workingSets" : "JVMCI,HotSpot,SPARC",
-     },
- 
--    "jdk.vm.ci.hotspot.jfr" : {
--      "subDir" : "jvmci",
--      "sourceDirs" : ["src"],
--      "dependencies" : [
--        "jdk.vm.ci.hotspot",
--        "JFR",
--      ],
--      "checkstyle" : "jdk.vm.ci.hotspot",
--      "javaCompliance" : "1.8",
--      "profile" : "",
--      "workingSets" : "JVMCI,HotSpot",
--    },
-+
- 
-     "hotspot" : {
-       "native" : True,
-@@ -354,7 +343,7 @@ suite = {
-         "jdk.vm.ci.hotspot.aarch64",
-         "jdk.vm.ci.hotspot.amd64",
-         "jdk.vm.ci.hotspot.sparc",
--        "jdk.vm.ci.hotspot.jfr",
-+
-       ],
-       "distDependencies" : [
-         "JVMCI_SERVICES",
diff --git a/pkgs/development/compilers/graalvm/009_remove_signedness_verifier.patch b/pkgs/development/compilers/graalvm/009_remove_signedness_verifier.patch
deleted file mode 100644
index cf8bd405066..00000000000
--- a/pkgs/development/compilers/graalvm/009_remove_signedness_verifier.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/query/SizeAndSignednessVerifier.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/query/SizeAndSignednessVerifier.java
-index 23a76357fd2..f13694b6ed7 100644
---- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/query/SizeAndSignednessVerifier.java
-+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/query/SizeAndSignednessVerifier.java
-@@ -249,15 +249,6 @@ public final class SizeAndSignednessVerifier extends NativeInfoTreeVisitor {
-     }
- 
-     private void checkSignedness(boolean isUnsigned, ResolvedJavaType type, ResolvedJavaMethod method) {
--        if (isSigned(type)) {
--            if (isUnsigned) {
--                addError("Type " + type.toJavaName(false) + " is signed, but accessed C value is unsigned", method);
--            }
--        } else if (nativeLibs.isWordBase(type)) {
--            /* every Word type other than Signed is assumed to be unsigned. */
--            if (!isUnsigned) {
--                addError("Type " + type.toJavaName(false) + " is unsigned, but accessed C value is signed", method);
--            }
--        }
-+
-     }
- }
diff --git a/pkgs/development/compilers/graalvm/010_mx_substratevm.py b/pkgs/development/compilers/graalvm/010_mx_substratevm.py
deleted file mode 100644
index afb6b568167..00000000000
--- a/pkgs/development/compilers/graalvm/010_mx_substratevm.py
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/substratevm/mx.substratevm/mx_substratevm.py b/substratevm/mx.substratevm/mx_substratevm.py
-index b89163ef983..0fd0138b336 100644
---- a/substratevm/mx.substratevm/mx_substratevm.py
-+++ b/substratevm/mx.substratevm/mx_substratevm.py
-@@ -189,7 +189,7 @@ if str(svm_java_compliance().value) not in GRAAL_COMPILER_FLAGS_MAP:
-     mx.abort("Substrate VM does not support this Java version: " + str(svm_java_compliance()))
- GRAAL_COMPILER_FLAGS = GRAAL_COMPILER_FLAGS_BASE + GRAAL_COMPILER_FLAGS_MAP[str(svm_java_compliance().value)]
- 
--IMAGE_ASSERTION_FLAGS = ['-H:+VerifyGraalGraphs', '-H:+VerifyPhases']
-+IMAGE_ASSERTION_FLAGS = ['-H:+VerifyGraalGraphs', '-H:+VerifyPhases', '-H:+ReportExceptionStackTraces']
- suite = mx.suite('substratevm')
- svmSuites = [suite]
- clibraryDists = ['SVM_HOSTED_NATIVE']
diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix
deleted file mode 100644
index 9430ded8b6a..00000000000
--- a/pkgs/development/compilers/graalvm/default.nix
+++ /dev/null
@@ -1,540 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, fetchurl, fetchzip, fetchgit, mercurial_4, python27, setJavaClassPath,
-  which, zlib, makeWrapper, openjdk, unzip, git, clang, llvm, icu, ruby, glibc, bash, gcc, libobjc,
-  xcodebuild, gfortran, readline, bzip2, xz, pcre, curl, ed, libresolv, libiconv, writeScriptBin,
-  openssl, perl, CoreFoundation, Foundation, JavaNativeFoundation, JavaRuntimeSupport, JavaVM, Cocoa
-}:
-
-let
-  version = "19.2.1";
-  mercurial = mercurial_4;
-  truffleMake = ./truffle.make;
-  makeMxGitCache = list: out: ''
-     mkdir ${out}
-    ${lib.concatMapStrings ({ url, name, rev, sha256 }: ''
-      mkdir -p ${out}/${name}
-      cp -rf ${fetchgit { inherit url rev sha256; }}/* ${out}/${name}
-    ''
-    ) list}
-
-    # # GRAAL-NODEJS # #
-    chmod -R +rw ${out}
-    sed -i "s|#include \"../../../../mxbuild/trufflenode/coremodules/node_snapshots.h\"| \
-           #include \"$NIX_BUILD_TOP/mxbuild/graal-nodejs/trufflenode/coremodules/node_snapshots.h\"|g" \
-      ${out}/graaljs/graal-nodejs/deps/v8/src/graal/callbacks.cc
-
-    # patch the shebang in python script runner
-    chmod -R +rw ${out}/graaljs/graal-nodejs/mx.graal-nodejs/python2
-    patchShebangs ${out}/graaljs/graal-nodejs/mx.graal-nodejs/python2/python
-
-    # # TUFFLE-RUBY # #
-    (cd ${out}/truffleruby && git apply ${./005_tool_jt.rb.patch})
-    patchShebangs ${out}/truffleruby/tool/query-versions-json.rb
-
-    substituteInPlace ${out}/truffleruby/src/main/c/Makefile \
-      --replace '(MX_HOME)/mx' '(MX_HOME)/mx-internal'
-
-    substituteInPlace ${out}/truffleruby/src/processor/java/org/truffleruby/processor/BuildInformationProcessor.java \
-      --replace 'trufflerubyHome = findHome();' \
-                'trufflerubyHome = new File(System.getenv("MX_GIT_CACHE_DIR"), "truffleruby");' \
-      --replace tool/query-versions-json.rb 'ruby tool/query-versions-json.rb' \
-      --replace 'revision = runCommand("git rev-parse --short=8 HEAD");' \
-                'revision = "${version}";' \
-      --replace 'compileDate = runCommand("git log -1 --date=short --pretty=format:%cd");' \
-                'compileDate = "1970-01-01";'
-
-    substituteInPlace ${out}/truffleruby/mx.truffleruby/mx_truffleruby.py \
-      --replace "mx_binary = join(mx._mx_home, 'mx')" "mx_binary = join(mx._mx_home, 'mx-internal')"
-
-    # # FASTR # #
-    (cd ${out}/fastr && git apply ${ ./006_mx_copylib.py.patch })
-    (cd ${out}/fastr && git apply ${ ./007_unimplemented.c.patch })
-    substituteInPlace ${out}/fastr/com.oracle.truffle.r.parser.processor/src/com/oracle/truffle/r/parser/processor/GenerateRParserProcessor.java \
-      --replace 'File suiteRoot = srcGenDir.getCanonicalFile().getParentFile().getParentFile().getParentFile();' \
-                'File suiteRoot = new File(System.getenv("MX_GIT_CACHE_DIR"), "fastr");'
-
-    substituteInPlace ${out}/fastr/com.oracle.truffle.r.native/gnur/Makefile.libs \
-      --replace 'mx -p' 'mx-internal -p'
-
-    substituteInPlace ${out}/fastr/com.oracle.truffle.r.native/include/Makefile \
-      --replace 'mx -p' 'mx-internal -p'
-
-    substituteInPlace ${out}/fastr/com.oracle.truffle.r.native/fficall/Makefile \
-      --replace 'mx -p' 'mx-internal -p'
-
-    substituteInPlace ${out}/fastr/com.oracle.truffle.r.native.recommended/Makefile \
-      --replace 'mx -p' 'mx-internal -p'
-
-    # Make sure that the logs aren't hidden when compiling gnur
-    substituteInPlace ${out}/fastr/com.oracle.truffle.r.native/gnur/Makefile.gnur \
-      --replace '> gnur_configure.log 2>&1' "" \
-      --replace '> gnur_make.log 2>&1' ""
-
-    substituteInPlace ${out}/fastr/com.oracle.truffle.r.native/run/Linux/Renviron \
-      --replace /bin/ "" \
-      --replace /usr/bin/ ""
-
-    sed -i "s|exec \$mx|exec mx-internal|g" ${out}/fastr/com.oracle.truffle.r.native/run/*.sh
-    chmod +x ${out}/fastr/com.oracle.truffle.r.native/run/*.sh
-    patchShebangs ${out}/fastr/com.oracle.truffle.r.native/run/*.sh
-
-    cd ${out}
-    hg init
-    hg add
-    hg commit -m 'dummy commit'
-    hg tag      ${lib.escapeShellArg "vm${version}"}
-    hg checkout ${lib.escapeShellArg "vm${version}"}
-  '';
-
-  # pre-download some cache entries ('mx' will not be able to download under nixbld)
-  makeMxCache = list:
-    stdenv.mkDerivation {
-      name = "mx-cache";
-      nativeBuildInputs = [ unzip ];
-      buildCommand = with lib; ''
-        mkdir $out
-        ${lib.concatMapStrings
-          ({url, name, sha1, isNinja ? false}: ''
-            install -D ${fetchurl { inherit url sha1; }} $out/${name}
-            echo -n ${sha1} > $out/${name}.sha1
-            ${if isNinja then ''
-                export BASENAME=${removeSuffix ".zip" name}
-                mkdir "$out/$BASENAME.extracted" &&
-                unzip "$out/${name}" -d "$out/$BASENAME.extracted"
-
-                # Ninja is called later in the build process
-               ${lib.optionalString stdenv.isLinux ''
-                 if [ -f $out/$BASENAME.extracted/ninja ]; then
-                   patchelf --set-interpreter \
-                     "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-                     --set-rpath "${stdenv.cc.cc.lib}/lib64" \
-                     $out/$BASENAME.extracted/ninja
-                 fi''}
-                ''
-              else ""}
-         '') list}
-      '';
-    };
-
-  jvmci8-mxcache = [
-    rec { sha1 = "53addc878614171ff0fcbc8f78aed12175c22cdb"; name = "JACOCOCORE_0.8.4_${sha1}/jacococore-0.8.4.jar";                                   url = "mirror://maven/org/jacoco/org.jacoco.core/0.8.4/org.jacoco.core-0.8.4.jar"; }
-    rec { sha1 = "9bd1fa334d941005bc9ab3ac92478a590f5b7d73"; name = "JACOCOCORE_0.8.4_${sha1}/jacococore-0.8.4.sources.jar";                           url = "mirror://maven/org/jacoco/org.jacoco.core/0.8.4/org.jacoco.core-0.8.4-sources.jar"; }
-    rec { sha1 = "e5ca9511493b7e3bc2cabdb8ded92e855f3aac32"; name = "JACOCOREPORT_0.8.4_${sha1}/jacocoreport-0.8.4.jar";                               url = "mirror://maven/org/jacoco/org.jacoco.report/0.8.4/org.jacoco.report-0.8.4.jar"; }
-    rec { sha1 = "eb61e479b35b467954f28a565c094c563b790e19"; name = "JACOCOREPORT_0.8.4_${sha1}/jacocoreport-0.8.4.sources.jar";                       url = "mirror://maven/org/jacoco/org.jacoco.report/0.8.4/org.jacoco.report-0.8.4-sources.jar"; }
-    rec { sha1 = "869021a6d90cfb008b12e83fccbe42eca29e5355"; name = "JACOCOAGENT_0.8.4_${sha1}/jacocoagent-0.8.4.jar";                                 url = "mirror://maven/org/jacoco/org.jacoco.agent/0.8.4/org.jacoco.agent-0.8.4-runtime.jar"; }
-    rec { sha1 = "306816fb57cf94f108a43c95731b08934dcae15c"; name = "JOPTSIMPLE_4_6_${sha1}/joptsimple-4-6.jar";                                       url = "mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6.jar"; }
-    rec { sha1 = "9cd14a61d7aa7d554f251ef285a6f2c65caf7b65"; name = "JOPTSIMPLE_4_6_${sha1}/joptsimple-4-6.sources.jar";                               url = "mirror://maven/net/sf/jopt-simple/jopt-simple/4.6/jopt-simple-4.6-sources.jar"; }
-    rec { sha1 = "fa29aa438674ff19d5e1386d2c3527a0267f291e"; name = "ASM_7.1_${sha1}/asm-7.1.jar";                                                     url = "mirror://maven/org/ow2/asm/asm/7.1/asm-7.1.jar"; }
-    rec { sha1 = "9d170062d595240da35301362b079e5579c86f49"; name = "ASM_7.1_${sha1}/asm-7.1.sources.jar";                                             url = "mirror://maven/org/ow2/asm/asm/7.1/asm-7.1-sources.jar"; }
-    rec { sha1 = "a3662cf1c1d592893ffe08727f78db35392fa302"; name = "ASM_TREE_7.1_${sha1}/asm-tree-7.1.jar";                                           url = "mirror://maven/org/ow2/asm/asm-tree/7.1/asm-tree-7.1.jar"; }
-    rec { sha1 = "157238292b551de8680505fa2d19590d136e25b9"; name = "ASM_TREE_7.1_${sha1}/asm-tree-7.1.sources.jar";                                   url = "mirror://maven/org/ow2/asm/asm-tree/7.1/asm-tree-7.1-sources.jar"; }
-    rec { sha1 = "379e0250f7a4a42c66c5e94e14d4c4491b3c2ed3"; name = "ASM_ANALYSIS_7.1_${sha1}/asm-analysis-7.1.jar";                                   url = "mirror://maven/org/ow2/asm/asm-analysis/7.1/asm-analysis-7.1.jar"; }
-    rec { sha1 = "36789198124eb075f1a5efa18a0a7812fb16f47f"; name = "ASM_ANALYSIS_7.1_${sha1}/asm-analysis-7.1.sources.jar";                           url = "mirror://maven/org/ow2/asm/asm-analysis/7.1/asm-analysis-7.1-sources.jar"; }
-    rec { sha1 = "431dc677cf5c56660c1c9004870de1ed1ea7ce6c"; name = "ASM_COMMONS_7.1_${sha1}/asm-commons-7.1.jar";                                     url = "mirror://maven/org/ow2/asm/asm-commons/7.1/asm-commons-7.1.jar"; }
-    rec { sha1 = "a62ff3ae6e37affda7c6fb7d63b89194c6d006ee"; name = "ASM_COMMONS_7.1_${sha1}/asm-commons-7.1.sources.jar";                             url = "mirror://maven/org/ow2/asm/asm-commons/7.1/asm-commons-7.1-sources.jar"; }
-    rec { sha1 = "ec2544ab27e110d2d431bdad7d538ed509b21e62"; name = "COMMONS_MATH3_3_2_${sha1}/commons-math3-3-2.jar";                                 url = "mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2.jar"; }
-    rec { sha1 = "cd098e055bf192a60c81d81893893e6e31a6482f"; name = "COMMONS_MATH3_3_2_${sha1}/commons-math3-3-2.sources.jar";                         url = "mirror://maven/org/apache/commons/commons-math3/3.2/commons-math3-3.2-sources.jar"; }
-    rec { sha1 = "442447101f63074c61063858033fbfde8a076873"; name = "JMH_1_21_${sha1}/jmh-1-21.jar";                                                   url = "mirror://maven/org/openjdk/jmh/jmh-core/1.21/jmh-core-1.21.jar"; }
-    rec { sha1 = "a6fe84788bf8cf762b0e561bf48774c2ea74e370"; name = "JMH_1_21_${sha1}/jmh-1-21.sources.jar";                                           url = "mirror://maven/org/openjdk/jmh/jmh-core/1.21/jmh-core-1.21-sources.jar"; }
-    rec { sha1 = "7aac374614a8a76cad16b91f1a4419d31a7dcda3"; name = "JMH_GENERATOR_ANNPROCESS_1_21_${sha1}/jmh-generator-annprocess-1-21.jar";         url = "mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21.jar"; }
-    rec { sha1 = "fb48e2a97df95f8b9dced54a1a37749d2a64d2ae"; name = "JMH_GENERATOR_ANNPROCESS_1_21_${sha1}/jmh-generator-annprocess-1-21.sources.jar"; url = "mirror://maven/org/openjdk/jmh/jmh-generator-annprocess/1.21/jmh-generator-annprocess-1.21-sources.jar"; }
-    rec { sha1 = "2973d150c0dc1fefe998f834810d68f278ea58ec"; name = "JUNIT_${sha1}/junit.jar";                                                         url = "mirror://maven/junit/junit/4.12/junit-4.12.jar"; }
-    rec { sha1 = "a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa"; name = "JUNIT_${sha1}/junit.sources.jar";                                                 url = "mirror://maven/junit/junit/4.12/junit-4.12-sources.jar"; }
-    rec { sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0"; name = "HAMCREST_${sha1}/hamcrest.jar";                                                   url = "mirror://maven/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"; }
-    rec { sha1 = "1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b"; name = "HAMCREST_${sha1}/hamcrest.sources.jar";                                           url = "mirror://maven/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar"; }
-    rec { sha1 = "0d031013db9a80d6c88330c42c983fbfa7053193"; name = "hsdis_${sha1}/hsdis.so";                                                          url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hsdis/intel/hsdis-amd64-linux-${sha1}.so"; }
-] ++ lib.optionals stdenv.isLinux [
-  rec { sha1 = "0d031013db9a80d6c88330c42c983fbfa7053193"; name = "hsdis_${sha1}/hsdis.so";                                                          url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hsdis/intel/hsdis-amd64-linux-${sha1}.so"; }
-                                                                          ]
-++ lib.optionals stdenv.isDarwin [
-  rec { sha1 = "67f6d23cbebd8998450a88b5bef362171f66f11a"; name = "hsdis_${sha1}/hsdis.dylib";                                                       url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/hsdis/intel/hsdis-amd64-darwin-${sha1}.dylib"; }
-                                                                          ];
-
-  graal-mxcache = jvmci8-mxcache ++ [
-    # rec { sha1 = "5001adab652fc4eb35e30cdefbb0765442f8b7db"; name = "LLVM_ORG_LIBCXX_SRC_${sha1}/llvm-org-libcxx-src.tar.gz";                          url = "https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/compiler-rt-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-linux-amd64.tar.gz"; }
-    rec { sha1 = "5001adab652fc4eb35e30cdefbb0765442f8b7db"; name = "LLVM_ORG_COMPILER_RT_LINUX_${sha1}/llvm-org-compiler-rt-linux.tar.gz";            url = "https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/compiler-rt-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-linux-amd64.tar.gz"; }
-    rec { sha1 = "a990b2dba1c706f5c43c56fedfe70bad9a695852"; name = "LLVM_WRAPPER_${sha1}/llvm-wrapper.jar";                                           url = "mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2.jar"; }
-    rec { sha1 = "decbd95d46092fa9afaf2523b5b23d07ad7ad6bc"; name = "LLVM_WRAPPER_${sha1}/llvm-wrapper.sources.jar";                                   url = "mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2-sources.jar"; }
-    rec { sha1 = "cfa6a0259d98bff5aa8d41ba11b4d1dad648fbaa"; name = "JAVACPP_${sha1}/javacpp.jar";                                                     url = "mirror://maven/org/bytedeco/javacpp/1.4.2/javacpp-1.4.2.jar"; }
-    rec { sha1 = "fdb2d2c17f6b91cdd5421554396da8905f0dfed2"; name = "JAVACPP_${sha1}/javacpp.sources.jar";                                             url = "mirror://maven/org/bytedeco/javacpp/1.4.2/javacpp-1.4.2-sources.jar"; }
-    rec { sha1 = "702ca2d0ae93841c5ab75e4d119b29780ec0b7d9"; name = "NINJA_SYNTAX_${sha1}/ninja-syntax.tar.gz";                                        url = "https://pypi.org/packages/source/n/ninja_syntax/ninja_syntax-1.7.2.tar.gz"; }
-    rec { sha1 = "f2cfb09cee12469ff64f0d698b13de19903bb4f7"; name = "NanoHTTPD-WebSocket_${sha1}/nanohttpd-websocket.jar";                             url = "mirror://maven/org/nanohttpd/nanohttpd-websocket/2.3.1/nanohttpd-websocket-2.3.1.jar"; }
-    rec { sha1 = "a8d54d1ca554a77f377eff6bf9e16ca8383c8f6c"; name = "NanoHTTPD_${sha1}/nanohttpd.jar";                                                 url = "mirror://maven/org/nanohttpd/nanohttpd/2.3.1/nanohttpd-2.3.1.jar"; }
-    rec { sha1 = "946f8aa9daa917dd81a8b818111bec7e288f821a"; name = "ANTLR4_${sha1}/antlr4.jar";                                                       url = "mirror://maven/org/antlr/antlr4-runtime/4.7.1/antlr4-runtime-4.7.1.jar"; }
-    rec { sha1 = "c3aeac59c022bdc497c8c48ed86fa50450e4896a"; name = "JLINE_${sha1}/jline.jar";                                                         url = "mirror://maven/jline/jline/2.14.6/jline-2.14.6.jar"; }
-    rec { sha1 = "d0bdc21c5e6404726b102998e44c66a738897905"; name = "JAVA_ALLOCATION_INSTRUMENTER_${sha1}/java-allocation-instrumenter.jar";           url = "mirror://maven/com/google/code/java-allocation-instrumenter/java-allocation-instrumenter/3.1.0/java-allocation-instrumenter-3.1.0.jar"; }
-    rec { sha1 = "0da08b8cce7bbf903602a25a3a163ae252435795"; name = "ASM5_${sha1}/asm5.jar";                                                           url = "mirror://maven/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar"; }
-    rec { sha1 = "396ce0c07ba2b481f25a70195c7c94922f0d1b0b"; name = "ASM_TREE5_${sha1}/asm-tree5.jar";                                                 url = "mirror://maven/org/ow2/asm/asm-tree/5.0.4/asm-tree-5.0.4.jar"; }
-    rec { sha1 = "280c265b789e041c02e5c97815793dfc283fb1e6"; name = "LIBFFI_SOURCES_${sha1}/libffi-sources.tar.gz";                                    url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/libffi-3.2.1.tar.gz"; }
-    rec { sha1 = "8819cea8bfe22c9c63f55465e296b3855ea41786"; name = "TruffleJSON_${sha1}/trufflejson.jar";                                             url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/trufflejson-20180130.jar"; }
-    rec { sha1 = "9712a8124c40298015f04a74f61b3d81a51513af"; name = "CHECKSTYLE_8.8_${sha1}/checkstyle-8.8.jar";                                       url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/checkstyle-8.8-all.jar"; }
-    rec { sha1 = "8dc5a90bed5f51d7538d05b8c31c31b7dfddbd66"; name = "VISUALVM_COMMON_${sha1}/visualvm-common.tar.gz";                                  url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm/visualvm-19_0_0-20.tar.gz"; }
-    rec { sha1 = "e6e60889b7211a80b21052a249bd7e0f88f79fee"; name = "Java-WebSocket_${sha1}/java-websocket.jar";                                       url = "mirror://maven/org/java-websocket/Java-WebSocket/1.3.9/Java-WebSocket-1.3.9.jar"; }
-    rec { sha1 = "7a4d00d5ec5febd252a6182e8b6e87a0a9821f81"; name = "ICU4J_${sha1}/icu4j.jar";                                                         url = "mirror://maven/com/ibm/icu/icu4j/62.1/icu4j-62.1.jar"; }
-    # This duplication of asm with underscore and minus is totally weird
-    rec { sha1 = "c01b6798f81b0fc2c5faa70cbe468c275d4b50c7"; name = "ASM-6.2.1_${sha1}/asm-6.2.1.jar";                                                 url = "mirror://maven/org/ow2/asm/asm/6.2.1/asm-6.2.1.jar"; }
-    rec { sha1 = "cee28077ac7a63d3de0b205ec314d83944ff6267"; name = "ASM-6.2.1_${sha1}/asm-6.2.1.sources.jar";                                         url = "mirror://maven/org/ow2/asm/asm/6.2.1/asm-6.2.1-sources.jar"; }
-    rec { sha1 = "332b022092ecec53cdb6272dc436884b2d940615"; name = "ASM_TREE-6.2.1_${sha1}/asm-tree-6.2.1.jar";                                       url = "mirror://maven/org/ow2/asm/asm-tree/6.2.1/asm-tree-6.2.1.jar"; }
-    rec { sha1 = "072bd64989090e4ed58e4657e3d4481d96f643af"; name = "ASM_TREE-6.2.1_${sha1}/asm-tree-6.2.1.sources.jar";                               url = "mirror://maven/org/ow2/asm/asm-tree/6.2.1/asm-tree-6.2.1-sources.jar"; }
-    rec { sha1 = "e8b876c5ccf226cae2f44ed2c436ad3407d0ec1d"; name = "ASM_ANALYSIS-6.2.1_${sha1}/asm-analysis-6.2.1.jar";                               url = "mirror://maven/org/ow2/asm/asm-analysis/6.2.1/asm-analysis-6.2.1.jar"; }
-    rec { sha1 = "b0b249bd185677648692e7c57b488b6d7c2a6653"; name = "ASM_ANALYSIS-6.2.1_${sha1}/asm-analysis-6.2.1.sources.jar";                       url = "mirror://maven/org/ow2/asm/asm-analysis/6.2.1/asm-analysis-6.2.1-sources.jar"; }
-    rec { sha1 = "eaf31376d741a3e2017248a4c759209fe25c77d3"; name = "ASM_COMMONS-6.2.1_${sha1}/asm-commons-6.2.1.jar";                                 url = "mirror://maven/org/ow2/asm/asm-commons/6.2.1/asm-commons-6.2.1.jar"; }
-    rec { sha1 = "667fa0f9d370e7848b0e3d173942855a91fd1daf"; name = "ASM_COMMONS-6.2.1_${sha1}/asm-commons-6.2.1.sources.jar";                         url = "mirror://maven/org/ow2/asm/asm-commons/6.2.1/asm-commons-6.2.1-sources.jar"; }
-    # From here on the deps are new
-    rec { sha1 = "400d664d7c92a659d988c00cb65150d1b30cf339"; name = "ASM_UTIL-6.2.1_${sha1}/asm-util-6.2.1.jar";                                       url = "mirror://maven/org/ow2/asm/asm-util/6.2.1/asm-util-6.2.1.jar"; }
-    rec { sha1 = "c9f7246bf93bb0dc7fe9e7c9eca531a8fb98d252"; name = "ASM_UTIL-6.2.1_${sha1}/asm-util-6.2.1.sources.jar";                               url = "mirror://maven/org/ow2/asm/asm-util/6.2.1/asm-util-6.2.1-sources.jar"; }
-    rec { sha1 = "4b52bd03014f6d080ef0528865c1ee50621e35c6"; name = "NETBEANS_PROFILER_${sha1}/netbeans-profiler.jar";                                 url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/truffle/js/org-netbeans-lib-profiler-8.2-201609300101.jar"; }
-    rec { sha1 = "b5840706cc8ce639fcafeab1bc61da2d8aa37afd"; name = "NASHORN_INTERNAL_TESTS_${sha1}/nashorn-internal-tests.jar";                       url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/truffle/js/nashorn-internal-tests-700f5e3f5ff2.jar"; }
-    rec { sha1 = "9577018f9ce3636a2e1cb0a0c7fe915e5098ded5"; name = "JACKSON_ANNOTATIONS_${sha1}/jackson-annotations.jar";                             url = "mirror://maven/com/fasterxml/jackson/core/jackson-annotations/2.8.6/jackson-annotations-2.8.6.jar"; }
-    rec { sha1 = "2ef7b1cc34de149600f5e75bc2d5bf40de894e60"; name = "JACKSON_CORE_${sha1}/jackson-core.jar";                                           url = "mirror://maven/com/fasterxml/jackson/core/jackson-core/2.8.6/jackson-core-2.8.6.jar"; }
-    rec { sha1 = "c43de61f74ecc61322ef8f402837ba65b0aa2bf4"; name = "JACKSON_DATABIND_${sha1}/jackson-databind.jar";                                   url = "mirror://maven/com/fasterxml/jackson/core/jackson-databind/2.8.6/jackson-databind-2.8.6.jar"; }
-    rec { sha1 = "2838952e91baa37ac73ed817451268a193ba440a"; name = "JCODINGS_${sha1}/jcodings.jar";                                                   url = "mirror://maven/org/jruby/jcodings/jcodings/1.0.40/jcodings-1.0.40.jar"; }
-    rec { sha1 = "0ed89e096c83d540acac00d6ee3ea935b4c905ff"; name = "JCODINGS_${sha1}/jcodings.sources.jar";                                           url = "mirror://maven/org/jruby/jcodings/jcodings/1.0.40/jcodings-1.0.40-sources.jar"; }
-    rec { sha1 = "5dbb09787a9b8780737b71fbf942235ef59051b9"; name = "JONI_${sha1}/joni.jar";                                                           url = "mirror://maven/org/jruby/joni/joni/2.1.25/joni-2.1.25.jar"; }
-    rec { sha1 = "505a09064f6e2209616f38724f6d97d8d889aa92"; name = "JONI_${sha1}/joni.sources.jar";                                                   url = "mirror://maven/org/jruby/joni/joni/2.1.25/joni-2.1.25-sources.jar"; }
-    rec { sha1 = "c4f7d054303948eb6a4066194253886c8af07128"; name = "XZ-1.8_${sha1}/xz-1.8.jar";                                                       url = "mirror://maven/org/tukaani/xz/1.8/xz-1.8.jar"; }
-    rec { sha1 = "9314d3d372b05546a33791fbc8dd579c92ebd16b"; name = "GNUR_${sha1}/gnur.tar.gz";                                                        url = "http://cran.rstudio.com/src/base/R-3/R-3.5.1.tar.gz"; }
-    rec { sha1 = "90aa8308da72ae610207d8f6ca27736921be692a"; name = "ANTLR4_COMPLETE_${sha1}/antlr4-complete.jar";                                     url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/antlr-4.7.1-complete.jar"; }] ++
-  lib.optionals stdenv.isLinux [
-    rec { sha1 = "df4c1f784294d02a82d78664064248283bfcc297"; name = "LLVM_ORG_${sha1}/llvm-org.tar.gz";                                                url = "https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/llvm-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-linux-amd64.tar.gz"; }
-    rec { sha1 = "344483aefa15147c121a8fb6fb35a2406768cc5c"; name = "LLVM_PLATFORM_SPECIFIC_${sha1}/llvm-platform-specific.jar";                       url = "mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2-linux-x86_64.jar"; }
-    rec { sha1 = "fd1a723d62cbbc591041d303e8b151d89f131643"; name = "VISUALVM_PLATFORM_SPECIFIC_${sha1}/visualvm-platform-specific.tar.gz";            url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm/visualvm-19_0_0-20-linux-amd64.tar.gz"; }
-    rec { sha1 = "987234c4ce45505c21302e097c24efef4873325c"; name = "NINJA_${sha1}/ninja.zip";                                                         url = "https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip";
-          isNinja = true; }] ++
-  lib.optionals stdenv.isDarwin [
-    rec { sha1 = "0fa1af180755fa4cc018ee9be33f2d7d827593c4"; name = "LLVM_ORG_${sha1}/llvm-org.tar.gz";                                                url = "https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/llvm-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-darwin-amd64.tar.gz"; }
-    rec { sha1 = "57bc74574104a9e0a2dc4d7a71ffcc5731909e57"; name = "LLVM_PLATFORM_SPECIFIC_${sha1}/llvm-platform-specific.jar";                       url = "mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2-macosx-x86_64.jar"; }
-    rec { sha1 = "ae23bb365930f720acc88c62640bae6852a37d67"; name = "VISUALVM_PLATFORM_SPECIFIC_${sha1}/visualvm-platform-specific.tar.gz";            url = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/visualvm/visualvm-19_0_0-20-macosx-x86_64.tar.gz"; }
-    rec { sha1 = "8142c497f7dfbdb052a1e31960fdfe2c6f9a5ca2"; name = "NINJA_${sha1}/ninja.zip";                                                         url = "https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-mac.zip";
-          isNinja = true; }];
-
-  graal-mxcachegit = [
-    { sha256 = "01w39ms39gl3cw7c2fgcacr2yjg94im9x2x7p5g94l6xlcgqvcnr"; name = "graaljs";     url = "https://github.com/graalvm/graaljs.git";     rev = "vm-${version}"; }
-    { sha256 = "1dps9n5b9c80pbg1fmlwpffy6ina0f0h27di24kafc8isxrdggia"; name = "truffleruby"; url = "https://github.com/oracle/truffleruby.git";  rev = "vm-${version}"; }
-    { sha256 = "0jdpdqm3ld1wsasmi8ka26qf19cibjac8lrqm040h5vh0iqzxizy"; name = "fastr";       url = "https://github.com/oracle/fastr.git";        rev = "vm-${version}"; }
-    { sha256 = "1gv8vafwrafjzvgv4gwk4kcsb3bnvsx07qa5inc0bdyxy5shl381"; name = "graalpython"; url = "https://github.com/graalvm/graalpython.git"; rev = "vm-${version}"; }];
-
-  ninja-syntax = python27.pkgs.buildPythonPackage rec {
-    version = "1.7.2";
-    pname = "ninja_syntax";
-    doCheck = false;
-    src = python27.pkgs.fetchPypi {
-      inherit pname version;
-      sha256 = "07zg30m0khx55fv2gxxn7pqd549z0vk3x592mrdlk9l8krxwjb9l";
-    };
-  };
-
-  findbugs = fetchzip {
-    name   = "findbugs-3.0.0";
-    url    = "https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/findbugs-3.0.0.zip";
-    sha256 = "0sf5f9h1s6fmhfigjy81i109j1ani5kzdr4njlpq0mnkkh9fpr7m";
-  };
-
-  python27withPackages = python27.withPackages (ps: [ ninja-syntax ]);
-
-in rec {
-
-  mx = stdenv.mkDerivation rec {
-    version = "5.247.1";
-    pname = "mx";
-    src = fetchFromGitHub {
-      owner  = "graalvm";
-      repo   = "mx";
-      rev    = version;
-      sha256 = "038qr49rqzkhj76nqd27h8fysssnlpdhmy23ks2y81xlxhlzkc59";
-    };
-    nativeBuildInputs = [ makeWrapper ];
-    prePatch = ''
-      cp mx.py bak_mx.py
-    '';
-    patches = [ ./001_mx.py.patch ];
-    postPatch = ''
-      mv mx.py internal_mx.py
-      mv bak_mx.py mx.py
-    '';
-    buildPhase = ''
-      substituteInPlace mx --replace /bin/pwd pwd
-
-      # avoid crash with 'ValueError: ZIP does not support timestamps before 1980'
-      substituteInPlace internal_mx.py --replace \
-        'zipfile.ZipInfo(arcname, time.localtime(getmtime(join(root, f)))[:6])' \
-        'zipfile.ZipInfo(arcname, time.strptime ("1 Jan 1980", "%d %b %Y"       )[:6])'
-    '';
-    installPhase = ''
-      mkdir -p $out/bin
-      cp -dpR * $out/bin
-      wrapProgram $out/bin/mx \
-        --prefix PATH : ${lib.makeBinPath [ python27withPackages mercurial ]} \
-        --set    FINDBUGS_HOME ${findbugs}
-      makeWrapper ${python27}/bin/python $out/bin/mx-internal \
-        --add-flags "$out/bin/internal_mx.py" \
-        --prefix PATH : ${lib.makeBinPath [ python27withPackages mercurial ]} \
-        --set    FINDBUGS_HOME ${findbugs}
-    '';
-    meta = with lib; {
-      homepage = "https://github.com/graalvm/mx";
-      description = "Command-line tool used for the development of Graal projects";
-      license = licenses.gpl2;
-      platforms = python27.meta.platforms;
-    };
-  };
-
-  jvmci8 = stdenv.mkDerivation rec {
-    version = "19.3-b05";
-    pname = "jvmci";
-    src = fetchFromGitHub {
-      owner  = "graalvm";
-      repo   = "graal-jvmci-8";
-      rev    = "jvmci-${version}";
-      sha256 =  "0j7my76vldbrvki9x1gn9ics3x2z96j05jdy4nflbpik8i396114";
-    };
-    buildInputs = [ mx mercurial openjdk ] ++ lib.optionals stdenv.isDarwin [
-      libobjc CoreFoundation Foundation JavaNativeFoundation JavaRuntimeSupport JavaVM xcodebuild Cocoa
-    ];
-    postUnpack = ''
-      # a fake mercurial dir to prevent mx crash and supply the version to mx
-      ( cd $sourceRoot
-        hg init
-        hg add
-        hg commit -m 'dummy commit'
-        hg tag      ${lib.escapeShellArg src.rev}
-        hg checkout ${lib.escapeShellArg src.rev}
-      )
-    '';
-    patches = [ ./004_mx_jvmci.py.patch ] ++
-              lib.optional stdenv.isDarwin [
-                ./008_remove_jfr.patch ];
-    postPatch =''
-      # The hotspot version name regex fix
-      substituteInPlace mx.jvmci/mx_jvmci.py \
-        --replace "\\d+.\\d+-b\\d+" "\\d+.\\d+-b[g\\d][a\\d]"
-      # darwin: https://github.com/oracle/graal/issues/1816
-      substituteInPlace src/share/vm/code/compiledIC.cpp \
-        --replace 'entry == false' '*entry == false'
-    '';
-    hardeningDisable = [ "fortify" ];
-    NIX_CFLAGS_COMPILE = toString (lib.optional stdenv.isDarwin [
-      "-Wno-reserved-user-defined-literal"
-      "-Wno-c++11-narrowing"
-    ] ++
-    lib.optional stdenv.isLinux [
-      "-Wno-error=format-overflow" # newly detected by gcc7
-      "-Wno-error=nonnull"
-    ]);
-
-    buildPhase = ''
-      export MX_ALT_OUTPUT_ROOT=$NIX_BUILD_TOP/mxbuild
-      export MX_CACHE_DIR=${makeMxCache jvmci8-mxcache}
-
-      mx-internal --primary-suite . --vm=server -v build -DFULL_DEBUG_SYMBOLS=0
-      mx-internal --primary-suite . --vm=server -v vm -version
-      mx-internal --primary-suite . --vm=server -v unittest
-    '';
-    installPhase = ''
-      mkdir -p $out
-      ${if stdenv.isDarwin
-        then "mv openjdk1.8.0_*/darwin-amd64/product/* $out"
-        else "mv openjdk1.8.0_*/linux-amd64/product/* $out"}
-      install -v -m0555 -D $MX_CACHE_DIR/hsdis*/hsdis.so $out/jre/lib/amd64/hsdis-amd64.so
-    '';
-    # copy-paste openjdk's preFixup
-    preFixup = ''
-      # Propagate the setJavaClassPath setup hook from the JRE so that
-      # any package that depends on the JRE has $CLASSPATH set up
-      # properly.
-      mkdir -p $out/nix-support
-      printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
-
-      # Set JAVA_HOME automatically.
-      mkdir -p $out/nix-support
-      cat <<EOF > $out/nix-support/setup-hook
-      if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
-      EOF
-    '';
-    postFixup = openjdk.postFixup or null;
-    dontStrip = true; # stripped javac crashes with "segmentaion fault"
-    inherit (openjdk) meta;
-  };
-
-  graalvm8 = 	stdenv.mkDerivation rec {
-    inherit version;
-    pname = "graal";
-    src = fetchFromGitHub {
-      owner  = "oracle";
-      repo   = "graal";
-      rev    = "vm-${version}";
-      sha256 = "0v8zkmzkyhmmmvra5pp876d4i4ijrrw15j98ipayc7is02kwiwmq";
-    };
-
-    patches = [ ./002_setjmp.c.patch ./003_mx_truffle.py.patch ] ++
-              lib.optional stdenv.isDarwin [
-                ./009_remove_signedness_verifier.patch ./010_mx_substratevm.py
-              ];
-
-    nativeBuildInputs = [ gfortran ];
-
-    buildInputs = [ mx zlib.dev mercurial jvmci8 git llvm clang
-                    python27withPackages icu ruby bzip2 which
-                    readline bzip2 xz pcre curl ed
-                  ]  ++ lib.optional stdenv.isDarwin [
-                    CoreFoundation gcc.cc.lib libiconv perl openssl
-                  ];
-
-    postUnpack = ''
-      ${lib.optionalString stdenv.isLinux ''
-        cp ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc}/stdlib.h \
-          $sourceRoot/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/include
-      ''}
-      cp ${truffleMake} $TMPDIR/truffle.make
-      rm $sourceRoot/truffle/src/libffi/patches/others/0001-Add-mx-bootstrap-Makefile.patch
-
-      # a fake mercurial dir to prevent mx crash and supply the version to mx
-      ( cd $sourceRoot
-        hg init
-        hg add
-        hg commit -m 'dummy commit'
-        hg tag      ${lib.escapeShellArg src.rev}
-        hg checkout ${lib.escapeShellArg src.rev}
-      )
-
-      # make a copy of jvmci8
-      mkdir $NIX_BUILD_TOP/jvmci8
-      cp -dpR ${jvmci8}/* $NIX_BUILD_TOP/jvmci8
-      chmod +w -R $NIX_BUILD_TOP/jvmci8
-      export MX_CACHE_DIR=${makeMxCache graal-mxcache}
-      export MX_GIT_CACHE_DIR=$NIX_BUILD_TOP/mxgitcache
-      ${makeMxGitCache graal-mxcachegit "$MX_GIT_CACHE_DIR"}
-      cd $TMPDIR
-    '';
-
-    postPatch = ''
-      substituteInPlace substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/headers/PosixDirectives.java \
-        --replace '<zlib.h>' '<${zlib.dev}/include/zlib.h>'
-      substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/CCLinkerInvocation.java \
-        --replace 'cmd.add("-v");' 'cmd.add("-v"); cmd.add("-L${zlib}/lib");'
-
-      # For debugging native-image build, add this replace statement on CCompilerInvoker.java
-      # --replace '(String line : lines) {' '(String line : lines) {System.out.println("DEBUG: " + line);'
-      ${if stdenv.isLinux then ''
-          substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CCompilerInvoker.java \
-            --replace 'command.add(Platform.includedIn(Platform.WINDOWS.class) ? "CL" : "gcc");' \
-                      'command.add(Platform.includedIn(Platform.WINDOWS.class) ? "CL" : "${stdenv.cc}/bin/gcc");' ''
-        else ''
-          substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CCompilerInvoker.java \
-            --replace 'command.add(Platform.includedIn(Platform.WINDOWS.class) ? "CL" : "gcc");' \
-                      'command.add(Platform.includedIn(Platform.WINDOWS.class) ? "CL" : "${gcc.cc}/bin/gcc");
-                       command.add("-F"); command.add("${CoreFoundation}/Library/Frameworks");
-                       command.add("-framework"); command.add("CoreFoundation");'
-       ''}
-
-      # prevent cyclical imports caused by identical <include> names
-      substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/CCLinkerInvocation.java \
-        --replace 'protected String compilerCommand = "cc";' 'protected String compilerCommand = "${stdenv.cc}/bin/cc";'
-      # dragonegg can't seem to compile on nix, so let's not require it
-      substituteInPlace sulong/mx.sulong/suite.py \
-        --replace '"requireDragonegg" : True,' '"requireDragonegg" : False,'
-      substituteInPlace truffle/mx.truffle/mx_truffle.py \
-        --replace 'os.path.relpath(self.subject.delegate.dir, self.subject.suite.vc_dir)' \
-                  'self.subject.delegate.dir'
-      substituteInPlace sulong/projects/bootstrap-toolchain-launchers/Makefile \
-        --replace /bin/bash ${bash}/bin/bash
-      # Patch the native-image template, as it will be run during build
-      chmod +x vm/mx.vm/launcher_template.sh && patchShebangs vm/mx.vm
-      # Prevent random errors from too low maxRuntimecompilemethods
-      substituteInPlace truffle/mx.truffle/macro-truffle.properties \
-        --replace '-H:MaxRuntimeCompileMethods=1400' \
-                  '-H:MaxRuntimeCompileMethods=28000'
-      ${lib.optionalString stdenv.isDarwin ''
-        substituteInPlace truffle/src/com.oracle.truffle.nfi.test.native/src/object.cc \
-          --replace '#include <stdlib.h>' ""
-      ''}
-      ${lib.optionalString stdenv.isLinux ''
-        substituteInPlace sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/include/stdlib.h \
-          --replace '# include <cstdlib>' '# include "${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc}/cstdlib"'
-      ''}
-    '';
-
-    buildPhase = ''
-      export MX_ALT_OUTPUT_ROOT=$NIX_BUILD_TOP/mxbuild
-      export MX_GIT_CACHE='refcache'
-      export JVMCI_VERSION_CHECK='ignore'
-      export JAVA_HOME=$NIX_BUILD_TOP/jvmci8
-      export FASTR_RELEASE=true
-      export PKG_LDFLAGS_OVERRIDE="-L${pcre.out}/lib -L${zlib}/lib -L${gfortran.cc.lib}/lib64"
-      ${lib.optionalString stdenv.isDarwin ''
-        export CC="gcc"
-        export CPP="gcc -E"
-        export NIX_CXXSTDLIB_LINK=""
-        export NIX_CXXSTDLIB_LINK_FOR_TARGET=""
-        export OPENSSL_PREFIX=$(realpath openssl)
-        # this fixes error: impure path 'LibFFIHeaderDirectives' used in link
-        export NIX_ENFORCE_PURITY=0
-      ''}
-      ( cd vm
-        mx-internal -v --suite sdk --suite compiler --suite vm --suite tools --suite regex --suite truffle \
-                       --dynamicimports /substratevm,/sulong,graal-js,graalpython,fastr,truffleruby build
-      )
-    '';
-
-    installPhase =
-      (if stdenv.isDarwin then ''
-      mkdir -p $out
-      rm -rf $MX_ALT_OUTPUT_ROOT/vm/darwin-amd64/GRAALVM_*STAGE1*
-      cp -rf $MX_ALT_OUTPUT_ROOT/vm/darwin-amd64/GRAALVM*/graalvm-unknown-${version}/* $out
-      ''
-       else ''
-      mkdir -p $out
-      rm -rf $MX_ALT_OUTPUT_ROOT/vm/linux-amd64/GRAALVM_*STAGE1*
-      cp -rf $MX_ALT_OUTPUT_ROOT/vm/linux-amd64/GRAALVM*/graalvm-unknown-${version}/* $out
-
-      # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html
-      substituteInPlace $out/jre/lib/security/java.security \
-        --replace file:/dev/random    file:/dev/./urandom \
-        --replace NativePRNGBlocking  SHA1PRNG
-      # copy static and dynamic libraries needed for static compilation
-      cp -rf ${glibc}/lib/* $out/jre/lib/svm/clibraries/linux-amd64/
-      cp ${glibc.static}/lib/* $out/jre/lib/svm/clibraries/linux-amd64/
-      cp ${zlib.static}/lib/libz.a $out/jre/lib/svm/clibraries/linux-amd64/libz.a
-    '');
-
-    inherit (jvmci8) preFixup;
-    dontStrip = true; # stripped javac crashes with "segmentaion fault"
-    doInstallCheck = true;
-    installCheckPhase = ''
-      echo ${lib.escapeShellArg ''
-               public class HelloWorld {
-                 public static void main(String[] args) {
-                   System.out.println("Hello World");
-                 }
-               }
-             ''} > HelloWorld.java
-      $out/bin/javac HelloWorld.java
-
-      # run on JVM with Graal Compiler
-      $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld
-      $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World'
-
-      # Ahead-Of-Time compilation
-      $out/bin/native-image --no-server HelloWorld
-      ./helloworld
-      ./helloworld | fgrep 'Hello World'
-
-      ${lib.optionalString stdenv.isLinux
-        ''
-          # Ahead-Of-Time compilation with --static (supported on linux only)
-          $out/bin/native-image --no-server --static HelloWorld
-          ./helloworld
-          ./helloworld | fgrep 'Hello World'
-        ''}
-         '';
-    enableParallelBuilding = true;
-    passthru.home = graalvm8;
-
-    meta = with lib; {
-      homepage = "https://github.com/oracle/graal";
-      description = "High-Performance Polyglot VM";
-      license = licenses.gpl2;
-      maintainers = with maintainers; [ volth hlolli ];
-      platforms = [ "x86_64-linux" "x86_64-darwin" /*"aarch64-linux"*/ ];
-    };
-  };
-}
diff --git a/pkgs/development/compilers/graalvm/truffle.make b/pkgs/development/compilers/graalvm/truffle.make
deleted file mode 100644
index ec357446a5d..00000000000
--- a/pkgs/development/compilers/graalvm/truffle.make
+++ /dev/null
@@ -1,16 +0,0 @@
-# This Makefile is used by mx to bootstrap libffi build.
-
-# `make MX_VERBOSE=y` will report all lines executed. The actual value doesn't
-# matter as long as it's not empty.
-
-QUIETLY$(MX_VERBOSE) = @
-
-.PHONY: default
-
-default:
-	sed -i "s|-print-multi-os-directory||g" ../$(SOURCES)/configure
-	$(QUIETLY) echo CONFIGURE libffi
-	$(QUIETLY) mkdir ../$(OUTPUT)
-	$(QUIETLY) cd ../$(OUTPUT) && ../$(SOURCES)/configure $(CONFIGURE_ARGS)
-	$(QUIETLY) echo MAKE libffi
-	$(QUIETLY) $(MAKE) -C ../$(OUTPUT)
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 46d3b06a14e..431e8ef7798 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -333,6 +333,8 @@ mapAliases ({
   google-musicmanager = throw "google-musicmanager has been removed because Google Play Music was discontinued"; # added 2021-03-07
   googleAuthenticator = google-authenticator; # added 2016-10-16
   grantlee5 = libsForQt5.grantlee;  # added 2015-12-19
+  graalvm8 = graalvm8-ce;
+  graalvm11 = graalvm11-ce;
   gsettings_desktop_schemas = gsettings-desktop-schemas; # added 2018-02-25
   gtk_doc = gtk-doc; # added 2018-02-25
   guileCairo = guile-cairo; # added 2017-09-24
@@ -374,6 +376,7 @@ mapAliases ({
   jbuilder = dune_1; # added 2018-09-09
   jikes = throw "jikes was deprecated on 2019-10-07: abandoned by upstream";
   joseki = apache-jena-fuseki; # added 2016-02-28
+  jvmci8 = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # added 2021-10-15
   json_glib = json-glib; # added 2018-02-25
   kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16
   k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # 2020-11-06
@@ -569,6 +572,7 @@ mapAliases ({
   mpv-with-scripts = self.wrapMpv self.mpv-unwrapped { }; # added 2020-05-22
   multipath_tools = multipath-tools;  # added 2016-01-21
   mupen64plus1_5 = mupen64plus; # added 2016-02-12
+  mx = throw "graalvm8 and its tools were deprecated in favor of graalvm8-ce"; # added 2021-10-15
   mxisd = throw "mxisd has been removed from nixpkgs as it has reached end of life, see https://github.com/kamax-matrix/mxisd/blob/535e0a5b96ab63cb0ddef90f6f42c5866407df95/EOL.md#end-of-life-notice . ma1sd may be a suitable alternative."; # added 2021-04-15
   mysqlWorkbench = mysql-workbench; # added 2017-01-19
   nagiosPluginsOfficial = monitoring-plugins;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e32568306c0..f9630864216 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12094,14 +12094,6 @@ with pkgs;
   openjdk = openjdk16;
   openjdk_headless = openjdk16_headless;
 
-  inherit (callPackages ../development/compilers/graalvm {
-    gcc = if stdenv.targetPlatform.isDarwin then gcc8 else gcc;
-    inherit (darwin.apple_sdk.frameworks)
-      CoreFoundation Foundation JavaNativeFoundation
-      JavaVM JavaRuntimeSupport Cocoa;
-    inherit (darwin) libiconv libobjc libresolv;
-  }) mx jvmci8 graalvm8;
-
   graalvmCEPackages =
     recurseIntoAttrs (callPackage ../development/compilers/graalvm/community-edition {
       inherit (darwin.apple_sdk.frameworks) Foundation;