git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #78928 from NixOS/staging-next

Staging next

commitc195ef6aab79b8194158b0b2fadbf96f986b14c8 authorFrederik Rietdijk <freddyrietdijk@fridh.nl> dateSun 2 Feb 2020, 15:35 (7 years ago) parent26aba555cc0468
64 files changed+1575−689
pkgs/development/compilers/graalvm/001_mx.py.patch+147−113 pkgs/development/compilers/graalvm/005_tool_jt.rb.patch+46 pkgs/development/compilers/graalvm/006_mx_copylib.py.patch+14 pkgs/development/compilers/graalvm/007_unimplemented.c.patch+85 pkgs/development/compilers/graalvm/008_remove_jfr.patch+33 pkgs/development/compilers/graalvm/009_remove_signedness_verifier.patch+21 pkgs/development/compilers/graalvm/010_mx_substratevm.py+13 pkgs/development/compilers/graalvm/default.nix+203−75 pkgs/development/compilers/graalvm/truffle.make+4−2 pkgs/development/compilers/llvm/7/clang/HIP-use-PATH-7.patch+68 pkgs/development/compilers/llvm/7/clang/default.nix+7−3 pkgs/development/compilers/llvm/7/default.nix+1 pkgs/development/compilers/llvm/8/clang/HIP-use-PATH-8.patch+80 pkgs/development/compilers/llvm/8/clang/default.nix+4−2 pkgs/development/compilers/llvm/8/default.nix+1 pkgs/development/compilers/llvm/9/clang/HIP-use-PATH-9.patch+80 pkgs/development/compilers/llvm/9/clang/default.nix+4−2 pkgs/development/compilers/llvm/9/default.nix+1 pkgs/development/compilers/openjdk/darwin/8.nix+6−3 pkgs/development/libraries/at-spi2-core/default.nix+3−1 pkgs/development/libraries/clutter-gst/default.nix+4−4 pkgs/development/libraries/cppunit/default.nix+2−2 pkgs/development/libraries/epoxy/default.nix+2−2 pkgs/development/libraries/gtkd/default.nix+11 pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch+3−3 pkgs/development/libraries/kde-frameworks/fetch.sh+1−1 pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch+3−4 pkgs/development/libraries/kde-frameworks/srcs.nix+332−324 pkgs/development/libraries/libappindicator/default.nix+2 pkgs/development/libraries/libde265/default.nix+2−2 pkgs/development/libraries/libdvdnav/default.nix+2−2 pkgs/development/libraries/libgnomekbd/default.nix+2 pkgs/development/libraries/libinput/default.nix+2−2 pkgs/development/libraries/libnotify/default.nix+2 pkgs/development/libraries/liboauth/default.nix+2 pkgs/development/libraries/libpeas/default.nix+2 pkgs/development/libraries/libuv/default.nix+2−2 pkgs/development/libraries/libvpx/CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch+211 pkgs/development/libraries/libvpx/default.nix+5−1 pkgs/development/libraries/poppler/default.nix+2−2 pkgs/development/libraries/v8/default.nix−2 pkgs/development/libraries/wavpack/default.nix+3−71 pkgs/development/libraries/x264/default.nix+4−2 pkgs/development/python-modules/botocore/default.nix−2 pkgs/development/python-modules/numpy/default.nix+2−2 pkgs/development/python-modules/pandas/default.nix+2−2 pkgs/development/python-modules/pyparsing/default.nix+30−14 pkgs/development/python-modules/pytest/default.nix+2−2 pkgs/development/python-modules/s3transfer/default.nix−2 pkgs/development/python-modules/urllib3/default.nix−2 pkgs/development/tools/build-managers/cmake/default.nix+2−2 pkgs/misc/cups/default.nix+2−2 pkgs/os-specific/darwin/apple-sdk/default.nix+15−13 pkgs/os-specific/darwin/apple-sdk/frameworks.nix+2 pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix+9 pkgs/os-specific/linux/iproute/default.nix+2−2 pkgs/servers/pulseaudio/default.nix+4−1 pkgs/servers/pulseaudio/qpaeq.nix+54 pkgs/servers/samba/4.x.nix+10−8 pkgs/tools/admin/awscli/default.nix−3 pkgs/tools/misc/coreutils/default.nix+4 pkgs/tools/system/pciutils/default.nix+2−2 pkgs/tools/text/gnused/default.nix+2−2 pkgs/top-level/all-packages.nix+9−1
pkgs/development/compilers/graalvm/001_mx.py.patch+147−113
@@ -1,57 +1,31 @@
11diff --git a/mx.py b/mx.py
2−index af7a9c2..08c0ea8 100755
2+index a0b9315..b7d67a0 100755
33--- a/mx.py
44+++ b/mx.py
5−@@ -4976,30 +4976,6 @@ class PackedResourceLibrary(ResourceLibrary):
5+@@ -238,21 +238,7 @@ def _check_file_with_sha1(path, sha1, sha1path, mustExist=True, newFile=False, l
6+ f.write(value or sha1OfFile(path))
67
7− def get_path(self, resolve):
8− extract_path = _make_absolute(self.extract_path, self.suite.dir)
9−- download_path = super(PackedResourceLibrary, self).get_path(resolve)
10−- if resolve and self._check_extract_needed(extract_path, download_path):
11−- extract_path_tmp = tempfile.mkdtemp(suffix=basename(extract_path), dir=dirname(extract_path))
12−- try:
13−- # extract archive
14−- Extractor.create(download_path).extract(extract_path_tmp)
15−- # ensure modification time is up to date
16−- os.utime(extract_path_tmp, None)
17−- logv("Moving temporary directory {} to {}".format(extract_path_tmp, extract_path))
18−- try:
19−- # attempt atomic overwrite
20−- os.rename(extract_path_tmp, extract_path)
21−- except OSError:
22−- # clean destination & re-try for cases where atomic overwrite doesn't work
23−- rmtree(extract_path, ignore_errors=True)
24−- os.rename(extract_path_tmp, extract_path)
25−- except OSError as ose:
26−- # Rename failed. Race with other process?
27−- if self._check_extract_needed(extract_path, download_path):
28−- # ok something really went wrong
29−- abort("Extracting {} failed!".format(download_path), context=ose)
30−- finally:
31−- rmtree(extract_path_tmp, ignore_errors=True)
8+ if exists(path):
9+- if sha1Check and sha1:
10+- if not _sha1CachedValid() or (newFile and sha1 != _sha1Cached()):
11+- logv('Create/update SHA1 cache file ' + sha1path)
12+- _writeSha1Cached()
3213-
33− return extract_path
34−
35− def _check_download_needed(self):
36−@@ -5900,7 +5876,7 @@ class HgConfig(VC):
37−
38− def update_to_branch(self, vcdir, branch, abortOnError=True):
39− cmd = ['update', branch]
40−- self.hg_command(vcdir, cmd, abortOnError=abortOnError)
41−+ self.run(['hg', vcdir] + cmd)
42−
43− def add(self, vcdir, path, abortOnError=True):
44− return self.run(['hg', '-q', '-R', vcdir, 'add', path]) == 0
45−@@ -5937,7 +5913,7 @@ class HgConfig(VC):
46− return None
47−
48− def parent_info(self, vcdir, abortOnError=True):
49−- out = self.hg_command(vcdir, ["log", "-r", ".", "--template", "{author}|||{date|hgdate}"], abortOnError=abortOnError)
50−+ out = _check_output_str(["hg", '-R', vcdir, "log", "-r", ".", "--template", "{author}|||{date|hgdate}"])
51− author, date = out.split("|||")
52− ts, _ = date.split(" ")
53− return self._sanitize_parent_info({
54−@@ -8301,46 +8277,8 @@ class SuiteImport:
14+- if sha1 != _sha1Cached():
15+- computedSha1 = sha1OfFile(path)
16+- if sha1 == computedSha1:
17+- warn('Fixing corrupt SHA1 cache file ' + sha1path)
18+- _writeSha1Cached(computedSha1)
19+- return True
20+- if logErrors:
21+- size = os.path.getsize(path)
22+- log_error('SHA1 of {} [size: {}] ({}) does not match expected value ({})'.format(TimeStampFile(path), size, computedSha1, sha1))
23+- return False
24++ return True
25+ elif mustExist:
26+ if logErrors:
27+ log_error("'{}' does not exist".format(path))
28+@@ -1057,46 +1043,8 @@ class SuiteImport:
5529 version = import_dict.get("version")
5630 suite_dir = None
5731 version_from = import_dict.get("versionFrom")
@@ -100,7 +74,7 @@ index af7a9c2..08c0ea8 100755
10074
10175 @staticmethod
10276 def get_source_urls(source, kind=None):
103−@@ -8381,8 +8319,6 @@ class Suite(object):
77+@@ -1467,8 +1415,6 @@ class Suite(object):
10478 :type dists: list[Distribution]
10579 """
10680 def __init__(self, mxDir, primary, internal, importing_suite, load, vc, vc_dir, dynamicallyImported=False):
@@ -109,7 +83,7 @@ index af7a9c2..08c0ea8 100755
10983 self.imported_by = [] if primary else [importing_suite]
11084 self.mxDir = mxDir
11185 self.dir = dirname(mxDir)
112−@@ -8410,7 +8346,7 @@ class Suite(object):
86+@@ -1496,7 +1442,7 @@ class Suite(object):
11387 self._outputRoot = None
11488 self._preloaded_suite_dict = None
11589 self.vc = vc
@@ -118,7 +92,7 @@ index af7a9c2..08c0ea8 100755
11892 self._preload_suite_dict()
11993 self._init_imports()
12094 if load:
121−@@ -9310,7 +9246,9 @@ def get_dynamic_imports():
95+@@ -2405,7 +2351,9 @@ class Repository(SuiteConstituent):
12296 class SourceSuite(Suite):
12397 """A source suite"""
12498 def __init__(self, mxDir, primary=False, load=True, internal=False, importing_suite=None, dynamicallyImported=False):
@@ -129,7 +103,7 @@ index af7a9c2..08c0ea8 100755
129103 Suite.__init__(self, mxDir, primary, internal, importing_suite, load, vc, vc_dir, dynamicallyImported=dynamicallyImported)
130104 logvv("SourceSuite.__init__({}), got vc={}, vc_dir={}".format(mxDir, self.vc, self.vc_dir))
131105 self.projects = []
132−@@ -9359,17 +9297,7 @@ class SourceSuite(Suite):
106+@@ -2454,17 +2402,7 @@ class SourceSuite(Suite):
133107 """
134108 Gets the release tag from VC or create a time based once if VC is unavailable
135109 """
@@ -148,7 +122,57 @@ index af7a9c2..08c0ea8 100755
148122
149123 def scm_metadata(self, abortOnError=False):
150124 scm = self.scm
151−@@ -12541,55 +12469,8 @@ def _attempt_download(url, path, jarEntryName=None):
125+@@ -2993,12 +2931,35 @@ def _find_suite_import(importing_suite, suite_import, fatalIfMissing=True, load=
126+ Attempts to locate an existing suite in the local context
127+ Returns the path to the mx.name dir if found else None
128+ """
129+- if mode == 'binary':
130+- # binary suites are always stored relative to the importing suite in mx-private directory
131+- return importing_suite._find_binary_suite_dir(suite_import.name)
132++ warn("FAKE CLONE: " + str(suite_import))
133++ if (suite_import.name == "truffle"):
134++ return join(get_env('TMP'), "source", "truffle", "mx.truffle")
135++ if (suite_import.name == "graal-nodejs"):
136++ return join(get_env('MX_GIT_CACHE_DIR'), "graaljs", "graal-nodejs", "mx.graal-nodejs")
137++ if (suite_import.name == "truffleruby"):
138++ return join(get_env('MX_GIT_CACHE_DIR'), "truffleruby", "mx.truffleruby")
139++ if (suite_import.name == "graalpython"):
140++ return join(get_env('MX_GIT_CACHE_DIR'), "graalpython", "mx.graalpython")
141++ if (suite_import.name == "vm"):
142++ return join(get_env('TMP'), "source", "vm", "mx.vm")
143++ if (suite_import.name == "fastr"):
144++ return join(get_env('MX_GIT_CACHE_DIR'), "fastr", "mx.fastr")
145++ if (suite_import.name == "sdk"):
146++ return join(get_env('TMP'), "source", "sdk", "mx.sdk")
147++ if (suite_import.name == "graal-js"):
148++ return join(get_env('MX_GIT_CACHE_DIR'), "graaljs", "graal-js", "mx.graal-js")
149++ if (suite_import.name == "regex"):
150++ return join(get_env('TMP'), "source", "regex", "mx.regex")
151++ if (suite_import.name == "substratevm"):
152++ return join(get_env('TMP'), "source", "substratevm", "mx.substratevm")
153++ if (suite_import.name == "tools"):
154++ return join(get_env('TMP'), "source", "tools", "mx.tools")
155++ if (suite_import.name == "sulong"):
156++ return join(get_env('TMP'), "source", "sulong", "mx.sulong")
157++ if (suite_import.name == "compiler"):
158++ return join(get_env('TMP'), "source", "compiler", "mx.compiler")
159+ else:
160+- # use the SuiteModel to locate a local source copy of the suite
161+- return _suitemodel.find_suite_dir(suite_import)
162++ return join(get_env('MX_GIT_CACHE_DIR'), suite_import.name)
163+
164+ def _get_import_dir(url, mode):
165+ """Return directory where the suite will be cloned to"""
166+@@ -3816,7 +3777,7 @@ def getmtime(name):
167+ """
168+ Wrapper for builtin open function that handles long path names on Windows.
169+ """
170+- return os.path.getmtime(_safe_path(name))
171++ return 315532800
172+
173+
174+ def stat(name):
175+@@ -4062,57 +4023,8 @@ def _attempt_download(url, path, jarEntryName=None):
152176 return False
153177
154178 def download(path, urls, verbose=False, abortOnError=True, verifyOnly=False):
@@ -173,40 +197,91 @@ index af7a9c2..08c0ea8 100755
173197- url = m.group(1)
174198- jarEntryName = m.group(2)
175199-
200+- if not _opts.trust_http and (url.lower().startswith('http://') or url.lower().startswith('ftp://')):
201+- warn('Downloading from non-https URL {}. Use --trust-http mx option to suppress this warning.'.format(url))
202+-
176203- if verifyOnly:
177204- try:
178205- conn = _urlopen(url, timeout=10)
179206- conn.close()
180−- return True
181207- except (IOError, socket.timeout) as e:
182208- _suggest_tlsv1_error(e)
183209- verify_errors[url] = e
184−- continue
210+- else:
211+- for i in range(4):
212+- if i != 0:
213+- time.sleep(1)
214+- warn('Retry {} to download from {}'.format(i, url))
215+- if _attempt_download(url, path, jarEntryName):
216+- return True # Download was successful
185217-
186−- for i in range(4):
187−- if i != 0:
188−- time.sleep(1)
189−- warn('Retry {} to download from {}'.format(i, url))
190−- res = _attempt_download(url, path, jarEntryName)
191−- if res is True:
192−- return True
193−- if res is False:
194−- break
195−-
196−- if abortOnError:
218+- if verifyOnly and len(verify_errors) < len(urls): # verify-mode at least one success -> success
219+- return True
220+- else: # Either verification error or no download was successful
197221- msg = 'Could not download to ' + path + ' from any of the following URLs: ' + ', '.join(urls)
198−- if verifyOnly:
222+- if verifyOnly: # verify-mode -> print error details
199223- for url, e in verify_errors.items():
200224- msg += '\n ' + url + ': ' + str(e)
201−- abort(msg)
202−- else:
203−- return False
225+- if abortOnError:
226+- abort(msg)
227+- else:
228+- warn(msg)
229+- return False
204230+ print("FAKE download(path={} urls={} verbose={} abortOnError={} verifyOnly={})".format(path, urls, verbose, abortOnError, verifyOnly))
205231+ return True
206232
207233 def update_file(path, content, showDiff=False):
208234 """
209−@@ -13393,6 +13274,7 @@ class Archiver(SafeFileCreation):
235+@@ -7887,30 +7799,6 @@ class PackedResourceLibrary(ResourceLibrary):
236+
237+ def get_path(self, resolve):
238+ extract_path = _make_absolute(self.extract_path, self.suite.dir)
239+- download_path = super(PackedResourceLibrary, self).get_path(resolve)
240+- if resolve and self._check_extract_needed(extract_path, download_path):
241+- extract_path_tmp = tempfile.mkdtemp(suffix=basename(extract_path), dir=dirname(extract_path))
242+- try:
243+- # extract archive
244+- Extractor.create(download_path).extract(extract_path_tmp)
245+- # ensure modification time is up to date
246+- os.utime(extract_path_tmp, None)
247+- logv("Moving temporary directory {} to {}".format(extract_path_tmp, extract_path))
248+- try:
249+- # attempt atomic overwrite
250+- os.rename(extract_path_tmp, extract_path)
251+- except OSError:
252+- # clean destination & re-try for cases where atomic overwrite doesn't work
253+- rmtree(extract_path, ignore_errors=True)
254+- os.rename(extract_path_tmp, extract_path)
255+- except OSError as ose:
256+- # Rename failed. Race with other process?
257+- if self._check_extract_needed(extract_path, download_path):
258+- # ok something really went wrong
259+- abort("Extracting {} failed!".format(download_path), context=ose)
260+- finally:
261+- rmtree(extract_path_tmp, ignore_errors=True)
262+-
263+ return extract_path
264+
265+ def _check_download_needed(self):
266+@@ -8430,7 +8318,7 @@ class VC(_with_metaclass(ABCMeta, object)):
267+ :param str branch: a branch name
268+ :param bool abortOnError: if True abort on error
269+ """
270+- abort(self.kind + " update_to_branch is not implemented")
271++ self.run(['hg', vcdir] + cmd)
272+
273+ def is_release_from_tags(self, vcdir, prefix):
274+ """
275+@@ -8831,7 +8719,7 @@ class HgConfig(VC):
276+ return None
277+
278+ def parent_info(self, vcdir, abortOnError=True):
279+- out = self.hg_command(vcdir, ["log", "-r", ".", "--template", "{author}|||{date|hgdate}"], abortOnError=abortOnError)
280++ out = _check_output_str(["hg", '-R', vcdir, "log", "-r", ".", "--template", "{author}|||{date|hgdate}"])
281+ author, date = out.split("|||")
282+ ts, _ = date.split(" ")
283+ return self._sanitize_parent_info({
284+@@ -14069,6 +13957,7 @@ class Archiver(SafeFileCreation):
210285
211286 def _add_zip(self, filename, archive_name, provenance):
212287 self._add_provenance(archive_name, provenance)
@@ -214,44 +289,3 @@ index af7a9c2..08c0ea8 100755
214289 self.zf.write(filename, archive_name)
215290
216291 def _add_str_zip(self, data, archive_name, provenance):
217−@@ -18541,12 +18423,35 @@ def _find_suite_import(importing_suite, suite_import, fatalIfMissing=True, load=
218− Attempts to locate an existing suite in the local context
219− Returns the path to the mx.name dir if found else None
220− """
221−- if mode == 'binary':
222−- # binary suites are always stored relative to the importing suite in mx-private directory
223−- return importing_suite._find_binary_suite_dir(suite_import.name)
224−+ warn("FAKE CLONE: " + str(suite_import))
225−+ if (suite_import.name == "truffle"):
226−+ return join(get_env('TMP'), "source", "truffle", "mx.truffle")
227−+ if (suite_import.name == "graal-nodejs"):
228−+ return join(get_env('MX_GIT_CACHE_DIR'), "graaljs", "graal-nodejs", "mx.graal-nodejs")
229−+ if (suite_import.name == "truffleruby"):
230−+ return join(get_env('MX_GIT_CACHE_DIR'), "truffleruby", "mx.truffleruby")
231−+ if (suite_import.name == "graalpython"):
232−+ return join(get_env('MX_GIT_CACHE_DIR'), "graalpython", "mx.graalpython")
233−+ if (suite_import.name == "vm"):
234−+ return join(get_env('TMP'), "source", "vm", "mx.vm")
235−+ if (suite_import.name == "fastr"):
236−+ return join(get_env('MX_GIT_CACHE_DIR'), "fastr", "mx.fastr")
237−+ if (suite_import.name == "sdk"):
238−+ return join(get_env('TMP'), "source", "sdk", "mx.sdk")
239−+ if (suite_import.name == "graal-js"):
240−+ return join(get_env('MX_GIT_CACHE_DIR'), "graaljs", "graal-js", "mx.graal-js")
241−+ if (suite_import.name == "regex"):
242−+ return join(get_env('TMP'), "source", "regex", "mx.regex")
243−+ if (suite_import.name == "substratevm"):
244−+ return join(get_env('TMP'), "source", "substratevm", "mx.substratevm")
245−+ if (suite_import.name == "tools"):
246−+ return join(get_env('TMP'), "source", "tools", "mx.tools")
247−+ if (suite_import.name == "sulong"):
248−+ return join(get_env('TMP'), "source", "sulong", "mx.sulong")
249−+ if (suite_import.name == "compiler"):
250−+ return join(get_env('TMP'), "source", "compiler", "mx.compiler")
251− else:
252−- # use the SuiteModel to locate a local source copy of the suite
253−- return _suitemodel.find_suite_dir(suite_import)
254−+ return join(get_env('MX_GIT_CACHE_DIR'), suite_import.name)
255−
256− def _get_import_dir(url, mode):
257− """Return directory where the suite will be cloned to"""
pkgs/development/compilers/graalvm/005_tool_jt.rb.patchnew file+46
@@ -0,0 +1,46 @@
1+diff --git a/tool/jt.rb b/tool/jt.rb
2+index 870d88edcb..0a6e4c367b 100755
3+--- a/tool/jt.rb
4++++ b/tool/jt.rb
5+@@ -152,13 +152,16 @@ module Utilities
6+ end
7+
8+ def find_mx
9+- if which('mx')
10+- 'mx'
11++ if ENV.key?("MX_GIT_CACHE_DIR")
12++ "mx-internal"
13+ else
14+- mx_repo = find_or_clone_repo("https://github.com/graalvm/mx.git")
15+- "#{mx_repo}/mx"
16++ if which('mx')
17++ 'mx'
18++ else
19++ mx_repo = find_or_clone_repo("https://github.com/graalvm/mx.git")
20++ "#{mx_repo}/mx"
21++ end
22+ end
23+- end
24+
25+ def find_launcher(use_native)
26+ if use_native
27+@@ -444,8 +447,8 @@ module Commands
28+ --no-sforceimports do not run sforceimports before building
29+ parser build the parser
30+ options build the options
31+- graalvm build a minimal JVM-only GraalVM containing only TruffleRuby,
32+- available by default in mxbuild/truffleruby-jvm,
33++ graalvm build a minimal JVM-only GraalVM containing only TruffleRuby,
34++ available by default in mxbuild/truffleruby-jvm,
35+ the Ruby is symlinked into rbenv or chruby if available
36+ --graal include the GraalVM Compiler in the build
37+ --native build native ruby image as well, available in mxbuild/truffleruby-native
38+@@ -491,7 +494,7 @@ module Commands
39+ jt test compiler run compiler tests
40+ jt test integration [TESTS] run integration tests
41+ jt test bundle [--jdebug] tests using bundler
42+- jt test gems [TESTS] tests using gems
43++ jt test gems [TESTS] tests using gems
44+ jt test ecosystem [TESTS] tests using the wider ecosystem such as bundler, Rails, etc
45+ jt test cexts [--no-openssl] [--no-gems] [test_names...]
46+ run C extension tests (set GEM_HOME)
pkgs/development/compilers/graalvm/006_mx_copylib.py.patchnew file+14
@@ -0,0 +1,14 @@
1+diff --git a/mx.fastr/mx_copylib.py b/mx.fastr/mx_copylib.py
2+index 4f57e1954..db45220d9 100644
3+--- a/mx.fastr/mx_copylib.py
4++++ b/mx.fastr/mx_copylib.py
5+@@ -54,6 +54,9 @@ def _copylib(lib, libpath, plain_libpath_base, target):
6+ else:
7+ try:
8+ if platform.system() == 'Linux':
9++ # https://github.com/oracle/fastr/issues/110
10++ if libpath.endswith("libgcc_s.so"):
11++ libpath = libpath + ".1"
12+ output = subprocess.check_output(['objdump', '-p', libpath])
13+ elif platform.system() == 'SunOS':
14+ output = subprocess.check_output(['elfdump', '-d', libpath])
pkgs/development/compilers/graalvm/007_unimplemented.c.patchnew file+85
@@ -0,0 +1,85 @@
1+diff --git a/com.oracle.truffle.r.native/fficall/src/common/unimplemented.c b/com.oracle.truffle.r.native/fficall/src/common/unimplemented.c
2+index dcf081316..c2cb4879b 100644
3+--- a/com.oracle.truffle.r.native/fficall/src/common/unimplemented.c
4++++ b/com.oracle.truffle.r.native/fficall/src/common/unimplemented.c
5+@@ -20,8 +20,10 @@
6+
7+ #include <Rinternals.h>
8+ #include <stdlib.h>
9++#include <rlocale.h>
10+
11+ #include <R_ext/eventloop.h>
12++#include <R_ext/GraphicsEngine.h>
13+ #include <Defn.h>
14+
15+ Rboolean known_to_be_latin1 = FALSE;
16+@@ -166,3 +168,69 @@ int Scollate(SEXP a, SEXP b) {
17+ void z_prec_r(Rcomplex *r, Rcomplex *x, double digits) {
18+ unimplemented("z_prec_r");
19+ }
20++
21++int Rf_AdobeSymbol2ucs2(int n) {
22++ unimplemented("Rf_AdobeSymbol2ucs2");
23++ return 0;
24++}
25++
26++size_t Mbrtowc(wchar_t *wc, const char *s, size_t n, mbstate_t *ps) {
27++ unimplemented("Mbrtowc");
28++ return 0;
29++}
30++
31++double R_GE_VStrHeight(const char *s, cetype_t enc, const pGEcontext gc, pGEDevDesc dd) {
32++ unimplemented("R_GE_VStrHeight");
33++ return 0;
34++}
35++
36++void R_GE_VText(double x, double y, const char * const s, cetype_t enc,
37++ double x_justify, double y_justify, double rotation,
38++ const pGEcontext gc, pGEDevDesc dd) {
39++ unimplemented("R_GE_VText");
40++}
41++
42++double R_GE_VStrWidth(const char *s, cetype_t enc, const pGEcontext gc, pGEDevDesc dd) {
43++ unimplemented("R_GE_VStrWidth");
44++}
45++
46++void setulb(int n, int m, double *x, double *l, double *u, int *nbd,
47++ double *f, double *g, double factr, double *pgtol,
48++ double *wa, int * iwa, char *task, int iprint, int *isave) {
49++ unimplemented("setulb");
50++}
51++
52++void genptry(int n, double *p, double *ptry, double scale, void *ex) {
53++ unimplemented("genptry");
54++}
55++
56++double EXP(double x) {
57++ unimplemented("EXP");
58++ return 0;
59++}
60++
61++double LOG(double x) {
62++ unimplemented("LOG");
63++ return 0;
64++}
65++
66++Rwchar_t Rf_utf8toucs32(wchar_t high, const char *s) {
67++ unimplemented("Rf_utf8toucs32");
68++ return 0;
69++}
70++
71++size_t mbtoucs(unsigned int *wc, const char *s, size_t n) {
72++ unimplemented("mbtoucs");
73++ return (size_t) 0;
74++}
75++
76++
77++int DispatchOrEval(SEXP call, SEXP op, const char *generic, SEXP args,
78++ SEXP rho, SEXP *ans, int dropmissing, int argsevald) {
79++ unimplemented("DispatchOrEval");
80++ return 0;
81++}
82++
83++void ENSURE_NAMEDMAX (SEXP x) {
84++ unimplemented("ENSURE_NAMEDMAX");
85++}
pkgs/development/compilers/graalvm/008_remove_jfr.patchnew file+33
@@ -0,0 +1,33 @@
1+diff --git a/mx.jvmci/suite.py b/mx.jvmci/suite.py
2+index 9690c0a38f..fa1d36b7e1 100644
3+--- a/mx.jvmci/suite.py
4++++ b/mx.jvmci/suite.py
5+@@ -241,18 +241,7 @@ suite = {
6+ "workingSets" : "JVMCI,HotSpot,SPARC",
7+ },
8+
9+- "jdk.vm.ci.hotspot.jfr" : {
10+- "subDir" : "jvmci",
11+- "sourceDirs" : ["src"],
12+- "dependencies" : [
13+- "jdk.vm.ci.hotspot",
14+- "JFR",
15+- ],
16+- "checkstyle" : "jdk.vm.ci.hotspot",
17+- "javaCompliance" : "1.8",
18+- "profile" : "",
19+- "workingSets" : "JVMCI,HotSpot",
20+- },
21++
22+
23+ "hotspot" : {
24+ "native" : True,
25+@@ -354,7 +343,7 @@ suite = {
26+ "jdk.vm.ci.hotspot.aarch64",
27+ "jdk.vm.ci.hotspot.amd64",
28+ "jdk.vm.ci.hotspot.sparc",
29+- "jdk.vm.ci.hotspot.jfr",
30++
31+ ],
32+ "distDependencies" : [
33+ "JVMCI_SERVICES",
pkgs/development/compilers/graalvm/009_remove_signedness_verifier.patchnew file+21
@@ -0,0 +1,21 @@
1+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
2+index 23a76357fd2..f13694b6ed7 100644
3+--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/query/SizeAndSignednessVerifier.java
4++++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/query/SizeAndSignednessVerifier.java
5+@@ -249,15 +249,6 @@ public final class SizeAndSignednessVerifier extends NativeInfoTreeVisitor {
6+ }
7+
8+ private void checkSignedness(boolean isUnsigned, ResolvedJavaType type, ResolvedJavaMethod method) {
9+- if (isSigned(type)) {
10+- if (isUnsigned) {
11+- addError("Type " + type.toJavaName(false) + " is signed, but accessed C value is unsigned", method);
12+- }
13+- } else if (nativeLibs.isWordBase(type)) {
14+- /* every Word type other than Signed is assumed to be unsigned. */
15+- if (!isUnsigned) {
16+- addError("Type " + type.toJavaName(false) + " is unsigned, but accessed C value is signed", method);
17+- }
18+- }
19++
20+ }
21+ }
pkgs/development/compilers/graalvm/010_mx_substratevm.pynew file+13
@@ -0,0 +1,13 @@
1+diff --git a/substratevm/mx.substratevm/mx_substratevm.py b/substratevm/mx.substratevm/mx_substratevm.py
2+index b89163ef983..0fd0138b336 100644
3+--- a/substratevm/mx.substratevm/mx_substratevm.py
4++++ b/substratevm/mx.substratevm/mx_substratevm.py
5+@@ -189,7 +189,7 @@ if str(svm_java_compliance().value) not in GRAAL_COMPILER_FLAGS_MAP:
6+ mx.abort("Substrate VM does not support this Java version: " + str(svm_java_compliance()))
7+ GRAAL_COMPILER_FLAGS = GRAAL_COMPILER_FLAGS_BASE + GRAAL_COMPILER_FLAGS_MAP[str(svm_java_compliance().value)]
8+
9+-IMAGE_ASSERTION_FLAGS = ['-H:+VerifyGraalGraphs', '-H:+VerifyPhases']
10++IMAGE_ASSERTION_FLAGS = ['-H:+VerifyGraalGraphs', '-H:+VerifyPhases', '-H:+ReportExceptionStackTraces']
11+ suite = mx.suite('substratevm')
12+ svmSuites = [suite]
13+ clibraryDists = ['SVM_HOSTED_NATIVE']
pkgs/development/compilers/graalvm/default.nix+203−75
@@ -1,10 +1,11 @@
11{ stdenv, lib, fetchFromGitHub, fetchurl, fetchzip, fetchgit, mercurial_4, python27, setJavaClassPath,
2− zlib, makeWrapper, openjdk, unzip, git, clang, llvm, which, icu, ruby, bzip2, glibc
3− # gfortran, readline, bzip2, lzma, pcre, curl, ed, tree ## WIP: fastr deps
2+ which, zlib, makeWrapper, openjdk, unzip, git, clang, llvm, icu, ruby, glibc, bash, gcc, libobjc,
3+ xcodebuild, gfortran, readline, bzip2, lzma, pcre, curl, ed, libresolv, libiconv, writeScriptBin,
4+ openssl, perl, CoreFoundation, Foundation, JavaNativeFoundation, JavaRuntimeSupport, JavaVM, Cocoa
45}:
56
67let
7− version = "19.1.1";
8+ version = "19.2.1";
89 mercurial = mercurial_4;
910 truffleMake = ./truffle.make;
1011 makeMxGitCache = list: out: ''
@@ -25,6 +26,57 @@ let
2526 chmod -R +rw ${out}/graaljs/graal-nodejs/mx.graal-nodejs/python2
2627 patchShebangs ${out}/graaljs/graal-nodejs/mx.graal-nodejs/python2/python
2728
29+ # # TUFFLE-RUBY # #
30+ (cd ${out}/truffleruby && git apply ${./005_tool_jt.rb.patch})
31+ patchShebangs ${out}/truffleruby/tool/query-versions-json.rb
32+
33+ substituteInPlace ${out}/truffleruby/src/main/c/Makefile \
34+ --replace '(MX_HOME)/mx' '(MX_HOME)/mx-internal'
35+
36+ substituteInPlace ${out}/truffleruby/src/processor/java/org/truffleruby/processor/BuildInformationProcessor.java \
37+ --replace 'trufflerubyHome = findHome();' \
38+ 'trufflerubyHome = new File(System.getenv("MX_GIT_CACHE_DIR"), "truffleruby");' \
39+ --replace tool/query-versions-json.rb 'ruby tool/query-versions-json.rb' \
40+ --replace 'revision = runCommand("git rev-parse --short=8 HEAD");' \
41+ 'revision = "${version}";' \
42+ --replace 'compileDate = runCommand("git log -1 --date=short --pretty=format:%cd");' \
43+ 'compileDate = "1970-01-01";'
44+
45+ substituteInPlace ${out}/truffleruby/mx.truffleruby/mx_truffleruby.py \
46+ --replace "mx_binary = join(mx._mx_home, 'mx')" "mx_binary = join(mx._mx_home, 'mx-internal')"
47+
48+ # # FASTR # #
49+ (cd ${out}/fastr && git apply ${ ./006_mx_copylib.py.patch })
50+ (cd ${out}/fastr && git apply ${ ./007_unimplemented.c.patch })
51+ substituteInPlace ${out}/fastr/com.oracle.truffle.r.parser.processor/src/com/oracle/truffle/r/parser/processor/GenerateRParserProcessor.java \
52+ --replace 'File suiteRoot = srcGenDir.getCanonicalFile().getParentFile().getParentFile().getParentFile();' \
53+ 'File suiteRoot = new File(System.getenv("MX_GIT_CACHE_DIR"), "fastr");'
54+
55+ substituteInPlace ${out}/fastr/com.oracle.truffle.r.native/gnur/Makefile.libs \
56+ --replace 'mx -p' 'mx-internal -p'
57+
58+ substituteInPlace ${out}/fastr/com.oracle.truffle.r.native/include/Makefile \
59+ --replace 'mx -p' 'mx-internal -p'
60+
61+ substituteInPlace ${out}/fastr/com.oracle.truffle.r.native/fficall/Makefile \
62+ --replace 'mx -p' 'mx-internal -p'
63+
64+ substituteInPlace ${out}/fastr/com.oracle.truffle.r.native.recommended/Makefile \
65+ --replace 'mx -p' 'mx-internal -p'
66+
67+ # Make sure that the logs aren't hidden when compiling gnur
68+ substituteInPlace ${out}/fastr/com.oracle.truffle.r.native/gnur/Makefile.gnur \
69+ --replace '> gnur_configure.log 2>&1' "" \
70+ --replace '> gnur_make.log 2>&1' ""
71+
72+ substituteInPlace ${out}/fastr/com.oracle.truffle.r.native/run/Linux/Renviron \
73+ --replace /bin/ "" \
74+ --replace /usr/bin/ ""
75+
76+ sed -i "s|exec \$mx|exec mx-internal|g" ${out}/fastr/com.oracle.truffle.r.native/run/*.sh
77+ chmod +x ${out}/fastr/com.oracle.truffle.r.native/run/*.sh
78+ patchShebangs ${out}/fastr/com.oracle.truffle.r.native/run/*.sh
79+
2880 cd ${out}
2981 hg init
3082 hg add
@@ -50,14 +102,15 @@ let
50102 unzip "$out/${name}" -d "$out/$BASENAME.extracted"
51103
52104 # Ninja is called later in the build process
53− if [ -f $out/$BASENAME.extracted/ninja ]; then
54− patchelf --set-interpreter \
55− "$(cat $NIX_CC/nix-support/dynamic-linker)" \
56− --set-rpath "${stdenv.cc.cc.lib}/lib64" \
57− $out/$BASENAME.extracted/ninja
58− fi
59− ''
60− else ""}
105+ ${lib.optionalString stdenv.isLinux ''
106+ if [ -f $out/$BASENAME.extracted/ninja ]; then
107+ patchelf --set-interpreter \
108+ "$(cat $NIX_CC/nix-support/dynamic-linker)" \
109+ --set-rpath "${stdenv.cc.cc.lib}/lib64" \
110+ $out/$BASENAME.extracted/ninja
111+ fi''}
112+ ''
113+ else ""}
61114 '') list}
62115 '';
63116 };
@@ -89,30 +142,32 @@ let
89142 rec { sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0"; name = "HAMCREST_${sha1}/hamcrest.jar"; url = mirror://maven/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar; }
90143 rec { sha1 = "1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b"; name = "HAMCREST_${sha1}/hamcrest.sources.jar"; url = mirror://maven/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar; }
91144 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"; }
92− ];
145+] ++ lib.optionals stdenv.isLinux [
146+ 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"; }
147+ ]
148+++ lib.optionals stdenv.isDarwin [
149+ 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"; }
150+ ];
93151
94152 graal-mxcache = jvmci8-mxcache ++ [
153+ # 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; }
154+ 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; }
95155 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; }
96156 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; }
97− 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; }
98− rec { sha1 = "503402aa0cf80fd95ede043c0011152c2b4556fd"; name = "LLVM_PLATFORM_${sha1}/llvm-platform.jar"; url = mirror://maven/org/bytedeco/javacpp-presets/llvm-platform/6.0.1-1.4.2/llvm-platform-6.0.1-1.4.2.jar; }
99157 rec { sha1 = "cfa6a0259d98bff5aa8d41ba11b4d1dad648fbaa"; name = "JAVACPP_${sha1}/javacpp.jar"; url = mirror://maven/org/bytedeco/javacpp/1.4.2/javacpp-1.4.2.jar; }
100158 rec { sha1 = "fdb2d2c17f6b91cdd5421554396da8905f0dfed2"; name = "JAVACPP_${sha1}/javacpp.sources.jar"; url = mirror://maven/org/bytedeco/javacpp/1.4.2/javacpp-1.4.2-sources.jar; }
101159 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"; }
102− rec { sha1 = "987234c4ce45505c21302e097c24efef4873325c"; name = "NINJA_${sha1}/ninja.zip"; url = "https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip";
103− isNinja = true; }
104160 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; }
105161 rec { sha1 = "a8d54d1ca554a77f377eff6bf9e16ca8383c8f6c"; name = "NanoHTTPD_${sha1}/nanohttpd.jar"; url = mirror://maven/org/nanohttpd/nanohttpd/2.3.1/nanohttpd-2.3.1.jar; }
106162 rec { sha1 = "946f8aa9daa917dd81a8b818111bec7e288f821a"; name = "ANTLR4_${sha1}/antlr4.jar"; url = mirror://maven/org/antlr/antlr4-runtime/4.7.1/antlr4-runtime-4.7.1.jar; }
107163 rec { sha1 = "c3aeac59c022bdc497c8c48ed86fa50450e4896a"; name = "JLINE_${sha1}/jline.jar"; url = mirror://maven/jline/jline/2.14.6/jline-2.14.6.jar; }
108164 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; }
109− rec { sha1 = "0da08b8cce7bbf903602a25a3a163ae252435795"; name = "ASM5_${sha1}/asm5.jar"; url = mirror://maven/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar; }
165+ rec { sha1 = "0da08b8cce7bbf903602a25a3a163ae252435795"; name = "ASM5_${sha1}/asm5.jar"; url = mirror://maven/org/ow2/asm/asm/5.0.4/asm-5.0.4.jar; }
110166 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; }
111167 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; }
112168 rec { sha1 = "8819cea8bfe22c9c63f55465e296b3855ea41786"; name = "TruffleJSON_${sha1}/trufflejson.jar"; url = https://lafo.ssw.uni-linz.ac.at/pub/graal-external-deps/trufflejson-20180130.jar; }
113169 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; }
114− rec { sha1 = "158ba6f2b346469b5f8083d1700c3f55b8b9082c"; 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-11.tar.gz; }
115− rec { sha1 = "eb5ffa476ed2f6fac0ecd4bb2ae32741f9646932"; 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-11-linux-amd64.tar.gz; }
170+ 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; }
116171 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; }
117172 rec { sha1 = "7a4d00d5ec5febd252a6182e8b6e87a0a9821f81"; name = "ICU4J_${sha1}/icu4j.jar"; url = mirror://maven/com/ibm/icu/icu4j/62.1/icu4j-62.1.jar; }
118173 # This duplication of asm with underscore and minus is totally weird
@@ -138,15 +193,25 @@ let
138193 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; }
139194 rec { sha1 = "c4f7d054303948eb6a4066194253886c8af07128"; name = "XZ-1.8_${sha1}/xz-1.8.jar"; url = mirror://maven/org/tukaani/xz/1.8/xz-1.8.jar; }
140195 rec { sha1 = "9314d3d372b05546a33791fbc8dd579c92ebd16b"; name = "GNUR_${sha1}/gnur.tar.gz"; url = http://cran.rstudio.com/src/base/R-3/R-3.5.1.tar.gz; }
141− 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; }
142− ];
196+ 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; }] ++
197+ lib.optionals stdenv.isLinux [
198+ 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; }
199+ 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; }
200+ 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; }
201+ rec { sha1 = "987234c4ce45505c21302e097c24efef4873325c"; name = "NINJA_${sha1}/ninja.zip"; url = "https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip";
202+ isNinja = true; }] ++
203+ lib.optionals stdenv.isDarwin [
204+ 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; }
205+ 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; }
206+ 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; }
207+ rec { sha1 = "8142c497f7dfbdb052a1e31960fdfe2c6f9a5ca2"; name = "NINJA_${sha1}/ninja.zip"; url = "https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-mac.zip";
208+ isNinja = true; }];
143209
144210 graal-mxcachegit = [
145− { sha256 = "05z2830ng71bhgsxc0zyc74l1bz7hg54la8j1r99993fhhch4y36"; name = "graaljs"; url = "https://github.com/graalvm/graaljs.git"; rev = "vm-${version}"; }
146− { sha256 = "0ai5x4n1c2lcfkfpp29zn1bcmp3khc5hvssyw1qr1l2zy79fxwjp"; name = "truffleruby"; url = "https://github.com/oracle/truffleruby.git"; rev = "vm-${version}"; }
147− { sha256 = "010079qsl6dff3yca8vlzcahq9z1ppyr758shjkm1f7izwphjv7p"; name = "fastr"; url = "https://github.com/oracle/fastr.git"; rev = "vm-${version}"; }
148− { sha256 = "0hcqbasqs0yb7p1sal63qbxqxh942gh5vzl95pfdlflmc2g82v4q"; name = "graalpython"; url = "https://github.com/graalvm/graalpython.git"; rev = "vm-${version}"; }
149− ];
211+ { sha256 = "01w39ms39gl3cw7c2fgcacr2yjg94im9x2x7p5g94l6xlcgqvcnr"; name = "graaljs"; url = "https://github.com/graalvm/graaljs.git"; rev = "vm-${version}"; }
212+ { sha256 = "1dps9n5b9c80pbg1fmlwpffy6ina0f0h27di24kafc8isxrdggia"; name = "truffleruby"; url = "https://github.com/oracle/truffleruby.git"; rev = "vm-${version}"; }
213+ { sha256 = "0jdpdqm3ld1wsasmi8ka26qf19cibjac8lrqm040h5vh0iqzxizy"; name = "fastr"; url = "https://github.com/oracle/fastr.git"; rev = "vm-${version}"; }
214+ { sha256 = "1gv8vafwrafjzvgv4gwk4kcsb3bnvsx07qa5inc0bdyxy5shl381"; name = "graalpython"; url = "https://github.com/graalvm/graalpython.git"; rev = "vm-${version}"; }];
150215
151216 ninja-syntax = python27.pkgs.buildPythonPackage rec {
152217 version = "1.7.2";
@@ -169,13 +234,13 @@ let
169234in rec {
170235
171236 mx = stdenv.mkDerivation rec {
172− version = "5.223.0";
237+ version = "5.247.1";
173238 pname = "mx";
174239 src = fetchFromGitHub {
175240 owner = "graalvm";
176241 repo = "mx";
177242 rev = version;
178− sha256 = "0q51dnm6n1472p93dxr4jh8d7cv09a70pq89cdgxwh42vapykrn9";
243+ sha256 = "038qr49rqzkhj76nqd27h8fysssnlpdhmy23ks2y81xlxhlzkc59";
179244 };
180245 nativeBuildInputs = [ makeWrapper ];
181246 prePatch = ''
@@ -214,15 +279,17 @@ in rec {
214279 };
215280
216281 jvmci8 = stdenv.mkDerivation rec {
217− version = "19.2-b01";
282+ version = "19.3-b05";
218283 pname = "jvmci";
219284 src = fetchFromGitHub {
220285 owner = "graalvm";
221286 repo = "graal-jvmci-8";
222287 rev = "jvmci-${version}";
223− sha256 = "0maipj871vaxvap4576m0pzblzqxfjjzmwap3ndd84ny8d6vbqaa";
288+ sha256 = "0j7my76vldbrvki9x1gn9ics3x2z96j05jdy4nflbpik8i396114";
224289 };
225− buildInputs = [ mx mercurial openjdk ];
290+ buildInputs = [ mx mercurial openjdk ] ++ lib.optional stdenv.isDarwin [
291+ libobjc CoreFoundation Foundation JavaNativeFoundation JavaRuntimeSupport JavaVM xcodebuild Cocoa
292+ ];
226293 postUnpack = ''
227294 # a fake mercurial dir to prevent mx crash and supply the version to mx
228295 ( cd $sourceRoot
@@ -233,17 +300,27 @@ in rec {
233300 hg checkout ${lib.escapeShellArg src.rev}
234301 )
235302 '';
236− patches = [ ./004_mx_jvmci.py.patch ];
303+ patches = [ ./004_mx_jvmci.py.patch ] ++
304+ lib.optional stdenv.isDarwin [
305+ ./008_remove_jfr.patch ];
237306 postPatch =''
238307 # The hotspot version name regex fix
239308 substituteInPlace mx.jvmci/mx_jvmci.py \
240− --replace "\\d+.\\d+-b\\d+" "\\d+.\\d+-bga"
241− substituteInPlace src/share/vm/jvmci/jvmciCompilerToVM.cpp \
242− --replace 'method->name_and_sig_as_C_string(), method->native_function(), entry' \
243− 'method->name_and_sig_as_C_string(), p2i(method->native_function()), p2i(entry)' || exit -1
309+ --replace "\\d+.\\d+-b\\d+" "\\d+.\\d+-b[g\\d][a\\d]"
310+ # darwin: https://github.com/oracle/graal/issues/1816
311+ substituteInPlace src/share/vm/code/compiledIC.cpp \
312+ --replace 'entry == false' '*entry == false'
244313 '';
245314 hardeningDisable = [ "fortify" ];
246− NIX_CFLAGS_COMPILE = "-Wno-error=format-overflow -Wno-error=nonnull";
315+ NIX_CFLAGS_COMPILE = toString (lib.optional stdenv.isDarwin [
316+ "-Wno-reserved-user-defined-literal"
317+ "-Wno-c++11-narrowing"
318+ ] ++
319+ lib.optional stdenv.isLinux [
320+ "-Wno-error=format-overflow" # newly detected by gcc7
321+ "-Wno-error=nonnull"
322+ ]);
323+
247324 buildPhase = ''
248325 export MX_ALT_OUTPUT_ROOT=$NIX_BUILD_TOP/mxbuild
249326 export MX_CACHE_DIR=${makeMxCache jvmci8-mxcache}
@@ -254,7 +331,9 @@ in rec {
254331 '';
255332 installPhase = ''
256333 mkdir -p $out
257− mv openjdk1.8.0_*/linux-amd64/product/* $out
334+ ${if stdenv.isDarwin
335+ then "mv openjdk1.8.0_*/darwin-amd64/product/* $out"
336+ else "mv openjdk1.8.0_*/linux-amd64/product/* $out"}
258337 install -v -m0555 -D $MX_CACHE_DIR/hsdis*/hsdis.so $out/jre/lib/amd64/hsdis-amd64.so
259338 '';
260339 # copy-paste openjdk's preFixup
@@ -276,25 +355,36 @@ in rec {
276355 inherit (openjdk) meta;
277356 };
278357
279− graalvm8 = stdenv.mkDerivation rec {
358+ graalvm8 = stdenv.mkDerivation rec {
280359 inherit version;
281360 pname = "graal";
282361 src = fetchFromGitHub {
283362 owner = "oracle";
284363 repo = "graal";
285364 rev = "vm-${version}";
286− sha256 = "0abx6adk91yzaf1md4qbidxykpqcgphh6j4hj01ry57s4if0j66f";
365+ sha256 = "0v8zkmzkyhmmmvra5pp876d4i4ijrrw15j98ipayc7is02kwiwmq";
287366 };
288− patches = [ ./002_setjmp.c.patch ./003_mx_truffle.py.patch ];
289− buildInputs = [ mx zlib mercurial jvmci8 git clang llvm
290− python27withPackages which icu ruby bzip2
291− # gfortran readline bzip2 lzma pcre.dev curl ed ## WIP: fastr dependencies
367+
368+ patches = [ ./002_setjmp.c.patch ./003_mx_truffle.py.patch ] ++
369+ lib.optional stdenv.isDarwin [
370+ ./009_remove_signedness_verifier.patch ./010_mx_substratevm.py
371+ ];
372+
373+ buildInputs = [ mx zlib.dev mercurial jvmci8 git llvm clang
374+ python27withPackages icu ruby bzip2 which
375+ readline bzip2 lzma pcre curl ed gfortran
376+ ] ++ lib.optional stdenv.isDarwin [
377+ CoreFoundation gcc.cc.lib libiconv perl openssl
292378 ];
379+
293380 postUnpack = ''
294− cp ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc}/stdlib.h \
295− $sourceRoot/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/include
296− cp ${truffleMake} $TMP && mv *truffle.make truffle.make
381+ ${lib.optionalString stdenv.isLinux ''
382+ cp ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc}/stdlib.h \
383+ $sourceRoot/sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/include
384+ ''}
385+ cp ${truffleMake} $TMPDIR/truffle.make
297386 rm $sourceRoot/truffle/src/libffi/patches/others/0001-Add-mx-bootstrap-Makefile.patch
387+
298388 # a fake mercurial dir to prevent mx crash and supply the version to mx
299389 ( cd $sourceRoot
300390 hg init
@@ -303,57 +393,93 @@ in rec {
303393 hg tag ${lib.escapeShellArg src.rev}
304394 hg checkout ${lib.escapeShellArg src.rev}
305395 )
396+
397+ # make a copy of jvmci8
398+ mkdir $NIX_BUILD_TOP/jvmci8
399+ cp -dpR ${jvmci8}/* $NIX_BUILD_TOP/jvmci8
400+ chmod +w -R $NIX_BUILD_TOP/jvmci8
401+ export MX_CACHE_DIR=${makeMxCache graal-mxcache}
402+ export MX_GIT_CACHE_DIR=$NIX_BUILD_TOP/mxgitcache
403+ ${makeMxGitCache graal-mxcachegit "$MX_GIT_CACHE_DIR"}
404+ cd $TMPDIR
306405 '';
406+
307407 postPatch = ''
308408 substituteInPlace substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/headers/PosixDirectives.java \
309409 --replace '<zlib.h>' '<${zlib.dev}/include/zlib.h>'
310410 substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/CCLinkerInvocation.java \
311411 --replace 'cmd.add("-v");' 'cmd.add("-v"); cmd.add("-L${zlib}/lib");'
312− substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CCompilerInvoker.java \
313− --replace 'command.add(Platform.includedIn(Platform.WINDOWS.class) ? "CL" : "gcc");' \
314− 'command.add(Platform.includedIn(Platform.WINDOWS.class) ? "CL" : "${stdenv.cc}/bin/gcc");'
412+
413+ # For debugging native-image build, add this replace statement on CCompilerInvoker.java
414+ # --replace '(String line : lines) {' '(String line : lines) {System.out.println("DEBUG: " + line);'
415+ ${if stdenv.isLinux then ''
416+ substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CCompilerInvoker.java \
417+ --replace 'command.add(Platform.includedIn(Platform.WINDOWS.class) ? "CL" : "gcc");' \
418+ 'command.add(Platform.includedIn(Platform.WINDOWS.class) ? "CL" : "${stdenv.cc}/bin/gcc");' ''
419+ else ''
420+ substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/c/codegen/CCompilerInvoker.java \
421+ --replace 'command.add(Platform.includedIn(Platform.WINDOWS.class) ? "CL" : "gcc");' \
422+ 'command.add(Platform.includedIn(Platform.WINDOWS.class) ? "CL" : "${gcc.cc}/bin/gcc");
423+ command.add("-F"); command.add("${CoreFoundation}/Library/Frameworks");
424+ command.add("-framework"); command.add("CoreFoundation");'
425+ ''}
426+
427+ # prevent cyclical imports caused by identical <include> names
315428 substituteInPlace substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/CCLinkerInvocation.java \
316429 --replace 'protected String compilerCommand = "cc";' 'protected String compilerCommand = "${stdenv.cc}/bin/cc";'
317− # prevent cyclical imports caused by identical <include> names
318− substituteInPlace sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/include/stdlib.h \
319− --replace '# include <cstdlib>' '# include "${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc}/cstdlib"'
320430 # dragonegg can't seem to compile on nix, so let's not require it
321431 substituteInPlace sulong/mx.sulong/suite.py \
322432 --replace '"requireDragonegg" : True,' '"requireDragonegg" : False,'
323433 substituteInPlace truffle/mx.truffle/mx_truffle.py \
324434 --replace 'os.path.relpath(self.subject.delegate.dir, self.subject.suite.vc_dir)' \
325435 'self.subject.delegate.dir'
326−
436+ substituteInPlace sulong/projects/bootstrap-toolchain-launchers/Makefile \
437+ --replace /bin/bash ${bash}/bin/bash
327438 # Patch the native-image template, as it will be run during build
328439 chmod +x vm/mx.vm/launcher_template.sh && patchShebangs vm/mx.vm
329440 # Prevent random errors from too low maxRuntimecompilemethods
330441 substituteInPlace truffle/mx.truffle/macro-truffle.properties \
331442 --replace '-H:MaxRuntimeCompileMethods=1400' \
332443 '-H:MaxRuntimeCompileMethods=28000'
444+ ${lib.optionalString stdenv.isDarwin ''
445+ substituteInPlace truffle/src/com.oracle.truffle.nfi.test.native/src/object.cc \
446+ --replace '#include <stdlib.h>' ""
447+ ''}
448+ ${lib.optionalString stdenv.isLinux ''
449+ substituteInPlace sulong/projects/com.oracle.truffle.llvm.libraries.bitcode/include/stdlib.h \
450+ --replace '# include <cstdlib>' '# include "${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc}/cstdlib"'
451+ ''}
333452 '';
334453
335454 buildPhase = ''
336− # make a copy of jvmci8
337− mkdir $NIX_BUILD_TOP/jvmci8
338− cp -dpR ${jvmci8}/* $NIX_BUILD_TOP/jvmci8
339− chmod +w -R $NIX_BUILD_TOP/jvmci8
340−
341455 export MX_ALT_OUTPUT_ROOT=$NIX_BUILD_TOP/mxbuild
342− export MX_CACHE_DIR=${makeMxCache graal-mxcache}
343456 export MX_GIT_CACHE='refcache'
344− export MX_GIT_CACHE_DIR=$NIX_BUILD_TOP/mxgitcache
345457 export JVMCI_VERSION_CHECK='ignore'
346458 export JAVA_HOME=$NIX_BUILD_TOP/jvmci8
347− # export FASTR_RELEASE=true ## WIP
348− ${makeMxGitCache graal-mxcachegit "$MX_GIT_CACHE_DIR"}
349− cd $NIX_BUILD_TOP/source
350−
459+ export FASTR_RELEASE=true
460+ export PKG_LDFLAGS_OVERRIDE="-L${pcre.out}/lib -L${zlib}/lib -L${gfortran.cc.lib}/lib64"
461+ ${lib.optionalString stdenv.isDarwin ''
462+ export CC="gcc"
463+ export CPP="gcc -E"
464+ export NIX_CXXSTDLIB_LINK=""
465+ export NIX_TARGET_CXXSTDLIB_LINK=""
466+ export OPENSSL_PREFIX=$(realpath openssl)
467+ # this fixes error: impure path 'LibFFIHeaderDirectives' used in link
468+ export NIX_ENFORCE_PURITY=0
469+ ''}
351470 ( cd vm
352− mx-internal -v --dynamicimports /substratevm,/tools,sulong,/graal-nodejs,graalpython build
471+ mx-internal -v --suite sdk --suite compiler --suite vm --suite tools --suite regex --suite truffle \
472+ --dynamicimports /substratevm,/sulong,graal-js,graalpython,fastr,truffleruby build
353473 )
354474 '';
355475
356− installPhase = ''
476+ installPhase =
477+ (if stdenv.isDarwin then ''
478+ mkdir -p $out
479+ rm -rf $MX_ALT_OUTPUT_ROOT/vm/darwin-amd64/GRAALVM_*STAGE1*
480+ cp -rf $MX_ALT_OUTPUT_ROOT/vm/darwin-amd64/GRAALVM*/graalvm-unknown-${version}/* $out
481+ ''
482+ else ''
357483 mkdir -p $out
358484 rm -rf $MX_ALT_OUTPUT_ROOT/vm/linux-amd64/GRAALVM_*STAGE1*
359485 cp -rf $MX_ALT_OUTPUT_ROOT/vm/linux-amd64/GRAALVM*/graalvm-unknown-${version}/* $out
@@ -366,7 +492,7 @@ in rec {
366492 cp -rf ${glibc}/lib/* $out/jre/lib/svm/clibraries/linux-amd64/
367493 cp ${glibc.static}/lib/* $out/jre/lib/svm/clibraries/linux-amd64/
368494 cp ${zlib.static}/lib/libz.a $out/jre/lib/svm/clibraries/linux-amd64/libz.a
369− '';
495+ '');
370496
371497 inherit (jvmci8) preFixup;
372498 dontStrip = true; # stripped javac crashes with "segmentaion fault"
@@ -390,12 +516,14 @@ in rec {
390516 ./helloworld
391517 ./helloworld | fgrep 'Hello World'
392518
393− # Ahead-Of-Time compilation with --static
394− $out/bin/native-image --no-server --static HelloWorld
395− ./helloworld
396− ./helloworld | fgrep 'Hello World'
397− '';
398−
519+ ${lib.optionalString stdenv.isLinux
520+ ''
521+ # Ahead-Of-Time compilation with --static (supported on linux only)
522+ $out/bin/native-image --no-server --static HelloWorld
523+ ./helloworld
524+ ./helloworld | fgrep 'Hello World'
525+ ''}
526+ '';
399527 enableParallelBuilding = true;
400528 passthru.home = graalvm8;
401529
@@ -404,7 +532,7 @@ in rec {
404532 description = "High-Performance Polyglot VM";
405533 license = licenses.gpl2;
406534 maintainers = with maintainers; [ volth hlolli ];
407− platforms = [ "x86_64-linux" /*"aarch64-linux" "x86_64-darwin"*/ ];
535+ platforms = [ "x86_64-linux" "x86_64-darwin" /*"aarch64-linux"*/ ];
408536 };
409537 };
410538}
pkgs/development/compilers/graalvm/truffle.make+4−2
@@ -2,13 +2,15 @@
22
33# `make MX_VERBOSE=y` will report all lines executed. The actual value doesn't
44# matter as long as it's not empty.
5+
56QUIETLY$(MX_VERBOSE) = @
67
78.PHONY: default
89
910default:
11+ sed -i "s|-print-multi-os-directory||g" ../$(SOURCES)/configure
1012 $(QUIETLY) echo CONFIGURE libffi
1113 $(QUIETLY) mkdir ../$(OUTPUT)
12− $(QUIETLY) cd ../$(OUTPUT) && ../$(SOURCES)/configure $(CONFIGURE_ARGS) > ../libffi.configure.log
14+ $(QUIETLY) cd ../$(OUTPUT) && ../$(SOURCES)/configure $(CONFIGURE_ARGS)
1315 $(QUIETLY) echo MAKE libffi
14− $(QUIETLY) $(MAKE) -C ../$(OUTPUT) > ../libffi.build.log
16+ $(QUIETLY) $(MAKE) -C ../$(OUTPUT)
pkgs/development/compilers/llvm/7/clang/HIP-use-PATH-7.patchnew file+68
@@ -0,0 +1,68 @@
1+From 8412cba68835f8f4cc527d02194b181faa5944d4 Mon Sep 17 00:00:00 2001
2+From: =?UTF-8?q?Holger=20W=C3=BCnsche?= <holger.o.wuensche@t-online.de>
3+Date: Tue, 21 Jan 2020 19:46:09 +0100
4+Subject: [PATCH] [HIP] use GetProgramPath for executable discovery
5+
6+This change replaces the manual building of executable paths
7+using llvm::sys::path::append with GetProgramPath.
8+This enables adding other paths in case executables reside
9+in different directories and makes the code easier to read.
10+
11+Differential Revision: https://reviews.llvm.org/D72903
12+---
13+ clang/lib/Driver/ToolChains/HIP.cpp | 18 ++++++------------
14+ 1 file changed, 6 insertions(+), 12 deletions(-)
15+
16+diff --git a/lib/Driver/ToolChains/HIP.cpp b/lib/Driver/ToolChains/HIP.cpp
17+index 03acf45a9b3..75fd3226c75 100644
18+--- a/lib/Driver/ToolChains/HIP.cpp
19++++ b/lib/Driver/ToolChains/HIP.cpp
20+@@ -98,9 +98,8 @@ const char *AMDGCN::Linker::constructLLVMLinkCommand(
21+ const char *OutputFileName =
22+ C.addTempFile(C.getArgs().MakeArgString(TmpName));
23+ CmdArgs.push_back(OutputFileName);
24+- SmallString<128> ExecPath(C.getDriver().Dir);
25+- llvm::sys::path::append(ExecPath, "llvm-link");
26+- const char *Exec = Args.MakeArgString(ExecPath);
27++ const char *Exec =
28++ Args.MakeArgString(getToolChain().GetProgramPath("llvm-link"));
29+ C.addCommand(llvm::make_unique<Command>(JA, *this, Exec, CmdArgs, Inputs));
30+ return OutputFileName;
31+ }
32+@@ -141,9 +140,8 @@ const char *AMDGCN::Linker::constructOptCommand(
33+ const char *OutputFileName =
34+ C.addTempFile(C.getArgs().MakeArgString(TmpFileName));
35+ OptArgs.push_back(OutputFileName);
36+- SmallString<128> OptPath(C.getDriver().Dir);
37+- llvm::sys::path::append(OptPath, "opt");
38+- const char *OptExec = Args.MakeArgString(OptPath);
39++ const char *OptExec =
40++ Args.MakeArgString(getToolChain().GetProgramPath("opt"));
41+ C.addCommand(llvm::make_unique<Command>(JA, *this, OptExec, OptArgs, Inputs));
42+ return OutputFileName;
43+ }
44+@@ -161,9 +159,7 @@ const char *AMDGCN::Linker::constructLlcCommand(
45+ const char *LlcOutputFile =
46+ C.addTempFile(C.getArgs().MakeArgString(LlcOutputFileName));
47+ LlcArgs.push_back(LlcOutputFile);
48+- SmallString<128> LlcPath(C.getDriver().Dir);
49+- llvm::sys::path::append(LlcPath, "llc");
50+- const char *Llc = Args.MakeArgString(LlcPath);
51++ const char *Llc = Args.MakeArgString(getToolChain().GetProgramPath("llc"));
52+ C.addCommand(llvm::make_unique<Command>(JA, *this, Llc, LlcArgs, Inputs));
53+ return LlcOutputFile;
54+ }
55+@@ -178,9 +174,7 @@ void AMDGCN::Linker::constructLldCommand(Compilation &C, const JobAction &JA,
56+ ArgStringList LldArgs{"-flavor", "gnu", "--no-undefined",
57+ "-shared", "-o", Output.getFilename(),
58+ InputFileName};
59+- SmallString<128> LldPath(C.getDriver().Dir);
60+- llvm::sys::path::append(LldPath, "lld");
61+- const char *Lld = Args.MakeArgString(LldPath);
62++ const char *Lld = Args.MakeArgString(getToolChain().GetProgramPath("lld"));
63+ C.addCommand(llvm::make_unique<Command>(JA, *this, Lld, LldArgs, Inputs));
64+ }
65+
66+--
67+2.23.1
68+
pkgs/development/compilers/llvm/7/clang/default.nix+7−3
@@ -1,4 +1,4 @@
1−{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3
1+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld
22, fixDarwinDylibNames
33, enableManpages ? false
44, enablePolly ? false # TODO: get this info from llvm (passthru?)
@@ -22,7 +22,7 @@ let
2222 nativeBuildInputs = [ cmake python3 ]
2323 ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;
2424
25− buildInputs = [ libxml2 llvm ]
25+ buildInputs = [ libxml2 llvm lld ]
2626 ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
2727
2828 cmakeFlags = [
@@ -38,7 +38,11 @@ let
3838 "-DLINK_POLLY_INTO_TOOLS=ON"
3939 ];
4040
41− patches = [ ./purity.patch ];
41+ patches = [
42+ ./purity.patch
43+ # make clang -xhip use $PATH to find executables
44+ ./HIP-use-PATH-7.patch
45+ ];
4246
4347 postPatch = ''
4448 sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \
pkgs/development/compilers/llvm/7/default.nix+1
@@ -32,6 +32,7 @@ let
3232 llvm-polly = callPackage ./llvm.nix { enablePolly = true; };
3333
3434 clang-unwrapped = callPackage ./clang {
35+ inherit (tools) lld;
3536 inherit clang-tools-extra_src;
3637 };
3738 clang-polly-unwrapped = callPackage ./clang {
pkgs/development/compilers/llvm/8/clang/HIP-use-PATH-8.patchnew file+80
@@ -0,0 +1,80 @@
1+From d9f1b7d7571b252e0ba2359ae6cfa93a9903c0e7 Mon Sep 17 00:00:00 2001
2+From: =?UTF-8?q?Holger=20W=C3=BCnsche?= <holger.o.wuensche@t-online.de>
3+Date: Tue, 21 Jan 2020 19:49:44 +0100
4+Subject: [PATCH] [HIP] use GetProgramPath for executable discovery
5+
6+This change replaces the manual building of executable paths
7+using llvm::sys::path::append with GetProgramPath.
8+This enables adding other paths in case executables reside
9+in different directories and makes the code easier to read.
10+
11+Differential Revision: https://reviews.llvm.org/D72903
12+---
13+ clang/lib/Driver/ToolChains/HIP.cpp | 23 ++++++++---------------
14+ 1 file changed, 8 insertions(+), 15 deletions(-)
15+
16+diff --git a/lib/Driver/ToolChains/HIP.cpp b/lang/lib/Driver/ToolChains/HIP.cpp
17+index 868765cf88e..31f2d68ec6c 100644
18+--- a/lib/Driver/ToolChains/HIP.cpp
19++++ b/lib/Driver/ToolChains/HIP.cpp
20+@@ -104,9 +104,8 @@ const char *AMDGCN::Linker::constructLLVMLinkCommand(
21+ const char *OutputFileName =
22+ C.addTempFile(C.getArgs().MakeArgString(TmpName));
23+ CmdArgs.push_back(OutputFileName);
24+- SmallString<128> ExecPath(C.getDriver().Dir);
25+- llvm::sys::path::append(ExecPath, "llvm-link");
26+- const char *Exec = Args.MakeArgString(ExecPath);
27++ const char *Exec =
28++ Args.MakeArgString(getToolChain().GetProgramPath("llvm-link"));
29+ C.addCommand(llvm::make_unique<Command>(JA, *this, Exec, CmdArgs, Inputs));
30+ return OutputFileName;
31+ }
32+@@ -147,9 +146,8 @@ const char *AMDGCN::Linker::constructOptCommand(
33+ const char *OutputFileName =
34+ C.addTempFile(C.getArgs().MakeArgString(TmpFileName));
35+ OptArgs.push_back(OutputFileName);
36+- SmallString<128> OptPath(C.getDriver().Dir);
37+- llvm::sys::path::append(OptPath, "opt");
38+- const char *OptExec = Args.MakeArgString(OptPath);
39++ const char *OptExec =
40++ Args.MakeArgString(getToolChain().GetProgramPath("opt"));
41+ C.addCommand(llvm::make_unique<Command>(JA, *this, OptExec, OptArgs, Inputs));
42+ return OutputFileName;
43+ }
44+@@ -167,9 +165,7 @@ const char *AMDGCN::Linker::constructLlcCommand(
45+ const char *LlcOutputFile =
46+ C.addTempFile(C.getArgs().MakeArgString(LlcOutputFileName));
47+ LlcArgs.push_back(LlcOutputFile);
48+- SmallString<128> LlcPath(C.getDriver().Dir);
49+- llvm::sys::path::append(LlcPath, "llc");
50+- const char *Llc = Args.MakeArgString(LlcPath);
51++ const char *Llc = Args.MakeArgString(getToolChain().GetProgramPath("llc"));
52+ C.addCommand(llvm::make_unique<Command>(JA, *this, Llc, LlcArgs, Inputs));
53+ return LlcOutputFile;
54+ }
55+@@ -184,9 +180,7 @@ void AMDGCN::Linker::constructLldCommand(Compilation &C, const JobAction &JA,
56+ ArgStringList LldArgs{"-flavor", "gnu", "--no-undefined",
57+ "-shared", "-o", Output.getFilename(),
58+ InputFileName};
59+- SmallString<128> LldPath(C.getDriver().Dir);
60+- llvm::sys::path::append(LldPath, "lld");
61+- const char *Lld = Args.MakeArgString(LldPath);
62++ const char *Lld = Args.MakeArgString(getToolChain().GetProgramPath("lld"));
63+ C.addCommand(llvm::make_unique<Command>(JA, *this, Lld, LldArgs, Inputs));
64+ }
65+
66+@@ -218,9 +212,8 @@ void AMDGCN::constructHIPFatbinCommand(Compilation &C, const JobAction &JA,
67+ Args.MakeArgString(std::string("-outputs=").append(OutputFileName));
68+ BundlerArgs.push_back(BundlerOutputArg);
69+
70+- SmallString<128> BundlerPath(C.getDriver().Dir);
71+- llvm::sys::path::append(BundlerPath, "clang-offload-bundler");
72+- const char *Bundler = Args.MakeArgString(BundlerPath);
73++ const char *Bundler = Args.MakeArgString(
74++ T.getToolChain().GetProgramPath("clang-offload-bundler"));
75+ C.addCommand(llvm::make_unique<Command>(JA, T, Bundler, BundlerArgs, Inputs));
76+ }
77+
78+--
79+2.23.1
80+
pkgs/development/compilers/llvm/8/clang/default.nix+4−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3
1+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld
22, fixDarwinDylibNames
33, enableManpages ? false
44, enablePolly ? false # TODO: get this info from llvm (passthru?)
@@ -22,7 +22,7 @@ let
2222 nativeBuildInputs = [ cmake python3 ]
2323 ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;
2424
25− buildInputs = [ libxml2 llvm ]
25+ buildInputs = [ libxml2 llvm lld ]
2626 ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
2727
2828 cmakeFlags = [
@@ -50,6 +50,8 @@ let
5050 ./unwindlib.patch
5151 # https://reviews.llvm.org/D51899
5252 ./compiler-rt-baremetal.patch
53+ # make clang -xhip use $PATH to find executables
54+ ./HIP-use-PATH-8.patch
5355 ];
5456
5557 postPatch = ''
pkgs/development/compilers/llvm/8/default.nix+1
@@ -32,6 +32,7 @@ let
3232 llvm-polly = callPackage ./llvm.nix { enablePolly = true; };
3333
3434 clang-unwrapped = callPackage ./clang {
35+ inherit (tools) lld;
3536 inherit clang-tools-extra_src;
3637 };
3738 clang-polly-unwrapped = callPackage ./clang {
pkgs/development/compilers/llvm/9/clang/HIP-use-PATH-9.patchnew file+80
@@ -0,0 +1,80 @@
1+From 7147e9774c74abcd1d6db24e24d0fd989c2b97dd Mon Sep 17 00:00:00 2001
2+From: =?UTF-8?q?Holger=20W=C3=BCnsche?= <holger.o.wuensche@t-online.de>
3+Date: Tue, 21 Jan 2020 19:52:04 +0100
4+Subject: [PATCH] [HIP] use GetProgramPath for executable discovery
5+
6+This change replaces the manual building of executable paths
7+using llvm::sys::path::append with GetProgramPath.
8+This enables adding other paths in case executables reside
9+in different directories and makes the code easier to read.
10+
11+Differential Revision: https://reviews.llvm.org/D72903
12+---
13+ clang/lib/Driver/ToolChains/HIP.cpp | 23 ++++++++---------------
14+ 1 file changed, 8 insertions(+), 15 deletions(-)
15+
16+diff --git a/lib/Driver/ToolChains/HIP.cpp b/lib/Driver/ToolChains/HIP.cpp
17+index 2ec97e798fd..735c302debb 100644
18+--- a/lib/Driver/ToolChains/HIP.cpp
19++++ b/lib/Driver/ToolChains/HIP.cpp
20+@@ -66,9 +66,8 @@ const char *AMDGCN::Linker::constructLLVMLinkCommand(
21+ const char *OutputFileName =
22+ C.addTempFile(C.getArgs().MakeArgString(TmpName));
23+ CmdArgs.push_back(OutputFileName);
24+- SmallString<128> ExecPath(C.getDriver().Dir);
25+- llvm::sys::path::append(ExecPath, "llvm-link");
26+- const char *Exec = Args.MakeArgString(ExecPath);
27++ const char *Exec =
28++ Args.MakeArgString(getToolChain().GetProgramPath("llvm-link"));
29+ C.addCommand(llvm::make_unique<Command>(JA, *this, Exec, CmdArgs, Inputs));
30+ return OutputFileName;
31+ }
32+@@ -114,9 +113,8 @@ const char *AMDGCN::Linker::constructOptCommand(
33+ const char *OutputFileName =
34+ C.addTempFile(C.getArgs().MakeArgString(TmpFileName));
35+ OptArgs.push_back(OutputFileName);
36+- SmallString<128> OptPath(C.getDriver().Dir);
37+- llvm::sys::path::append(OptPath, "opt");
38+- const char *OptExec = Args.MakeArgString(OptPath);
39++ const char *OptExec =
40++ Args.MakeArgString(getToolChain().GetProgramPath("opt"));
41+ C.addCommand(llvm::make_unique<Command>(JA, *this, OptExec, OptArgs, Inputs));
42+ return OutputFileName;
43+ }
44+@@ -156,9 +154,7 @@ const char *AMDGCN::Linker::constructLlcCommand(
45+ const char *LlcOutputFile =
46+ C.addTempFile(C.getArgs().MakeArgString(LlcOutputFileName));
47+ LlcArgs.push_back(LlcOutputFile);
48+- SmallString<128> LlcPath(C.getDriver().Dir);
49+- llvm::sys::path::append(LlcPath, "llc");
50+- const char *Llc = Args.MakeArgString(LlcPath);
51++ const char *Llc = Args.MakeArgString(getToolChain().GetProgramPath("llc"));
52+ C.addCommand(llvm::make_unique<Command>(JA, *this, Llc, LlcArgs, Inputs));
53+ return LlcOutputFile;
54+ }
55+@@ -172,9 +168,7 @@ void AMDGCN::Linker::constructLldCommand(Compilation &C, const JobAction &JA,
56+ // The output from ld.lld is an HSA code object file.
57+ ArgStringList LldArgs{
58+ "-flavor", "gnu", "-shared", "-o", Output.getFilename(), InputFileName};
59+- SmallString<128> LldPath(C.getDriver().Dir);
60+- llvm::sys::path::append(LldPath, "lld");
61+- const char *Lld = Args.MakeArgString(LldPath);
62++ const char *Lld = Args.MakeArgString(getToolChain().GetProgramPath("lld"));
63+ C.addCommand(llvm::make_unique<Command>(JA, *this, Lld, LldArgs, Inputs));
64+ }
65+
66+@@ -206,9 +200,8 @@ void AMDGCN::constructHIPFatbinCommand(Compilation &C, const JobAction &JA,
67+ Args.MakeArgString(std::string("-outputs=").append(OutputFileName));
68+ BundlerArgs.push_back(BundlerOutputArg);
69+
70+- SmallString<128> BundlerPath(C.getDriver().Dir);
71+- llvm::sys::path::append(BundlerPath, "clang-offload-bundler");
72+- const char *Bundler = Args.MakeArgString(BundlerPath);
73++ const char *Bundler = Args.MakeArgString(
74++ T.getToolChain().GetProgramPath("clang-offload-bundler"));
75+ C.addCommand(llvm::make_unique<Command>(JA, T, Bundler, BundlerArgs, Inputs));
76+ }
77+
78+--
79+2.23.1
80+
pkgs/development/compilers/llvm/9/clang/default.nix+4−2
@@ -1,4 +1,4 @@
1−{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3
1+{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld
22, fixDarwinDylibNames
33, enableManpages ? false
44, enablePolly ? false # TODO: get this info from llvm (passthru?)
@@ -22,7 +22,7 @@ let
2222 nativeBuildInputs = [ cmake python3 ]
2323 ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx;
2424
25− buildInputs = [ libxml2 llvm ]
25+ buildInputs = [ libxml2 llvm lld ]
2626 ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
2727
2828 cmakeFlags = [
@@ -43,6 +43,8 @@ let
4343 ./purity.patch
4444 # https://reviews.llvm.org/D51899
4545 ./compiler-rt-baremetal.patch
46+ # make clang -xhip use $PATH to find executables
47+ ./HIP-use-PATH-9.patch
4648 ];
4749
4850 postPatch = ''
pkgs/development/compilers/llvm/9/default.nix+1
@@ -32,6 +32,7 @@ let
3232 llvm-polly = callPackage ./llvm.nix { enablePolly = true; };
3333
3434 clang-unwrapped = callPackage ./clang {
35+ inherit (tools) lld;
3536 inherit clang-tools-extra_src;
3637 };
3738 clang-polly-unwrapped = callPackage ./clang {
pkgs/development/compilers/openjdk/darwin/8.nix+6−3
@@ -7,11 +7,14 @@ let
77 };
88
99 jdk = stdenv.mkDerivation {
10− name = "zulu1.8.0_222-8.40.0.25-ca-fx";
10+ # @hlolli: Later version than 1.8.0_202 throws error when building jvmci.
11+ # dyld: lazy symbol binding failed: Symbol not found: _JVM_BeforeHalt
12+ # Referenced from: ../libjava.dylib Expected in: .../libjvm.dylib
13+ name = "zulu1.8.0_202-8.36.0.1";
1114
1215 src = fetchurl {
13− url = "http://cdn.azul.com/zulu/bin/zulu8.40.0.25-ca-fx-jdk8.0.222-macosx_x64.zip";
14− sha256 = "1mal8bdc94q7ahx7p3xggy3qpxr6h83g2y01wzgvnqjd8n5i3qr1";
16+ url = "https://cdn.azul.com/zulu/bin/zulu8.36.0.1-ca-jdk8.0.202-macosx_x64.zip";
17+ sha256 = "0s92l1wlf02vjx8dvrsla2kq7qwxnmgh325b38mgqy872016jm9p";
1518 curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/zulu-linux/";
1619 };
1720
pkgs/development/libraries/at-spi2-core/default.nix+3−1
@@ -30,7 +30,9 @@ stdenv.mkDerivation rec {
3030 outputs = [ "out" "dev" ];
3131
3232 nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection makeWrapper ];
33− buildInputs = [ dbus glib libX11 libXtst libXi ];
33+ buildInputs = [ libX11 libXtst libXi ];
34+ # In atspi-2.pc dbus-1 glib-2.0
35+ propagatedBuildInputs = [ dbus glib ];
3436
3537 doCheck = false; # fails with "AT-SPI: Couldn't connect to accessibility bus. Is at-spi-bus-launcher running?"
3638
pkgs/development/libraries/clutter-gst/default.nix+4−4
@@ -1,13 +1,13 @@
11{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl, gnome3, gdk-pixbuf }:
22
3−let
3+stdenv.mkDerivation rec {
44 pname = "clutter-gst";
55 version = "3.0.27";
6−in stdenv.mkDerivation rec {
7− name = "${pname}-${version}";
6+
7+ outputs = [ "out" "dev" ];
88
99 src = fetchurl {
10− url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
10+ url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
1111 sha256 = "17czmpl92dzi4h3rn5rishk015yi3jwiw29zv8qan94xcmnbssgy";
1212 };
1313
pkgs/development/libraries/cppunit/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "cppunit";
5− version = "1.14.0";
5+ version = "1.15.0";
66
77 src = fetchurl {
88 url = "https://dev-www.libreoffice.org/src/${pname}-${version}.tar.gz";
9− sha256 = "1027cyfx5gsjkdkaf6c2wnjh68882grw8n672018cj3vs9lrhmix";
9+ sha256 = "08j9hc11yl07ginsf282pshn6zpy96yhzf7426sfn10f8gdxyq8w";
1010 };
1111
1212 meta = with stdenv.lib; {
pkgs/development/libraries/epoxy/default.nix+2−2
@@ -6,13 +6,13 @@ with stdenv.lib;
66
77stdenv.mkDerivation rec {
88 pname = "epoxy";
9− version = "1.5.3";
9+ version = "1.5.4";
1010
1111 src = fetchFromGitHub {
1212 owner = "anholt";
1313 repo = "libepoxy";
1414 rev = version;
15− sha256 = "03nrmf161xyj3q9zsigr5qj5vx5dsfxxyjva73cm1mgqqc5d60px";
15+ sha256 = "0rmg0qlswn250h0arx434jh3hwzsr95lawanpmh1czsfvrcx59l6";
1616 };
1717
1818 outputs = [ "out" "dev" ];
pkgs/development/libraries/gtkd/default.nix+11
@@ -7,6 +7,8 @@ in stdenv.mkDerivation rec {
77 pname = "gtkd";
88 version = "3.9.0";
99
10+ outputs = [ "out" "dev" ];
11+
1012 src = fetchzip {
1113 url = "https://gtkd.org/Downloads/sources/GtkD-${version}.zip";
1214 sha256 = "12kc4s5gp6gn456d8pzhww1ggi9qbxldmcpp6855297g2x8xxy5p";
@@ -118,6 +120,15 @@ in stdenv.mkDerivation rec {
118120 "PKG_CONFIG=${pkgconfig}/bin/pkg-config"
119121 ];
120122
123+ # The .pc files does not declare an `includedir=`, so the multiple
124+ # outputs setup hook misses this.
125+ postFixup = ''
126+ for pc in $dev/lib/pkgconfig/*; do
127+ substituteInPlace $pc \
128+ --replace "$out/include" "$dev/include"
129+ done
130+ '';
131+
121132 meta = with stdenv.lib; {
122133 description = "D binding and OO wrapper for GTK";
123134 homepage = https://gtkd.org;
pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch+3−3
@@ -1,12 +1,12 @@
11diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
2−index 0acd33f..c04b0a5 100644
2+index c1d056b..d9e19f0 100644
33--- a/kde-modules/KDEInstallDirs.cmake
44+++ b/kde-modules/KDEInstallDirs.cmake
5−@@ -236,35 +236,6 @@
5+@@ -242,35 +242,6 @@
66 # GNUInstallDirs code deals with re-configuring, but that is dealt with
77 # by the _define_* macros in this module).
88 set(_LIBDIR_DEFAULT "lib")
9−-# Override this default 'lib' with 'lib64' iff:
9+-# Override this default 'lib' with 'lib64' if:
1010-# - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
1111-# - we are NOT on debian
1212-# - we are NOT on flatpak
pkgs/development/libraries/kde-frameworks/fetch.sh+1−1
@@ -1 +1 @@
1−WGET_ARGS=( https://download.kde.org/stable/frameworks/5.64/ )
1+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.66/ )
pkgs/development/libraries/kde-frameworks/kinit/kdeinit-extra_libs.patch+3−4
@@ -38,10 +38,9 @@ Index: kinit-5.32.0/src/kdeinit/kinit.cpp
3838 static void secondary_child_handler(int)
3939@@ -1692,7 +1676,7 @@ int main(int argc, char **argv)
4040 if (!d.suicide && qEnvironmentVariableIsEmpty("KDE_IS_PRELINKED")) {
41− const int extrasCount = sizeof(extra_libs) / sizeof(extra_libs[0]);
42− for (int i = 0; i < extrasCount; i++) {
43−- const QString extra = findSharedLib(QString::fromLatin1(extra_libs[i]));
44−+ const QString extra = QString::fromLatin1(extra_libs[i]);
41+ for (const char *extra_lib : extra_libs) {
42+- const QString extra = findSharedLib(QString::fromLatin1(extra_lib));
43++ const QString extra = QString::fromLatin1(extra_lib);
4544 if (!extra.isEmpty()) {
4645 QLibrary l(extra);
4746 l.setLoadHints(QLibrary::ExportExternalSymbolsHint);
pkgs/development/libraries/kde-frameworks/srcs.nix+332−324
@@ -3,651 +3,659 @@
33
44{
55 attica = {
6− version = "5.64.0";
6+ version = "5.66.0";
77 src = fetchurl {
8− url = "${mirror}/stable/frameworks/5.64/attica-5.64.0.tar.xz";
9− sha256 = "c9b060693656a458f92905091e12d800be020abbf47bb68b9f769a191aa368d9";
10− name = "attica-5.64.0.tar.xz";
8+ url = "${mirror}/stable/frameworks/5.66/attica-5.66.0.tar.xz";
9+ sha256 = "e87ea061d393104804aa65db69ec3489512b472d8fb821c9fc49ffdcb85177fb";
10+ name = "attica-5.66.0.tar.xz";
1111 };
1212 };
1313 baloo = {
14− version = "5.64.0";
14+ version = "5.66.0";
1515 src = fetchurl {
16− url = "${mirror}/stable/frameworks/5.64/baloo-5.64.0.tar.xz";
17− sha256 = "adaaef1aeec07ccc210210a2e67f4d12c0275226bb05d0220da0281f1a3984c2";
18− name = "baloo-5.64.0.tar.xz";
16+ url = "${mirror}/stable/frameworks/5.66/baloo-5.66.0.tar.xz";
17+ sha256 = "9495869eee72f587efadc8a848c3f76b93a1dcb1914c8e818d7084451107a1f8";
18+ name = "baloo-5.66.0.tar.xz";
1919 };
2020 };
2121 bluez-qt = {
22− version = "5.64.0";
22+ version = "5.66.0";
2323 src = fetchurl {
24− url = "${mirror}/stable/frameworks/5.64/bluez-qt-5.64.0.tar.xz";
25− sha256 = "7d6c7ba913cea6059327726325b8af4cf2baa7594b8be3143e0649eaa36f8384";
26− name = "bluez-qt-5.64.0.tar.xz";
24+ url = "${mirror}/stable/frameworks/5.66/bluez-qt-5.66.0.tar.xz";
25+ sha256 = "cc3f3fcc1df87b61480549d658c1a27690661aaa4f22a65552efe3f6bf41c887";
26+ name = "bluez-qt-5.66.0.tar.xz";
2727 };
2828 };
2929 breeze-icons = {
30− version = "5.64.0";
30+ version = "5.66.0";
3131 src = fetchurl {
32− url = "${mirror}/stable/frameworks/5.64/breeze-icons-5.64.0.tar.xz";
33− sha256 = "08c2f7efc5f1550668dd2e0cff1641b1b6ec8a91f01614ee14c6abc4d975672f";
34− name = "breeze-icons-5.64.0.tar.xz";
32+ url = "${mirror}/stable/frameworks/5.66/breeze-icons-5.66.0.tar.xz";
33+ sha256 = "445a77204c7d9ac398e7f1d1594cd93e719665c85c7fb9ef71fde1ce68cb64d7";
34+ name = "breeze-icons-5.66.0.tar.xz";
3535 };
3636 };
3737 extra-cmake-modules = {
38− version = "5.64.0";
38+ version = "5.66.0";
3939 src = fetchurl {
40− url = "${mirror}/stable/frameworks/5.64/extra-cmake-modules-5.64.0.tar.xz";
41− sha256 = "1865efc6254bed44e0a6918c5af3da62be4008ba7a197a47f35251f298041a69";
42− name = "extra-cmake-modules-5.64.0.tar.xz";
40+ url = "${mirror}/stable/frameworks/5.66/extra-cmake-modules-5.66.0.tar.xz";
41+ sha256 = "2ff1a4ede28488ea787e742ab37edaacc5f59bf9188476e48f681ce23300b9c4";
42+ name = "extra-cmake-modules-5.66.0.tar.xz";
4343 };
4444 };
4545 frameworkintegration = {
46− version = "5.64.0";
46+ version = "5.66.0";
4747 src = fetchurl {
48− url = "${mirror}/stable/frameworks/5.64/frameworkintegration-5.64.0.tar.xz";
49− sha256 = "6c1880f8300a014bb835ce29fd68651bfd38400de8044fe5914cb4392df48a26";
50− name = "frameworkintegration-5.64.0.tar.xz";
48+ url = "${mirror}/stable/frameworks/5.66/frameworkintegration-5.66.0.tar.xz";
49+ sha256 = "55c01613436781d74652bef19fc594448cdee4c002d5e1713b583473455f54d8";
50+ name = "frameworkintegration-5.66.0.tar.xz";
5151 };
5252 };
5353 kactivities = {
54− version = "5.64.0";
54+ version = "5.66.0";
5555 src = fetchurl {
56− url = "${mirror}/stable/frameworks/5.64/kactivities-5.64.0.tar.xz";
57− sha256 = "5afbd0785c04127c91f1ad7402c95ce3f994fb94b216baf56cd802a3a230a3f9";
58− name = "kactivities-5.64.0.tar.xz";
56+ url = "${mirror}/stable/frameworks/5.66/kactivities-5.66.0.tar.xz";
57+ sha256 = "7c37c8f189cb3c9f0cacbcef606562d8bc596e685d2a47bc9994deae6e69f41f";
58+ name = "kactivities-5.66.0.tar.xz";
5959 };
6060 };
6161 kactivities-stats = {
62− version = "5.64.0";
62+ version = "5.66.0";
6363 src = fetchurl {
64− url = "${mirror}/stable/frameworks/5.64/kactivities-stats-5.64.0.tar.xz";
65− sha256 = "ca1c07b1250735372a4f6aa6b493536d420a902de0d7a8c9777b437fb6ab0bf9";
66− name = "kactivities-stats-5.64.0.tar.xz";
64+ url = "${mirror}/stable/frameworks/5.66/kactivities-stats-5.66.0.tar.xz";
65+ sha256 = "567de599a8fd8b6a5304fc1696e24b069b4eaa7bbc643b1e760293d8c1162b73";
66+ name = "kactivities-stats-5.66.0.tar.xz";
6767 };
6868 };
6969 kapidox = {
70− version = "5.64.0";
70+ version = "5.66.0";
7171 src = fetchurl {
72− url = "${mirror}/stable/frameworks/5.64/kapidox-5.64.0.tar.xz";
73− sha256 = "f75eedfa1af51f5224b14d8bc4c229c2c2d27f607e00172d24bdcede1c899fb4";
74− name = "kapidox-5.64.0.tar.xz";
72+ url = "${mirror}/stable/frameworks/5.66/kapidox-5.66.0.tar.xz";
73+ sha256 = "19af4d93adfa22ff4de832185c1e9191d35039394bb032ee60e33efc5cc456db";
74+ name = "kapidox-5.66.0.tar.xz";
7575 };
7676 };
7777 karchive = {
78− version = "5.64.0";
78+ version = "5.66.0";
7979 src = fetchurl {
80− url = "${mirror}/stable/frameworks/5.64/karchive-5.64.0.tar.xz";
81− sha256 = "135fbfb2dfe107e4487723a5f887d1d074e13258a4583d592639366094aafe1a";
82− name = "karchive-5.64.0.tar.xz";
80+ url = "${mirror}/stable/frameworks/5.66/karchive-5.66.0.tar.xz";
81+ sha256 = "434f315af624d315b06a35ba5e71e570f36ca454af891833d6e896e42edf23d8";
82+ name = "karchive-5.66.0.tar.xz";
8383 };
8484 };
8585 kauth = {
86− version = "5.64.0";
86+ version = "5.66.0";
8787 src = fetchurl {
88− url = "${mirror}/stable/frameworks/5.64/kauth-5.64.0.tar.xz";
89− sha256 = "ac95525bf1430868c8f54dbdc986478cf7b21192ad3b486381485b429eadddcc";
90− name = "kauth-5.64.0.tar.xz";
88+ url = "${mirror}/stable/frameworks/5.66/kauth-5.66.0.tar.xz";
89+ sha256 = "f167ec8f926caf348a161a39e0c0588f517fe3a49ab4f39c1dfa94f47e104414";
90+ name = "kauth-5.66.0.tar.xz";
9191 };
9292 };
9393 kbookmarks = {
94− version = "5.64.0";
94+ version = "5.66.0";
9595 src = fetchurl {
96− url = "${mirror}/stable/frameworks/5.64/kbookmarks-5.64.0.tar.xz";
97− sha256 = "51343a57b50032d60ffae123f426cdd67cd290ce306ae494c1956d0b899d4ff2";
98− name = "kbookmarks-5.64.0.tar.xz";
96+ url = "${mirror}/stable/frameworks/5.66/kbookmarks-5.66.0.tar.xz";
97+ sha256 = "b225463ec0fe2424a1f5e70c83b02e3ece6a3ca80832cd2621732d18d7160a43";
98+ name = "kbookmarks-5.66.0.tar.xz";
9999 };
100100 };
101101 kcalendarcore = {
102− version = "5.64.0";
102+ version = "5.66.0";
103103 src = fetchurl {
104− url = "${mirror}/stable/frameworks/5.64/kcalendarcore-5.64.0.tar.xz";
105− sha256 = "983f240a7478a780dc403d577827f027856f9f67e8c3bfe8b69d56093e5bb80e";
106− name = "kcalendarcore-5.64.0.tar.xz";
104+ url = "${mirror}/stable/frameworks/5.66/kcalendarcore-5.66.0.tar.xz";
105+ sha256 = "bbdb48c775ccc1e1bdba962b5ccdc0611a2d14523076d33c4507c05db3ab33d3";
106+ name = "kcalendarcore-5.66.0.tar.xz";
107107 };
108108 };
109109 kcmutils = {
110− version = "5.64.0";
110+ version = "5.66.0";
111111 src = fetchurl {
112− url = "${mirror}/stable/frameworks/5.64/kcmutils-5.64.0.tar.xz";
113− sha256 = "f55938c566669e9fcdd786ebfd89edfc11b0c283532aed04cfe4162b58a8b649";
114− name = "kcmutils-5.64.0.tar.xz";
112+ url = "${mirror}/stable/frameworks/5.66/kcmutils-5.66.0.tar.xz";
113+ sha256 = "e02dbf996ed93bdc2813a2a64dcb0ddeb54987dd84bbe787bd890b17d57e4a85";
114+ name = "kcmutils-5.66.0.tar.xz";
115115 };
116116 };
117117 kcodecs = {
118− version = "5.64.0";
118+ version = "5.66.0";
119119 src = fetchurl {
120− url = "${mirror}/stable/frameworks/5.64/kcodecs-5.64.0.tar.xz";
121− sha256 = "24cbffb123179cf4386500ae7bc7c99f65c4422cd7b91f314152f11cd596402a";
122− name = "kcodecs-5.64.0.tar.xz";
120+ url = "${mirror}/stable/frameworks/5.66/kcodecs-5.66.0.tar.xz";
121+ sha256 = "0dcb684ad75374bbab82b90bda20e914cf656bd51a6dff69bbb1bfc650481a05";
122+ name = "kcodecs-5.66.0.tar.xz";
123123 };
124124 };
125125 kcompletion = {
126− version = "5.64.0";
126+ version = "5.66.0";
127127 src = fetchurl {
128− url = "${mirror}/stable/frameworks/5.64/kcompletion-5.64.0.tar.xz";
129− sha256 = "4fe5b9254e038e654d55167163b2812582f31fe550c977979d692b69424c2508";
130− name = "kcompletion-5.64.0.tar.xz";
128+ url = "${mirror}/stable/frameworks/5.66/kcompletion-5.66.0.tar.xz";
129+ sha256 = "be5e272e257b9fe5b951d7c596fef7c75b16886e6b1cd5ebff60d87bd6dd495d";
130+ name = "kcompletion-5.66.0.tar.xz";
131131 };
132132 };
133133 kconfig = {
134− version = "5.64.0";
134+ version = "5.66.0";
135135 src = fetchurl {
136− url = "${mirror}/stable/frameworks/5.64/kconfig-5.64.0.tar.xz";
137− sha256 = "112c1db9f038dbacf357d08645c83ca103d8c3e7fb0c880ac16f665fdf7d9157";
138− name = "kconfig-5.64.0.tar.xz";
136+ url = "${mirror}/stable/frameworks/5.66/kconfig-5.66.0.tar.xz";
137+ sha256 = "c0df73bde40162a5ffc20604c2ad343e71a6df852c3f7b05e70e1464f5f63256";
138+ name = "kconfig-5.66.0.tar.xz";
139139 };
140140 };
141141 kconfigwidgets = {
142− version = "5.64.0";
142+ version = "5.66.0";
143143 src = fetchurl {
144− url = "${mirror}/stable/frameworks/5.64/kconfigwidgets-5.64.0.tar.xz";
145− sha256 = "e84d590c064f2a86d5b9d2fb5d8aa7abc8ac8752125f5d3197cca6dc7e115c56";
146− name = "kconfigwidgets-5.64.0.tar.xz";
144+ url = "${mirror}/stable/frameworks/5.66/kconfigwidgets-5.66.0.tar.xz";
145+ sha256 = "730834528307c65691d67c901f1c186b49d74ee986ef75e171e867e8751bf10a";
146+ name = "kconfigwidgets-5.66.0.tar.xz";
147147 };
148148 };
149149 kcontacts = {
150− version = "5.64.0";
150+ version = "5.66.0";
151151 src = fetchurl {
152− url = "${mirror}/stable/frameworks/5.64/kcontacts-5.64.0.tar.xz";
153− sha256 = "0bf0a1ba6ebedd400bed7a490093962cde6a2b26c49627d6770a71524db63058";
154− name = "kcontacts-5.64.0.tar.xz";
152+ url = "${mirror}/stable/frameworks/5.66/kcontacts-5.66.0.tar.xz";
153+ sha256 = "08086f554eb4718e91a9e96d143ba05fc741289928db9bcc21b21ca7125b0017";
154+ name = "kcontacts-5.66.0.tar.xz";
155155 };
156156 };
157157 kcoreaddons = {
158− version = "5.64.0";
158+ version = "5.66.0";
159159 src = fetchurl {
160− url = "${mirror}/stable/frameworks/5.64/kcoreaddons-5.64.0.tar.xz";
161− sha256 = "3f0cb3273debf9791dda3f1ad135b6b1a20d88fed1e21890c4b70bac64fdb188";
162− name = "kcoreaddons-5.64.0.tar.xz";
160+ url = "${mirror}/stable/frameworks/5.66/kcoreaddons-5.66.0.tar.xz";
161+ sha256 = "8a8edf566cb08ad83cb17f942eeb8746993249cd0f7679f7eb810201b85e464b";
162+ name = "kcoreaddons-5.66.0.tar.xz";
163163 };
164164 };
165165 kcrash = {
166− version = "5.64.0";
166+ version = "5.66.0";
167167 src = fetchurl {
168− url = "${mirror}/stable/frameworks/5.64/kcrash-5.64.0.tar.xz";
169− sha256 = "9e9ad5e7a6a3e9a128128a7863204f8c4a555bd8659d8ed4ef4cc6bb2fc48290";
170− name = "kcrash-5.64.0.tar.xz";
168+ url = "${mirror}/stable/frameworks/5.66/kcrash-5.66.0.tar.xz";
169+ sha256 = "5a518059de3f3e85ee7b38a0edf348d097993518ce9b17504470f0d8aad3f2e4";
170+ name = "kcrash-5.66.0.tar.xz";
171171 };
172172 };
173173 kdbusaddons = {
174− version = "5.64.0";
174+ version = "5.66.0";
175175 src = fetchurl {
176− url = "${mirror}/stable/frameworks/5.64/kdbusaddons-5.64.0.tar.xz";
177− sha256 = "74a6eb443a74eb74a859238b555a3b16be1d6367c4db2a7af5b16da528d57f62";
178− name = "kdbusaddons-5.64.0.tar.xz";
176+ url = "${mirror}/stable/frameworks/5.66/kdbusaddons-5.66.0.tar.xz";
177+ sha256 = "ee600f15af2fb9a28ad15f7e0689d519211fa63b86f2e6c356bd32530ebdfa46";
178+ name = "kdbusaddons-5.66.0.tar.xz";
179179 };
180180 };
181181 kdeclarative = {
182− version = "5.64.0";
182+ version = "5.66.0";
183183 src = fetchurl {
184− url = "${mirror}/stable/frameworks/5.64/kdeclarative-5.64.0.tar.xz";
185− sha256 = "1bf199aebabe63880babc364572de44f6b0a94ffbbffd955bc85916c2be7701d";
186− name = "kdeclarative-5.64.0.tar.xz";
184+ url = "${mirror}/stable/frameworks/5.66/kdeclarative-5.66.0.tar.xz";
185+ sha256 = "ed3a334d8bce6d70e68e013d4210bd6e11cb2ebce9ede4c1813f44dada7eca73";
186+ name = "kdeclarative-5.66.0.tar.xz";
187187 };
188188 };
189189 kded = {
190− version = "5.64.0";
190+ version = "5.66.0";
191191 src = fetchurl {
192− url = "${mirror}/stable/frameworks/5.64/kded-5.64.0.tar.xz";
193− sha256 = "2e8bda93918ac174254c8f70a71c9d6966a4721e14a631760e1b912d108001be";
194− name = "kded-5.64.0.tar.xz";
192+ url = "${mirror}/stable/frameworks/5.66/kded-5.66.0.tar.xz";
193+ sha256 = "52223e641c4e8e3158220ed7b6c48e4c3f3e67f882603ada0e3757b4136255a4";
194+ name = "kded-5.66.0.tar.xz";
195195 };
196196 };
197197 kdelibs4support = {
198− version = "5.64.0";
198+ version = "5.66.0";
199199 src = fetchurl {
200− url = "${mirror}/stable/frameworks/5.64/portingAids/kdelibs4support-5.64.0.tar.xz";
201− sha256 = "8c9e23e0e22ccec8b46b4c4b160adb8c8765c1dc308bf297f6f72ccc97c7b682";
202− name = "kdelibs4support-5.64.0.tar.xz";
200+ url = "${mirror}/stable/frameworks/5.66/portingAids/kdelibs4support-5.66.0.tar.xz";
201+ sha256 = "314d0ddb95c024c3d36dd262fcaa9295b462e6430f84b22c82f145029e3b2708";
202+ name = "kdelibs4support-5.66.0.tar.xz";
203203 };
204204 };
205205 kdesignerplugin = {
206− version = "5.64.0";
206+ version = "5.66.0";
207207 src = fetchurl {
208− url = "${mirror}/stable/frameworks/5.64/portingAids/kdesignerplugin-5.64.0.tar.xz";
209− sha256 = "1ca638ec822d9882f4a865d599ce8ad94785fa890ce73bccd5e78210c4a3d95b";
210− name = "kdesignerplugin-5.64.0.tar.xz";
208+ url = "${mirror}/stable/frameworks/5.66/portingAids/kdesignerplugin-5.66.0.tar.xz";
209+ sha256 = "a7f9c530d8c7d214a176ee381541bd45f3a000a3e86404040b11f1394912d40b";
210+ name = "kdesignerplugin-5.66.0.tar.xz";
211211 };
212212 };
213213 kdesu = {
214− version = "5.64.0";
214+ version = "5.66.0";
215215 src = fetchurl {
216− url = "${mirror}/stable/frameworks/5.64/kdesu-5.64.0.tar.xz";
217− sha256 = "f4644b0ee91c55473589909c20a7fa1cfbd3d466f1c72b330d53871a2346d4f0";
218− name = "kdesu-5.64.0.tar.xz";
216+ url = "${mirror}/stable/frameworks/5.66/kdesu-5.66.0.tar.xz";
217+ sha256 = "764d30acb0ef1d609c9454ecabb939bd64a814442e01aba769eba0673b56f88a";
218+ name = "kdesu-5.66.0.tar.xz";
219219 };
220220 };
221221 kdewebkit = {
222− version = "5.64.0";
222+ version = "5.66.0";
223223 src = fetchurl {
224− url = "${mirror}/stable/frameworks/5.64/portingAids/kdewebkit-5.64.0.tar.xz";
225− sha256 = "882801a1fd944b08918cb7d9341985e4330e7adac00ae4e6dddcea5343393ac1";
226− name = "kdewebkit-5.64.0.tar.xz";
224+ url = "${mirror}/stable/frameworks/5.66/portingAids/kdewebkit-5.66.0.tar.xz";
225+ sha256 = "f73d2599ce2269eaab45ddc11bdeb49dc887e950ded57454f3fd6499c370a777";
226+ name = "kdewebkit-5.66.0.tar.xz";
227227 };
228228 };
229229 kdnssd = {
230− version = "5.64.0";
230+ version = "5.66.0";
231231 src = fetchurl {
232− url = "${mirror}/stable/frameworks/5.64/kdnssd-5.64.0.tar.xz";
233− sha256 = "92d9a4947c45e56ea15e417eaf87121b4b3a4f1f81dfd154d2ee968a9797f46b";
234− name = "kdnssd-5.64.0.tar.xz";
232+ url = "${mirror}/stable/frameworks/5.66/kdnssd-5.66.0.tar.xz";
233+ sha256 = "e280246212329f2834437ea3e84971fc85f3a3e6824963322e1f5de6aa04709c";
234+ name = "kdnssd-5.66.0.tar.xz";
235235 };
236236 };
237237 kdoctools = {
238− version = "5.64.0";
238+ version = "5.66.0";
239239 src = fetchurl {
240− url = "${mirror}/stable/frameworks/5.64/kdoctools-5.64.0.tar.xz";
241− sha256 = "3e669c9bdf8822c262d834a9fbe9250ffdc91ea49c916b2c16ac8483b62f8fce";
242− name = "kdoctools-5.64.0.tar.xz";
240+ url = "${mirror}/stable/frameworks/5.66/kdoctools-5.66.0.tar.xz";
241+ sha256 = "41e4ca7aceab17919ef4a82ad99606f520ebfe57f30205597b4184f7a3730a7a";
242+ name = "kdoctools-5.66.0.tar.xz";
243243 };
244244 };
245245 kemoticons = {
246− version = "5.64.0";
246+ version = "5.66.0";
247247 src = fetchurl {
248− url = "${mirror}/stable/frameworks/5.64/kemoticons-5.64.0.tar.xz";
249− sha256 = "0b586957bfe26ce0fe44eca305992f99e3c31fbeb19a9d369c4abfdf9cc0400f";
250− name = "kemoticons-5.64.0.tar.xz";
248+ url = "${mirror}/stable/frameworks/5.66/kemoticons-5.66.0.tar.xz";
249+ sha256 = "dc307192d883108134da104d1507709a3b80c5b5e9984377840bd42d39a431dd";
250+ name = "kemoticons-5.66.0.tar.xz";
251251 };
252252 };
253253 kfilemetadata = {
254− version = "5.64.0";
254+ version = "5.66.0";
255255 src = fetchurl {
256− url = "${mirror}/stable/frameworks/5.64/kfilemetadata-5.64.0.tar.xz";
257− sha256 = "4b581e4d659defe4db595a984ed4c037bc80e0bf7b298ec79e6aa5061fa56e23";
258− name = "kfilemetadata-5.64.0.tar.xz";
256+ url = "${mirror}/stable/frameworks/5.66/kfilemetadata-5.66.0.tar.xz";
257+ sha256 = "d78c2128887591229e6c61c60e77af8647e407d570b07892f5f06ab682f807b9";
258+ name = "kfilemetadata-5.66.0.tar.xz";
259259 };
260260 };
261261 kglobalaccel = {
262− version = "5.64.0";
262+ version = "5.66.0";
263263 src = fetchurl {
264− url = "${mirror}/stable/frameworks/5.64/kglobalaccel-5.64.0.tar.xz";
265− sha256 = "6863515428988c129acfcceaa3518f90d72c590aff2c295a958a68d0c4cd02ab";
266− name = "kglobalaccel-5.64.0.tar.xz";
264+ url = "${mirror}/stable/frameworks/5.66/kglobalaccel-5.66.0.tar.xz";
265+ sha256 = "fae805994f946791525da65ca15f93b65b2001241c7539ad04b3aaef937fb1c3";
266+ name = "kglobalaccel-5.66.0.tar.xz";
267267 };
268268 };
269269 kguiaddons = {
270− version = "5.64.0";
270+ version = "5.66.0";
271271 src = fetchurl {
272− url = "${mirror}/stable/frameworks/5.64/kguiaddons-5.64.0.tar.xz";
273− sha256 = "4caac79b7341c7796f3ca5e1d88cef57ecab2eefcac9ab654fd977706c89bae4";
274− name = "kguiaddons-5.64.0.tar.xz";
272+ url = "${mirror}/stable/frameworks/5.66/kguiaddons-5.66.0.tar.xz";
273+ sha256 = "379e5ed87b00d344a13e424e39d97d74d494c503400bcd72df132de74c8cc591";
274+ name = "kguiaddons-5.66.0.tar.xz";
275275 };
276276 };
277277 kholidays = {
278− version = "5.64.0";
278+ version = "5.66.0";
279279 src = fetchurl {
280− url = "${mirror}/stable/frameworks/5.64/kholidays-5.64.0.tar.xz";
281− sha256 = "65b847ba7a00e1a42c0048fe05a400f584e1d9e746edb5d935331ffcb1f5d4ab";
282− name = "kholidays-5.64.0.tar.xz";
280+ url = "${mirror}/stable/frameworks/5.66/kholidays-5.66.0.tar.xz";
281+ sha256 = "2d9bb70fbcb3a45208409228b5e5a88b0cb00fe8f2621e2e938bc77c2df11f02";
282+ name = "kholidays-5.66.0.tar.xz";
283283 };
284284 };
285285 khtml = {
286− version = "5.64.0";
286+ version = "5.66.0";
287287 src = fetchurl {
288− url = "${mirror}/stable/frameworks/5.64/portingAids/khtml-5.64.0.tar.xz";
289− sha256 = "00d3a3e8c8b8072f4894d74f91d963cfefbd681e47da0b8e80e1297224c5af85";
290− name = "khtml-5.64.0.tar.xz";
288+ url = "${mirror}/stable/frameworks/5.66/portingAids/khtml-5.66.0.tar.xz";
289+ sha256 = "ee34b082760262fb9b5e287960955075ec72179585e51567350a08bf0b4b7a10";
290+ name = "khtml-5.66.0.tar.xz";
291291 };
292292 };
293293 ki18n = {
294− version = "5.64.0";
294+ version = "5.66.0";
295295 src = fetchurl {
296− url = "${mirror}/stable/frameworks/5.64/ki18n-5.64.0.tar.xz";
297− sha256 = "ccd2c2f8b14251701f902c9e7d046da1582e544d31edae743911f3554022d024";
298− name = "ki18n-5.64.0.tar.xz";
296+ url = "${mirror}/stable/frameworks/5.66/ki18n-5.66.0.tar.xz";
297+ sha256 = "9622337a513fcb8f0b5100c218b9fa85617f92024e5d7feada6d071f58a329e3";
298+ name = "ki18n-5.66.0.tar.xz";
299299 };
300300 };
301301 kiconthemes = {
302− version = "5.64.0";
302+ version = "5.66.0";
303303 src = fetchurl {
304− url = "${mirror}/stable/frameworks/5.64/kiconthemes-5.64.0.tar.xz";
305− sha256 = "f89a97e9501d841d4543249776783ebd1fc4d7f69e114f8a56027f59ad32000a";
306− name = "kiconthemes-5.64.0.tar.xz";
304+ url = "${mirror}/stable/frameworks/5.66/kiconthemes-5.66.0.tar.xz";
305+ sha256 = "93fa9b8d0f951c2c9991f366081f98670086f2b66a740d7be95b64c35dff111d";
306+ name = "kiconthemes-5.66.0.tar.xz";
307307 };
308308 };
309309 kidletime = {
310− version = "5.64.0";
310+ version = "5.66.0";
311311 src = fetchurl {
312− url = "${mirror}/stable/frameworks/5.64/kidletime-5.64.0.tar.xz";
313− sha256 = "8287e958a8a2a9538bec1038f5e31ebba338ff522de9c51265ca1d63030581d0";
314− name = "kidletime-5.64.0.tar.xz";
312+ url = "${mirror}/stable/frameworks/5.66/kidletime-5.66.0.tar.xz";
313+ sha256 = "66e891b33ed9026ed6fd211cd1ecf3405255b19d3a58199b87af0b22a40d7185";
314+ name = "kidletime-5.66.0.tar.xz";
315315 };
316316 };
317317 kimageformats = {
318− version = "5.64.0";
318+ version = "5.66.0";
319319 src = fetchurl {
320− url = "${mirror}/stable/frameworks/5.64/kimageformats-5.64.0.tar.xz";
321− sha256 = "48c6a7026854127fc83698ab11e6639a525d387cf384f2558db6c7478bceae4c";
322− name = "kimageformats-5.64.0.tar.xz";
320+ url = "${mirror}/stable/frameworks/5.66/kimageformats-5.66.0.tar.xz";
321+ sha256 = "c3b02befbb03f25deca0c7ffafea8c8a5eb79e21d8e2e566bf6fddf4f8afe04d";
322+ name = "kimageformats-5.66.0.tar.xz";
323323 };
324324 };
325325 kinit = {
326− version = "5.64.0";
326+ version = "5.66.0";
327327 src = fetchurl {
328− url = "${mirror}/stable/frameworks/5.64/kinit-5.64.0.tar.xz";
329− sha256 = "5298b783499cedb681c334b20234a511cb3377e66d140e7df6b7c1899186263d";
330− name = "kinit-5.64.0.tar.xz";
328+ url = "${mirror}/stable/frameworks/5.66/kinit-5.66.0.tar.xz";
329+ sha256 = "6d9b6ea1542ff5529fd42f49240be37bbd8a3dfdfe8c45ac980b3c9b3fee650e";
330+ name = "kinit-5.66.0.tar.xz";
331331 };
332332 };
333333 kio = {
334− version = "5.64.0";
334+ version = "5.66.0";
335335 src = fetchurl {
336− url = "${mirror}/stable/frameworks/5.64/kio-5.64.0.tar.xz";
337− sha256 = "e38c8dcf634989f0f7ec95b68bdd936b9e05f7d242e4050b01f79b7021108f59";
338− name = "kio-5.64.0.tar.xz";
336+ url = "${mirror}/stable/frameworks/5.66/kio-5.66.0.tar.xz";
337+ sha256 = "c5350e20474b48c4fc02347186b7e4db24cb7580ba8c0f1e120b302e6b8db17d";
338+ name = "kio-5.66.0.tar.xz";
339339 };
340340 };
341341 kirigami2 = {
342− version = "5.64.0";
342+ version = "5.66.0";
343343 src = fetchurl {
344− url = "${mirror}/stable/frameworks/5.64/kirigami2-5.64.0.tar.xz";
345− sha256 = "c394360e2323c55cf654d09ec762a03c47db0027e6a992646ea32d27ce8b228e";
346− name = "kirigami2-5.64.0.tar.xz";
344+ url = "${mirror}/stable/frameworks/5.66/kirigami2-5.66.0.tar.xz";
345+ sha256 = "4e4abfeaa5e997de52076786dd0d314f178bc883b1b48a8b2cf37dd5979ac41b";
346+ name = "kirigami2-5.66.0.tar.xz";
347347 };
348348 };
349349 kitemmodels = {
350− version = "5.64.0";
350+ version = "5.66.0";
351351 src = fetchurl {
352− url = "${mirror}/stable/frameworks/5.64/kitemmodels-5.64.0.tar.xz";
353− sha256 = "1bae70e4c6a033eea649efc17f0a060aba89144f4c469f235fbf5023dba5abc4";
354− name = "kitemmodels-5.64.0.tar.xz";
352+ url = "${mirror}/stable/frameworks/5.66/kitemmodels-5.66.0.tar.xz";
353+ sha256 = "5c8bcc36b9c29868ba7fa1ece9b83385379d7fed04937a92454ac94a356b3854";
354+ name = "kitemmodels-5.66.0.tar.xz";
355355 };
356356 };
357357 kitemviews = {
358− version = "5.64.0";
358+ version = "5.66.0";
359359 src = fetchurl {
360− url = "${mirror}/stable/frameworks/5.64/kitemviews-5.64.0.tar.xz";
361− sha256 = "0b3f8a0116c042ae187b67f35ffd40872352b91f5f236d19dd26ffad8db83fee";
362− name = "kitemviews-5.64.0.tar.xz";
360+ url = "${mirror}/stable/frameworks/5.66/kitemviews-5.66.0.tar.xz";
361+ sha256 = "026461fa2e3e0237a56eb18a2817453c788514578f27a4aa0832b85fe98a09ab";
362+ name = "kitemviews-5.66.0.tar.xz";
363363 };
364364 };
365365 kjobwidgets = {
366− version = "5.64.0";
366+ version = "5.66.0";
367367 src = fetchurl {
368− url = "${mirror}/stable/frameworks/5.64/kjobwidgets-5.64.0.tar.xz";
369− sha256 = "3b39fc5dfc0f1a9cc9bffed3d05b90ba46c52c63cbbeffa0666f5f09e7093ce0";
370− name = "kjobwidgets-5.64.0.tar.xz";
368+ url = "${mirror}/stable/frameworks/5.66/kjobwidgets-5.66.0.tar.xz";
369+ sha256 = "34501be3ec85f0e71dba22669b3c862b297606e9bbff9aae466667c7075b6f8d";
370+ name = "kjobwidgets-5.66.0.tar.xz";
371371 };
372372 };
373373 kjs = {
374− version = "5.64.0";
374+ version = "5.66.0";
375375 src = fetchurl {
376− url = "${mirror}/stable/frameworks/5.64/portingAids/kjs-5.64.0.tar.xz";
377− sha256 = "93855cde810feb7208443a93f81c952bdb42f9886154959bc7a6509c9863e503";
378− name = "kjs-5.64.0.tar.xz";
376+ url = "${mirror}/stable/frameworks/5.66/portingAids/kjs-5.66.0.tar.xz";
377+ sha256 = "9bed62ebf9fba7d986ff7baabf6c4431f02826c9be70beda15cc62c692fb5f7f";
378+ name = "kjs-5.66.0.tar.xz";
379379 };
380380 };
381381 kjsembed = {
382− version = "5.64.0";
382+ version = "5.66.0";
383383 src = fetchurl {
384− url = "${mirror}/stable/frameworks/5.64/portingAids/kjsembed-5.64.0.tar.xz";
385− sha256 = "939226116cb47fd66dc45a41baa3c0f45b7ab904ec7674088ced3df5c7bae62e";
386− name = "kjsembed-5.64.0.tar.xz";
384+ url = "${mirror}/stable/frameworks/5.66/portingAids/kjsembed-5.66.0.tar.xz";
385+ sha256 = "58fe647901b69167b7c66a284c3181c2eda9c3b751548eb43bfe0795d10eb0ce";
386+ name = "kjsembed-5.66.0.tar.xz";
387387 };
388388 };
389389 kmediaplayer = {
390− version = "5.64.0";
390+ version = "5.66.0";
391391 src = fetchurl {
392− url = "${mirror}/stable/frameworks/5.64/portingAids/kmediaplayer-5.64.0.tar.xz";
393− sha256 = "ce4816a14134c4968559ff5030895ab69b63b66e9b541b74595ce05e4fe68d1d";
394− name = "kmediaplayer-5.64.0.tar.xz";
392+ url = "${mirror}/stable/frameworks/5.66/portingAids/kmediaplayer-5.66.0.tar.xz";
393+ sha256 = "7ec1fea10a1017a0f32183fdc3b2cca38c11273240423ac0d393626436fd4230";
394+ name = "kmediaplayer-5.66.0.tar.xz";
395395 };
396396 };
397397 knewstuff = {
398− version = "5.64.0";
398+ version = "5.66.0";
399399 src = fetchurl {
400− url = "${mirror}/stable/frameworks/5.64/knewstuff-5.64.0.tar.xz";
401− sha256 = "91334c95a1082ae402ee869da399e5bdbac986c8b30a85d0a899b30de1f3be72";
402− name = "knewstuff-5.64.0.tar.xz";
400+ url = "${mirror}/stable/frameworks/5.66/knewstuff-5.66.0.tar.xz";
401+ sha256 = "acef94661e3a0e42938224c17b90f835d6686d88a25698fe82980d7e1139b1fe";
402+ name = "knewstuff-5.66.0.tar.xz";
403403 };
404404 };
405405 knotifications = {
406− version = "5.64.0";
406+ version = "5.66.0";
407407 src = fetchurl {
408− url = "${mirror}/stable/frameworks/5.64/knotifications-5.64.0.tar.xz";
409− sha256 = "5f0c3b158ba253e8df81016c8921d689836ecac063a39766c0290352c9f71bc1";
410− name = "knotifications-5.64.0.tar.xz";
408+ url = "${mirror}/stable/frameworks/5.66/knotifications-5.66.0.tar.xz";
409+ sha256 = "aad3697a35109fad49fa286b7837d382599478bac33151cd7991c760866c12c1";
410+ name = "knotifications-5.66.0.tar.xz";
411411 };
412412 };
413413 knotifyconfig = {
414− version = "5.64.0";
414+ version = "5.66.0";
415415 src = fetchurl {
416− url = "${mirror}/stable/frameworks/5.64/knotifyconfig-5.64.0.tar.xz";
417− sha256 = "f496ed0728e688347da360f7aad7f2666cb0310ab669c6006ce9661233218b27";
418− name = "knotifyconfig-5.64.0.tar.xz";
416+ url = "${mirror}/stable/frameworks/5.66/knotifyconfig-5.66.0.tar.xz";
417+ sha256 = "fd9e09b099f49896b5afa6f5663ef82266531ec413d4edeb03ebc768314a37d8";
418+ name = "knotifyconfig-5.66.0.tar.xz";
419419 };
420420 };
421421 kpackage = {
422− version = "5.64.0";
422+ version = "5.66.0";
423423 src = fetchurl {
424− url = "${mirror}/stable/frameworks/5.64/kpackage-5.64.0.tar.xz";
425− sha256 = "c39c80317c75206ec347edf6d301cb66c2117489f37725374fcfe3b1459aaed6";
426− name = "kpackage-5.64.0.tar.xz";
424+ url = "${mirror}/stable/frameworks/5.66/kpackage-5.66.0.tar.xz";
425+ sha256 = "ae848a72e789a80d4a9d0346e90cb1038ebc784da6e7ff645411edd878554ab5";
426+ name = "kpackage-5.66.0.tar.xz";
427427 };
428428 };
429429 kparts = {
430− version = "5.64.0";
430+ version = "5.66.0";
431431 src = fetchurl {
432− url = "${mirror}/stable/frameworks/5.64/kparts-5.64.0.tar.xz";
433− sha256 = "61338a37015c2df787b8e0fe49f0ef320474a82831b4f110fb5aefd1635b1d9f";
434− name = "kparts-5.64.0.tar.xz";
432+ url = "${mirror}/stable/frameworks/5.66/kparts-5.66.0.tar.xz";
433+ sha256 = "6de2395cd6a9993f216f4dc4718f352bc4cbbd8147734c76be0e1e6149f733d0";
434+ name = "kparts-5.66.0.tar.xz";
435435 };
436436 };
437437 kpeople = {
438− version = "5.64.0";
438+ version = "5.66.0";
439439 src = fetchurl {
440− url = "${mirror}/stable/frameworks/5.64/kpeople-5.64.0.tar.xz";
441− sha256 = "b5bc8d037dab124ea65be1c480b25943e789a403176f8b31599383dcdec20a0e";
442− name = "kpeople-5.64.0.tar.xz";
440+ url = "${mirror}/stable/frameworks/5.66/kpeople-5.66.0.tar.xz";
441+ sha256 = "2728f08a9417ceb62aa9fc5a3340aed291aeb8a852e5f6f46c5a23fcc34168ab";
442+ name = "kpeople-5.66.0.tar.xz";
443443 };
444444 };
445445 kplotting = {
446− version = "5.64.0";
446+ version = "5.66.0";
447447 src = fetchurl {
448− url = "${mirror}/stable/frameworks/5.64/kplotting-5.64.0.tar.xz";
449− sha256 = "f38f65c97d199077c88213bce84c6162ba254c443f06ccfaf62088ff0e217f7b";
450− name = "kplotting-5.64.0.tar.xz";
448+ url = "${mirror}/stable/frameworks/5.66/kplotting-5.66.0.tar.xz";
449+ sha256 = "2a4387f748614f005cf67e549b9466c6eed52589ac58297857ba6a0be92c32ee";
450+ name = "kplotting-5.66.0.tar.xz";
451451 };
452452 };
453453 kpty = {
454− version = "5.64.0";
454+ version = "5.66.0";
455455 src = fetchurl {
456− url = "${mirror}/stable/frameworks/5.64/kpty-5.64.0.tar.xz";
457− sha256 = "c2ece8c6b336ee85973e005969f1228bbfac87cbace6853e9d01a7b5c5fe319e";
458− name = "kpty-5.64.0.tar.xz";
456+ url = "${mirror}/stable/frameworks/5.66/kpty-5.66.0.tar.xz";
457+ sha256 = "a7fac6ced7504cec13a6776f0f4ba22db9878e44e2bbf85a219a2590e061c859";
458+ name = "kpty-5.66.0.tar.xz";
459+ };
460+ };
461+ kquickcharts = {
462+ version = "5.66.0";
463+ src = fetchurl {
464+ url = "${mirror}/stable/frameworks/5.66/kquickcharts-5.66.0.tar.xz";
465+ sha256 = "70fae10b2af1c504e3b166beb0a342cdef0e0f8eb42e53ba88f0e3b174331624";
466+ name = "kquickcharts-5.66.0.tar.xz";
459467 };
460468 };
461469 kross = {
462− version = "5.64.0";
470+ version = "5.66.0";
463471 src = fetchurl {
464− url = "${mirror}/stable/frameworks/5.64/portingAids/kross-5.64.0.tar.xz";
465− sha256 = "d8a7e9fbeba4d16d6288d13d72a5f7581aa8be5894b06f83dbc6068b04551ebd";
466− name = "kross-5.64.0.tar.xz";
472+ url = "${mirror}/stable/frameworks/5.66/portingAids/kross-5.66.0.tar.xz";
473+ sha256 = "109159996da54ec52ec8114ff05f88bdee6428e49ca84515ab73c457e0005ebc";
474+ name = "kross-5.66.0.tar.xz";
467475 };
468476 };
469477 krunner = {
470− version = "5.64.0";
478+ version = "5.66.0";
471479 src = fetchurl {
472− url = "${mirror}/stable/frameworks/5.64/krunner-5.64.0.tar.xz";
473− sha256 = "e056635f347eb4d8b2a1545de993b28ead1af4e8e4acc43f1dd1637b528fe0b2";
474− name = "krunner-5.64.0.tar.xz";
480+ url = "${mirror}/stable/frameworks/5.66/krunner-5.66.0.tar.xz";
481+ sha256 = "b7d67d61c0b0f96128c143e3d2694dc5ced88a7de73db0f4493f084de9dc9701";
482+ name = "krunner-5.66.0.tar.xz";
475483 };
476484 };
477485 kservice = {
478− version = "5.64.0";
486+ version = "5.66.0";
479487 src = fetchurl {
480− url = "${mirror}/stable/frameworks/5.64/kservice-5.64.0.tar.xz";
481− sha256 = "60e0c111485158f89211a62403697714dfe141e3539c1c7e1bf04550db74f02f";
482− name = "kservice-5.64.0.tar.xz";
488+ url = "${mirror}/stable/frameworks/5.66/kservice-5.66.0.tar.xz";
489+ sha256 = "f1174576f6e3e562d7de65494efc2c1c3ac569c656b8301ffbe34576ea623a6a";
490+ name = "kservice-5.66.0.tar.xz";
483491 };
484492 };
485493 ktexteditor = {
486− version = "5.64.0";
494+ version = "5.66.0";
487495 src = fetchurl {
488− url = "${mirror}/stable/frameworks/5.64/ktexteditor-5.64.0.tar.xz";
489− sha256 = "0fe12c57a7428d78c46d3367bdae47a0b9fbbd762be4f57f0c52dcd76e309ed5";
490− name = "ktexteditor-5.64.0.tar.xz";
496+ url = "${mirror}/stable/frameworks/5.66/ktexteditor-5.66.0.tar.xz";
497+ sha256 = "9156e5e554b17d73078e4df09ae524a684f6adff8c2bbd40705b67fd30a6cc0b";
498+ name = "ktexteditor-5.66.0.tar.xz";
491499 };
492500 };
493501 ktextwidgets = {
494− version = "5.64.0";
502+ version = "5.66.0";
495503 src = fetchurl {
496− url = "${mirror}/stable/frameworks/5.64/ktextwidgets-5.64.0.tar.xz";
497− sha256 = "0e94c36c7d836450d4c52bd933c492235ea0071b15702c302aed003e8400bbfd";
498− name = "ktextwidgets-5.64.0.tar.xz";
504+ url = "${mirror}/stable/frameworks/5.66/ktextwidgets-5.66.0.tar.xz";
505+ sha256 = "dcc4595ceeecd3f59236ed303f2a0d61915c88eb36ad040a0562b60fb10cb9a1";
506+ name = "ktextwidgets-5.66.0.tar.xz";
499507 };
500508 };
501509 kunitconversion = {
502− version = "5.64.0";
510+ version = "5.66.0";
503511 src = fetchurl {
504− url = "${mirror}/stable/frameworks/5.64/kunitconversion-5.64.0.tar.xz";
505− sha256 = "6783d6180b132a80dce2a4cc6c793dae0f5859b0709207c5fc6f4501ef53a822";
506− name = "kunitconversion-5.64.0.tar.xz";
512+ url = "${mirror}/stable/frameworks/5.66/kunitconversion-5.66.0.tar.xz";
513+ sha256 = "82db51b59ffdb5b2e69bc5c6ea54521acbc49ee5601baaf4e43cba50d12b418c";
514+ name = "kunitconversion-5.66.0.tar.xz";
507515 };
508516 };
509517 kwallet = {
510− version = "5.64.0";
518+ version = "5.66.0";
511519 src = fetchurl {
512− url = "${mirror}/stable/frameworks/5.64/kwallet-5.64.0.tar.xz";
513− sha256 = "16ff5bb5724105c3d59404f292232c03c6003f6229b483509e395e1171ccabde";
514− name = "kwallet-5.64.0.tar.xz";
520+ url = "${mirror}/stable/frameworks/5.66/kwallet-5.66.0.tar.xz";
521+ sha256 = "6e48070e22a822a4003e1f7a739fe1e335bcf46982cbf4909d23a6e40689a827";
522+ name = "kwallet-5.66.0.tar.xz";
515523 };
516524 };
517525 kwayland = {
518− version = "5.64.0";
526+ version = "5.66.0";
519527 src = fetchurl {
520− url = "${mirror}/stable/frameworks/5.64/kwayland-5.64.0.tar.xz";
521− sha256 = "1540d4ff62afd0bff234e08618fc77d2c54b5cd69bf9c478c45a08a6e69349d3";
522− name = "kwayland-5.64.0.tar.xz";
528+ url = "${mirror}/stable/frameworks/5.66/kwayland-5.66.0.tar.xz";
529+ sha256 = "f43231f10a5294f7ac3d43d2b903f1cf9649364782ca55831e0c069a54cc170d";
530+ name = "kwayland-5.66.0.tar.xz";
523531 };
524532 };
525533 kwidgetsaddons = {
526− version = "5.64.0";
534+ version = "5.66.0";
527535 src = fetchurl {
528− url = "${mirror}/stable/frameworks/5.64/kwidgetsaddons-5.64.0.tar.xz";
529− sha256 = "a2d4a47489621d095c4979ea25d5d8304cf4004b10a892a2b314d74cd30cb5da";
530− name = "kwidgetsaddons-5.64.0.tar.xz";
536+ url = "${mirror}/stable/frameworks/5.66/kwidgetsaddons-5.66.0.tar.xz";
537+ sha256 = "311d8274469f03b1938da5a4f7ad17c82e3f96bc79ec28624cb748b13403f451";
538+ name = "kwidgetsaddons-5.66.0.tar.xz";
531539 };
532540 };
533541 kwindowsystem = {
534− version = "5.64.0";
542+ version = "5.66.0";
535543 src = fetchurl {
536− url = "${mirror}/stable/frameworks/5.64/kwindowsystem-5.64.0.tar.xz";
537− sha256 = "77c2e6b0032a79547f80bcd36682aa72c0e901e3b5acc83a58f69d644ce03dab";
538− name = "kwindowsystem-5.64.0.tar.xz";
544+ url = "${mirror}/stable/frameworks/5.66/kwindowsystem-5.66.0.tar.xz";
545+ sha256 = "416e2ba52a8c95a6b161ca306724525c1971723cb12e7d8ad7fa108e0b820f0c";
546+ name = "kwindowsystem-5.66.0.tar.xz";
539547 };
540548 };
541549 kxmlgui = {
542− version = "5.64.0";
550+ version = "5.66.0";
543551 src = fetchurl {
544− url = "${mirror}/stable/frameworks/5.64/kxmlgui-5.64.0.tar.xz";
545− sha256 = "faa95b92b3b03130022841a6797d5beb3efb6a0d757afaefe038889af76a1dd1";
546− name = "kxmlgui-5.64.0.tar.xz";
552+ url = "${mirror}/stable/frameworks/5.66/kxmlgui-5.66.0.tar.xz";
553+ sha256 = "a8f9ed354e30ff1f40306e876d96fcd1fa3a26a8e6acfccdeab8f3437d7231bc";
554+ name = "kxmlgui-5.66.0.tar.xz";
547555 };
548556 };
549557 kxmlrpcclient = {
550− version = "5.64.0";
558+ version = "5.66.0";
551559 src = fetchurl {
552− url = "${mirror}/stable/frameworks/5.64/kxmlrpcclient-5.64.0.tar.xz";
553− sha256 = "8c36472cb69a2d5eeb88c437907f7b0b46703ef34d04df7b45a8c90eb95fd6b0";
554− name = "kxmlrpcclient-5.64.0.tar.xz";
560+ url = "${mirror}/stable/frameworks/5.66/kxmlrpcclient-5.66.0.tar.xz";
561+ sha256 = "6b637c138414d93104477034737c9e866d99e43f883a3dfc45d3220df6c21e6c";
562+ name = "kxmlrpcclient-5.66.0.tar.xz";
555563 };
556564 };
557565 modemmanager-qt = {
558− version = "5.64.0";
566+ version = "5.66.0";
559567 src = fetchurl {
560− url = "${mirror}/stable/frameworks/5.64/modemmanager-qt-5.64.0.tar.xz";
561− sha256 = "a9d8554b3720cf46aaaa70da87c79688afc5baa155ffd19ea00e4cae2a1caa21";
562− name = "modemmanager-qt-5.64.0.tar.xz";
568+ url = "${mirror}/stable/frameworks/5.66/modemmanager-qt-5.66.0.tar.xz";
569+ sha256 = "50e24894d0243dbd2fc1a44a1e6368e3bb95a20c1ca56106d26752d5854d8be9";
570+ name = "modemmanager-qt-5.66.0.tar.xz";
563571 };
564572 };
565573 networkmanager-qt = {
566− version = "5.64.0";
574+ version = "5.66.0";
567575 src = fetchurl {
568− url = "${mirror}/stable/frameworks/5.64/networkmanager-qt-5.64.0.tar.xz";
569− sha256 = "369d0391e199d059dd2faa554324cbd45334f7864ccfc462699b06c89af04bbf";
570− name = "networkmanager-qt-5.64.0.tar.xz";
576+ url = "${mirror}/stable/frameworks/5.66/networkmanager-qt-5.66.0.tar.xz";
577+ sha256 = "3089951c69845c4f6d1848bbbaf05116a72d4207a9f2d63b063a76c78549bf45";
578+ name = "networkmanager-qt-5.66.0.tar.xz";
571579 };
572580 };
573581 oxygen-icons5 = {
574− version = "5.64.0";
582+ version = "5.66.0";
575583 src = fetchurl {
576− url = "${mirror}/stable/frameworks/5.64/oxygen-icons5-5.64.0.tar.xz";
577− sha256 = "41d415b4bd9cca0d9abc43b187059d833ce92b3fff3da66eb8ff4004215e91ef";
578− name = "oxygen-icons5-5.64.0.tar.xz";
584+ url = "${mirror}/stable/frameworks/5.66/oxygen-icons5-5.66.0.tar.xz";
585+ sha256 = "c6275fdcd4883c143adf4f16450a63dcb8651073a205bd14c599ec6ab638e8ef";
586+ name = "oxygen-icons5-5.66.0.tar.xz";
579587 };
580588 };
581589 plasma-framework = {
582− version = "5.64.0";
590+ version = "5.66.0";
583591 src = fetchurl {
584− url = "${mirror}/stable/frameworks/5.64/plasma-framework-5.64.0.tar.xz";
585− sha256 = "3f1311a48826ab0a76f47d05b02f9a9486f821cc1ad757b895b570e371acfd09";
586− name = "plasma-framework-5.64.0.tar.xz";
592+ url = "${mirror}/stable/frameworks/5.66/plasma-framework-5.66.0.tar.xz";
593+ sha256 = "3263ccf95a6fcf8fde087d402d89d64c64c0130d4df62b95b860fada13aad419";
594+ name = "plasma-framework-5.66.0.tar.xz";
587595 };
588596 };
589597 prison = {
590− version = "5.64.0";
598+ version = "5.66.0";
591599 src = fetchurl {
592− url = "${mirror}/stable/frameworks/5.64/prison-5.64.0.tar.xz";
593− sha256 = "31e136dd33940f32fdb87699b113c57aab566112bb9649f20a057c4eee20db2e";
594− name = "prison-5.64.0.tar.xz";
600+ url = "${mirror}/stable/frameworks/5.66/prison-5.66.0.tar.xz";
601+ sha256 = "ff5b4ae32ae44f2aea4b9254afe54af0fc9ea742517116cd2322e1a71a7315ce";
602+ name = "prison-5.66.0.tar.xz";
595603 };
596604 };
597605 purpose = {
598− version = "5.64.0";
606+ version = "5.66.0";
599607 src = fetchurl {
600− url = "${mirror}/stable/frameworks/5.64/purpose-5.64.0.tar.xz";
601− sha256 = "004794dfa2d0bcef316d582f37e5691e3980c99240ef570313a98a8d44235b0d";
602− name = "purpose-5.64.0.tar.xz";
608+ url = "${mirror}/stable/frameworks/5.66/purpose-5.66.0.tar.xz";
609+ sha256 = "33b8ec6ede6a1deee6c85e45ebe42aca9a3add7884ee68aa8f1a16ed0637b4db";
610+ name = "purpose-5.66.0.tar.xz";
603611 };
604612 };
605613 qqc2-desktop-style = {
606− version = "5.64.0";
614+ version = "5.66.0";
607615 src = fetchurl {
608− url = "${mirror}/stable/frameworks/5.64/qqc2-desktop-style-5.64.0.tar.xz";
609− sha256 = "b0e6ad1ccbd01b6974c3222c6098b6c1ae1fe594c26fe0e2817c35dd90b6013a";
610− name = "qqc2-desktop-style-5.64.0.tar.xz";
616+ url = "${mirror}/stable/frameworks/5.66/qqc2-desktop-style-5.66.0.tar.xz";
617+ sha256 = "49bb518fc9f3c08cb330b1d82cb5c68d9ea358a562c6e460ea06aaaa13812b87";
618+ name = "qqc2-desktop-style-5.66.0.tar.xz";
611619 };
612620 };
613621 solid = {
614− version = "5.64.0";
622+ version = "5.66.0";
615623 src = fetchurl {
616− url = "${mirror}/stable/frameworks/5.64/solid-5.64.0.tar.xz";
617− sha256 = "fcbbfd124759854bde2da74e1768da818361f61f2839877b4efbcd38b825da6b";
618− name = "solid-5.64.0.tar.xz";
624+ url = "${mirror}/stable/frameworks/5.66/solid-5.66.0.tar.xz";
625+ sha256 = "78deab8c55c30f2c923795730a9655b4d05a75cd6240bc0caa64104b141a3a39";
626+ name = "solid-5.66.0.tar.xz";
619627 };
620628 };
621629 sonnet = {
622− version = "5.64.0";
630+ version = "5.66.0";
623631 src = fetchurl {
624− url = "${mirror}/stable/frameworks/5.64/sonnet-5.64.0.tar.xz";
625− sha256 = "3af364858f76c0206136ae8f3c03da5442ea5e42d2560877f5e00f33850c84dc";
626− name = "sonnet-5.64.0.tar.xz";
632+ url = "${mirror}/stable/frameworks/5.66/sonnet-5.66.0.tar.xz";
633+ sha256 = "5ca700e8e9954b380cc5f4cee0f392888ae240ccd2c4d3a37a2f41f8ac9c8294";
634+ name = "sonnet-5.66.0.tar.xz";
627635 };
628636 };
629637 syndication = {
630− version = "5.64.0";
638+ version = "5.66.0";
631639 src = fetchurl {
632− url = "${mirror}/stable/frameworks/5.64/syndication-5.64.0.tar.xz";
633− sha256 = "bffcd673a70646c8cb683ed7b26f6ef251a2ffe439fc78123ccee4332b567b57";
634− name = "syndication-5.64.0.tar.xz";
640+ url = "${mirror}/stable/frameworks/5.66/syndication-5.66.0.tar.xz";
641+ sha256 = "5e6c90360461b820a48069af2838cffbcbedfe8bcd042535823e1cf1b43cd6b7";
642+ name = "syndication-5.66.0.tar.xz";
635643 };
636644 };
637645 syntax-highlighting = {
638− version = "5.64.0";
646+ version = "5.66.0";
639647 src = fetchurl {
640− url = "${mirror}/stable/frameworks/5.64/syntax-highlighting-5.64.0.tar.xz";
641− sha256 = "9655fa79d99fb7d585ae1a11c03d204c83263fe19391e7610575fb0436052b5f";
642− name = "syntax-highlighting-5.64.0.tar.xz";
648+ url = "${mirror}/stable/frameworks/5.66/syntax-highlighting-5.66.0.tar.xz";
649+ sha256 = "e572719cb64524c6abc476eeccca56f54cb0d7352fc747af3036dbe817566c25";
650+ name = "syntax-highlighting-5.66.0.tar.xz";
643651 };
644652 };
645653 threadweaver = {
646− version = "5.64.0";
654+ version = "5.66.0";
647655 src = fetchurl {
648− url = "${mirror}/stable/frameworks/5.64/threadweaver-5.64.0.tar.xz";
649− sha256 = "4a3ec0b2b45a5997b24d60059d95006fca5fd86f5d619d8fb1fd30d7510f5a02";
650− name = "threadweaver-5.64.0.tar.xz";
656+ url = "${mirror}/stable/frameworks/5.66/threadweaver-5.66.0.tar.xz";
657+ sha256 = "a63db1ef8421e68534f5b9891013286fbad2ef8677f28c15ec733f086ae5cee3";
658+ name = "threadweaver-5.66.0.tar.xz";
651659 };
652660 };
653661}
pkgs/development/libraries/libappindicator/default.nix+2
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
1919 versionMajor = "12.10";
2020 versionMinor = "0";
2121
22+ outputs = [ "out" "dev" ];
23+
2224 src = fetchurl {
2325 url = "${meta.homepage}/${versionMajor}/${version}/+download/libappindicator-${version}.tar.gz";
2426 sha256 = "17xlqd60v0zllrxp8bgq3k5a1jkj0svkqn8rzllcyjh8k0gpr46m";
pkgs/development/libraries/libde265/default.nix+2−2
@@ -1,14 +1,14 @@
11{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig }:
22
33stdenv.mkDerivation rec {
4− version = "1.0.4";
4+ version = "1.0.5";
55 pname = "libde265";
66
77 src = fetchFromGitHub {
88 owner = "strukturag";
99 repo = "libde265";
1010 rev = "v${version}";
11− sha256 = "0svxrhh1pv7xpj75svz0iw1sq5i6z2grj7sc3q11hl63666hzh7d";
11+ sha256 = "1qisj8ryzbknam3hk81rq70fsd9mcpxm898bqygvbsmbwyvmz3pg";
1212 };
1313
1414 nativeBuildInputs = [ autoreconfHook pkgconfig ];
pkgs/development/libraries/libdvdnav/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "libdvdnav";
5− version = "6.0.0";
5+ version = "6.0.1";
66
77 src = fetchurl {
88 url = "http://get.videolan.org/libdvdnav/${version}/${pname}-${version}.tar.bz2";
9− sha256 = "062njcksmpgw9yv3737qkf93r2pzhaxi9szqjabpa8d010dp38ph";
9+ sha256 = "0cv7j8irsv1n2dadlnhr6i1b8pann2ah6xpxic41f04my6ba6rp5";
1010 };
1111
1212 nativeBuildInputs = [ pkgconfig ];
pkgs/development/libraries/libgnomekbd/default.nix+2
@@ -4,6 +4,8 @@ stdenv.mkDerivation rec {
44 pname = "libgnomekbd";
55 version = "3.26.1";
66
7+ outputs = [ "out" "dev" ];
8+
79 src = fetchurl {
810 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
911 sha256 = "0y962ykn3rr9gylj0pwpww7bi20lmhvsw6qvxs5bisbn2mih5jpp";
pkgs/development/libraries/libinput/default.nix+2−2
@@ -27,11 +27,11 @@ in
2727with stdenv.lib;
2828stdenv.mkDerivation rec {
2929 pname = "libinput";
30− version = "1.14.3";
30+ version = "1.15.0";
3131
3232 src = fetchurl {
3333 url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz";
34− sha256 = "1dy58j8dvr7ri34bx0lppmh5638m956azgwk501w373hi42kmsqg";
34+ sha256 = "1qa3b2fd4pv8ysf0mgwnyhqv9v48zgy3sy0q3a3vxcmwcvpizgxz";
3535 };
3636
3737 outputs = [ "bin" "out" "dev" ];
pkgs/development/libraries/libnotify/default.nix+2
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
1414 pname = "libnotify";
1515 version = "0.7.8";
1616
17+ outputs = [ "out" "dev" ];
18+
1719 src = fetchurl {
1820 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
1921 sha256 = "1371csx0n92g60b5dmai4mmzdnx8081mc3kcgc6a0xipcq5rw839";
pkgs/development/libraries/liboauth/default.nix+2
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
99 sha256 = "07w1aq8y8wld43wmbk2q8134p3bfkp2vma78mmsfgw2jn1bh3xhd";
1010 };
1111
12+ outputs = [ "out" "dev" ];
13+
1214 nativeBuildInputs = [ pkgconfig ];
1315
1416 propagatedBuildInputs = [ nss nspr ];
pkgs/development/libraries/libpeas/default.nix+2
@@ -6,6 +6,8 @@ stdenv.mkDerivation rec {
66 pname = "libpeas";
77 version = "1.24.0";
88
9+ outputs = [ "out" "dev" ];
10+
911 src = fetchurl {
1012 url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
1113 sha256 = "1yg6r0srz3knhgvplprl3pikrq5c02dmdxgfwcynd6hjih9h16hb";
pkgs/development/libraries/libuv/default.nix+2−2
@@ -1,14 +1,14 @@
11{ stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }:
22
33stdenv.mkDerivation rec {
4− version = "1.34.0";
4+ version = "1.34.1";
55 pname = "libuv";
66
77 src = fetchFromGitHub {
88 owner = pname;
99 repo = pname;
1010 rev = "v${version}";
11− sha256 = "0vcrrqf0zqgsfmgbyl45qhajyab98kxqq66l0w4lkj5say86aln8";
11+ sha256 = "0vkn76wr2nivhmgjnkni2yih642mrlzkxbivdmlvcf3hg4h7gipp";
1212 };
1313
1414 postPatch = let
pkgs/development/libraries/libvpx/CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patchnew file+211
@@ -0,0 +1,211 @@
1+Backports of
2+
3+From 46e17f0cb4a80b36755c84b8bf15731d3386c08f Mon Sep 17 00:00:00 2001
4+From: kyslov <kyslov@google.com>
5+Date: Fri, 4 Jan 2019 17:04:09 -0800
6+Subject: [PATCH] Fix OOB memory access on fuzzed data
7+
8+From 0681cff1ad36b3ef8ec242f59b5a6c4234ccfb88 Mon Sep 17 00:00:00 2001
9+From: James Zern <jzern@google.com>
10+Date: Tue, 24 Jul 2018 21:36:50 -0700
11+Subject: [PATCH] vp9: fix OOB read in decoder_peek_si_internal
12+
13+From f00890eecdf8365ea125ac16769a83aa6b68792d Mon Sep 17 00:00:00 2001
14+From: James Zern <jzern@google.com>
15+Date: Tue, 11 Dec 2018 18:06:20 -0800
16+Subject: [PATCH] update libwebm to libwebm-1.0.0.27-352-g6ab9fcf
17+
18+From 34d54b04e98dd0bac32e9aab0fbda0bf501bc742 Mon Sep 17 00:00:00 2001
19+From: James Zern <jzern@google.com>
20+Date: Tue, 9 Apr 2019 18:37:44 -0700
21+Subject: [PATCH] update libwebm to libwebm-1.0.0.27-358-gdbf1d10
22+
23+From 52add5896661d186dec284ed646a4b33b607d2c7 Mon Sep 17 00:00:00 2001
24+From: Jerome Jiang <jianj@google.com>
25+Date: Wed, 23 May 2018 15:43:00 -0700
26+Subject: [PATCH] VP8: Fix use-after-free in postproc.
27+
28+to address CVE-2019-9232 CVE-2019-9325 CVE-2019-9371 CVE-2019-9433
29+
30+--- libvpx-1.7.0.orig/test/decode_api_test.cc
31++++ libvpx-1.7.0/test/decode_api_test.cc
32+@@ -138,8 +138,30 @@ TEST(DecodeAPI, Vp9InvalidDecode) {
33+ EXPECT_EQ(VPX_CODEC_OK, vpx_codec_destroy(&dec));
34+ }
35+
36+-TEST(DecodeAPI, Vp9PeekSI) {
37++void TestPeekInfo(const uint8_t *const data, uint32_t data_sz,
38++ uint32_t peek_size) {
39+ const vpx_codec_iface_t *const codec = &vpx_codec_vp9_dx_algo;
40++ // Verify behavior of vpx_codec_decode. vpx_codec_decode doesn't even get
41++ // to decoder_peek_si_internal on frames of size < 8.
42++ if (data_sz >= 8) {
43++ vpx_codec_ctx_t dec;
44++ EXPECT_EQ(VPX_CODEC_OK, vpx_codec_dec_init(&dec, codec, NULL, 0));
45++ EXPECT_EQ((data_sz < peek_size) ? VPX_CODEC_UNSUP_BITSTREAM
46++ : VPX_CODEC_CORRUPT_FRAME,
47++ vpx_codec_decode(&dec, data, data_sz, NULL, 0));
48++ vpx_codec_iter_t iter = NULL;
49++ EXPECT_EQ(NULL, vpx_codec_get_frame(&dec, &iter));
50++ EXPECT_EQ(VPX_CODEC_OK, vpx_codec_destroy(&dec));
51++ }
52++
53++ // Verify behavior of vpx_codec_peek_stream_info.
54++ vpx_codec_stream_info_t si;
55++ si.sz = sizeof(si);
56++ EXPECT_EQ((data_sz < peek_size) ? VPX_CODEC_UNSUP_BITSTREAM : VPX_CODEC_OK,
57++ vpx_codec_peek_stream_info(codec, data, data_sz, &si));
58++}
59++
60++TEST(DecodeAPI, Vp9PeekStreamInfo) {
61+ // The first 9 bytes are valid and the rest of the bytes are made up. Until
62+ // size 10, this should return VPX_CODEC_UNSUP_BITSTREAM and after that it
63+ // should return VPX_CODEC_CORRUPT_FRAME.
64+@@ -150,24 +172,18 @@ TEST(DecodeAPI, Vp9PeekSI) {
65+ };
66+
67+ for (uint32_t data_sz = 1; data_sz <= 32; ++data_sz) {
68+- // Verify behavior of vpx_codec_decode. vpx_codec_decode doesn't even get
69+- // to decoder_peek_si_internal on frames of size < 8.
70+- if (data_sz >= 8) {
71+- vpx_codec_ctx_t dec;
72+- EXPECT_EQ(VPX_CODEC_OK, vpx_codec_dec_init(&dec, codec, NULL, 0));
73+- EXPECT_EQ(
74+- (data_sz < 10) ? VPX_CODEC_UNSUP_BITSTREAM : VPX_CODEC_CORRUPT_FRAME,
75+- vpx_codec_decode(&dec, data, data_sz, NULL, 0));
76+- vpx_codec_iter_t iter = NULL;
77+- EXPECT_EQ(NULL, vpx_codec_get_frame(&dec, &iter));
78+- EXPECT_EQ(VPX_CODEC_OK, vpx_codec_destroy(&dec));
79+- }
80+-
81+- // Verify behavior of vpx_codec_peek_stream_info.
82+- vpx_codec_stream_info_t si;
83+- si.sz = sizeof(si);
84+- EXPECT_EQ((data_sz < 10) ? VPX_CODEC_UNSUP_BITSTREAM : VPX_CODEC_OK,
85+- vpx_codec_peek_stream_info(codec, data, data_sz, &si));
86++ TestPeekInfo(data, data_sz, 10);
87++ }
88++}
89++
90++TEST(DecodeAPI, Vp9PeekStreamInfoTruncated) {
91++ // This profile 1 header requires 10.25 bytes, ensure
92++ // vpx_codec_peek_stream_info doesn't over read.
93++ const uint8_t profile1_data[10] = { 0xa4, 0xe9, 0x30, 0x68, 0x53,
94++ 0xe9, 0x30, 0x68, 0x53, 0x04 };
95++
96++ for (uint32_t data_sz = 1; data_sz <= 10; ++data_sz) {
97++ TestPeekInfo(profile1_data, data_sz, 11);
98+ }
99+ }
100+ #endif // CONFIG_VP9_DECODER
101+--- libvpx-1.7.0.orig/third_party/libwebm/mkvparser/mkvparser.cc
102++++ libvpx-1.7.0/third_party/libwebm/mkvparser/mkvparser.cc
103+@@ -5307,8 +5307,8 @@ long VideoTrack::Parse(Segment* pSegment
104+
105+ const long long stop = pos + s.size;
106+
107+- Colour* colour = NULL;
108+- Projection* projection = NULL;
109++ std::unique_ptr<Colour> colour_ptr;
110++ std::unique_ptr<Projection> projection_ptr;
111+
112+ while (pos < stop) {
113+ long long id, size;
114+@@ -5357,11 +5357,19 @@ long VideoTrack::Parse(Segment* pSegment
115+ if (rate <= 0)
116+ return E_FILE_FORMAT_INVALID;
117+ } else if (id == libwebm::kMkvColour) {
118+- if (!Colour::Parse(pReader, pos, size, &colour))
119++ Colour* colour = NULL;
120++ if (!Colour::Parse(pReader, pos, size, &colour)) {
121+ return E_FILE_FORMAT_INVALID;
122++ } else {
123++ colour_ptr.reset(colour);
124++ }
125+ } else if (id == libwebm::kMkvProjection) {
126+- if (!Projection::Parse(pReader, pos, size, &projection))
127++ Projection* projection = NULL;
128++ if (!Projection::Parse(pReader, pos, size, &projection)) {
129+ return E_FILE_FORMAT_INVALID;
130++ } else {
131++ projection_ptr.reset(projection);
132++ }
133+ }
134+
135+ pos += size; // consume payload
136+@@ -5392,8 +5400,8 @@ long VideoTrack::Parse(Segment* pSegment
137+ pTrack->m_display_unit = display_unit;
138+ pTrack->m_stereo_mode = stereo_mode;
139+ pTrack->m_rate = rate;
140+- pTrack->m_colour = colour;
141+- pTrack->m_projection = projection;
142++ pTrack->m_colour = colour_ptr.release();
143++ pTrack->m_projection = projection_ptr.release();
144+
145+ pResult = pTrack;
146+ return 0; // success
147+--- libvpx-1.7.0.orig/vp8/common/postproc.c
148++++ libvpx-1.7.0/vp8/common/postproc.c
149+@@ -65,7 +65,7 @@ void vp8_deblock(VP8_COMMON *cm, YV12_BU
150+ double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065;
151+ int ppl = (int)(level + .5);
152+
153+- const MODE_INFO *mode_info_context = cm->show_frame_mi;
154++ const MODE_INFO *mode_info_context = cm->mi;
155+ int mbr, mbc;
156+
157+ /* The pixel thresholds are adjusted according to if or not the macroblock
158+--- libvpx-1.7.0.orig/vp8/decoder/dboolhuff.h
159++++ libvpx-1.7.0/vp8/decoder/dboolhuff.h
160+@@ -76,7 +76,7 @@ static int vp8dx_decode_bool(BOOL_DECODE
161+ }
162+
163+ {
164+- register int shift = vp8_norm[range];
165++ const unsigned char shift = vp8_norm[(unsigned char)range];
166+ range <<= shift;
167+ value <<= shift;
168+ count -= shift;
169+--- libvpx-1.7.0.orig/vp9/vp9_dx_iface.c
170++++ libvpx-1.7.0/vp9/vp9_dx_iface.c
171+@@ -97,7 +97,7 @@ static vpx_codec_err_t decoder_peek_si_i
172+ const uint8_t *data, unsigned int data_sz, vpx_codec_stream_info_t *si,
173+ int *is_intra_only, vpx_decrypt_cb decrypt_cb, void *decrypt_state) {
174+ int intra_only_flag = 0;
175+- uint8_t clear_buffer[10];
176++ uint8_t clear_buffer[11];
177+
178+ if (data + data_sz <= data) return VPX_CODEC_INVALID_PARAM;
179+
180+@@ -158,6 +158,9 @@ static vpx_codec_err_t decoder_peek_si_i
181+ if (profile > PROFILE_0) {
182+ if (!parse_bitdepth_colorspace_sampling(profile, &rb))
183+ return VPX_CODEC_UNSUP_BITSTREAM;
184++ // The colorspace info may cause vp9_read_frame_size() to need 11
185++ // bytes.
186++ if (data_sz < 11) return VPX_CODEC_UNSUP_BITSTREAM;
187+ }
188+ rb.bit_offset += REF_FRAMES; // refresh_frame_flags
189+ vp9_read_frame_size(&rb, (int *)&si->w, (int *)&si->h);
190+--- libvpx-1.7.0.orig/vpx_dsp/bitreader.h
191++++ libvpx-1.7.0/vpx_dsp/bitreader.h
192+@@ -94,7 +94,7 @@ static INLINE int vpx_read(vpx_reader *r
193+ }
194+
195+ {
196+- register int shift = vpx_norm[range];
197++ const unsigned char shift = vpx_norm[(unsigned char)range];
198+ range <<= shift;
199+ value <<= shift;
200+ count -= shift;
201+--- libvpx-1.7.0.orig/vpx_dsp/bitreader_buffer.c
202++++ libvpx-1.7.0/vpx_dsp/bitreader_buffer.c
203+@@ -23,7 +23,7 @@ int vpx_rb_read_bit(struct vpx_read_bit_
204+ rb->bit_offset = off + 1;
205+ return bit;
206+ } else {
207+- rb->error_handler(rb->error_handler_data);
208++ if (rb->error_handler != NULL) rb->error_handler(rb->error_handler_data);
209+ return 0;
210+ }
211+ }
pkgs/development/libraries/libvpx/default.nix+5−1
@@ -65,7 +65,11 @@ stdenv.mkDerivation rec {
6565 sha256 = "0vvh89hvp8qg9an9vcmwb7d9k3nixhxaz6zi65qdjnd0i56kkcz6";
6666 };
6767
68− patchPhase = ''patchShebangs .'';
68+ patches = [
69+ ./CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch
70+ ];
71+
72+ postPatch = ''patchShebangs .'';
6973
7074 outputs = [ "bin" "dev" "out" ];
7175 setOutputFlags = false;
pkgs/development/libraries/poppler/default.nix+2−2
@@ -12,11 +12,11 @@ let
1212in
1313stdenv.mkDerivation rec {
1414 name = "poppler-${suffix}-${version}";
15− version = "0.83.0"; # beware: updates often break cups-filters build
15+ version = "0.84.0"; # beware: updates often break cups-filters build
1616
1717 src = fetchurl {
1818 url = "${meta.homepage}/poppler-${version}.tar.xz";
19− sha256 = "16vr1g5qsqwyxfnyikqw37i04x9zpp45far2x90c7qbijw6nap38";
19+ sha256 = "0ccp2gx05cz5y04k5pgbyi4ikyq60nafa7x2yx4aaf1vfkd318f7";
2020 };
2121
2222 outputs = [ "out" "dev" ];
pkgs/development/libraries/v8/default.nix−2
@@ -121,8 +121,6 @@ stdenv.mkDerivation rec {
121121 Version: ${version}
122122 Libs: -L$out/lib -lv8 -pthread
123123 Cflags: -I$out/include
124− Libs: -L$out/lib -lpulse
125− Cflags: -I$out/include
126124 EOF
127125 '';
128126
pkgs/development/libraries/wavpack/default.nix+3−71
@@ -1,8 +1,8 @@
1−{ stdenv, fetchurl, libiconv, fetchpatch }:
1+{ stdenv, fetchurl, libiconv }:
22
33stdenv.mkDerivation rec {
44 pname = "wavpack";
5− version = "5.1.0";
5+ version = "5.2.0";
66
77 enableParallelBuilding = true;
88
@@ -10,77 +10,9 @@ stdenv.mkDerivation rec {
1010
1111 src = fetchurl {
1212 url = "http://www.wavpack.com/${pname}-${version}.tar.bz2";
13− sha256 = "0i19c6krc0p9krwrqy9s5xahaafigqzxcn31piidmlaqadyn4f8r";
13+ sha256 = "062f97bvm466ygvix3z0kbgffvvrc5cg2ak568jaq8r56v28q8rw";
1414 };
1515
16− patches = [
17− (fetchpatch {
18− url = "https://github.com/dbry/WavPack/commit/26cb47f99d481ad9b93eeff80d26e6b63bbd7e15.patch";
19− name = "CVE-2018-10536-CVE-2018-10537.patch";
20− sha256 = "0s0fyycd4x7pw4vl1yp2vp4zrlk04j85idvnxz5h96fj6196anw6";
21− })
22− (fetchpatch {
23− url = "https://github.com/dbry/WavPack/commit/6f8bb34c2993a48ab9afbe353e6d0cff7c8d821d.patch";
24− name = "CVE-2018-10538-CVE-2018-10539-CVE-2018-10540.patch";
25− sha256 = "03qzmaq9mwiqbzrx1lvkgkhz3cjv7dky1b4lka3d5q2rwdlyw5qk";
26− })
27− (fetchpatch {
28− url = "https://github.com/dbry/WavPack/commit/d5bf76b5a88d044a1be1d5656698e3ba737167e5.patch";
29− name = "CVE-2018-6767.patch";
30− sha256 = "158c60i188kbxl0hzb7g74g21pknz7fk429vnbbx9zk1mlyyyl5b";
31− })
32− (fetchpatch {
33− url = "https://github.com/dbry/WavPack/commit/bf408e95f43fafdcef42c3f5f9c9d0e6ab0331b9.patch";
34− name = "CVE-2019-11498-1.patch";
35− sha256 = "161dw759v1lzbhj7daw2gbmcji8s0njpa65xmqhqw73bwpzb3xkd";
36− })
37− (fetchpatch {
38− url = "https://github.com/dbry/WavPack/commit/cd353bccafb1274a525c3536aaff8c48c3a33aa0.patch";
39− name = "CVE-2019-11498-2.patch";
40− sha256 = "120sb1iqkq2gadh0qydqvca4vwx31zb7gk1d0nm0y5agav2ai0dk";
41− })
42− (fetchpatch {
43− url = "https://github.com/dbry/WavPack/commit/4c0faba32fddbd0745cbfaf1e1aeb3da5d35b9fc.patch";
44− name = "CVE-2019-11498-3.patch";
45− sha256 = "12744yn1035mf7wzgqrkyadw5mwqf9v34ckj2m5sirk97k47k0wa";
46− })
47− (fetchpatch {
48− url = "https://github.com/dbry/WavPack/commit/bc6cba3f552c44565f7f1e66dc1580189addb2b4.patch";
49− name = "CVE-2019-11498-4.patch";
50− sha256 = "0qdw071b14hmxkjw6kn83d8hzq89l3hqh64pl1f1wb8m51w5xfg7";
51− })
52− (fetchpatch {
53− url = "https://github.com/dbry/WavPack/commit/070ef6f138956d9ea9612e69586152339dbefe51.patch";
54− name = "CVE-2018-19840.patch";
55− sha256 = "08y27py8hnki74ad8wbknnd36vj5pzzcm2vk3ngcbsjnj7x5mffz";
56− })
57− (fetchpatch {
58− url = "https://github.com/dbry/WavPack/commit/bba5389dc598a92bdf2b297c3ea34620b6679b5b.patch";
59− name = "CVE-2018-19841.patch";
60− sha256 = "08gx5xx51bi86cqqy7cv1d25k669a7wnkksasjspphwkpwkcxymy";
61− })
62− (fetchpatch {
63− url = "https://github.com/dbry/WavPack/commit/f68a9555b548306c5b1ee45199ccdc4a16a6101b.patch";
64− name = "CVE-2019-1010317.patch";
65− sha256 = "0v748nd9408v6ah37cn8wr0k0m0ny1g884q8q92j1dhwad69kfid";
66− })
67− (fetchpatch {
68− url = "https://github.com/dbry/WavPack/commit/33a0025d1d63ccd05d9dbaa6923d52b1446a62fe.patch";
69− name = "CVE-2019-1010319.patch";
70− sha256 = "011sqdgpykilaj2c4ns298z7aad03yprpva0dqr39nx88ji6jnrb";
71− })
72− (fetchpatch {
73− url = "https://github.com/dbry/WavPack/commit/36a24c7881427d2e1e4dc1cef58f19eee0d13aec.patch";
74− name = "CVE-2018-7253.patch";
75− sha256 = "130kvmlpaj6x1pm6qzdzrmf4xzhp0pj29qrardb76zcfinx5pk2n";
76− })
77− (fetchpatch {
78− url = "https://github.com/dbry/WavPack/commit/8e3fe45a7bac31d9a3b558ae0079e2d92a04799e.patch";
79− name = "CVE-2018-7254.patch";
80− sha256 = "06fdzw2cbdj8ajf171z1g53cl6bf1cdh2czswqldrqqvv3jkzk77";
81− })
82− ];
83−
8416 meta = with stdenv.lib; {
8517 description = "Hybrid audio compression format";
8618 homepage = http://www.wavpack.com/;
pkgs/development/libraries/x264/default.nix+4−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "x264";
5− version = "20190517-2245";
5+ version = "20191217-2245";
66
77 src = fetchurl {
88 url = "https://download.videolan.org/x264/snapshots/x264-snapshot-${version}-stable.tar.bz2";
9− sha256 = "1xv41z04km3rf374xk3ny7v8ibr211ph0j5am0909ln63mphc48f";
9+ sha256 = "0q214q4rhbhigyx3dfhp6d5v5gzln01cxccl153ps5ih567mqjdj";
1010 };
1111
1212 # Upstream ./configure greps for (-mcpu|-march|-mfpu) in CFLAGS, which in nix
@@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
2424 preConfigure = lib.optionalString (stdenv.buildPlatform.isx86_64 || stdenv.hostPlatform.isi686) ''
2525 # `AS' is set to the binutils assembler, but we need nasm
2626 unset AS
27+ '' + lib.optionalString (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) ''
28+ export AS=$CC
2729 '';
2830
2931 configureFlags = [ "--enable-shared" ]
pkgs/development/python-modules/botocore/default.nix−2
@@ -19,8 +19,6 @@ buildPythonPackage rec {
1919 sha256 = "8223485841ef4731a5d4943a733295ba69d0005c4ae64c468308cc07f6960d39";
2020 };
2121
22− outputs = [ "out" "dev" ];
23−
2422 propagatedBuildInputs = [
2523 dateutil
2624 jmespath
pkgs/development/python-modules/numpy/default.nix+2−2
@@ -27,13 +27,13 @@ let
2727 };
2828in buildPythonPackage rec {
2929 pname = "numpy";
30− version = "1.18.0";
30+ version = "1.18.1";
3131 format = "pyproject.toml";
3232
3333 src = fetchPypi {
3434 inherit pname version;
3535 extension = "zip";
36− sha256 = "a9d72d9abaf65628f0f31bbb573b7d9304e43b1e6bbae43149c17737a42764c4";
36+ sha256 = "b6ff59cee96b454516e47e7721098e6ceebef435e3e21ac2d6c3b8b02628eb77";
3737 };
3838
3939 nativeBuildInputs = [ gfortran pytest cython setuptoolsBuildHook ];
pkgs/development/python-modules/pandas/default.nix+2−2
@@ -30,11 +30,11 @@ let
3030
3131in buildPythonPackage rec {
3232 pname = "pandas";
33− version = "0.25.3";
33+ version = "1.0.0";
3434
3535 src = fetchPypi {
3636 inherit pname version;
37− sha256 = "52da74df8a9c9a103af0a72c9d5fdc8e0183a90884278db7f386b5692a2220a4";
37+ sha256 = "3ea6cc86931f57f18b1240572216f09922d91b19ab8a01cf24734394a3db3bec";
3838 };
3939
4040 checkInputs = [ pytest glibcLocales moto hypothesis ];
pkgs/development/python-modules/pyparsing/default.nix+30−14
@@ -1,19 +1,35 @@
1−{ stdenv, buildPythonPackage, fetchPypi }:
1+{ buildPythonPackage
2+, fetchFromGitHub
3+, lib
4+
5+# pythonPackages
6+, coverage
7+}:
8+
29buildPythonPackage rec {
3− pname = "pyparsing";
4− version = "2.4.6";
10+ pname = "pyparsing";
11+ version = "2.4.6";
512
6− src = fetchPypi {
7− inherit pname version;
8− sha256 = "4c830582a84fb022400b85429791bc551f1f4871c33f23e44f353119e92f969f";
9− };
13+ src = fetchFromGitHub {
14+ owner = "pyparsing";
15+ repo = pname;
16+ rev = "pyparsing_${version}";
17+ sha256 = "1fh7s3cfr274pd6hh6zygl99842rqws98an2nkrrqj2spb9ldxcm";
18+ };
1019
11− # Not everything necessary to run the tests is included in the distribution
12− doCheck = false;
20+ # https://github.com/pyparsing/pyparsing/blob/847af590154743bae61a32c3dc1a6c2a19009f42/tox.ini#L6
21+ checkInputs = [ coverage ];
22+ checkPhase = ''
23+ coverage run --branch simple_unit_tests.py
24+ coverage run --branch unitTests.py
25+ '';
1326
14− meta = with stdenv.lib; {
15− homepage = https://pyparsing.wikispaces.com/;
16− description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions";
17− license = licenses.mit;
18− };
27+ meta = with lib; {
28+ homepage = "https://github.com/pyparsing/pyparsing";
29+ description = "An alternative approach to creating and executing simple grammars, vs. the traditional lex/yacc approach, or the use of regular expressions";
30+ license = licenses.mit;
31+ maintainers = with maintainers; [
32+ kamadorueda
33+ ];
34+ };
1935}
pkgs/development/python-modules/pytest/default.nix+2−2
@@ -3,7 +3,7 @@
33, atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy, python
44}:
55buildPythonPackage rec {
6− version = "5.3.2";
6+ version = "5.3.5";
77 pname = "pytest";
88
99 disabled = !isPy3k;
@@ -15,7 +15,7 @@ buildPythonPackage rec {
1515
1616 src = fetchPypi {
1717 inherit pname version;
18− sha256 = "6b571215b5a790f9b41f19f3531c53a45cf6bb8ef2988bc1ff9afb38270b25fa";
18+ sha256 = "0d5fe9189a148acc3c3eb2ac8e1ac0742cb7618c084f3d228baaec0c254b318d";
1919 };
2020
2121 checkInputs = [ hypothesis mock ];
pkgs/development/python-modules/s3transfer/default.nix−2
@@ -21,8 +21,6 @@ buildPythonPackage rec {
2121 sha256 = "6efc926738a3cd576c2a79725fed9afde92378aa5c6a957e3af010cb019fac9d";
2222 };
2323
24− outputs = [ "out" "dev" ];
25−
2624 propagatedBuildInputs =
2725 [ botocore
2826 ] ++ stdenv.lib.optional (pythonOlder "3") futures;
pkgs/development/python-modules/urllib3/default.nix−2
@@ -11,8 +11,6 @@ buildPythonPackage rec {
1111 sha256 = "f3c5fd51747d450d4dcf6f923c81f78f811aab8205fda64b0aba34a4e48b0745";
1212 };
1313
14− outputs = [ "out" "dev" ];
15−
1614 NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [
1715 "test_headers" "test_headerdict" "test_can_validate_ip_san" "test_delayed_body_read_timeout"
1816 "test_timeout_errors_cause_retries" "test_select_multiple_interrupts_with_event"
pkgs/development/tools/build-managers/cmake/default.nix+2−2
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
1919 + lib.optionalString useNcurses "-cursesUI"
2020 + lib.optionalString withQt5 "-qt5UI"
2121 + lib.optionalString useQt4 "-qt4UI";
22− version = "3.16.2";
22+ version = "3.16.3";
2323
2424 src = fetchurl {
2525 url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz";
2626 # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt
27− sha256 = "1ag65ignli58kpmji6gjhj8xw4w1qdr910i99hsvx8hcqrp7h2cc";
27+ sha256 = "0s06wrp0jnw2l4yq94skj53hwnz7lqrmhh96sq7w7njkkggickz5";
2828 };
2929
3030 patches = [
pkgs/misc/cups/default.nix+2−2
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
3030 pname = "cups";
3131
3232 # After 2.2.6, CUPS requires headers only available in macOS 10.12+
33− version = if stdenv.isDarwin then "2.2.6" else "2.3.0";
33+ version = if stdenv.isDarwin then "2.2.6" else "2.3.1";
3434
3535 passthru = { inherit version; };
3636
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
3838 url = "https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz";
3939 sha256 = if version == "2.2.6"
4040 then "16qn41b84xz6khrr2pa2wdwlqxr29rrrkjfi618gbgdkq9w5ff20"
41− else "19d1jpdpxy0fclq37pchi7ldnw9dssxx3zskcgqai3h0rwlh5bxc";
41+ else "1kkpmj17205j8w9hdff2bfpk6lwdmr3gx0j4r35nhgvya24rvjhv";
4242 };
4343
4444 outputs = [ "out" "lib" "dev" "man" ];
pkgs/os-specific/darwin/apple-sdk/default.nix+15−13
@@ -61,9 +61,16 @@ let
6161 installPhase = ''
6262 linkFramework() {
6363 local path="$1"
64+ local nested_path="$1"
6465 local dest="$out/Library/Frameworks/$path"
66+ if [ "$path" == "JavaNativeFoundation.framework" ]; then
67+ local nested_path="JavaVM.framework/Versions/A/Frameworks/JavaNativeFoundation.framework"
68+ fi
69+ if [ "$path" == "JavaRuntimeSupport.framework" ]; then
70+ local nested_path="JavaVM.framework/Versions/A/Frameworks/JavaRuntimeSupport.framework"
71+ fi
6572 local name="$(basename "$path" .framework)"
66− local current="$(readlink "/System/Library/Frameworks/$path/Versions/Current")"
73+ local current="$(readlink "/System/Library/Frameworks/$nested_path/Versions/Current")"
6774 if [ -z "$current" ]; then
6875 current=A
6976 fi
@@ -75,25 +82,21 @@ let
7582 # ApplicationServices in the 10.9 SDK
7683 local isChild=0
7784
78− if [ -d "${sdk.out}/Library/Frameworks/$path/Versions/$current/Headers" ]; then
85+ if [ -d "${sdk.out}/Library/Frameworks/$nested_path/Versions/$current/Headers" ]; then
7986 isChild=1
80− cp -R "${sdk.out}/Library/Frameworks/$path/Versions/$current/Headers" .
87+ cp -R "${sdk.out}/Library/Frameworks/$nested_path/Versions/$current/Headers" .
8188 elif [ -d "${sdk.out}/Library/Frameworks/$name.framework/Versions/$current/Headers" ]; then
8289 current="$(readlink "/System/Library/Frameworks/$name.framework/Versions/Current")"
8390 cp -R "${sdk.out}/Library/Frameworks/$name.framework/Versions/$current/Headers" .
8491 fi
85− ln -s -L "/System/Library/Frameworks/$path/Versions/$current/$name"
86− ln -s -L "/System/Library/Frameworks/$path/Versions/$current/Resources"
92+ ln -s -L "/System/Library/Frameworks/$nested_path/Versions/$current/$name"
93+ ln -s -L "/System/Library/Frameworks/$nested_path/Versions/$current/Resources"
8794
88− if [ -f "/System/Library/Frameworks/$path/module.map" ]; then
89− ln -s "/System/Library/Frameworks/$path/module.map"
95+ if [ -f "/System/Library/Frameworks/$nested_path/module.map" ]; then
96+ ln -s "/System/Library/Frameworks/$nested_path/module.map"
9097 fi
9198
92− if [ $isChild -eq 1 ]; then
93− pushd "${sdk.out}/Library/Frameworks/$path/Versions/$current" >/dev/null
94− else
95− pushd "${sdk.out}/Library/Frameworks/$name.framework/Versions/$current" >/dev/null
96− fi
99+ pushd "${sdk.out}/Library/Frameworks/$nested_path/Versions/$current" >/dev/null
97100 local children=$(echo Frameworks/*.framework)
98101 popd >/dev/null
99102
@@ -109,7 +112,6 @@ let
109112 popd >/dev/null
110113 }
111114
112−
113115 linkFramework "${name}.framework"
114116 '';
115117
pkgs/os-specific/darwin/apple-sdk/frameworks.nix+2
@@ -65,6 +65,8 @@ with frameworks; with libs; {
6565 InstallerPlugins = [];
6666 InstantMessage = [];
6767 JavaFrameEmbedding = [];
68+ JavaNativeFoundation = [];
69+ JavaRuntimeSupport = [];
6870 JavaScriptCore = [];
6971 Kerberos = [];
7072 Kernel = [ IOKit ];
pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix+9
@@ -12,5 +12,14 @@ appleDerivation {
1212
1313 cp -r dispatch/*.h $out/include/dispatch
1414 cp -r os/object*.h $out/include/os
15+
16+ # gcc compatability. Source: https://stackoverflow.com/a/28014302/3714556
17+ substituteInPlace $out/include/dispatch/object.h \
18+ --replace 'typedef void (^dispatch_block_t)(void);' \
19+ '#ifdef __clang__
20+ typedef void (^dispatch_block_t)(void);
21+ #else
22+ typedef void* dispatch_block_t;
23+ #endif'
1524 '';
1625}
pkgs/os-specific/linux/iproute/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "iproute2";
5− version = "5.4.0";
5+ version = "5.5.0";
66
77 src = fetchurl {
88 url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz";
9− sha256 = "1bl6c3af7wbgi6nqjfm32fkhqh63iphkg2g11f1srifll1ham5zy";
9+ sha256 = "0ywg70f98wgfai35jl47xzpjp45a6n7crja4vc8ql85cbi1l7ids";
1010 };
1111
1212 preConfigure = ''
pkgs/servers/pulseaudio/default.nix+4−1
@@ -108,7 +108,10 @@ stdenv.mkDerivation rec {
108108 rm -rf $out/{bin,share,etc,lib/{pulse-*,systemd}}
109109 sed 's|-lltdl|-L${libtool.lib}/lib -lltdl|' -i $out/lib/pulseaudio/libpulsecore-${version}.la
110110 ''
111− + ''moveToOutput lib/cmake "$dev" '';
111+ + ''
112+ moveToOutput lib/cmake "$dev"
113+ rm -f $out/bin/qpaeq # this is packaged by the "qpaeq" package now, because of missing deps
114+ '';
112115
113116 preFixup = lib.optionalString stdenv.isLinux ''
114117 wrapProgram $out/libexec/pulse/gsettings-helper \
pkgs/servers/pulseaudio/qpaeq.nixnew file+54
@@ -0,0 +1,54 @@
1+{ mkDerivation
2+, makeDesktopItem
3+, python3
4+, fetchurl
5+, lib
6+, pulseaudio
7+}:
8+
9+let
10+ desktopItem = makeDesktopItem {
11+ name = "qpaeq";
12+ exec = "@out@/bin/qpaeq";
13+ icon = "audio-volume-high";
14+ desktopName = "qpaeq";
15+ genericName = "Audio equalizer";
16+ categories = "Music;Sound;";
17+ startupNotify = "false";
18+ };
19+in
20+mkDerivation rec {
21+ pname = "qpaeq";
22+ inherit (pulseaudio) version src;
23+
24+ buildInputs = [
25+ ((python3.withPackages (ps: with ps; [
26+ pyqt5
27+ dbus-python
28+ ])))
29+ ];
30+
31+ dontBuild = true;
32+ dontConfigure = true;
33+
34+ installPhase = ''
35+ runHook preInstall
36+ install -D ./src/utils/qpaeq $out/bin/qpaeq
37+ install -D ${desktopItem}/share/applications/qpaeq.desktop $out/share/applications/qpaeq.desktop
38+ runHook postInstall
39+ '';
40+
41+ preFixup = ''
42+ sed "s|,sip|,PyQt5.sip|g" -i $out/bin/qpaeq
43+ wrapQtApp $out/bin/qpaeq
44+ sed "s|@out@|$out|g" -i $out/share/applications/qpaeq.desktop
45+ '';
46+
47+ meta = {
48+ description = "An equalizer interface for pulseaudio's equalizer sinks";
49+ homepage = http://www.pulseaudio.org/;
50+ license = lib.licenses.lgpl2Plus;
51+ maintainers = with lib.maintainers; [ lovek323 mkg20001 ];
52+ platforms = lib.platforms.unix;
53+ };
54+}
pkgs/servers/samba/4.x.nix+10−8
@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl, rpcgen
1+{ lib, stdenv, fetchurl, fetchpatch, python, pkgconfig, perl, libxslt, docbook_xsl, rpcgen
22, fixDarwinDylibNames
33, docbook_xml_dtd_42, readline
44, popt, iniparser, libbsd, libarchive, libiconv, gettext
@@ -20,11 +20,11 @@ with lib;
2020
2121stdenv.mkDerivation rec {
2222 pname = "samba";
23− version = "4.10.11";
23+ version = "4.11.5";
2424
2525 src = fetchurl {
2626 url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz";
27− sha256 = "157qvz8x2s7994rzxhcmpc79cfk86zc0rq5qwg8alvjcw0r457v0";
27+ sha256 = "0gyr773dl0krcra6pvyp8i9adj3r16ihrrm2b71c0974cbzrkqpk";
2828 };
2929
3030 outputs = [ "out" "dev" "man" ];
@@ -34,6 +34,11 @@ stdenv.mkDerivation rec {
3434 ./patch-source3__libads__kerberos_keytab.c.patch
3535 ./4.x-no-persistent-install-dynconfig.patch
3636 ./4.x-fix-makeflags-parsing.patch
37+ (fetchpatch {
38+ name = "test-oLschema2ldif-fmemopen.patch";
39+ url = "https://gitlab.com/samba-team/samba/commit/5e517e57c9d4d35e1042a49d3592652b05f0c45b.patch";
40+ sha256 = "1bbldf794svsdvcbp649imghmj0jck7545d3k9xs953qkkgwkbxi";
41+ })
3742 ];
3843
3944 nativeBuildInputs = optionals stdenv.isDarwin [ rpcgen fixDarwinDylibNames ];
@@ -41,12 +46,12 @@ stdenv.mkDerivation rec {
4146 buildInputs = [
4247 python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /*
4348 docbook_xml_dtd_45 */ readline popt iniparser jansson
44− libbsd libarchive zlib fam libiconv gettext libunwind krb5Full
49+ libbsd libarchive zlib fam libiconv gettext libunwind krb5Full gnutls
4550 ] ++ optionals stdenv.isLinux [ libaio systemd ]
4651 ++ optional enableLDAP openldap
4752 ++ optional (enablePrinting && stdenv.isLinux) cups
4853 ++ optional enableMDNS avahi
49− ++ optionals enableDomainController [ gnutls gpgme lmdb ]
54+ ++ optionals enableDomainController [ gpgme lmdb ]
5055 ++ optional enableRegedit ncurses
5156 ++ optional (enableCephFS && stdenv.isLinux) libceph
5257 ++ optionals (enableGlusterFS && stdenv.isLinux) [ glusterfs libuuid ]
@@ -61,9 +66,6 @@ stdenv.mkDerivation rec {
6166 sed -i "s,\(XML_CATALOG_FILES=\"\),\1$XML_CATALOG_FILES ,g" buildtools/wafsamba/wafsamba.py
6267
6368 patchShebangs ./buildtools/bin
64− '' + optionalString stdenv.isDarwin ''
65− substituteInPlace libcli/dns/wscript_build \
66− --replace "bld.SAMBA_BINARY('resolvconftest'" "True or bld.SAMBA_BINARY('resolvconftest'"
6769 '';
6870
6971 configureFlags = [
pkgs/tools/admin/awscli/default.nix−3
@@ -57,9 +57,6 @@ in py.pkgs.buildPythonApplication rec {
5757 pyyaml
5858 groff
5959 less
60− urllib3
61− dateutil
62− jmespath
6360 ];
6461
6562 postInstall = ''
pkgs/tools/misc/coreutils/default.nix+4
@@ -52,6 +52,10 @@ stdenv.mkDerivation (rec {
5252
5353 sed '2i print "Skipping env -S test"; exit 77;' -i ./tests/misc/env-S.pl
5454
55+ # Fails on systems with a rootfs. Looks like a bug in the test, see
56+ # https://lists.gnu.org/archive/html/bug-coreutils/2019-12/msg00000.html
57+ sed '2i print "Skipping df skip-rootfs test"; exit 77' -i ./tests/df/skip-rootfs.sh
58+
5559 # these tests fail in the unprivileged nix sandbox (without nix-daemon) as we break posix assumptions
5660 for f in ./tests/chgrp/{basic.sh,recurse.sh,default-no-deref.sh,no-x.sh,posix-H.sh}; do
5761 sed '2i echo Skipping chgrp && exit 77' -i "$f"
pkgs/tools/system/pciutils/default.nix+2−2
@@ -1,11 +1,11 @@
11{ stdenv, fetchurl, pkgconfig, zlib, kmod, which }:
22
33stdenv.mkDerivation rec {
4− name = "pciutils-3.6.2"; # with release-date database
4+ name = "pciutils-3.6.4"; # with release-date database
55
66 src = fetchurl {
77 url = "mirror://kernel/software/utils/pciutils/${name}.tar.xz";
8− sha256 = "1wwkpglvvr1sdj2gxz9khq507y02c4px48njy25divzdhv4jwifv";
8+ sha256 = "0mb0f2phdcmp4kfiqsszn2k6nlln0w160ffzrjjv4bbfjwrgfzzn";
99 };
1010
1111 nativeBuildInputs = [ pkgconfig ];
pkgs/tools/text/gnused/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "gnused";
5− version = "4.7";
5+ version = "4.8";
66
77 src = fetchurl {
88 url = "mirror://gnu/sed/sed-${version}.tar.xz";
9− sha256 = "0smxcx66vx29djzb542nxcynl7qnzxqa5032ibazi7x2s267d198";
9+ sha256 = "0cznxw73fzv1n3nj2zsq6nf73rvsbxndp444xkpahdqvlzz0r6zp";
1010 };
1111
1212 outputs = [ "out" "info" ];
pkgs/top-level/all-packages.nix+9−1
@@ -8442,7 +8442,13 @@ in
84428442 jre = jre8;
84438443 jre_headless = jre8_headless;
84448444
8445− inherit (callPackages ../development/compilers/graalvm { }) mx jvmci8 graalvm8;
8445+ inherit (callPackages ../development/compilers/graalvm {
8446+ gcc = if stdenv.targetPlatform.isDarwin then gcc8 else gcc;
8447+ inherit (darwin.apple_sdk.frameworks)
8448+ CoreFoundation Foundation JavaNativeFoundation
8449+ JavaVM JavaRuntimeSupport Cocoa;
8450+ inherit (darwin) libiconv libobjc libresolv;
8451+ }) mx jvmci8 graalvm8;
84468452
84478453 inherit (callPackages ../development/compilers/graalvm/enterprise-edition.nix { })
84488454 graalvm8-ee
@@ -15449,6 +15455,8 @@ in
1544915455 inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;
1545015456 };
1545115457
15458+ qpaeq = qt5.callPackage ../servers/pulseaudio/qpaeq.nix { };
15459+
1545215460 pulseaudioFull = pulseaudio.override {
1545315461 x11Support = true;
1545415462 jackaudioSupport = true;