diff options
414 files changed, 8842 insertions, 5898 deletions
diff --git a/doc/contributing/submitting-changes.xml b/doc/contributing/submitting-changes.xml index f0971162411..6a8b4e0b249 100644 --- a/doc/contributing/submitting-changes.xml +++ b/doc/contributing/submitting-changes.xml @@ -228,6 +228,33 @@ Additional information. </listitem> </itemizedlist> </section> + <section xml:id="submitting-changes-submitting-security-fixes"> + <title>Submitting security fixes</title> + + <para> + Security fixes are submitted in the same way as other changes and thus the same guidelines apply. + </para> + + <para> + If the security fix comes in the form of a patch and a CVE is available, then the name of the patch should be the CVE identifier, so e.g. <literal>CVE-2019-13636.patch</literal> in the case of a patch that is included in the Nixpkgs tree. If a patch is fetched the name needs to be set as well, e.g.: + </para> + +<programlisting> + (fetchpatch { + name = "CVE-2019-11068.patch"; + url = "https://gitlab.gnome.org/GNOME/libxslt/commit/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch"; + sha256 = "0pkpb4837km15zgg6h57bncp66d5lwrlvkr73h0lanywq7zrwhj8"; + }) + </programlisting> + + <para> + If a security fix applies to both master and a stable release then, similar to regular changes, they are preferably delivered via master first and cherry-picked to the release branch. + </para> + + <para> + Critical security fixes may by-pass the staging branches and be delivered directly to release branches such as <literal>master</literal> and <literal>release-*</literal>. + </para> + </section> <section xml:id="submitting-changes-pull-request-template"> <title>Pull Request Template</title> @@ -298,12 +325,17 @@ Additional information. <para> review changes from pull request number 12345: -<screen>nix-shell -p nix-review --run "nix-review pr 12345"</screen> + <screen>nix run nixpkgs.nix-review -c nix-review pr 12345</screen> </para> <para> review uncommitted changes: -<screen>nix-shell -p nix-review --run "nix-review wip"</screen> + <screen>nix run nixpkgs.nix-review -c nix-review wip</screen> + </para> + + <para> + review changes from last commit: + <screen>nix run nixpkgs.nix-review -c nix-review rev HEAD</screen> </para> </section> diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index 1e677450aa1..7cbac95f7d4 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -398,7 +398,9 @@ nix: For more on how to write a `shell.nix` file see the below section. You'll need to express a derivation. Note that Nixpkgs ships with a convenience wrapper function around `mkDerivation` called `haskell.lib.buildStackProject` to help you -create this derivation in exactly the way Stack expects. All of the same inputs +create this derivation in exactly the way Stack expects. However for this to work +you need to disable the sandbox, which you can do by using `--option sandbox relaxed` +or `--option sandbox false` to the Nix command. All of the same inputs as `mkDerivation` can be provided. For example, to build a Stack project that including packages that link against a version of the R library compiled with special options turned on: diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 02bff8666e2..1bedebd1190 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -144,6 +144,24 @@ What's happening here? 2. Then we create a Python 3.5 environment with the `withPackages` function. 3. The `withPackages` function expects us to provide a function as an argument that takes the set of all python packages and returns a list of packages to include in the environment. Here, we select the packages `numpy` and `toolz` from the package set. +To combine this with `mkShell` you can: + +```nix +with import <nixpkgs> {}; + +let + pythonEnv = python35.withPackages (ps: [ + ps.numpy + ps.toolz + ]); +in mkShell { + buildInputs = [ + pythonEnv + hello + ]; +} +``` + ##### Execute command with `--run` A convenient option with `nix-shell` is the `--run` option, with which you can execute a command in the `nix-shell`. We can diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 511ae197948..585156c2475 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -207,7 +207,7 @@ rec { # 32 bit mingw-w64 mingw32 = { - config = "i686-pc-mingw32"; + config = "i686-w64-mingw32"; libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain platform = {}; }; @@ -215,7 +215,7 @@ rec { # 64 bit mingw-w64 mingwW64 = { # That's the triplet they use in the mingw-w64 docs. - config = "x86_64-pc-mingw32"; + config = "x86_64-w64-mingw32"; libc = "msvcrt"; # This distinguishes the mingw (non posix) toolchain platform = {}; }; diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index e923334a11b..36235744602 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -208,6 +208,9 @@ rec { vendors = setTypes types.openVendor { apple = {}; pc = {}; + # Actually matters, unlocking some MinGW-w64-specific options in GCC. See + # bottom of https://sourceforge.net/p/mingw-w64/wiki2/Unicode%20apps/ + w64 = {}; none = {}; unknown = {}; diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ec21dd9fafb..71373b21e1a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -731,6 +731,16 @@ githubId = 135230; name = "Aycan iRiCAN"; }; + b4dm4n = { + email = "fabianm88@gmail.com"; + github = "B4dM4n"; + githubId = 448169; + name = "Fabian Möller"; + keys = [{ + longkeyid = "rsa4096/0x754B5C0963C42C5"; + fingerprint = "6309 E212 29D4 DA30 AF24 BDED 754B 5C09 63C4 2C50"; + }]; + }; babariviere = { email = "babathriviere@gmail.com"; github = "babariviere"; @@ -2884,6 +2894,15 @@ githubId = 137306; name = "Michele Catalano"; }; + isgy = { + email = "isgy@teiyg.com"; + github = "isgy"; + githubId = 13622947; + keys = [{ + longkeyid = "rsa4096/0xD3E1B013B4631293"; + fingerprint = "1412 816B A9FA F62F D051 1975 D3E1 B013 B463 1293"; + }]; + }; ivan = { email = "ivan@ludios.org"; github = "ivan"; @@ -4487,6 +4506,10 @@ github = "moredread"; githubId = 100848; name = "André-Patrick Bubel"; + keys = [{ + longkeyid = "rsa8192/0x118CE7C424B45728"; + fingerprint = "4412 38AD CAD3 228D 876C 5455 118C E7C4 24B4 5728"; + }]; }; moretea = { email = "maarten@moretea.nl"; diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index c8940d78af4..9d89960876e 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -1,6 +1,5 @@ #! /somewhere/python3 - -from contextlib import contextmanager +from contextlib import contextmanager, _GeneratorContextManager from xml.sax.saxutils import XMLGenerator import _thread import atexit @@ -8,7 +7,7 @@ import json import os import ptpython.repl import pty -import queue +from queue import Queue, Empty import re import shutil import socket @@ -17,6 +16,7 @@ import sys import tempfile import time import unicodedata +from typing import Tuple, TextIO, Any, Callable, Dict, Iterator, Optional, List CHAR_TO_KEY = { "A": "shift-a", @@ -81,12 +81,18 @@ CHAR_TO_KEY = { ")": "shift-0x0B", } +# Forward references +nr_tests: int +nr_succeeded: int +log: "Logger" +machines: "List[Machine]" + -def eprint(*args, **kwargs): +def eprint(*args: object, **kwargs: Any) -> None: print(*args, file=sys.stderr, **kwargs) -def create_vlan(vlan_nr): +def create_vlan(vlan_nr: str) -> Tuple[str, str, "subprocess.Popen[bytes]", Any]: global log log.log("starting VDE switch for network {}".format(vlan_nr)) vde_socket = os.path.abspath("./vde{}.ctl".format(vlan_nr)) @@ -110,7 +116,7 @@ def create_vlan(vlan_nr): return (vlan_nr, vde_socket, vde_process, fd) -def retry(fn): +def retry(fn: Callable) -> None: """Call the given function repeatedly, with 1 second intervals, until it returns True or a timeout is reached. """ @@ -125,52 +131,52 @@ def retry(fn): class Logger: - def __init__(self): + def __init__(self) -> None: self.logfile = os.environ.get("LOGFILE", "/dev/null") self.logfile_handle = open(self.logfile, "wb") self.xml = XMLGenerator(self.logfile_handle, encoding="utf-8") - self.queue = queue.Queue(1000) + self.queue: "Queue[Dict[str, str]]" = Queue(1000) self.xml.startDocument() self.xml.startElement("logfile", attrs={}) - def close(self): + def close(self) -> None: self.xml.endElement("logfile") self.xml.endDocument() self.logfile_handle.close() - def sanitise(self, message): + def sanitise(self, message: str) -> str: return "".join(ch for ch in message if unicodedata.category(ch)[0] != "C") - def maybe_prefix(self, message, attributes): + def maybe_prefix(self, message: str, attributes: Dict[str, str]) -> str: if "machine" in attributes: return "{}: {}".format(attributes["machine"], message) return message - def log_line(self, message, attributes): + def log_line(self, message: str, attributes: Dict[str, str]) -> None: self.xml.startElement("line", attributes) self.xml.characters(message) self.xml.endElement("line") - def log(self, message, attributes={}): + def log(self, message: str, attributes: Dict[str, str] = {}) -> None: eprint(self.maybe_prefix(message, attributes)) self.drain_log_queue() self.log_line(message, attributes) - def enqueue(self, message): + def enqueue(self, message: Dict[str, str]) -> None: self.queue.put(message) - def drain_log_queue(self): + def drain_log_queue(self) -> None: try: while True: item = self.queue.get_nowait() attributes = {"machine": item["machine"], "type": "serial"} self.log_line(self.sanitise(item["msg"]), attributes) - except queue.Empty: + except Empty: pass @contextmanager - def nested(self, message, attributes={}): + def nested(self, message: str, attributes: Dict[str, str] = {}) -> Iterator[None]: eprint(self.maybe_prefix(message, attributes)) self.xml.startElement("nest", attrs={}) @@ -189,24 +195,22 @@ class Logger: class Machine: - def __init__(self, args): + def __init__(self, args: Dict[str, Any]) -> None: if "name" in args: self.name = args["name"] else: self.name = "machine" - try: - cmd = args["startCommand"] - self.name = re.search("run-(.+)-vm$", cmd).group(1) - except KeyError: - pass - except AttributeError: - pass + cmd = args.get("startCommand", None) + if cmd: + match = re.search("run-(.+)-vm$", cmd) + if match: + self.name = match.group(1) self.script = args.get("startCommand", self.create_startcommand(args)) tmp_dir = os.environ.get("TMPDIR", tempfile.gettempdir()) - def create_dir(name): + def create_dir(name: str) -> str: path = os.path.join(tmp_dir, name) os.makedirs(path, mode=0o700, exist_ok=True) return path @@ -216,14 +220,14 @@ class Machine: self.booted = False self.connected = False - self.pid = None + self.pid: Optional[int] = None self.socket = None - self.monitor = None - self.logger = args["log"] + self.monitor: Optional[socket.socket] = None + self.logger: Logger = args["log"] self.allow_reboot = args.get("allowReboot", False) @staticmethod - def create_startcommand(args): + def create_startcommand(args: Dict[str, str]) -> str: net_backend = "-netdev user,id=net0" net_frontend = "-device virtio-net-pci,netdev=net0" @@ -273,30 +277,32 @@ class Machine: return start_command - def is_up(self): + def is_up(self) -> bool: return self.booted and self.connected - def log(self, msg): + def log(self, msg: str) -> None: self.logger.log(msg, {"machine": self.name}) - def nested(self, msg, attrs={}): + def nested(self, msg: str, attrs: Dict[str, str] = {}) -> _GeneratorContextManager: my_attrs = {"machine": self.name} my_attrs.update(attrs) return self.logger.nested(msg, my_attrs) - def wait_for_monitor_prompt(self): + def wait_for_monitor_prompt(self) -> str: + assert self.monitor is not None while True: answer = self.monitor.recv(1024).decode() if answer.endswith("(qemu) "): return answer - def send_monitor_command(self, command): + def send_monitor_command(self, command: str) -> str: message = ("{}\n".format(command)).encode() self.log("sending monitor command: {}".format(command)) + assert self.monitor is not None self.monitor.send(message) return self.wait_for_monitor_prompt() - def wait_for_unit(self, unit, user=None): + def wait_for_unit(self, unit: str, user: Optional[str] = None) -> bool: while True: info = self.get_unit_info(unit, user) state = info["ActiveState"] @@ -316,7 +322,7 @@ class Machine: if state == "active": return True - def get_unit_info(self, unit, user=None): + def get_unit_info(self, unit: str, user: Optional[str] = None) -> Dict[str, str]: status, lines = self.systemctl('--no-pager show "{}"'.format(unit), user) if status != 0: raise Exception( @@ -327,8 +333,9 @@ class Machine: line_pattern = re.compile(r"^([^=]+)=(.*)$") - def tuple_from_line(line): + def tuple_from_line(line: str) -> Tuple[str, str]: match = line_pattern.match(line) + assert match is not None return match[1], match[2] return dict( @@ -337,7 +344,7 @@ class Machine: if line_pattern.match(line) ) - def systemctl(self, q, user=None): + def systemctl(self, q: str, user: Optional[str] = None) -> Tuple[int, str]: if user is not None: q = q.replace("'", "\\'") return self.execute( @@ -349,7 +356,7 @@ class Machine: ) return self.execute("systemctl {}".format(q)) - def require_unit_state(self, unit, require_state="active"): + def require_unit_state(self, unit: str, require_state: str = "active") -> None: with self.nested( "checking if unit ‘{}’ has reached state '{}'".format(unit, require_state) ): @@ -361,7 +368,7 @@ class Machine: + "'active' but it is in state ‘{}’".format(state) ) - def execute(self, command): + def execute(self, command: str) -> Tuple[int, str]: self.connect() out_command = "( {} ); echo '|!EOF' $?\n".format(command) @@ -379,19 +386,21 @@ class Machine: return (status_code, output) output += chunk - def succeed(self, *commands): + def succeed(self, *commands: str) -> str: """Execute each command and check that it succeeds.""" + output = "" for command in commands: with self.nested("must succeed: {}".format(command)): - status, output = self.execute(command) + (status, out) = self.execute(command) if status != 0: - self.log("output: {}".format(output)) + self.log("output: {}".format(out)) raise Exception( "command `{}` failed (exit code {})".format(command, status) ) - return output + output += out + return output - def fail(self, *commands): + def fail(self, *commands: str) -> None: """Execute each command and check that it fails.""" for command in commands: with self.nested("must fail: {}".format(command)): @@ -401,21 +410,21 @@ class Machine: "command `{}` unexpectedly succeeded".format(command) ) - def wait_until_succeeds(self, command): + def wait_until_succeeds(self, command: str) -> str: with self.nested("waiting for success: {}".format(command)): while True: status, output = self.execute(command) if status == 0: return output - def wait_until_fails(self, command): + def wait_until_fails(self, command: str) -> str: with self.nested("waiting for failure: {}".format(command)): while True: status, output = self.execute(command) if status != 0: return output - def wait_for_shutdown(self): + def wait_for_shutdown(self) -> None: if not self.booted: return @@ -427,14 +436,14 @@ class Machine: self.booted = False self.connected = False - def get_tty_text(self, tty): + def get_tty_text(self, tty: str) -> str: status, output = self.execute( "fold -w$(stty -F /dev/tty{0} size | " "awk '{{print $2}}') /dev/vcs{0}".format(tty) ) return output - def wait_until_tty_matches(self, tty, regexp): + def wait_until_tty_matches(self, tty: str, regexp: str) -> bool: matcher = re.compile(regexp) with self.nested("waiting for {} to appear on tty {}".format(regexp, tty)): while True: @@ -442,43 +451,43 @@ class Machine: if len(matcher.findall(text)) > 0: return True - def send_chars(self, chars): + def send_chars(self, chars: List[str]) -> None: with self.nested("sending keys ‘{}‘".format(chars)): for char in chars: self.send_key(char) - def wait_for_file(self, filename): + def wait_for_file(self, filename: str) -> bool: with self.nested("waiting for file ‘{}‘".format(filename)): while True: status, _ = self.execute("test -e {}".format(filename)) if status == 0: return True - def wait_for_open_port(self, port): - def port_is_open(_): + def wait_for_open_port(self, port: int) -> None: + def port_is_open(_: Any) -> bool: status, _ = self.execute("nc -z localhost {}".format(port)) return status == 0 with self.nested("waiting for TCP port {}".format(port)): retry(port_is_open) - def wait_for_closed_port(self, port): - def port_is_closed(_): + def wait_for_closed_port(self, port: int) -> None: + def port_is_closed(_: Any) -> bool: status, _ = self.execute("nc -z localhost {}".format(port)) return status != 0 retry(port_is_closed) - def start_job(self, jobname, user=None): + def start_job(self, jobname: str, user: Optional[str] = None) -> Tuple[int, str]: return self.systemctl("start {}".format(jobname), user) - def stop_job(self, jobname, user=None): + def stop_job(self, jobname: str, user: Optional[str] = None) -> Tuple[int, str]: return self.systemctl("stop {}".format(jobname), user) - def wait_for_job(self, jobname): + def wait_for_job(self, jobname: str) -> bool: return self.wait_for_unit(jobname) - def connect(self): + def connect(self) -> None: if self.connected: return @@ -494,7 +503,7 @@ class Machine: self.log("(connecting took {:.2f} seconds)".format(toc - tic)) self.connected = True - def screenshot(self, filename): + def screenshot(self, filename: str) -> None: out_dir = os.environ.get("out", os.getcwd()) word_pattern = re.compile(r"^\w+$") if word_pattern.match(filename): @@ -511,12 +520,12 @@ class Machine: if ret.returncode != 0: raise Exception("Cannot convert screenshot") - def dump_tty_contents(self, tty): + def dump_tty_contents(self, tty: str) -> None: """Debugging: Dump the contents of the TTY<n> """ self.execute("fold -w 80 /dev/vcs{} | systemd-cat".format(tty)) - def get_screen_text(self): + def get_screen_text(self) -> str: if shutil.which("tesseract") is None: raise Exception("get_screen_text used but enableOCR is false") @@ -544,30 +553,30 @@ class Machine: return ret.stdout.decode("utf-8") - def wait_for_text(self, regex): - def screen_matches(last): + def wait_for_text(self, regex: str) -> None: + def screen_matches(last: bool) -> bool: text = self.get_screen_text() - m = re.search(regex, text) + matches = re.search(regex, text) is not None - if last and not m: + if last and not matches: self.log("Last OCR attempt failed. Text was: {}".format(text)) - return m + return matches with self.nested("waiting for {} to appear on screen".format(regex)): retry(screen_matches) - def send_key(self, key): + def send_key(self, key: str) -> None: key = CHAR_TO_KEY.get(key, key) self.send_monitor_command("sendkey {}".format(key)) - def start(self): + def start(self) -> None: if self.booted: return self.log("starting vm") - def create_socket(path): + def create_socket(path: str) -> socket.socket: if os.path.exists(path): os.unlink(path) s = socket.socket(family=socket.AF_UNIX, type=socket.SOCK_STREAM) @@ -617,9 +626,9 @@ class Machine: self.monitor, _ = self.monitor_socket.accept() self.shell, _ = self.shell_socket.accept() - def process_serial_output(): - for line in self.process.stdout: - line = line.decode("unicode_escape").replace("\r", "").rstrip() + def process_serial_output() -> None: + for _line in self.process.stdout: + line = _line.decode("unicode_escape").replace("\r", "").rstrip() eprint("{} # {}".format(self.name, line)) self.logger.enqueue({"msg": line, "machine": self.name}) @@ -632,14 +641,14 @@ class Machine: self.log("QEMU running (pid {})".format(self.pid)) - def shutdown(self): + def shutdown(self) -> None: if not self.booted: return self.shell.send("poweroff\n".encode()) self.wait_for_shutdown() - def crash(self): + def crash(self) -> None: if not self.booted: return @@ -647,7 +656,7 @@ class Machine: self.send_monitor_command("quit") self.wait_for_shutdown() - def wait_for_x(self): + def wait_for_x(self) -> None: """Wait until it is possible to connect to the X server. Note that testing the existence of /tmp/.X11-unix/X0 is insufficient. """ @@ -664,15 +673,15 @@ class Machine: if status == 0: return - def get_window_names(self): + def get_window_names(self) -> List[str]: return self.succeed( r"xwininfo -root -tree | sed 's/.*0x[0-9a-f]* \"\([^\"]*\)\".*/\1/; t; d'" ).splitlines() - def wait_for_window(self, regexp): + def wait_for_window(self, regexp: str) -> None: pattern = re.compile(regexp) - def window_is_visible(last_try): + def window_is_visible(last_try: bool) -> bool: names = self.get_window_names() if last_try: self.log( @@ -685,10 +694,10 @@ class Machine: with self.nested("Waiting for a window to appear"): retry(window_is_visible) - def sleep(self, secs): + def sleep(self, secs: int) -> None: time.sleep(secs) - def forward_port(self, host_port=8080, guest_port=80): + def forward_port(self, host_port: int = 8080, guest_port: int = 80) -> None: """Forward a TCP port on the host to a TCP port on the guest. Useful during interactive testing. """ @@ -696,43 +705,46 @@ class Machine: "hostfwd_add tcp::{}-:{}".format(host_port, guest_port) ) - def block(self): + def block(self) -> None: """Make the machine unreachable by shutting down eth1 (the multicast interface used to talk to the other VMs). We keep eth0 up so that the test driver can continue to talk to the machine. """ self.send_monitor_command("set_link virtio-net-pci.1 off") - def unblock(self): + def unblock(self) -> None: """Make the machine reachable. """ self.send_monitor_command("set_link virtio-net-pci.1 on") -def create_machine(args): +def create_machine(args: Dict[str, Any]) -> Machine: global log args["log"] = log args["redirectSerial"] = os.environ.get("USE_SERIAL", "0") == "1" return Machine(args) -def start_all(): +def start_all() -> None: + global machines with log.nested("starting all VMs"): for machine in machines: machine.start() -def join_all(): +def join_all() -> None: + global machines with log.nested("waiting for all VMs to finish"): for machine in machines: machine.wait_for_shutdown() -def test_script(): +def test_script() -> None: exec(os.environ["testScript"]) -def run_tests(): +def run_tests() -> None: + global machines tests = os.environ.get("tests", None) if tests is not None: with log.nested("running the VM test script"): @@ -755,7 +767,7 @@ def run_tests(): @contextmanager -def subtest(name): +def subtest(name: str) -> Iterator[None]: global nr_tests global nr_succeeded @@ -772,7 +784,6 @@ def subtest(name): if __name__ == "__main__": - global log log = Logger() vlan_nrs = list(dict.fromkeys(os.environ["VLANS"].split())) @@ -791,7 +802,7 @@ if __name__ == "__main__": nr_succeeded = 0 @atexit.register - def clean_up(): + def clean_up() -> None: with log.nested("cleaning up"): for machine in machines: if machine.pid is None: diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 21f6172e967..4d990cf551f 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -26,7 +26,7 @@ in rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ (python3.withPackages (p: [ p.ptpython ])) ]; - checkInputs = with python3Packages; [ pylint black ]; + checkInputs = with python3Packages; [ pylint black mypy ]; dontUnpack = true; @@ -34,6 +34,9 @@ in rec { doCheck = true; checkPhase = '' + mypy --disallow-untyped-defs \ + --no-implicit-optional \ + --ignore-missing-imports ${testDriverScript} pylint --errors-only ${testDriverScript} black --check --diff ${testDriverScript} ''; diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix index 719ba5ffb12..e0b558dcb0d 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix @@ -22,17 +22,7 @@ with lib; }); ''; - services.xserver = { - enable = true; - - # Automatically login as nixos. - displayManager.slim = { - enable = true; - defaultUser = "nixos"; - autoLogin = true; - }; - - }; + services.xserver.enable = true; # Provide networkmanager for easy wireless configuration. networking.networkmanager.enable = true; diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix index 0b813bbf37b..23c3426bff0 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix @@ -10,8 +10,6 @@ with lib; services.xserver.desktopManager.gnome3.enable = true; - services.xserver.displayManager.slim.enable = mkForce false; - # Auto-login as root. services.xserver.displayManager.gdm.autoLogin = { enable = true; diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix index 1dc7920ff64..6a10a6404e6 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix @@ -13,6 +13,15 @@ with lib; enable = true; enableQt4Support = false; }; + + # Automatically login as nixos. + displayManager.sddm = { + enable = true; + autoLogin = { + enable = true; + user = "nixos"; + }; + }; }; environment.systemPackages = with pkgs; [ diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f7c66166c5c..6b578cd5619 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -316,6 +316,7 @@ ./services/development/bloop.nix ./services/development/hoogle.nix ./services/development/jupyter/default.nix + ./services/development/lorri.nix ./services/editors/emacs.nix ./services/editors/infinoted.nix ./services/games/factorio.nix @@ -841,6 +842,7 @@ ./services/web-servers/shellinabox.nix ./services/web-servers/tomcat.nix ./services/web-servers/traefik.nix + ./services/web-servers/ttyd.nix ./services/web-servers/uwsgi.nix ./services/web-servers/varnish/default.nix ./services/web-servers/zope2.nix diff --git a/nixos/modules/profiles/graphical.nix b/nixos/modules/profiles/graphical.nix index 649f5564ac6..ac3c228b3c6 100644 --- a/nixos/modules/profiles/graphical.nix +++ b/nixos/modules/profiles/graphical.nix @@ -16,7 +16,6 @@ # Enable sound in virtualbox appliances. hardware.pulseaudio.enable = true; - hardware.pulseaudio.systemWide = true; # Needed since we run plasma as root. environment.systemPackages = [ pkgs.glxinfo pkgs.firefox ]; } diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index d14613f22b0..9563029f030 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -224,6 +224,12 @@ in environment.REQUESTS_CA_BUNDLE = "/etc/ssl/certs/ca-certificates.crt"; serviceConfig = { Type = "oneshot"; + # With RemainAfterExit the service is considered active even + # after the main process having exited, which means when it + # gets changed, the activation phase restarts it, meaning + # the permissions of the StateDirectory get adjusted + # according to the specified group + RemainAfterExit = true; SuccessExitStatus = [ "0" "1" ]; User = data.user; Group = data.group; diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index 56dc858b640..7932d094197 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -18,7 +18,6 @@ let ''} state_file "${cfg.dataDir}/state" sticker_file "${cfg.dataDir}/sticker.sql" - log_file "syslog" user "${cfg.user}" group "${cfg.group}" diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix index d1a1383e45b..c70d999ca96 100644 --- a/nixos/modules/services/computing/slurm/slurm.nix +++ b/nixos/modules/services/computing/slurm/slurm.nix @@ -18,7 +18,7 @@ let ${optionalString (cfg.controlAddr != null) ''controlAddr=${cfg.controlAddr}''} ${toString (map (x: "NodeName=${x}\n") cfg.nodeName)} ${toString (map (x: "PartitionName=${x}\n") cfg.partitionName)} - PlugStackConfig=${plugStackConfig} + PlugStackConfig=${plugStackConfig}/plugstack.conf ProctrackType=${cfg.procTrackType} ${cfg.extraConfig} ''; @@ -39,6 +39,8 @@ let DbdHost=${cfg.dbdserver.dbdHost} SlurmUser=${cfg.user} StorageType=accounting_storage/mysql + StorageUser=${cfg.dbdserver.storageUser} + ${optionalString (cfg.dbdserver.storagePass != null) "StoragePass=${cfg.dbdserver.storagePass}"} ${cfg.dbdserver.extraConfig} ''; @@ -48,7 +50,6 @@ let name = "etc-slurm"; paths = [ configFile cgroupConfig plugStackConfig ] ++ cfg.extraConfigPaths; }; - in { @@ -86,6 +87,37 @@ in ''; }; + storageUser = mkOption { + type = types.str; + default = cfg.user; + description = '' + Database user name. + ''; + }; + + storagePass = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Database password. Note that this password will be publicable + readable in the nix store. Use <option>configFile</option> + to store the and config file and password outside the nix store. + ''; + }; + + configFile = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Path to <literal>slurmdbd.conf</literal>. The password for the database connection + is stored in the config file. Use this option to specfify a path + outside the nix store. If this option is unset a configuration file + will be generated. See also: + <citerefentry><refentrytitle>slurmdbd.conf</refentrytitle> + <manvolnum>8</manvolnum></citerefentry>. + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; @@ -112,7 +144,7 @@ in package = mkOption { type = types.package; - default = pkgs.slurm; + default = pkgs.slurm.override { enableX11 = ! cfg.enableSrunX11; }; defaultText = "pkgs.slurm"; example = literalExample "pkgs.slurm-full"; description = '' @@ -178,9 +210,14 @@ in If enabled srun will accept the option "--x11" to allow for X11 forwarding from within an interactive session or a batch job. This activates the slurm-spank-x11 module. Note that this option also enables - 'services.openssh.forwardX11' on the client. + <option>services.openssh.forwardX11</option> on the client. This option requires slurm to be compiled without native X11 support. + The default behavior is to re-compile the slurm package with native X11 + support disabled if this option is set to true. + + To use the native X11 support add <literal>PrologFlags=X11</literal> in <option>extraConfig</option>. + Note that this method will only work RSA SSH host keys. ''; }; @@ -356,7 +393,11 @@ in requires = [ "munged.service" "mysql.service" ]; # slurm strips the last component off the path - environment.SLURM_CONF = "${slurmdbdConf}/slurm.conf"; + environment.SLURM_CONF = + if (cfg.dbdserver.configFile == null) then + "${slurmdbdConf}/slurm.conf" + else + cfg.dbdserver.configFile; serviceConfig = { Type = "forking"; diff --git a/nixos/modules/services/development/lorri.nix b/nixos/modules/services/development/lorri.nix new file mode 100644 index 00000000000..618785ee53c --- /dev/null +++ b/nixos/modules/services/development/lorri.nix @@ -0,0 +1,45 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.lorri; + socketPath = "lorri/daemon.socket"; +in { + options = { + services.lorri = { + enable = lib.mkOption { + default = false; + type = lib.types.bool; + description = '' + Enables the daemon for `lorri`, a nix-shell replacement for project + development. The socket-activated daemon starts on the first request + issued by the `lorri` command. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.user.sockets.lorri = { + description = "Socket for Lorri Daemon"; + wantedBy = [ "sockets.target" ]; + socketConfig = { + ListenStream = "%t/${socketPath}"; + RuntimeDirectory = "lorri"; + }; + }; + + systemd.user.services.lorri = { + description = "Lorri Daemon"; + requires = [ "lorri.socket" ]; + after = [ "lorri.socket" ]; + path = with pkgs; [ config.nix.package gnutar gzip ]; + serviceConfig = { + ExecStart = "${pkgs.lorri}/bin/lorri daemon"; + PrivateTmp = true; + ProtectSystem = "strict"; + ProtectHome = "read-only"; + Restart = "on-failure"; + }; + }; + }; +} diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index d5fd76da970..df438a0c69d 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -631,6 +631,14 @@ in setgid = true; }; + security.wrappers.mailq = { + program = "mailq"; + source = "${pkgs.postfix}/bin/mailq"; + group = setgidGroup; + setuid = false; + setgid = true; + }; + security.wrappers.postqueue = { program = "postqueue"; source = "${pkgs.postfix}/bin/postqueue"; diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index bf1084eecc3..0f8bc2471e3 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -43,7 +43,7 @@ let ANALYTICS_REPORTING_ENABLED = boolToString cfg.analytics.reporting.enable; - SMTP_ENABLE = boolToString cfg.smtp.enable; + SMTP_ENABLED = boolToString cfg.smtp.enable; SMTP_HOST = cfg.smtp.host; SMTP_USER = cfg.smtp.user; SMTP_PASSWORD = cfg.smtp.password; diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixos/modules/services/network-filesystems/ceph.nix index 656a2d21b86..543a7b25d5d 100644 --- a/nixos/modules/services/network-filesystems/ceph.nix +++ b/nixos/modules/services/network-filesystems/ceph.nix @@ -9,12 +9,14 @@ let expandCamelCase = replaceStrings upperChars (map (s: " ${s}") lowerChars); expandCamelCaseAttrs = mapAttrs' (name: value: nameValuePair (expandCamelCase name) value); - makeServices = (daemonType: daemonIds: extraServiceConfig: + makeServices = (daemonType: daemonIds: mkMerge (map (daemonId: - { "ceph-${daemonType}-${daemonId}" = makeService daemonType daemonId cfg.global.clusterName pkgs.ceph extraServiceConfig; }) + { "ceph-${daemonType}-${daemonId}" = makeService daemonType daemonId cfg.global.clusterName pkgs.ceph; }) daemonIds)); - makeService = (daemonType: daemonId: clusterName: ceph: extraServiceConfig: { + makeService = (daemonType: daemonId: clusterName: ceph: + let + stateDirectory = "ceph/${if daemonType == "rgw" then "radosgw" else daemonType}/${clusterName}-${daemonId}"; in { enable = true; description = "Ceph ${builtins.replaceStrings lowerChars upperChars daemonType} daemon ${daemonId}"; after = [ "network-online.target" "time-sync.target" ] ++ optional (daemonType == "osd") "ceph-mon.target"; @@ -22,6 +24,11 @@ let partOf = [ "ceph-${daemonType}.target" ]; wantedBy = [ "ceph-${daemonType}.target" ]; + path = [ pkgs.getopt ]; + + # Don't start services that are not yet initialized + unitConfig.ConditionPathExists = "/var/lib/${stateDirectory}/keyring"; + serviceConfig = { LimitNOFILE = 1048576; LimitNPROC = 1048576; @@ -34,22 +41,22 @@ let Restart = "on-failure"; StartLimitBurst = "5"; StartLimitInterval = "30min"; + StateDirectory = stateDirectory; + User = "ceph"; + Group = if daemonType == "osd" then "disk" else "ceph"; ExecStart = ''${ceph.out}/bin/${if daemonType == "rgw" then "radosgw" else "ceph-${daemonType}"} \ - -f --cluster ${clusterName} --id ${daemonId} --setuser ceph \ - --setgroup ${if daemonType == "osd" then "disk" else "ceph"}''; - } // extraServiceConfig - // optionalAttrs (daemonType == "osd") { ExecStartPre = ''${ceph.lib}/libexec/ceph/ceph-osd-prestart.sh \ - --id ${daemonId} --cluster ${clusterName}''; }; - } // optionalAttrs (builtins.elem daemonType [ "mds" "mon" "rgw" "mgr" ]) { - preStart = '' - daemonPath="/var/lib/ceph/${if daemonType == "rgw" then "radosgw" else daemonType}/${clusterName}-${daemonId}" - if [ ! -d $daemonPath ]; then - mkdir -m 755 -p $daemonPath - chown -R ceph:ceph $daemonPath - fi - ''; - } // optionalAttrs (daemonType == "osd") { path = [ pkgs.getopt ]; } - ); + -f --cluster ${clusterName} --id ${daemonId}''; + } // optionalAttrs (daemonType == "osd") { + ExecStartPre = ''${ceph.lib}/libexec/ceph/ceph-osd-prestart.sh --id ${daemonId} --cluster ${clusterName}''; + StartLimitBurst = "30"; + RestartSec = "20s"; + PrivateDevices = "no"; # osd needs disk access + } // optionalAttrs ( daemonType == "mon") { + RestartSec = "10"; + } // optionalAttrs (lib.elem daemonType ["mgr" "mds"]) { + StartLimitBurst = "3"; + }; + }); makeTarget = (daemonType: { @@ -58,6 +65,7 @@ let partOf = [ "ceph.target" ]; wantedBy = [ "ceph.target" ]; before = [ "ceph.target" ]; + unitConfig.StopWhenUnneeded = true; }; } ); @@ -377,22 +385,22 @@ in systemd.services = let services = [] - ++ optional cfg.mon.enable (makeServices "mon" cfg.mon.daemons { RestartSec = "10"; }) - ++ optional cfg.mds.enable (makeServices "mds" cfg.mds.daemons { StartLimitBurst = "3"; }) - ++ optional cfg.osd.enable (makeServices "osd" cfg.osd.daemons { StartLimitBurst = "30"; - RestartSec = "20s"; - PrivateDevices = "no"; # osd needs disk access - }) - ++ optional cfg.rgw.enable (makeServices "rgw" cfg.rgw.daemons { }) - ++ optional cfg.mgr.enable (makeServices "mgr" cfg.mgr.daemons { StartLimitBurst = "3"; }); + ++ optional cfg.mon.enable (makeServices "mon" cfg.mon.daemons) + ++ optional cfg.mds.enable (makeServices "mds" cfg.mds.daemons) + ++ optional cfg.osd.enable (makeServices "osd" cfg.osd.daemons) + ++ optional cfg.rgw.enable (makeServices "rgw" cfg.rgw.daemons) + ++ optional cfg.mgr.enable (makeServices "mgr" cfg.mgr.daemons); in mkMerge services; systemd.targets = let targets = [ - { ceph = { description = "Ceph target allowing to start/stop all ceph service instances at once"; - wantedBy = [ "multi-user.target" ]; }; } - ] ++ optional cfg.mon.enable (makeTarget "mon") + { ceph = { + description = "Ceph target allowing to start/stop all ceph service instances at once"; + wantedBy = [ "multi-user.target" ]; + unitConfig.StopWhenUnneeded = true; + }; } ] + ++ optional cfg.mon.enable (makeTarget "mon") ++ optional cfg.mds.enable (makeTarget "mds") ++ optional cfg.osd.enable (makeTarget "osd") ++ optional cfg.rgw.enable (makeTarget "rgw") @@ -401,7 +409,11 @@ in mkMerge targets; systemd.tmpfiles.rules = [ + "d /etc/ceph - ceph ceph - -" "d /run/ceph 0770 ceph ceph -" - ]; + "d /var/lib/ceph - ceph ceph - -"] + ++ optionals cfg.mgr.enable [ "d /var/lib/ceph/mgr - ceph ceph - -"] + ++ optionals cfg.mon.enable [ "d /var/lib/ceph/mon - ceph ceph - -"] + ++ optionals cfg.osd.enable [ "d /var/lib/ceph/osd - ceph ceph - -"]; }; } diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index 83995d28179..0315c1c71ee 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -40,7 +40,6 @@ let daemonService = appName: args: { description = "Samba Service Daemon ${appName}"; - after = [ "network.target" ]; requiredBy = [ "samba.target" ]; partOf = [ "samba.target" ]; diff --git a/nixos/modules/services/networking/vsftpd.nix b/nixos/modules/services/networking/vsftpd.nix index 67be60da567..90093d9a78d 100644 --- a/nixos/modules/services/networking/vsftpd.nix +++ b/nixos/modules/services/networking/vsftpd.nix @@ -34,6 +34,15 @@ let }; optionDescription = [ + (yesNoOption "allowWriteableChroot" "allow_writeable_chroot" false '' + Allow the use of writeable root inside chroot(). + '') + (yesNoOption "virtualUseLocalPrivs" "virtual_use_local_privs" false '' + If enabled, virtual users will use the same privileges as local + users. By default, virtual users will use the same privileges as + anonymous users, which tends to be more restrictive (especially + in terms of write access). + '') (yesNoOption "anonymousUser" "anonymous_enable" false '' Whether to enable the anonymous FTP user. '') @@ -76,9 +85,21 @@ let outgoing data connections can only connect to the client. Only enable if you know what you are doing! '') - (yesNoOption "ssl_tlsv1" "ssl_tlsv1" true '' '') - (yesNoOption "ssl_sslv2" "ssl_sslv2" false '' '') - (yesNoOption "ssl_sslv3" "ssl_sslv3" false '' '') + (yesNoOption "ssl_tlsv1" "ssl_tlsv1" true '' + Only applies if <option>ssl_enable</option> is activated. If + enabled, this option will permit TLS v1 protocol connections. + TLS v1 connections are preferred. + '') + (yesNoOption "ssl_sslv2" "ssl_sslv2" false '' + Only applies if <option>ssl_enable</option> is activated. If + enabled, this option will permit SSL v2 protocol connections. + TLS v1 connections are preferred. + '') + (yesNoOption "ssl_sslv3" "ssl_sslv3" false '' + Only applies if <option>ssl_enable</option> is activated. If + enabled, this option will permit SSL v3 protocol connections. + TLS v1 connections are preferred. + '') ]; configFile = pkgs.writeText "vsftpd.conf" @@ -98,6 +119,9 @@ let listen=YES nopriv_user=vsftpd secure_chroot_dir=/var/empty + ${optionalString (cfg.localRoot != null) '' + local_root=${cfg.localRoot} + ''} syslog_enable=YES ${optionalString (pkgs.stdenv.hostPlatform.system == "x86_64-linux") '' seccomp_sandbox=NO @@ -106,6 +130,11 @@ let ${optionalString cfg.anonymousUser '' anon_root=${cfg.anonymousUserHome} ''} + ${optionalString cfg.enableVirtualUsers '' + guest_enable=YES + guest_username=vsftpd + pam_service_name=vsftpd + ''} ${cfg.extraConfig} ''; @@ -119,10 +148,7 @@ in services.vsftpd = { - enable = mkOption { - default = false; - description = "Whether to enable the vsftpd FTP server."; - }; + enable = mkEnableOption "vsftpd"; userlist = mkOption { default = []; @@ -143,6 +169,61 @@ in ''; }; + enableVirtualUsers = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable the <literal>pam_userdb</literal>-based + virtual user system + ''; + }; + + userDbPath = mkOption { + type = types.nullOr types.str; + example = "/etc/vsftpd/userDb"; + default = null; + description = '' + Only applies if <option>enableVirtualUsers</option> is true. + Path pointing to the <literal>pam_userdb</literal> user + database used by vsftpd to authenticate the virtual users. + + This user list should be stored in the Berkeley DB database + format. + + To generate a new user database, create a text file, add + your users using the following format: + <programlisting> + user1 + password1 + user2 + password2 + </programlisting> + + You can then install <literal>pkgs.db</literal> to generate + the Berkeley DB using + <programlisting> + db_load -T -t hash -f logins.txt userDb.db + </programlisting> + + Caution: <literal>pam_userdb</literal> will automatically + append a <literal>.db</literal> suffix to the filename you + provide though this option. This option shouldn't include + this filetype suffix. + ''; + }; + + localRoot = mkOption { + type = types.nullOr types.str; + default = null; + example = "/var/www/$USER"; + description = '' + This option represents a directory which vsftpd will try to + change into after a local (i.e. non- anonymous) login. + + Failure is silently ignored. + ''; + }; + anonymousUserHome = mkOption { type = types.path; default = "/home/ftp/"; @@ -186,18 +267,25 @@ in config = mkIf cfg.enable { - assertions = singleton + assertions = [ { assertion = (cfg.forceLocalLoginsSSL -> cfg.rsaCertFile != null) && (cfg.forceLocalDataSSL -> cfg.rsaCertFile != null); message = "vsftpd: If forceLocalLoginsSSL or forceLocalDataSSL is true then a rsaCertFile must be provided!"; - }; + } + { + assertion = (cfg.enableVirtualUsers -> cfg.userDbPath != null) + && (cfg.enableVirtualUsers -> cfg.localUsers != null); + message = "vsftpd: If enableVirtualUsers is true, you need to setup both the userDbPath and localUsers options."; + }]; users.users = [ { name = "vsftpd"; uid = config.ids.uids.vsftpd; description = "VSFTPD user"; - home = "/homeless-shelter"; + home = if cfg.localRoot != null + then cfg.localRoot # <= Necessary for virtual users. + else "/homeless-shelter"; } ] ++ optional cfg.anonymousUser { name = "ftp"; @@ -213,23 +301,24 @@ in # = false and whitelist root services.vsftpd.userlist = if cfg.userlistDeny then ["root"] else []; - systemd.services.vsftpd = - { description = "Vsftpd Server"; + systemd = { + tmpfiles.rules = optional cfg.anonymousUser + #Type Path Mode User Gr Age Arg + "d '${builtins.toString cfg.anonymousUserHome}' 0555 'ftp' 'ftp' - -"; + services.vsftpd = { + description = "Vsftpd Server"; wantedBy = [ "multi-user.target" ]; - preStart = - optionalString cfg.anonymousUser - '' - mkdir -p -m 555 ${cfg.anonymousUserHome} - chown -R ftp:ftp ${cfg.anonymousUserHome} - ''; - serviceConfig.ExecStart = "@${vsftpd}/sbin/vsftpd vsftpd ${configFile}"; serviceConfig.Restart = "always"; serviceConfig.Type = "forking"; }; + }; + security.pam.services.vsftpd.text = mkIf (cfg.enableVirtualUsers && cfg.userDbPath != null)'' + auth required pam_userdb.so db=${cfg.userDbPath} + account required pam_userdb.so db=${cfg.userDbPath} + ''; }; - } diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix index 4176da2c8cb..980961225c9 100644 --- a/nixos/modules/services/networking/wireguard.nix +++ b/nixos/modules/services/networking/wireguard.nix @@ -112,6 +112,32 @@ let Determines whether to add allowed IPs as routes or not. ''; }; + + socketNamespace = mkOption { + default = null; + type = with types; nullOr str; + example = "container"; + description = ''The pre-existing network namespace in which the + WireGuard interface is created, and which retains the socket even if the + interface is moved via <option>interfaceNamespace</option>. When + <literal>null</literal>, the interface is created in the init namespace. + See <link + xlink:href="https://www.wireguard.com/netns/">documentation</link>. + ''; + }; + + interfaceNamespace = mkOption { + default = null; + type = with types; nullOr str; + example = "init"; + description = ''The pre-existing network namespace the WireGuard + interface is moved to. The special value <literal>init</literal> means + the init namespace. When <literal>null</literal>, the interface is not + moved. + See <link + xlink:href="https://www.wireguard.com/netns/">documentation</link>. + ''; + }; }; }; @@ -239,6 +265,10 @@ let if peer.presharedKey != null then pkgs.writeText "wg-psk" peer.presharedKey else peer.presharedKeyFile; + src = interfaceCfg.socketNamespace; + dst = interfaceCfg.interfaceNamespace; + ip = nsWrap "ip" src dst; + wg = nsWrap "wg" src dst; in nameValuePair "wireguard-${interfaceName}-peer-${unitName}" { description = "WireGuard Peer - ${interfaceName} - ${peer.publicKey}"; @@ -255,16 +285,16 @@ let }; script = let - wg_setup = "wg set ${interfaceName} peer ${peer.publicKey}" + + wg_setup = "${wg} set ${interfaceName} peer ${peer.publicKey}" + optionalString (psk != null) " preshared-key ${psk}" + optionalString (peer.endpoint != null) " endpoint ${peer.endpoint}" + optionalString (peer.persistentKeepalive != null) " persistent-keepalive ${toString peer.persistentKeepalive}" + optionalString (peer.allowedIPs != []) " allowed-ips ${concatStringsSep "," peer.allowedIPs}"; route_setup = - optionalString (interfaceCfg.allowedIPsAsRoutes != false) + optionalString interfaceCfg.allowedIPsAsRoutes (concatMapStringsSep "\n" (allowedIP: - "ip route replace ${allowedIP} dev ${interfaceName} table ${interfaceCfg.table}" + "${ip} route replace ${allowedIP} dev ${interfaceName} table ${interfaceCfg.table}" ) peer.allowedIPs); in '' ${wg_setup} @@ -272,13 +302,13 @@ let ''; postStop = let - route_destroy = optionalString (interfaceCfg.allowedIPsAsRoutes != false) + route_destroy = optionalString interfaceCfg.allowedIPsAsRoutes (concatMapStringsSep "\n" (allowedIP: - "ip route delete ${allowedIP} dev ${interfaceName} table ${interfaceCfg.table}" + "${ip} route delete ${allowedIP} dev ${interfaceName} table ${interfaceCfg.table}" ) peer.allowedIPs); in '' - wg set ${interfaceName} peer ${peer.publicKey} remove + ${wg} set ${interfaceName} peer ${peer.publicKey} remove ${route_destroy} ''; }; @@ -287,6 +317,13 @@ let # exactly one way to specify the private key must be set #assert (values.privateKey != null) != (values.privateKeyFile != null); let privKey = if values.privateKeyFile != null then values.privateKeyFile else pkgs.writeText "wg-key" values.privateKey; + src = values.socketNamespace; + dst = values.interfaceNamespace; + ipPreMove = nsWrap "ip" src null; + ipPostMove = nsWrap "ip" src dst; + wg = nsWrap "wg" src dst; + ns = if dst == "init" then "1" else dst; + in nameValuePair "wireguard-${name}" { @@ -307,26 +344,33 @@ let ${values.preSetup} - ip link add dev ${name} type wireguard + ${ipPreMove} link add dev ${name} type wireguard + ${optionalString (values.interfaceNamespace != null && values.interfaceNamespace != values.socketNamespace) "${ipPreMove} link set ${name} netns ${ns}"} ${concatMapStringsSep "\n" (ip: - "ip address add ${ip} dev ${name}" + "${ipPostMove} address add ${ip} dev ${name}" ) values.ips} - wg set ${name} private-key ${privKey} ${ + ${wg} set ${name} private-key ${privKey} ${ optionalString (values.listenPort != null) " listen-port ${toString values.listenPort}"} - ip link set up dev ${name} + ${ipPostMove} link set up dev ${name} ${values.postSetup} ''; postStop = '' - ip link del dev ${name} + ${ipPostMove} link del dev ${name} ${values.postShutdown} ''; }; + nsWrap = cmd: src: dst: + let + nsList = filter (ns: ns != null) [ src dst ]; + ns = last nsList; + in + if (length nsList > 0 && ns != "init") then "ip netns exec ${ns} ${cmd}" else cmd; in { diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix index 4ab7e3f0c0a..095de64dfb1 100644 --- a/nixos/modules/services/web-servers/phpfpm/default.nix +++ b/nixos/modules/services/web-servers/phpfpm/default.nix @@ -31,7 +31,7 @@ let ''; passAsFile = [ "nixDefaults" "phpOptions" ]; } '' - cat $phpPackage/etc/php.ini $nixDefaultsPath $phpOptionsPath > $out + cat ${poolOpts.phpPackage}/etc/php.ini $nixDefaultsPath $phpOptionsPath > $out ''; poolOpts = { name, ... }: @@ -69,8 +69,6 @@ let phpOptions = mkOption { type = types.lines; - default = cfg.phpOptions; - defaultText = "config.services.phpfpm.phpOptions"; description = '' "Options appended to the PHP configuration file <filename>php.ini</filename> used for this PHP-FPM pool." ''; @@ -137,6 +135,7 @@ let config = { socket = if poolOpts.listen == "" then "${runtimeDir}/${name}.sock" else poolOpts.listen; group = mkDefault poolOpts.user; + phpOptions = mkBefore cfg.phpOptions; settings = mapAttrs (name: mkDefault){ listen = poolOpts.socket; diff --git a/nixos/modules/services/web-servers/ttyd.nix b/nixos/modules/services/web-servers/ttyd.nix new file mode 100644 index 00000000000..01a01d97a23 --- /dev/null +++ b/nixos/modules/services/web-servers/ttyd.nix @@ -0,0 +1,196 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.ttyd; + + # Command line arguments for the ttyd daemon + args = [ "--port" (toString cfg.port) ] + ++ optionals (cfg.socket != null) [ "--interface" cfg.socket ] + ++ optionals (cfg.interface != null) [ "--interface" cfg.interface ] + ++ [ "--signal" (toString cfg.signal) ] + ++ (concatLists (mapAttrsToList (_k: _v: [ "--client-option" "${_k}=${_v}" ]) cfg.clientOptions)) + ++ [ "--terminal-type" cfg.terminalType ] + ++ optionals cfg.checkOrigin [ "--check-origin" ] + ++ [ "--max-clients" (toString cfg.maxClients) ] + ++ optionals (cfg.indexFile != null) [ "--index" cfg.indexFile ] + ++ optionals cfg.enableIPv6 [ "--ipv6" ] + ++ optionals cfg.enableSSL [ "--ssl-cert" cfg.certFile + "--ssl-key" cfg.keyFile + "--ssl-ca" cfg.caFile ] + ++ [ "--debug" (toString cfg.logLevel) ]; + +in + +{ + + ###### interface + + options = { + services.ttyd = { + enable = mkEnableOption "ttyd daemon"; + + port = mkOption { + type = types.int; + default = 7681; + description = "Port to listen on (use 0 for random port)"; + }; + + socket = mkOption { + type = types.nullOr types.path; + default = null; + example = "/var/run/ttyd.sock"; + description = "UNIX domain socket path to bind."; + }; + + interface = mkOption { + type = types.nullOr types.str; + default = null; + example = "eth0"; + description = "Network interface to bind."; + }; + + username = mkOption { + type = types.nullOr types.str; + default = null; + description = "Username for basic authentication."; + }; + + passwordFile = mkOption { + type = types.nullOr types.path; + default = null; + apply = value: if value == null then null else toString value; + description = '' + File containing the password to use for basic authentication. + For insecurely putting the password in the globally readable store use + <literal>pkgs.writeText "ttydpw" "MyPassword"</literal>. + ''; + }; + + signal = mkOption { + type = types.ints.u8; + default = 1; + description = "Signal to send to the command on session close."; + }; + + clientOptions = mkOption { + type = types.attrsOf types.str; + default = {}; + example = literalExample ''{ + fontSize = "16"; + fontFamily = "Fira Code"; + + }''; + description = '' + Attribute set of client options for xtermjs. + <link xlink:href="https://xtermjs.org/docs/api/terminal/interfaces/iterminaloptions/"/> + ''; + }; + + terminalType = mkOption { + type = types.str; + default = "xterm-256color"; + description = "Terminal type to report."; + }; + + checkOrigin = mkOption { + type = types.bool; + default = false; + description = "Whether to allow a websocket connection from a different origin."; + }; + + maxClients = mkOption { + type = types.int; + default = 0; + description = "Maximum clients to support (0, no limit)"; + }; + + indexFile = mkOption { + type = types.nullOr types.path; + default = null; + description = "Custom index.html path"; + }; + + enableIPv6 = mkOption { + type = types.bool; + default = false; + description = "Whether or not to enable IPv6 support."; + }; + + enableSSL = mkOption { + type = types.bool; + default = false; + description = "Whether or not to enable SSL (https) support."; + }; + + certFile = mkOption { + type = types.nullOr types.path; + default = null; + description = "SSL certificate file path."; + }; + + keyFile = mkOption { + type = types.nullOr types.path; + default = null; + apply = value: if value == null then null else toString value; + description = '' + SSL key file path. + For insecurely putting the keyFile in the globally readable store use + <literal>pkgs.writeText "ttydKeyFile" "SSLKEY"</literal>. + ''; + }; + + caFile = mkOption { + type = types.nullOr types.path; + default = null; + description = "SSL CA file path for client certificate verification."; + }; + + logLevel = mkOption { + type = types.int; + default = 7; + description = "Set log level."; + }; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + + assertions = + [ { assertion = cfg.enableSSL + -> cfg.certFile != null && cfg.keyFile != null && cfg.caFile != null; + message = "SSL is enabled for ttyd, but no certFile, keyFile or caFile has been specefied."; } + { assertion = ! (cfg.interface != null && cfg.socket != null); + message = "Cannot set both interface and socket for ttyd."; } + { assertion = (cfg.username != null) == (cfg.passwordFile != null); + message = "Need to set both username and passwordFile for ttyd"; } + ]; + + systemd.services.ttyd = { + description = "ttyd Web Server Daemon"; + + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + # Runs login which needs to be run as root + # login: Cannot possibly work without effective root + User = "root"; + }; + + script = if cfg.passwordFile != null then '' + PASSWORD=$(cat ${escapeShellArg cfg.passwordFile}) + ${pkgs.ttyd}/bin/ttyd ${lib.escapeShellArgs args} \ + --credential ${escapeShellArg cfg.username}:"$PASSWORD" \ + ${pkgs.shadow}/bin/login + '' + else '' + ${pkgs.ttyd}/bin/ttyd ${lib.escapeShellArgs args} \ + ${pkgs.shadow}/bin/login + ''; + }; + }; +} diff --git a/nixos/modules/services/web-servers/varnish/default.nix b/nixos/modules/services/web-servers/varnish/default.nix index 63f967185c2..01fe3d12917 100644 --- a/nixos/modules/services/web-servers/varnish/default.nix +++ b/nixos/modules/services/web-servers/varnish/default.nix @@ -15,8 +15,8 @@ in package = mkOption { type = types.package; - default = pkgs.varnish5; - defaultText = "pkgs.varnish5"; + default = pkgs.varnish; + defaultText = "pkgs.varnish"; description = '' The package to use ''; @@ -48,7 +48,7 @@ in extraModules = mkOption { type = types.listOf types.package; default = []; - example = literalExample "[ pkgs.varnish5Packages.geoip ]"; + example = literalExample "[ pkgs.varnishPackages.geoip ]"; description = " Varnish modules (except 'std'). "; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 0aae25662c6..0135ac19cbf 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -184,6 +184,13 @@ in enableGnomeKeyring = true; }; + systemd.packages = with pkgs.gnome3; [ + gnome-flashback + ] ++ (map + (wm: gnome-flashback.mkSystemdTargetForWm { + inherit (wm) wmName; + }) cfg.flashback.customSessions); + services.dbus.packages = [ pkgs.gnome3.gnome-screensaver ]; @@ -271,6 +278,26 @@ in source-sans-pro ]; + ## Enable soft realtime scheduling, only supported on wayland ## + + security.wrappers.".gnome-shell-wrapped" = { + source = "${pkgs.gnome3.gnome-shell}/bin/.gnome-shell-wrapped"; + capabilities = "cap_sys_nice=ep"; + }; + + systemd.user.services.gnome-shell-wayland = let + gnomeShellRT = with pkgs.gnome3; pkgs.runCommand "gnome-shell-rt" {} '' + mkdir -p $out/bin/ + cp ${gnome-shell}/bin/gnome-shell $out/bin + sed -i "s@${gnome-shell}/bin/@${config.security.wrapperDir}/@" $out/bin/gnome-shell + ''; + in { + # Note we need to clear ExecStart before overriding it + serviceConfig.ExecStart = ["" "${gnomeShellRT}/bin/gnome-shell"]; + # Do not use the default environment, it provides a broken PATH + environment = mkForce {}; + }; + # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/blob/gnome-3-32/elements/core/meta-gnome-core-shell.bst environment.systemPackages = with pkgs.gnome3; [ adwaita-icon-theme diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 16b79d86919..9bdea78296f 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -146,7 +146,8 @@ in { # this file is expected in /etc/qemu and not sysconfdir (/var/lib) etc."qemu/bridge.conf".text = lib.concatMapStringsSep "\n" (e: "allow ${e}") cfg.allowedBridges; - systemPackages = with pkgs; [ libvirt libressl.nc cfg.qemuPackage ]; + systemPackages = with pkgs; [ libvirt libressl.nc iptables cfg.qemuPackage ]; + etc.ethertypes.source = "${pkgs.iptables}/etc/ethertypes"; }; boot.kernelModules = [ "tun" ]; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index ffb33e91d30..64aac8c8a1f 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -147,6 +147,7 @@ in login = handleTest ./login.nix {}; loki = handleTest ./loki.nix {}; #logstash = handleTest ./logstash.nix {}; + lorri = handleTest ./lorri/default.nix {}; mailcatcher = handleTest ./mailcatcher.nix {}; mathics = handleTest ./mathics.nix {}; matomo = handleTest ./matomo.nix {}; @@ -280,6 +281,7 @@ in virtualbox = handleTestOn ["x86_64-linux"] ./virtualbox.nix {}; wireguard = handleTest ./wireguard {}; wireguard-generated = handleTest ./wireguard/generated.nix {}; + wireguard-namespaces = handleTest ./wireguard/namespaces.nix {}; wordpress = handleTest ./wordpress.nix {}; xautolock = handleTest ./xautolock.nix {}; xfce = handleTest ./xfce.nix {}; diff --git a/nixos/tests/ceph-multi-node.nix b/nixos/tests/ceph-multi-node.nix index 6698aac3f27..ed493d6a1b3 100644 --- a/nixos/tests/ceph-multi-node.nix +++ b/nixos/tests/ceph-multi-node.nix @@ -49,9 +49,6 @@ let boot.kernelModules = [ "xfs" ]; services.ceph = cephConfig; - - # So that we don't have to battle systemd when bootstraping - systemd.targets.ceph.wantedBy = lib.mkForce []; }; networkMonA = { @@ -107,6 +104,10 @@ let }; }; }; + # Following deployment is based on the manual deployment described here: + # https://docs.ceph.com/docs/master/install/manual-deployment/ + # For other ways to deploy a ceph cluster, look at the documentation at + # https://docs.ceph.com/docs/master/ testscript = { ... }: '' startAll; @@ -114,27 +115,6 @@ let $osd0->waitForUnit("network.target"); $osd1->waitForUnit("network.target"); - # Create the ceph-related directories - $monA->mustSucceed( - "mkdir -p /var/lib/ceph/mgr/ceph-${cfg.monA.name}", - "mkdir -p /var/lib/ceph/mon/ceph-${cfg.monA.name}", - "chown ceph:ceph -R /var/lib/ceph/", - "mkdir -p /etc/ceph", - "chown ceph:ceph -R /etc/ceph" - ); - $osd0->mustSucceed( - "mkdir -p /var/lib/ceph/osd/ceph-${cfg.osd0.name}", - "chown ceph:ceph -R /var/lib/ceph/", - "mkdir -p /etc/ceph", - "chown ceph:ceph -R /etc/ceph" - ); - $osd1->mustSucceed( - "mkdir -p /var/lib/ceph/osd/ceph-${cfg.osd1.name}", - "chown ceph:ceph -R /var/lib/ceph/", - "mkdir -p /etc/ceph", - "chown ceph:ceph -R /etc/ceph" - ); - # Bootstrap ceph-mon daemon $monA->mustSucceed( "sudo -u ceph ceph-authtool --create-keyring /tmp/ceph.mon.keyring --gen-key -n mon. --cap mon 'allow *'", @@ -142,6 +122,7 @@ let "sudo -u ceph ceph-authtool /tmp/ceph.mon.keyring --import-keyring /etc/ceph/ceph.client.admin.keyring", "monmaptool --create --add ${cfg.monA.name} ${cfg.monA.ip} --fsid ${cfg.clusterId} /tmp/monmap", "sudo -u ceph ceph-mon --mkfs -i ${cfg.monA.name} --monmap /tmp/monmap --keyring /tmp/ceph.mon.keyring", + "sudo -u ceph mkdir -p /var/lib/ceph/mgr/ceph-${cfg.monA.name}/", "sudo -u ceph touch /var/lib/ceph/mon/ceph-${cfg.monA.name}/done", "systemctl start ceph-mon-${cfg.monA.name}" ); @@ -168,12 +149,14 @@ let # Bootstrap both OSDs $osd0->mustSucceed( "mkfs.xfs /dev/vdb", + "mkdir -p /var/lib/ceph/osd/ceph-${cfg.osd0.name}", "mount /dev/vdb /var/lib/ceph/osd/ceph-${cfg.osd0.name}", "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-${cfg.osd0.name}/keyring --name osd.${cfg.osd0.name} --add-key ${cfg.osd0.key}", "echo '{\"cephx_secret\": \"${cfg.osd0.key}\"}' | ceph osd new ${cfg.osd0.uuid} -i -", ); $osd1->mustSucceed( "mkfs.xfs /dev/vdb", + "mkdir -p /var/lib/ceph/osd/ceph-${cfg.osd1.name}", "mount /dev/vdb /var/lib/ceph/osd/ceph-${cfg.osd1.name}", "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-${cfg.osd1.name}/keyring --name osd.${cfg.osd1.name} --add-key ${cfg.osd1.key}", "echo '{\"cephx_secret\": \"${cfg.osd1.key}\"}' | ceph osd new ${cfg.osd1.uuid} -i -" @@ -209,22 +192,17 @@ let "ceph osd pool delete multi-node-other-test multi-node-other-test --yes-i-really-really-mean-it" ); - # As we disable the target in the config, we still want to test that it works as intended - $osd0->mustSucceed("systemctl stop ceph-osd-${cfg.osd0.name}"); - $osd1->mustSucceed("systemctl stop ceph-osd-${cfg.osd1.name}"); - $monA->mustSucceed( - "systemctl stop ceph-mgr-${cfg.monA.name}", - "systemctl stop ceph-mon-${cfg.monA.name}" - ); - - $monA->succeed("systemctl start ceph.target"); - $monA->waitForUnit("ceph-mon-${cfg.monA.name}"); - $monA->waitForUnit("ceph-mgr-${cfg.monA.name}"); - $osd0->succeed("systemctl start ceph.target"); - $osd0->waitForUnit("ceph-osd-${cfg.osd0.name}"); - $osd1->succeed("systemctl start ceph.target"); - $osd1->waitForUnit("ceph-osd-${cfg.osd1.name}"); - + # Shut down ceph on all machines in a very unpolite way + $monA->crash; + $osd0->crash; + $osd1->crash; + + # Start it up + $osd0->start; + $osd1->start; + $monA->start; + + # Ensure the cluster comes back up again $monA->succeed("ceph -s | grep 'mon: 1 daemons'"); $monA->waitUntilSucceeds("ceph -s | grep 'quorum ${cfg.monA.name}'"); $monA->waitUntilSucceeds("ceph osd stat | grep -e '2 osds: 2 up[^,]*, 2 in'"); diff --git a/nixos/tests/ceph-single-node.nix b/nixos/tests/ceph-single-node.nix index 10b77cff5a3..041fbd7e8e6 100644 --- a/nixos/tests/ceph-single-node.nix +++ b/nixos/tests/ceph-single-node.nix @@ -46,9 +46,6 @@ let boot.kernelModules = [ "xfs" ]; services.ceph = cephConfig; - - # So that we don't have to battle systemd when bootstraping - systemd.targets.ceph.wantedBy = lib.mkForce []; }; networkMonA = { @@ -72,22 +69,15 @@ let }; }; }; + # Following deployment is based on the manual deployment described here: + # https://docs.ceph.com/docs/master/install/manual-deployment/ + # For other ways to deploy a ceph cluster, look at the documentation at + # https://docs.ceph.com/docs/master/ testscript = { ... }: '' startAll; $monA->waitForUnit("network.target"); - # Create the ceph-related directories - $monA->mustSucceed( - "mkdir -p /var/lib/ceph/mgr/ceph-${cfg.monA.name}", - "mkdir -p /var/lib/ceph/mon/ceph-${cfg.monA.name}", - "mkdir -p /var/lib/ceph/osd/ceph-${cfg.osd0.name}", - "mkdir -p /var/lib/ceph/osd/ceph-${cfg.osd1.name}", - "mkdir -p /etc/ceph", - "chown ceph:ceph -R /etc/ceph", - "chown ceph:ceph -R /var/lib/ceph/", - ); - # Bootstrap ceph-mon daemon $monA->mustSucceed( "sudo -u ceph ceph-authtool --create-keyring /tmp/ceph.mon.keyring --gen-key -n mon. --cap mon 'allow *'", @@ -104,8 +94,9 @@ let # Can't check ceph status until a mon is up $monA->succeed("ceph -s | grep 'mon: 1 daemons'"); - # Start the ceph-mgr daemon, it has no deps and hardly any setup + # Start the ceph-mgr daemon, after copying in the keyring $monA->mustSucceed( + "sudo -u ceph mkdir -p /var/lib/ceph/mgr/ceph-${cfg.monA.name}/", "ceph auth get-or-create mgr.${cfg.monA.name} mon 'allow profile mgr' osd 'allow *' mds 'allow *' > /var/lib/ceph/mgr/ceph-${cfg.monA.name}/keyring", "systemctl start ceph-mgr-${cfg.monA.name}" ); @@ -117,7 +108,9 @@ let $monA->mustSucceed( "mkfs.xfs /dev/vdb", "mkfs.xfs /dev/vdc", + "mkdir -p /var/lib/ceph/osd/ceph-${cfg.osd0.name}", "mount /dev/vdb /var/lib/ceph/osd/ceph-${cfg.osd0.name}", + "mkdir -p /var/lib/ceph/osd/ceph-${cfg.osd1.name}", "mount /dev/vdc /var/lib/ceph/osd/ceph-${cfg.osd1.name}", "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-${cfg.osd0.name}/keyring --name osd.${cfg.osd0.name} --add-key ${cfg.osd0.key}", "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-${cfg.osd1.name}/keyring --name osd.${cfg.osd1.name} --add-key ${cfg.osd1.key}", @@ -159,20 +152,17 @@ let "ceph osd pool delete single-node-other-test single-node-other-test --yes-i-really-really-mean-it" ); - # As we disable the target in the config, we still want to test that it works as intended - $monA->mustSucceed( - "systemctl stop ceph-osd-${cfg.osd0.name}", - "systemctl stop ceph-osd-${cfg.osd1.name}", - "systemctl stop ceph-mgr-${cfg.monA.name}", - "systemctl stop ceph-mon-${cfg.monA.name}" - ); - + # Shut down ceph by stopping ceph.target. + $monA->mustSucceed("systemctl stop ceph.target"); + + # Start it up $monA->succeed("systemctl start ceph.target"); $monA->waitForUnit("ceph-mon-${cfg.monA.name}"); $monA->waitForUnit("ceph-mgr-${cfg.monA.name}"); $monA->waitForUnit("ceph-osd-${cfg.osd0.name}"); $monA->waitForUnit("ceph-osd-${cfg.osd1.name}"); - + + # Ensure the cluster comes back up again $monA->succeed("ceph -s | grep 'mon: 1 daemons'"); $monA->waitUntilSucceeds("ceph -s | grep 'quorum ${cfg.monA.name}'"); $monA->waitUntilSucceeds("ceph osd stat | grep -e '2 osds: 2 up[^,]*, 2 in'"); diff --git a/nixos/tests/jellyfin.nix b/nixos/tests/jellyfin.nix index b60c6eb94f4..65360624d48 100644 --- a/nixos/tests/jellyfin.nix +++ b/nixos/tests/jellyfin.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ lib, ...}: +import ./make-test-python.nix ({ lib, ...}: { name = "jellyfin"; @@ -9,8 +9,8 @@ import ./make-test.nix ({ lib, ...}: { services.jellyfin.enable = true; }; testScript = '' - $machine->waitForUnit('jellyfin.service'); - $machine->waitForOpenPort('8096'); - $machine->succeed("curl --fail http://localhost:8096/"); + machine.wait_for_unit("jellyfin.service") + machine.wait_for_open_port(8096) + machine.succeed("curl --fail http://localhost:8096/") ''; }) diff --git a/nixos/tests/lorri/builder.sh b/nixos/tests/lorri/builder.sh new file mode 100644 index 00000000000..b586b2bf798 --- /dev/null +++ b/nixos/tests/lorri/builder.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +printf "%s" "${name:?}" > "${out:?}" diff --git a/nixos/tests/lorri/default.nix b/nixos/tests/lorri/default.nix new file mode 100644 index 00000000000..53074385a65 --- /dev/null +++ b/nixos/tests/lorri/default.nix @@ -0,0 +1,26 @@ +import ../make-test-python.nix { + machine = { pkgs, ... }: { + imports = [ ../../modules/profiles/minimal.nix ]; + environment.systemPackages = [ pkgs.lorri ]; + }; + + testScript = '' + # Copy files over + machine.succeed( + "cp '${./fake-shell.nix}' shell.nix" + ) + machine.succeed( + "cp '${./builder.sh}' builder.sh" + ) + + # Start the daemon and wait until it is ready + machine.execute("lorri daemon > lorri.stdout 2> lorri.stderr &") + machine.wait_until_succeeds("grep --fixed-strings 'lorri: ready' lorri.stdout") + + # Ping the daemon + machine.execute("lorri ping_ $(readlink -f shell.nix)") + + # Wait for the daemon to finish the build + machine.wait_until_succeeds("grep --fixed-strings 'OutputPaths' lorri.stdout") + ''; +} diff --git a/nixos/tests/lorri/fake-shell.nix b/nixos/tests/lorri/fake-shell.nix new file mode 100644 index 00000000000..9de9d247e54 --- /dev/null +++ b/nixos/tests/lorri/fake-shell.nix @@ -0,0 +1,5 @@ +derivation { + system = builtins.currentSystem; + name = "fake-shell"; + builder = ./builder.sh; +} diff --git a/nixos/tests/mpd.nix b/nixos/tests/mpd.nix index ac2b810defe..a992576808d 100644 --- a/nixos/tests/mpd.nix +++ b/nixos/tests/mpd.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ pkgs, ... }: +import ./make-test.nix ({ pkgs, lib, ... }: let track = pkgs.fetchurl { # Sourced from http://freemusicarchive.org/music/Blue_Wave_Theory/Surf_Music_Month_Challenge/Skyhawk_Beach_fade_in @@ -46,38 +46,51 @@ import ./make-test.nix ({ pkgs, ... }: }; nodes = - { client = + { client = { ... }: { }; serverALSA = - { ... }: (mkServer { - mpd = defaultMpdCfg // { - network.listenAddress = "any"; - extraConfig = '' - audio_output { - type "alsa" - name "ALSA" - mixer_type "null" - } - ''; - }; - - musicService = with defaultMpdCfg; musicService { inherit user group musicDirectory; }; - }) // { networking.firewall.allowedTCPPorts = [ 6600 ]; }; + { ... }: lib.mkMerge [ + (mkServer { + mpd = defaultMpdCfg // { + network.listenAddress = "any"; + extraConfig = '' + audio_output { + type "alsa" + name "ALSA" + mixer_type "null" + } + ''; + }; + musicService = with defaultMpdCfg; musicService { inherit user group musicDirectory; }; + }) + { networking.firewall.allowedTCPPorts = [ 6600 ]; } + ]; serverPulseAudio = - { ... }: (mkServer { - mpd = defaultMpdCfg // { - extraConfig = '' - audio_output { - type "pulse" - name "The Pulse" - } - ''; - }; - - musicService = with defaultCfg; musicService { inherit user group musicDirectory; }; - }) // { hardware.pulseaudio.enable = true; }; + { ... }: lib.mkMerge [ + (mkServer { + mpd = defaultMpdCfg // { + extraConfig = '' + audio_output { + type "pulse" + name "The Pulse" + } + ''; + }; + + musicService = with defaultCfg; musicService { inherit user group musicDirectory; }; + }) + { + hardware.pulseaudio = { + enable = true; + systemWide = true; + tcp.enable = true; + tcp.anonymousClients.allowAll = true; + }; + systemd.services.mpd.environment.PULSE_SERVER = "localhost"; + } + ]; }; testScript = '' @@ -110,6 +123,7 @@ import ./make-test.nix ({ pkgs, ... }: play_some_music($serverALSA); play_some_music($serverPulseAudio); + $client->waitForUnit("multi-user.target"); $client->succeed("$mpc -h serverALSA status"); # The PulseAudio-based server is configured not to accept external client connections diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index 76cecb7433a..563f2472647 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -457,9 +457,7 @@ let wait_for_unit("prometheus-varnish-exporter.service") wait_for_open_port(6081) wait_for_open_port(9131) - succeed( - "curl -sSf http://localhost:9131/metrics | grep -q 'varnish_up 1'" - ) + succeed("curl -sSf http://localhost:9131/metrics | grep -q 'varnish_up 1'") ''; }; diff --git a/nixos/tests/sddm.nix b/nixos/tests/sddm.nix index 11d60598445..4bdcd701dcf 100644 --- a/nixos/tests/sddm.nix +++ b/nixos/tests/sddm.nix @@ -27,7 +27,7 @@ let user = nodes.machine.config.users.users.alice; in '' start_all() - machine.wait_for_text("select your user") + machine.wait_for_text("(?i)select your user") machine.screenshot("sddm") machine.send_chars("${user.password}\n") machine.wait_for_file("${user.home}/.Xauthority") diff --git a/nixos/tests/slurm.nix b/nixos/tests/slurm.nix index 4c2cd3c3d26..17527378cf0 100644 --- a/nixos/tests/slurm.nix +++ b/nixos/tests/slurm.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ lib, ... }: +import ./make-test-python.nix ({ lib, ... }: let mungekey = "mungeverryweakkeybuteasytointegratoinatest"; @@ -54,10 +54,15 @@ in { networking.firewall.enable = false; services.slurm.dbdserver = { enable = true; + storagePass = "password123"; }; services.mysql = { enable = true; - package = pkgs.mysql; + package = pkgs.mariadb; + initialScript = pkgs.writeText "mysql-init.sql" '' + CREATE USER 'slurm'@'localhost' IDENTIFIED BY 'password123'; + GRANT ALL PRIVILEGES ON slurm_acct_db.* TO 'slurm'@'localhost'; + ''; ensureDatabases = [ "slurm_acct_db" ]; ensureUsers = [{ ensurePermissions = { "slurm_acct_db.*" = "ALL PRIVILEGES"; }; @@ -80,63 +85,57 @@ in { testScript = '' - startAll; + start_all() # Set up authentification across the cluster - foreach my $node (($submit,$control,$dbd,$node1,$node2,$node3)) - { - $node->waitForUnit("default.target"); + for node in [submit, control, dbd, node1, node2, node3]: - $node->succeed("mkdir /etc/munge"); - $node->succeed("echo '${mungekey}' > /etc/munge/munge.key"); - $node->succeed("chmod 0400 /etc/munge/munge.key"); - $node->succeed("chown munge:munge /etc/munge/munge.key"); - $node->succeed("systemctl restart munged"); + node.wait_for_unit("default.target") + + node.succeed("mkdir /etc/munge") + node.succeed( + "echo '${mungekey}' > /etc/munge/munge.key" + ) + node.succeed("chmod 0400 /etc/munge/munge.key") + node.succeed("chown munge:munge /etc/munge/munge.key") + node.succeed("systemctl restart munged") + + node.wait_for_unit("munged") - $node->waitForUnit("munged"); - }; # Restart the services since they have probably failed due to the munge init # failure - subtest "can_start_slurmdbd", sub { - $dbd->succeed("systemctl restart slurmdbd"); - $dbd->waitForUnit("slurmdbd.service"); - $dbd->waitForOpenPort(6819); - }; + with subtest("can_start_slurmdbd"): + dbd.succeed("systemctl restart slurmdbd") + dbd.wait_for_unit("slurmdbd.service") + dbd.wait_for_open_port(6819) # there needs to be an entry for the current # cluster in the database before slurmctld is restarted - subtest "add_account", sub { - $control->succeed("sacctmgr -i add cluster default"); - # check for cluster entry - $control->succeed("sacctmgr list cluster | awk '{ print \$1 }' | grep default"); - }; + with subtest("add_account"): + control.succeed("sacctmgr -i add cluster default") + # check for cluster entry + control.succeed("sacctmgr list cluster | awk '{ print $1 }' | grep default") - subtest "can_start_slurmctld", sub { - $control->succeed("systemctl restart slurmctld"); - $control->waitForUnit("slurmctld.service"); - }; + with subtest("can_start_slurmctld"): + control.succeed("systemctl restart slurmctld") + control.waitForUnit("slurmctld.service") - subtest "can_start_slurmd", sub { - foreach my $node (($node1,$node2,$node3)) - { - $node->succeed("systemctl restart slurmd.service"); - $node->waitForUnit("slurmd"); - } - }; + with subtest("can_start_slurmd"): + for node in [node1, node2, node3]: + node.succeed("systemctl restart slurmd.service") + node.wait_for_unit("slurmd") # Test that the cluster works and can distribute jobs; - subtest "run_distributed_command", sub { - # Run `hostname` on 3 nodes of the partition (so on all the 3 nodes). - # The output must contain the 3 different names - $submit->succeed("srun -N 3 hostname | sort | uniq | wc -l | xargs test 3 -eq"); - }; + with subtest("run_distributed_command"): + # Run `hostname` on 3 nodes of the partition (so on all the 3 nodes). + # The output must contain the 3 different names + submit.succeed("srun -N 3 hostname | sort | uniq | wc -l | xargs test 3 -eq") - subtest "check_slurm_dbd", sub { - # find the srun job from above in the database - sleep 5; - $control->succeed("sacct | grep hostname"); - }; + with subtest("check_slurm_dbd"): + # find the srun job from above in the database + control.succeed("sleep 5") + control.succeed("sacct | grep hostname") ''; }) diff --git a/nixos/tests/wireguard/namespaces.nix b/nixos/tests/wireguard/namespaces.nix new file mode 100644 index 00000000000..94f993d9475 --- /dev/null +++ b/nixos/tests/wireguard/namespaces.nix @@ -0,0 +1,80 @@ +let + listenPort = 12345; + socketNamespace = "foo"; + interfaceNamespace = "bar"; + node = { + networking.wireguard.interfaces.wg0 = { + listenPort = listenPort; + ips = [ "10.10.10.1/24" ]; + privateKeyFile = "/etc/wireguard/private"; + generatePrivateKeyFile = true; + }; + }; + +in + +import ../make-test.nix ({ pkgs, ...} : { + name = "wireguard-with-namespaces"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ asymmetric ]; + }; + + nodes = { + # interface should be created in the socketNamespace + # and not moved from there + peer0 = pkgs.lib.attrsets.recursiveUpdate node { + networking.wireguard.interfaces.wg0 = { + preSetup = '' + ip netns add ${socketNamespace} + ''; + inherit socketNamespace; + }; + }; + # interface should be created in the init namespace + # and moved to the interfaceNamespace + peer1 = pkgs.lib.attrsets.recursiveUpdate node { + networking.wireguard.interfaces.wg0 = { + preSetup = '' + ip netns add ${interfaceNamespace} + ''; + inherit interfaceNamespace; + }; + }; + # interface should be created in the socketNamespace + # and moved to the interfaceNamespace + peer2 = pkgs.lib.attrsets.recursiveUpdate node { + networking.wireguard.interfaces.wg0 = { + preSetup = '' + ip netns add ${socketNamespace} + ip netns add ${interfaceNamespace} + ''; + inherit socketNamespace interfaceNamespace; + }; + }; + # interface should be created in the socketNamespace + # and moved to the init namespace + peer3 = pkgs.lib.attrsets.recursiveUpdate node { + networking.wireguard.interfaces.wg0 = { + preSetup = '' + ip netns add ${socketNamespace} + ''; + inherit socketNamespace; + interfaceNamespace = "init"; + }; + }; + }; + + testScript = '' + startAll(); + + $peer0->waitForUnit("wireguard-wg0.service"); + $peer1->waitForUnit("wireguard-wg0.service"); + $peer2->waitForUnit("wireguard-wg0.service"); + $peer3->waitForUnit("wireguard-wg0.service"); + + $peer0->succeed("ip -n ${socketNamespace} link show wg0"); + $peer1->succeed("ip -n ${interfaceNamespace} link show wg0"); + $peer2->succeed("ip -n ${interfaceNamespace} link show wg0"); + $peer3->succeed("ip link show wg0"); + ''; +}) diff --git a/nixos/tests/xmonad.nix b/nixos/tests/xmonad.nix index 79c15ccffec..c2e5ba60d7b 100644 --- a/nixos/tests/xmonad.nix +++ b/nixos/tests/xmonad.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, ...} : { name = "xmonad"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ nequissimus ]; @@ -21,19 +21,21 @@ import ./make-test.nix ({ pkgs, ...} : { }; }; - testScript = { ... }: '' - $machine->waitForX; - $machine->waitForFile("/home/alice/.Xauthority"); - $machine->succeed("xauth merge ~alice/.Xauthority"); - $machine->sendKeys("alt-ctrl-x"); - $machine->waitForWindow(qr/alice.*machine/); - $machine->sleep(1); - $machine->screenshot("terminal"); - $machine->waitUntilSucceeds("xmonad --restart"); - $machine->sleep(3); - $machine->sendKeys("alt-shift-ret"); - $machine->waitForWindow(qr/alice.*machine/); - $machine->sleep(1); - $machine->screenshot("terminal"); + testScript = { nodes, ... }: let + user = nodes.machine.config.users.users.alice; + in '' + machine.wait_for_x() + machine.wait_for_file("${user.home}/.Xauthority") + machine.succeed("xauth merge ${user.home}/.Xauthority") + machine.send_chars("alt-ctrl-x") + machine.wait_for_window("${user.name}.*machine") + machine.sleep(1) + machine.screenshot("terminal") + machine.wait_until_succeeds("xmonad --restart") + machine.sleep(3) + machine.send_chars("alt-shift-ret") + machine.wait_for_window("${user.name}.*machine") + machine.sleep(1) + machine.screenshot("terminal") ''; }) diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index c72815d5ca2..cd951701e77 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -33,6 +33,8 @@ mkDerivation rec { enableParallelBuilding = true; meta = with lib; { + homepage = "https://amarok.kde.org"; + description = "A powerful music player with an intuitive interface"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 6be40a7b93a..11434c0b349 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, wxGTK30, pkgconfig, file, gettext, gtk2, +{ stdenv, fetchzip, wxGTK30, pkgconfig, file, gettext, libvorbis, libmad, libjack2, lv2, lilv, serd, sord, sratom, suil, alsaLib, libsndfile, soxr, flac, lame, expat, libid3tag, ffmpeg, soundtouch, /*, portaudio - given up fighting their portaudio.patch */ autoconf, automake, libtool @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { version = "2.3.2"; pname = "audacity"; - src = fetchurl { + src = fetchzip { url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; - sha256 = "0cf7fr1qhyyylj8g9ax1rq5sb887bcv5b8d7hwlcfwamzxqpliyc"; + sha256 = "08w96124vv8k4myd4vifq73ningq6404x889wvg2sk016kc4dfv1"; }; preConfigure = /* we prefer system-wide libs */ '' @@ -43,12 +43,11 @@ stdenv.mkDerivation rec { "-lswscale" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoconf automake libtool ]; buildInputs = [ file gettext wxGTK30 expat alsaLib - libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil gtk2 + libsndfile soxr libid3tag libjack2 lv2 lilv serd sord sratom suil wxGTK30.gtk ffmpeg libmad lame libvorbis flac soundtouch - autoconf automake libtool # for the preConfigure phase ]; #ToDo: detach sbsms enableParallelBuilding = true; @@ -60,7 +59,7 @@ stdenv.mkDerivation rec { description = "Sound editor with graphical UI"; homepage = http://audacityteam.org/; license = licenses.gpl2Plus; - platforms = with platforms; linux; + platforms = intersectLists platforms.linux platforms.x86; # fails on ARM maintainers = with maintainers; [ the-kenny ]; }; } diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix index 3e9a2d380e2..dd59ac5080f 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix @@ -3,11 +3,11 @@ bitwig-studio1.overrideAttrs (oldAttrs: rec { name = "bitwig-studio-${version}"; - version = "3.0.1"; + version = "3.0.3"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/bitwig-studio-${version}.deb"; - sha256 = "0k25p1j4kgnhm7p90qp1cz79xddgi6nh1nx1y5wz42x8qrpxya0s"; + sha256 = "162l95imq2fb4blfkianlkymm690by9ri73xf9zigknqf0gacgsa"; }; runtimeDependencies = [ diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index 604fe4c4ab7..b926ff09d22 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchurl, pkgconfig, libjack2, alsaLib, libsndfile, liblo, lv2, qt5 }: +{ mkDerivation, lib, fetchurl, pkgconfig, libjack2, alsaLib, libsndfile, liblo, lv2, qt5 }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "drumkv1"; - version = "0.9.10"; + version = "0.9.11"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz"; - sha256 = "0h08r6vq23dlnag67fcfcpx83wampx4fag82v4bgkqg2sdh64p3n"; + sha256 = "1wnjn175l0mz51k9pjf3pdzv54c4jlh63saavld9lm6zfgfs13d7"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; nativeBuildInputs = [ pkgconfig ]; - meta = with stdenv.lib; { + meta = with lib; { description = "An old-school drum-kit sampler synthesizer with stereo fx"; homepage = http://drumkv1.sourceforge.net/; license = licenses.gpl2Plus; diff --git a/pkgs/applications/audio/mpc/default.nix b/pkgs/applications/audio/mpc/default.nix index b13e1cc037a..9a273299297 100644 --- a/pkgs/applications/audio/mpc/default.nix +++ b/pkgs/applications/audio/mpc/default.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, mpd_clientlib }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, mpd_clientlib, sphinx }: stdenv.mkDerivation rec { pname = "mpc"; - version = "0.28"; + version = "0.31"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "mpc"; rev = "v${version}"; - sha256 = "1g8i4q5xsqdhidyjpvj6hzbhxacv27cb47ndv9k68whd80c5f9n9"; + sha256 = "06wn5f24bgkqmhh2p8rbizmqibzqr4x1q7c6zl0pfq7mdy49g5ds"; }; buildInputs = [ mpd_clientlib ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - - enableParallelBuilding = true; + nativeBuildInputs = [ meson ninja pkgconfig sphinx ]; meta = with stdenv.lib; { description = "A minimalist command line interface to MPD"; diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 0d5445650a0..6c4b9a43176 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "mpg123-1.25.12"; + name = "mpg123-1.25.13"; src = fetchurl { url = "mirror://sourceforge/mpg123/${name}.tar.bz2"; - sha256 = "1l9iwwgqzw6yg5zk9pqmlbfyq6d8dqysbmj0j3m8dyrxd34wgzhz"; + sha256 = "02l915jq0ymndb082g6w89bpf66z04ifa1lr7ga3yycw6m46hc4h"; }; buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib; diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix index 5d86e37dec8..20a6e928cef 100644 --- a/pkgs/applications/audio/pithos/default.nix +++ b/pkgs/applications/audio/pithos/default.nix @@ -4,13 +4,13 @@ pythonPackages.buildPythonApplication rec { pname = "pithos"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0vaw0rfcdh4bsp9b8la9bs36kw0iwia54y5x060byxhff9av6nj4"; + sha256 = "10nnm55ql86x1qfmq6dx9a1igf7myjxibmvyhd7fyv06vdhfifgy"; }; format = "other"; diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/applications/audio/qjackctl/default.nix index 0b50d3098aa..84cc11b8bf3 100644 --- a/pkgs/applications/audio/qjackctl/default.nix +++ b/pkgs/applications/audio/qjackctl/default.nix @@ -1,14 +1,14 @@ { stdenv, mkDerivation, fetchurl, pkgconfig, alsaLib, libjack2, dbus, qtbase, qttools, qtx11extras }: mkDerivation rec { - version = "0.5.9"; + version = "0.6.0"; pname = "qjackctl"; # some dependencies such as killall have to be installed additionally src = fetchurl { url = "mirror://sourceforge/qjackctl/${pname}-${version}.tar.gz"; - sha256 = "1saywsda9m124rmjp7i3n0llryaliabjxhqhvqr6dm983qy7pypk"; + sha256 = "1kddvxxhwvw1ps1c1drr08hxqci7jw4jwr8h1d9isb8agydfxmcx"; }; buildInputs = [ diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index 43637ef5dc4..b4a50395464 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "snd-19.7"; + name = "snd-19.8"; src = fetchurl { url = "mirror://sourceforge/snd/${name}.tar.gz"; - sha256 = "1pr3l9iadvwinmxfl9a2lsm67yi7w3rhxglidpd41m2ni8jf2rlm"; + sha256 = "0cdf3940cjvf5kls5l1zjll9wgg152xzlxs0jmpsq1kml12qa67b"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/blockchains/wownero.nix b/pkgs/applications/blockchains/wownero.nix index 365afb5a241..8b25e098b2f 100644 --- a/pkgs/applications/blockchains/wownero.nix +++ b/pkgs/applications/blockchains/wownero.nix @@ -1,27 +1,25 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, git -, boost, miniupnpc_2, openssl, unbound, cppzmq -, zeromq, pcsclite, readline, libsodium, rapidjson +{ stdenv, fetchFromGitHub, cmake, boost, miniupnpc_2, openssl, unbound +, readline, libsodium, rapidjson }: with stdenv.lib; stdenv.mkDerivation rec { pname = "wownero"; + version = "0.7.0"; - version = "0.6.1.2"; src = fetchFromGitHub { owner = "wownero"; repo = "wownero"; rev = "v${version}"; - sha256 = "03q3pviyhrldpa3f4ly4d97jr39hvrz37chl102bap0790d9lk09"; + sha256 = "0lji24s6346qxcj4pmylv8byb8fnqzpmz81rx4i3zhc1bcsvdwas"; fetchSubmodules = true; }; - nativeBuildInputs = [ cmake pkgconfig git ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ - boost miniupnpc_2 openssl unbound rapidjson - cppzmq zeromq pcsclite readline libsodium + boost miniupnpc_2 openssl unbound rapidjson readline libsodium ]; cmakeFlags = [ @@ -30,13 +28,16 @@ stdenv.mkDerivation rec { ]; meta = { - description = "Wownero is a fork of the cryptocurrency Monero with primary alterations"; + description = '' + A privacy-centric memecoin that was fairly launched on April 1, 2018 with + no pre-mine, stealth-mine or ICO + ''; longDescription = '' - Wownero’s emission is capped and supply is finite. Wownero is a fairly - launched coin with no premine. It’s not a fork of another blockchain. With - its own genesis block there is no degradation of privacy caused by ring - signatures using different participants for the same transaction outputs. - Unlike opposing forks. + Wownero has a maximum supply of around 184 million WOW with a slow and + steady emission over 50 years. It is a fork of Monero, but with its own + genesis block, so there is no degradation of privacy due to ring + signatures using different participants for the same tx outputs on + opposing forks. ''; homepage = http://wownero.org/; license = licenses.bsd3; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 16d5609934d..48af3c9b014 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -250,12 +250,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2019.2.3"; /* updated by script */ + version = "2019.2.5"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "0kiqbcx64rlz1pajbn326zwy0d1vxdxpvk5xpqkcj7nva611pdq1"; /* updated by script */ + sha256 = "0p0shikhf73ayflv5bm212kz06hiy3brww9h9ijjp6lcadxc9pmf"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -263,12 +263,12 @@ in datagrip = buildDataGrip rec { name = "datagrip-${version}"; - version = "2019.2.5"; /* updated by script */ + version = "2019.2.6"; /* updated by script */ description = "Your Swiss Army Knife for Databases and SQL"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/datagrip/${name}.tar.gz"; - sha256 = "18frmlchalpvc55j25ig2slf2h33gwmbmm8dvc29jb3kgsl0ny7p"; /* updated by script */ + sha256 = "0g57njcklyskadxmvwb0r0z3ckq9qmcwh8qd80w396gj8fgbg50g"; /* updated by script */ }; wmClass = "jetbrains-datagrip"; update-channel = "DataGrip RELEASE"; @@ -276,12 +276,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2019.2.2"; /* updated by script */ + version = "2019.2.4"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "1wq1prgfn6wc7lc6qjhiykm62c56yrb5rv0hyylcsgdw0q3ns6z2"; /* updated by script */ + sha256 = "0rkyw3532qvr6jhr09m3h0ssdy5ilfgfvqqliyf0cacwzw9lfv0p"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -289,12 +289,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2019.2.3"; /* updated by script */ + version = "2019.2.4"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "0gy42x49yhdnp4ks6445xbc24dxw2vxnl12hdyx03mszdv0r58ni"; /* updated by script */ + sha256 = "012vmclx6kg85gffgc9mr3fp1ffgx20dz7xvafk7c1iynawx8wgq"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA RELEASE"; @@ -302,12 +302,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2019.2.3"; /* updated by script */ + version = "2019.2.4"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jbr.tar.gz"; - sha256 = "0allnibq8van3n1c5y85gscbpls0wshwffa6b2l2andw1jkhc259"; /* updated by script */ + sha256 = "09mz4dx3zbnqw0vh4iqr8sn2s8mvgr7zvn4k7kqivsiv8f79g90a"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA RELEASE"; @@ -315,12 +315,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2019.2.3"; /* updated by script */ + version = "2019.2.4"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "0pra0hmyczxcxnvsc7rqiwhwj23ckx97c9m1wcyn7ik612xwik1i"; /* updated by script */ + sha256 = "1bx8s4hh96pjfyccldwfarwv5fky6kg2kyc0h2arhfzwq1pbaisl"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -328,12 +328,12 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2019.2.3"; /* updated by script */ + version = "2019.2.4"; /* updated by script */ description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "02fynwi54libibgigwggh6xaf5p4046n0kjsqsck1kjbnrlghp10"; /* updated by script */ + sha256 = "00dl3yx13lw8qyc23dirw96vm2d8c6zsx73ds1ha8zycfh6hkxf8"; /* updated by script */ }; wmClass = "jetbrains-pycharm-ce"; update-channel = "PyCharm RELEASE"; @@ -341,12 +341,12 @@ in pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2019.2.3"; /* updated by script */ + version = "2019.2.4"; /* updated by script */ description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "19i3ll8p69n7jw7psv2nkhjq899gljwmc5ixpqhyl203rykavb7n"; /* updated by script */ + sha256 = "14ab1cvypanwwn0k1hrx3rl964av6pvridgc19z49idw5wpgxgw7"; /* updated by script */ }; wmClass = "jetbrains-pycharm"; update-channel = "PyCharm RELEASE"; @@ -354,12 +354,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2019.2.2"; /* updated by script */ + version = "2019.2.3"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "1wv5vhiv3w1dwyklx1pr5javp4psqyiv4naq37cvxxp9zh7hk8rc"; /* updated by script */ + sha256 = "13br6zmqpvi9hcd6wdnalkhj50gzr7cwrdh4v2bpda77iby2pz93"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -367,12 +367,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2019.2.3"; /* updated by script */ + version = "2019.2.4"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "0g8yxsq9xn8l8wnmcm0y5y0ll5081s83mmwrb62k4bldlsr25iba"; /* updated by script */ + sha256 = "1dqp222zvi8ikqdkprmqihyjxiq90vd0a0zl5935xjg1mzf8ald9"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; @@ -380,12 +380,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2019.2.3"; /* updated by script */ + version = "2019.2.4"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "0l3c3b1d53b3w90d4g99pjw8vmjj716jjaxsv4hy53shh1ncd55g"; /* updated by script */ + sha256 = "0iz9qgrbhn1rxr8n5q1y7klfs27j1f55pw8hqbl2ln4df94zqi5j"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 04e2cb45e28..f986d79ec50 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchFromGitHub, qt5, poppler, zlib, pkgconfig}: +{ lib, mkDerivation, fetchFromGitHub, qmake, qtbase, qtscript, qtsvg, + poppler, zlib, pkgconfig }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "texstudio"; version = "2.12.16"; @@ -11,12 +12,12 @@ stdenv.mkDerivation rec { sha256 = "0ck65fvz6mzfpqdb1ndgyvgxdnslrwhdr1swgck4gaghcrgbg3gq"; }; - nativeBuildInputs = [ qt5.qmake pkgconfig ]; - buildInputs = [ qt5.qtbase qt5.qtscript qt5.qtsvg poppler zlib ]; + nativeBuildInputs = [ qmake pkgconfig ]; + buildInputs = [ qtbase qtscript qtsvg poppler zlib ]; qmakeFlags = [ "NO_APPDATA=True" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "TeX and LaTeX editor"; longDescription='' Fork of TeXMaker, this editor is a full fledged IDE for diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 9d22cdbf4a8..0a099ea630d 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.1.2188"; + version = "8.1.2237"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "0ixq96l991b84sj66v63ds61yr75gx5zz411213yn6bz3s2fvlcv"; + sha256 = "1qwh3cw5zmjmnk07g0nc8nz8k5nlq9ilvvygnfdjy1fqg69q8p0h"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/displaycal/default.nix b/pkgs/applications/graphics/displaycal/default.nix index 821a9e8083e..7a4db535b2b 100644 --- a/pkgs/applications/graphics/displaycal/default.nix +++ b/pkgs/applications/graphics/displaycal/default.nix @@ -1,8 +1,19 @@ -{buildPythonPackage, stdenv, fetchurl, pkgconfig - , libXext, libXxf86vm, libX11, libXrandr, libXinerama, libXScrnSaver - , argyllcms, wxPython, numpy +{ python2 +, stdenv +, fetchurl +, pkgconfig +, libXext +, libXxf86vm +, libX11 +, libXrandr +, libXinerama +, libXScrnSaver +, argyllcms }: -buildPythonPackage { + +let + inherit (python2.pkgs) buildPythonApplication wxPython numpy; +in buildPythonApplication { pname = "displaycal"; version = "3.5.0.0"; diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix index cf5ecfdd043..e26886b070e 100644 --- a/pkgs/applications/graphics/dosage/default.nix +++ b/pkgs/applications/graphics/dosage/default.nix @@ -1,6 +1,6 @@ -{ stdenv, pythonPackages, fetchFromGitHub }: +{ stdenv, python3Packages, fetchFromGitHub }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "dosage"; version = "2018.04.08"; PBR_VERSION = version; @@ -11,10 +11,10 @@ pythonPackages.buildPythonApplication rec { rev = "b2fdc13feb65b93762928f7e99bac7b1b7b31591"; sha256 = "1p6vllqaf9s6crj47xqp97hkglch1kd4y8y4lxvzx3g2shhhk9hh"; }; - checkInputs = with pythonPackages; [ pytest responses ]; - propagatedBuildInputs = with pythonPackages; [ colorama lxml requests pbr ]; + checkInputs = with python3Packages; [ pytest responses ]; + propagatedBuildInputs = with python3Packages; [ colorama lxml requests pbr setuptools ]; - disabled = pythonPackages.pythonOlder "3.3"; + disabled = python3Packages.pythonOlder "3.3"; checkPhase = '' py.test tests/ diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 4142310b705..25cefabbd63 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "12.1.7"; + version = "12.2.2"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "1vac0cz99yjlz7b186wyy4wk4sxkvlirpjmh3vw65xaxamn8spn3"; + sha256 = "04h11gdy78py9zrs3v6y0hhhc2n1h4s0ymbvf6qn4vv4r3r9vbaw"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index fef068eaf0f..50814f23962 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper , xorg, imlib2, libjpeg, libpng -, curl, libexif, perlPackages }: +, curl, libexif, jpegexiforient, perlPackages }: with stdenv.lib; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" ]; postInstall = '' - wrapProgram "$out/bin/feh" --prefix PATH : "${libjpeg.bin}/bin" \ + wrapProgram "$out/bin/feh" --prefix PATH : "${makeBinPath [ libjpeg jpegexiforient ]}" \ --add-flags '--theme=feh' ''; diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix index 594429503a3..426985d312c 100644 --- a/pkgs/applications/graphics/renderdoc/default.nix +++ b/pkgs/applications/graphics/renderdoc/default.nix @@ -1,32 +1,34 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig +{ stdenv, fetchFromGitHub, cmake, pkgconfig, mkDerivation , qtbase, qtx11extras, qtsvg, makeWrapper -, vulkan-loader, xorg -, python3, bison, pcre, automake, autoconf +, vulkan-loader, xorg, python3, python3Packages +, bison, pcre, automake, autoconf, addOpenGLRunpath }: let custom_swig = fetchFromGitHub { owner = "baldurk"; repo = "swig"; - rev = "renderdoc-modified-6"; - sha256 = "00ykqlzx1k9iwqjlc54kfch7cnzsj53hxn7ql70dj3rxqzrnadc0"; + rev = "renderdoc-modified-7"; + sha256 = "15r2m5kcs0id64pa2fsw58qll3jyh71jzc04wy20pgsh2326zis6"; }; + pythonPackages = python3Packages; in -stdenv.mkDerivation rec { - version = "1.4"; +mkDerivation rec { + version = "1.5"; pname = "renderdoc"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "1iann73r4yzkwnm13h4zqipqrp5i5cnkv27yyap0axz6h3npw94r"; + sha256 = "0a05f6qfq90wrf4fixchp9knx4nhqhwjxl02n03a7k56xzxxnlci"; }; buildInputs = [ qtbase qtsvg xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader python3 - ]; + ]; # ++ (with pythonPackages; [pyside2 pyside2-tools shiboken2]); + # TODO: figure out how to make cmake recognise pyside2 - nativeBuildInputs = [ cmake makeWrapper pkgconfig bison pcre automake autoconf ]; + nativeBuildInputs = [ cmake makeWrapper pkgconfig bison pcre automake autoconf addOpenGLRunpath ]; postUnpack = '' cp -r ${custom_swig} swig @@ -40,19 +42,23 @@ stdenv.mkDerivation rec { "-DBUILD_VERSION_DIST_VER=${version}" "-DBUILD_VERSION_DIST_CONTACT=https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/graphics/renderdoc" "-DBUILD_VERSION_STABLE=ON" - # TODO: add once pyside2 is in nixpkgs - #"-DPYSIDE2_PACKAGE_DIR=${python36Packages.pyside2}" ]; - # Future work: define these in the above array via placeholders + # TODO: define these in the above array via placeholders, once those are widely supported preConfigure = '' cmakeFlags+=" -DVULKAN_LAYER_FOLDER=$out/share/vulkan/implicit_layer.d/" cmakeFlags+=" -DRENDERDOC_SWIG_PACKAGE=$PWD/../swig" ''; + dontWrapQtApps = true; preFixup = '' - wrapProgram $out/bin/qrenderdoc --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib - wrapProgram $out/bin/renderdoccmd --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib + wrapQtApp $out/bin/qrenderdoc --suffix LD_LIBRARY_PATH : "$out/lib:${vulkan-loader}/lib" + wrapProgram $out/bin/renderdoccmd --suffix LD_LIBRARY_PATH : "$out/lib:${vulkan-loader}/lib" + ''; + + # The only documentation for this so far is in pkgs/build-support/add-opengl-runpath/setup-hook.sh + postFixup = '' + addOpenGLRunpath $out/lib/librenderdoc.so ''; enableParallelBuilding = true; diff --git a/pkgs/applications/kde/print-manager.nix b/pkgs/applications/kde/print-manager.nix index 8ace4562cbd..f869f984e00 100644 --- a/pkgs/applications/kde/print-manager.nix +++ b/pkgs/applications/kde/print-manager.nix @@ -20,4 +20,10 @@ mkDerivation { kwidgetsaddons kitemviews kio kwindowsystem plasma-framework qtdeclarative ]; outputs = [ "out" "dev" ]; + # Fix build with cups deprecations etc. + # See: https://github.com/NixOS/nixpkgs/issues/73334 + NIX_CFLAGS_COMPILE = [ + "-Wno-error=deprecated-declarations" + "-Wno-error=format-security" + ]; } diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix index 3f13972de9b..01eb69baadd 100644 --- a/pkgs/applications/misc/bleachbit/default.nix +++ b/pkgs/applications/misc/bleachbit/default.nix @@ -1,13 +1,13 @@ { stdenv, pythonPackages, fetchurl, gettext }: pythonPackages.buildPythonApplication rec { pname = "bleachbit"; - version = "2.2"; + version = "3.0"; format = "other"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1yj9bc3k6s1aib7znb79h5rybfv691zz4szxkwf9fm9nr0dws603"; + sha256 = "18ns9hms671b4l0189m1m2agprkydnpvyky9q2f5hxf35i9cn67d"; }; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix index 97303c43fb1..d403ddc8b26 100644 --- a/pkgs/applications/misc/guake/default.nix +++ b/pkgs/applications/misc/guake/default.nix @@ -1,10 +1,21 @@ -{ stdenv, fetchFromGitHub, python3, gettext, gobject-introspection, wrapGAppsHook, glibcLocales -, gtk3, keybinder3, libnotify, libutempter, vte, libwnck3 }: +{ stdenv +, fetchFromGitHub +, python3 +, gettext +, gobject-introspection +, wrapGAppsHook +, gtk3 +, keybinder3 +, libnotify +, libutempter +, vte +, libwnck3 +}: -let +python3.pkgs.buildPythonApplication rec { + pname = "guake"; version = "3.6.3"; -in python3.pkgs.buildPythonApplication { - name = "guake-${version}"; + format = "other"; src = fetchFromGitHub { @@ -19,18 +30,34 @@ in python3.pkgs.buildPythonApplication { # and https://github.com/NixOS/nixpkgs/issues/56943 strictDeps = false; - nativeBuildInputs = [ gettext gobject-introspection wrapGAppsHook python3.pkgs.pip glibcLocales ]; - - buildInputs = [ gtk3 keybinder3 libnotify python3 vte ]; + nativeBuildInputs = [ + gettext + gobject-introspection + wrapGAppsHook + python3.pkgs.pip + ]; - propagatedBuildInputs = with python3.pkgs; [ dbus-python pbr pycairo pygobject3 libwnck3 ]; + buildInputs = [ + gtk3 + keybinder3 + libnotify + libwnck3 + python3 + vte + ]; - LC_ALL = "en_US.UTF-8"; # fixes weird encoding error, see https://github.com/NixOS/nixpkgs/pull/38642#issuecomment-379727699 + propagatedBuildInputs = with python3.pkgs; [ + dbus-python + pbr + pycairo + pygobject3 + setuptools + ]; PBR_VERSION = version; # pbr needs either .git directory, sdist, or env var makeFlags = [ - "prefix=$(out)" + "prefix=${placeholder ''out''}" ]; preFixup = '' @@ -39,9 +66,9 @@ in python3.pkgs.buildPythonApplication { meta = with stdenv.lib; { description = "Drop-down terminal for GNOME"; - homepage = http://guake-project.org; + homepage = "http://guake-project.org"; license = licenses.gpl2; - platforms = platforms.linux; maintainers = [ maintainers.msteen ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/hubstaff/revision.json b/pkgs/applications/misc/hubstaff/revision.json index 31d26559dd2..2fd29444dad 100644 --- a/pkgs/applications/misc/hubstaff/revision.json +++ b/pkgs/applications/misc/hubstaff/revision.json @@ -1,5 +1,5 @@ { - "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.5.0-4309ed45/Hubstaff-1.5.0-4309ed45.sh", - "version": "1.5.0-4309ed45", - "sha256": "1rfxizb28b8r344d18jh6shfcxz35vx8vh10c3j6zdcc998zkcr1" + "url": "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.5.2-bead991b/Hubstaff-1.5.2-bead991b.sh", + "version": "1.5.2-bead991b", + "sha256": "068b0q94ydldyjmzbka1j94vr1xdxvkxq79pp7ria81hvpp68yxf" } diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 99b9c38d53f..1c6708c51c9 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,36 +1,15 @@ -{ stdenv, fetchurl, glibcLocales, python3 }: +{ stdenv, glibcLocales, python3 }: -let - python = python3.override { - packageOverrides = self: super: { - - # https://github.com/pimutils/khal/issues/780 - python-dateutil = super.python-dateutil.overridePythonAttrs (oldAttrs: rec { - version = "2.6.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "891c38b2a02f5bb1be3e4793866c8df49c7d19baabf9c1bad62547e0b4866aca"; - }; - }); - - }; - }; - -in with python.pkgs; buildPythonApplication rec { - version = "0.14.0"; +python3.pkgs.buildPythonApplication rec { + version = "0.15.1"; pname = "khard"; - namePrefix = ""; - src = fetchurl { - url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz"; - sha256 = "0m1pc67jz663yfc0xzfpknymn8jj2bpfxaph3pl0mjd3h1zjfyaq"; + src = python3.pkgs.fetchPypi { + inherit pname version; + sha256 = "18ba2xgfq8sw0bg6xmlfjpizid1hkzgswcfcc54gl21y2dwfda2w"; }; - # setup.py reads the UTF-8 encoded readme. - LC_ALL = "en_US.UTF-8"; - buildInputs = [ glibcLocales ]; - - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ atomicwrites configobj vobject @@ -43,9 +22,6 @@ in with python.pkgs; buildPythonApplication rec { install -D misc/zsh/_khard $out/share/zsh/site-functions/_khard ''; - # Fails; but there are no tests anyway. - doCheck = false; - meta = { homepage = https://github.com/scheibler/khard; description = "Console carddav client"; diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 2706a5ed658..f20c4aff169 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -7,23 +7,21 @@ buildGoModule rec { pname = "wtf"; - version = "0.23.0"; - - overrideModAttrs = _oldAttrs : _oldAttrs // { - preBuild = ''export GOPROXY="https://gocenter.io"''; - }; + version = "0.24.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "0bhk81jmv6rq8h898lmvrh9v356310fbi82lvakmgay7nvzk9a1c"; + sha256 = "0jz7hjcm0hfxcih2zplp47wx6lyvhhzj9ka4ljqrx0i4l7cm9ahs"; }; - modSha256 = "1ndb7zbhaq0cnd8fd05fvb62qi0mxilgydz42qqz2z4fkbx9gp3m"; + modSha256 = "04d8hvd90f7v853p23xcx38qz3ryv7kz7zjk9b131cjnd4mcv0sm"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + subPackages = [ "." ]; + nativeBuildInputs = [ makeWrapper ]; postInstall = '' diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 6b059ccd4c4..a19e07d8d93 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -82,11 +82,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "0.69.135"; + version = "1.0.0"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "1ahxciiilpaz2zdmi25lpw0x2mgwvd8acjn7h11i2ciqw0xbl3iy"; + sha256 = "0mfwwyc00v6kny1fh20kaad8b6sshaxrlf35z9qcdsbm4n19wg1l"; }; dontConfigure = true; @@ -151,7 +151,7 @@ stdenv.mkDerivation rec { contribute to your favorite creators automatically. ''; license = licenses.mpl20; - maintainers = [ maintainers.uskudnik ]; + maintainers = with maintainers; [ uskudnik rht ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 885fa8dbd20..2e7fcb09560 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0pw0z35v04jzcnshsfwbc8cz95cl0dq6405rlmh2a3xz2gxaacqi"; - sha256bin64 = "1xyvaksik5a1jkkv7zqyys33n8x0n7q8xzf5mpgj71iany57z2sv"; - version = "79.0.3945.16"; + sha256 = "1n45pfpjqrpzmy7k2ps498mm273bpzfda58dz78lbdm6r7z3s7av"; + sha256bin64 = "1rf31v1ipix8c6q4blqjrn2ap3pxnlrpfx7037qjpg84zhip0zpc"; + version = "79.0.3945.29"; }; dev = { - sha256 = "169iwzqc5zvbmm7cq1q185w2j2y2r716pbgpadps7ng2i47z6rqs"; - sha256bin64 = "0ravjdmmbwlf3ydgmk7hdd5d92zxh67nv49igr5km6mr4fi1xsw2"; - version = "80.0.3955.4"; + sha256 = "1zj0nmj1687xsyzlh1hy2wblxv1qgdy2kj9h8bmqhld16laxwqw5"; + sha256bin64 = "1x8wpdz18cflvj2ambqwyhzq206dil4szh1s8paqw1jwncaw7gjf"; + version = "80.0.3962.2"; }; stable = { - sha256 = "0mpb7798hzpysidp10k4x54b56c3fm7wqfj4s3kl7z47835gzxld"; - sha256bin64 = "1y75687w0rls03yps63hi4m0qfdm0qzgq1jhp1jicyyhjkp0xw5q"; - version = "78.0.3904.87"; + sha256 = "01wx5bi397d80za0sdfwgfbjj6n2ad2i31zmcrhm6wzryjwrmx6i"; + sha256bin64 = "1nwhyasqxkxkx5pn2j9dx95mblj5w7fkh2zwvjz763b331w65ivp"; + version = "78.0.3904.97"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index a9ca0a5fe06..353b350f5fb 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,935 +1,965 @@ { - version = "70.0b2"; + version = "71.0b6"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ach/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/ach/firefox-71.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "cf64b9cd170d5a1bf1765ed07df197a3d0c7411b5281c89a0d2adfb3d9c404ed9fd2c8c021fe93971b846d7ebfdcfdf08f3a5703e156d6dbab61619f53d6d415"; + sha512 = "4832f3ba706224a472f19f5ee75cd11d776e2f90a64660903044db05dc125f2847441e7f0c033d3164bafe52ba9520d6f18f2233c366774af256b206bb719684"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/af/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/af/firefox-71.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "e2815831dc99e0373541a56a38fa936a97d93a07a2dd7f789f5e4cc45860ce3c1b70bbbe709d35534364586af5b0dc626a4ba36dc8881244f98665a80ba57764"; + sha512 = "591fd8f1e35837e02b4f245741baa8e17cc768146a319b64c3a29860de25cbe83a7ef10e0874888f091df231e87aa0c5b66e4a0a0bdbc91e4e68693d0b2e9fbe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/an/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/an/firefox-71.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "d7cc4b7a1d7fabe186ae10a9bbd5d746415178dc3d17255e2278c1b5a9a7170403cdd153668b94220ea68be387b0c7b3365c8d460bfe53f7b381e7f3da12948e"; + sha512 = "f62f6a0487b26bfdbb8b3e6420c023faf230b0848bd7d22fe860be382db10075233a74f493ce40959ba1fc8eb87d0144aeec1ab0543ac48d8c8f7c1e02be791d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ar/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/ar/firefox-71.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "8fb79f3636682c83dcf42b143892148fddb06eefca4c5eb72f5ed703b821dc2bfab7a167a58992d83202866dc07bfa09eee876cc567586791440afea676efbbe"; + sha512 = "95637fdb3c897629d2638a4e580122e02bbe767b965619cea27352cdd02f35e39ceaa35e6f07baaf483118a757a1591a95ff4f928e80839fa55883382f9cb602"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ast/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/ast/firefox-71.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "468bcff942edfc8ba843f6f5a4b42aeb2b606186701d6a371565c4803664591037fe44bd026fca790ff8b8bb036619862ec51f04af63acfbf393fe8ac677907f"; + sha512 = "9b047f8c399593d6bc532ba14893018f4c1c6c02e128d88776d11fc9a8027472cbfb0fff51c79629de316612de6952119339fd9317201a0a51e556549fb32a74"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/az/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/az/firefox-71.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "983f8d78364c1479a252806f912d015e791e8073bc7848c0bebb28c7a39d6ab08bac2bd9e4a7f1c1cb68b8d2894eaa927541a78836717066491b450c0b34671c"; + sha512 = "2a45e8d197db07527e05032ff46e776bf596f1f7192cfed5d245fc5ad14d427b43096904e997482bff225daeaf778ccf6d3eeb4ab6fd62a1fc1d0e1030dc9f60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/be/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/be/firefox-71.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "dd31f1d7d3f6fe10f9dba54475512016be4b26bf59ca0ce55932b23cbc29954bd80e95fb1e29f2ec695e8f16d0b0145ed0d160f1964fe40ffe079a3833ee8090"; + sha512 = "e4184c91a2830a3168eaec5aa18f17e5ed5fb13180f89b428a0c66e3087dc6aa7c0b7893683ede36201801548234b498ab7f0615fcf34649b0f4bee72f041cfe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/bg/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/bg/firefox-71.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "d08edb6750464805ef379b18008d5f3a76a649ee4d6528b4ebd255ab89205756e2c9978bd9a27f56a607117186d434fa2df49ef4494bf5bd4f1f8e2eed10b30a"; + sha512 = "6f5aa6d5efa2941d56a60a91565bb99bb8a347613a6da8afdee4f68cff3f489fc5b004c996384955dc59cc82a0c148ed22126d56b7ef1b9cf8898b3a0d1d6cf5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/bn/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/bn/firefox-71.0b6.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "a3c200e13d6b20a7fcdba2524501d936a183213f590213727facd9271867ca3d5ac0c59831b88e92a424b3b154bb9cfc66dfd8908ee28fe6a4ed15146944eb7a"; + sha512 = "238463c63366310feab496fc9407652e61e42b6ee2de5231ce614202ce9bb9cfee4bda088c2db47808ddf3ce844b5ca5a6824a7327f0fb8b82bbac48d451ee1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/br/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/br/firefox-71.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "235ca44c123dc8034541637b8cf5b7d7d3e361300639033dcae361bfcedd41360a5761486c990e7328e479b3073b5f68f01bd38228170c352f993c0bee4757c0"; + sha512 = "0a280492ce0184d22b438a83aa12cfb4a09c9c473fa95ca473d8116fff81d9185b48df9f4e99f59d569a38881dcf9cf3a0713097cfbae89281b9246532b9a78c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/bs/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/bs/firefox-71.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "2b2202f8397edd25f871d0e9b7e2535be98559bcd84080b8418460f7f1e558cb779f1588e94d87e8e713639cb3bde3efa8de7baf2e2f36bf387d965bffb9552d"; + sha512 = "b15a8f4620a60c9e4c2ffc4d5b037fb550a57ec40eb8a9604753f4a38e53098d919d1fe814bde405875e2c346cdbecae8ea732c43b50149d7ff575f979d77d92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ca/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/ca-valencia/firefox-71.0b6.tar.bz2"; + locale = "ca-valencia"; + arch = "linux-x86_64"; + sha512 = "5d3aa1a4a393e32a662c2a5bf59ac12798b82f7aa1be26f711f9d9d44d63d0f524c259ed4c6888fd6f2522cdc15c4aef168aabf9c69af12f6d29d1b75187e9de"; + } + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/ca/firefox-71.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "23b7af96430ff5202529e5bbfc5d359d8cb9419b54a8e7dff6b1c828ccd1cd3ca686ed062a29f7e8ee8201ae1a2bbce7032a0f3f0cfc63168fbf0b49c52a9391"; + sha512 = "e605d955c550a51debde40f527740dfa9afba47541298e9bd5a07264be2cad32ab61a7da8724e1244c6cebef4348e6ccbe26a12eaa545444c1b678f0d048ad3f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/cak/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/cak/firefox-71.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "beda7fd930fbcf0985711917ea4b78a94042072a8cdd325079f3568bfcf2456efa0666efa4f869430cbfde34091b9d7d101edb94fde0a0c6942f61ee9c8a4fc1"; + sha512 = "30ed299b8bd9167557c0fad649a9e52c3901c0d1e097760ec2e17d0b1f3731e28668ce5e649d97ba6e1694c367a917e468ad06780e3ec85234b215151e257a3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/cs/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/cs/firefox-71.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "1b47c85b7b5125ba416e18345c7247b85f29e4136d56333da14d8f2c3ebb7b9f81bd0332f6031b36e68e21d851f9390e171f75305bfbe0f46dd0b7c995e0b2aa"; + sha512 = "73743d76ca4aa5be5fd5a416b5a62f7e891c5951ae8e30688a476e906805656544aea5f07c05c7297f9f8abc9679d9a104d98ed51e6193fa6b39c7db6e4cc7e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/cy/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/cy/firefox-71.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "071d30f74d13311693dbf3b4c1a111d12e53aaeb8d6207f8628f7a45acfcf797a722a5196086fc7b6c12545a8a177868a5669542f0535a4223df155867ec6b30"; + sha512 = "a97732fbd1333dabf6c988965d3f01a339ff9430bba48a41101c8f8c72ff146e91215e51b57bbb677372db265c2ab60b69cbeb606d8257e75f5e3e29fa1569d0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/da/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/da/firefox-71.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "3640a0a07c512e60e4119a683ac44cc596dc2a187d7f04a4b087540ca5deaba1c220403e398edf4c36247e92eef73de252d597ec082a7bc6e6c77e7ea799fef4"; + sha512 = "be7bd08faf4074751467ffbf71a8119347e11231c67bf48e9204f6c472591365ed75121759c42b83605c05099f57122dec6854792af52afc689418c5e6954049"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/de/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/de/firefox-71.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "58538f8a9a0d6e97d49c005f45dc1b1842c07a6923a556d98aa13b4c979502a329adaf7b1782522e02a770945ef3809dc68138e73736593fa5ed5d07a1c9e265"; + sha512 = "1a54e941d4ef87ee21313bad9e8091aa8cd178d1e32c23511527eaa58afae1b17ee9cd22514669cca94d516b158d5f95420c72cee53a217ef9212aab239cce15"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/dsb/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/dsb/firefox-71.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "8a0ca47fdc85672c18bf883929eef9fa56b2b3b79e584c415c76f3005a55cca944700d27ca23b2ac2051c7c130b42b3551dcd1c05ec7a347ce6463ceecbb0748"; + sha512 = "0845cc605f1ec235babc42bdcd1f08ba57e1dac445c65ecc56f5062f87d86b9bff46c12e51d4b4a29cd0785a9e3a026a6d64307356f2fdd9c96e6ce52550517a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/el/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/el/firefox-71.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "c29d7b350fcfc7b6b76b02ef8677a21800d786e709b5e1b886532f74c8c11696da0fbf2adf6b22fd8c5edb6ab312516a2535ce3185ca5334cff9d79974a4f5ce"; + sha512 = "811cae96aaa3895d360165bb5de15bfef5ad05b1fb846e141a625114c4736b2c1107a331b891e6025113ab1a3c9a0241dbe2ad3abf89cf410fec5d01e4979fda"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/en-CA/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/en-CA/firefox-71.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "d04571c4f4b4bfec7f8a0eb2ee2ed9e9f91c415609106a97ddde7122bddb8f8a25685e4bc6c2eed5ccbad2111bc3e9db6e3ee27c422cc1813a8bb1941cd04af1"; + sha512 = "4bb57560d72f7afc9c44d68cdcd3075b0b8f07a074e196181236566dc9c51a8fc43658f2b4b50bc3ef17afa0fe4f20d57c21313b57a90da0be75820619e88ca8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/en-GB/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/en-GB/firefox-71.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "c1f39142888d46884a51b892f232f6cb78309d65a6ba342a45d4bc6f3448ae90bbfd77d44f0e1611948a66a63bcb6d0f0e76f2c6f5fc3083d58b12b6df7cd2ee"; + sha512 = "ca3cf0c5deacadc4eda81c5246e29d79ae362d9dd416a0c0242de550601b2e8543ff8068b763f3f861ae22287ed530248448e313123f0959ca2eda91b0ecd032"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/en-US/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/en-US/firefox-71.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "1b0eb7dd1995822cf30aa85749741c1bdea6cc98b4eaeb1d11fd94b56d2138a177428734169355257a165350cf21b72141386d6fcbca606e9d3bc11f292563de"; + sha512 = "88f0bdba9f8706c3b0475742496b51c12ae126317dd96aff78673948a14d6fa6de218086947de48264432bc7dec2dd3c02ad2f95b06b83d5680219ef5a42ce0a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/eo/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/eo/firefox-71.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "e03f025948a463007708099a6e19abbd5a3e272eb03e053c6dc7ef156b1e4e83d68ae02bcce8f19fca1409e96e07f88a36537e08dcd73f1f289cd64a57b3aafa"; + sha512 = "8c713290190413f68c2e197c49fbf8aea01d1b7952e893d707669cb6dda384aea63d9a4d5b36c7a871e4086cbb15e8a4deeac4f27f02df9b94603e1a89095f5d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/es-AR/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/es-AR/firefox-71.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "f48d98ebd744d4915ffb6f0cfaec981b8177b0f74297224555bfbfa7390dbec29eae93f4dd3ba51bd84dbeb71a4c60519414f2a4c3d75b7c96b59610e30e5f9e"; + sha512 = "39e70d871dfc4788e0fef7414982160afb642bd774a8a1f31f98fd187ee04a9c78c2c569caef5399c8860a5eb8e6ec8e3531df30ccd501df7feb7535a2c2b99c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/es-CL/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/es-CL/firefox-71.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "f593020ba37d0ce81a194772d1acc2f528ed826b009e034e17d3119e482b0df9e8dd518dd597687e566d30e2a736d89850e3cd2487d7c723e242a12f69962b45"; + sha512 = "fa4e470b89258ff9c6f0af4f975de1d6ddf26f3aa4e8970516481862faa28e7dfc7c843b843f00f080988f5e9b8a1ffc3a3a4e89b0aa51029170c8ec3c6f7d62"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/es-ES/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/es-ES/firefox-71.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "081641bedfa1f4831641aa0029f8ec34db6f4965f9aff2c5344b779387dd887c2cb371908778d6cef6ccaa0448c98513b300244dab30f36f68776506f840b43c"; + sha512 = "b7f7d3798f5ea6c7e2600b733cb220232bc879eb4a9300e5b017e5d3588e7bd33da63767f5edc57ee0b9be3701295cbb7f83dd4f8486fca6e834f153f2e186ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/es-MX/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/es-MX/firefox-71.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "fe58f3745c1b0009e065979cb6ca451f377d837b0a41062e0ab04d435cc935d931d6e8200521850ce3161aed6f9583a67df14d0cab5853e491b1a433909947d6"; + sha512 = "c6af98f1181e91a3ba6ac873325be50505a6c62ec978598965e5c7a3c6bf5e7b19b401d893b9659e15ca3e2552d7420a174a880e58cc3102c49bf90038b26807"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/et/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/et/firefox-71.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "2d1bfa94424af6f6ae08e11c99e83749408e9be1ac7face25d392c0475df978666706fd694b76558d824d226a50fa5f1eb8da52fd4ff3a1bb615bc83986ecba0"; + sha512 = "7e0f2ee6e03282b2815720024bb0ab0ab92eb3d59fe4843d76b666780940694214dad1caab182a1fed75e9a2fdf413a1ec6308e5154919a1f7f24ed772411a40"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/eu/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/eu/firefox-71.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "7a192de6d021fdbca6764906284b4490653705147c56b9709e83c7fc087916197c954ac1cc19cff3da78220d572492800ea5773d3e03cfac6ee75d5e6d8ae85b"; + sha512 = "3eb646c5a42dd5dbe1062271ab48b76c5164b9f5202d6b9f0fbcc81c606b52d54df3a80c4bfd3dedd2116fdaece322a01922f6ed8eeb3509dfcd99c7cd802a34"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/fa/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/fa/firefox-71.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "427af8a45ae42e31ced616daf2d5e418e745bf43f87dd4858c983746dda1d52e1b909db542e9822c39019b13d1b47196c7041040f8c56e9f0712d7fbfba8b935"; + sha512 = "cbbf7b055409a39636de670b03fddbd062f5add34dfa6b35bb9abaab508719fc55578849d81ef0733b1ff1b558e5cc889624d548accb179fee4069c99c1db068"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ff/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/ff/firefox-71.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "8a0627bff20eec56a7fbf6be6131bc004c12fd3033ceebe365a1367dccaf773c7c4f8592ee9a313a01943ec962ec010932d3f0fea7a94576372bb8fb735c90bc"; + sha512 = "db0db81dad551fc5a39798bc1e0e71b7881fa8c955edc4db2326835914a18f141574f62f7b8fb35f4f51a872854fab858cea95b88b3741a13c3412ba36a1b807"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/fi/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/fi/firefox-71.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "b86da9c7cfb2edab970d91b098c5ae3da60f83a9b772033d8a8a0a4db27afe62f5db600a17a883561733f1939bb95342273b4c5c7e004870c4eabb08648b822c"; + sha512 = "1842d85d3cc0881069fd0e6c6397809727aeafff2c2c2f2b4385a7da24a57dfe3fcd6255926a6301c3a48b36aa11df20f944e200416cd8c564d132faf8426eb7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/fr/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/fr/firefox-71.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "54ad1fe9eaff331246817e2033adf54d5267e991ee016f96edc21b5c322a46103f72a5662df06da313a840aedd04f677340573e57b55a9a1fa611af3ead97e0b"; + sha512 = "fb230dfe11cd1f722fa93a6343f7c897be3867ea0df49218fe877126a76b0f07281d2a5fae856c90cb3124c04c1ecf9d8e7253e10aafab15592d39cc4473e48d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/fy-NL/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/fy-NL/firefox-71.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "c13363513a633def5c2fdfcdd0327b201f5d6d04d0dcd698f614799ac88424d19612eacfc6325b11808617a3cdc3f92e5903d84cdd56fa68212cb1b2babb9a03"; + sha512 = "db074ad24fd4c3729f0d95c8aef501cafb6d4a05fb6f7dabb61446156b29932b8984e779f84d7043881e5e939cc9e5967f6b0024147769f771e3d0993fe4b620"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ga-IE/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/ga-IE/firefox-71.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "23644670ee388362801cc4ca62fc6bf370d479821e0811ab493405ff3c8fce538ece89184c9d4f020c8a5089d3f7addd1d4fe298b55199dfe12f73408a988314"; + sha512 = "a1862f8756053311f08f897f2ff871ce73e9359e261e48d924b2faebddcf52e42ed454cfb9e9a9d66e3f278f7632910600a34a156fcd44b76116f3e060451863"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/gd/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/gd/firefox-71.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "967d24fee05d35aaf27be6ebbd3d31112126ee04bb750d3f17a2bd6a1abeab5ec7ee43235a26de5f19e5979c6d295e74ffec9f1bbf6fa32564f50986487b0455"; + sha512 = "8d5652c12c5af81922581d57499da12642884449a619eb3cf3040c2200e520b0ba92e6a2341ce5bd43d6e39d4b0396842357ae96cb31d39b9627d7a8ae8de187"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/gl/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/gl/firefox-71.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "9976dfcfbf3d93df9c06a4328bc73ed5e1a3b922a8a616cd3c298d5955964ffda4e4fb96e85a23cb9c950602959e11d86f3d58840d475e5c6f5232992da13184"; + sha512 = "80f24c3420c6cbe0c41b827d9bfd1735d5b300e33a405acc6439e83b2642a6e2d8ca387611b6f041ccc97f56b7efa29526d260c7a2d76be056b66f4b2fb0f138"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/gn/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/gn/firefox-71.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "155eee867cf421717c5c6720c2926318dfd7e3900bd42bbadf6947d291c3afa7b6d81610d53052700f32338e9fd4dd66ffc240ceabd5e6c6b6a3d5a18462b923"; + sha512 = "fc57872a00afcc0c790863641dd3b31cfe4b9eb56ecdba17000c9b7abd701a4c6257a4f6080d90e545cf682b8b547635193e5c3af9625c3b18ec5513710f282f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/gu-IN/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/gu-IN/firefox-71.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "82c58161e908a2dcbd10f8192aa9c89e220a5ef250d5b5037f483a415105946fad0527b0bb6ef3ea78b6b6a785064f116e17bcac7b2f45a1f0676e689f030677"; + sha512 = "a066288f68f697da26aa6b49607673813ab6a932845e5b2199fb4f764acaf810f0bc170e5fb26e05db0a4a4ab1d2b29a7e644e662f6d64f4fecc847a8d9b84ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/he/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/he/firefox-71.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "c6f8f8c144d6acdbf65a733627a7b977ae0b1aea7020356ad8e8e3d1cecc568c015d5e3a523df00bc94262b1ba7460f22de6d06421119407914c3e3856b91736"; + sha512 = "9288ea2662584d9a9a90b84e96eb3426a47d4e7a9079120247add9d2e2af5615fd75f7f93b3197fa3f17cc539af65af99125a6c948ea1f6ecd94556ab5856f29"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/hi-IN/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/hi-IN/firefox-71.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "3ab7baf8b0609aa76cc3e72daa5bb0aab1feb6e4957ab032cb0011b575ac4f5f41689466a6ea10717c14065c463c6469967848a22a76bf9e03e53e9b3aaef6b9"; + sha512 = "3c55c8e417da47367d5af105798ccebcddf8279026e2a1821ef51b6e490e8ed96ae4f187822d6f0b023aceb549994ff3874c9b5c5be821aa40ac4f56d1d84580"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/hr/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/hr/firefox-71.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "50be7cb19abc57bb3d3810bed8786c1ba8f4aa3f4c2d4d6ec6347b1cd263c724c6f138d2f95e579010c3dd893b432dfac169f964e78585601211de2b4144c02d"; + sha512 = "790c7c17a44774d1069b388c28012e960639e7a5a6b504a819e2d1a9f909fec9a8c9a093f256cd9e83094b320a22c805db8dd72d186fa11d100a18a741a1f6ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/hsb/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/hsb/firefox-71.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "cdbf552caa9d85ca5cd2501a98c7270eefbc4ad31db3cfc8399dc5e2d7dd7344feb71b1fd7bc6023e74dd10963668f004c4c7a74f518cc849539d9f780081c52"; + sha512 = "22b2c1d54ee2c9a6f2eec7b8c8bd7cd90ebb543331462d7ecf79d83ae2efc5e063ed07995d4f61e63822c7d0fb9ce58fe8223d3c73b87526865684bbb21cad8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/hu/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/hu/firefox-71.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "731cbc3fa44e815fb9e437f863eb218accd37a009e136a653947a5571440dd839f025b724c160ef3076f87285f51503a1a9020f470076a71dd246caed8f66237"; + sha512 = "86453e03519675fa7f450831089c34528d5fbb48c76d927e697e2bfeb10125addafea94160282bae6904d8923b76febf39c1ffa6c7f065f500d8d7c85bf83a6f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/hy-AM/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/hy-AM/firefox-71.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "0be8245de7830aec18132d8a36d9eb48528070b09d87cfcd8dff78b0d26d79dbd2cecd94bf5088158253849c2690201e38766cf85719126d232932384c7dbff0"; + sha512 = "0ba3bf4e3921387fc52f619657b9c07dde6be7d1d48096297fa07d371b86449949f8c38909842cf93bb86ef22a5270f35f2d959c6a4a8156102fa488663af89a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ia/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/ia/firefox-71.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "09fea9073150d0b6464d0769317c94d397eefcbd1577b73bee9601fe3babe12b7533730383a56629c2470e39628f11f0d0fef36a41f3212865b2643ca2f00add"; + sha512 = "fca43bba8ab0ffd37431d5620e94598f5a519556bbc7e84aeabc29be043bef84c981b7ec875416107c1e2f04947f9560350130b4ba5ef76af147c77bf4dc2d3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/id/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/id/firefox-71.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "94b0340e3cd930ba39520ad28198a108bff9ffe40e8e1de77bc783bcd211d7cb5017b2c894d212a7a024ceb69c681f76bf513a38a3cd40aa6f846afcff32b3a4"; + sha512 = "e0fc3a4f27bfeef8a2377eb749936ed41c8ba3f46087a1fc1e964ac113c83fa4748de8df69deac8fd274cb1d9d5abf86e64d21ea27ad0798c0f2f7a7948809a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/is/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/is/firefox-71.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "68fb812f36082a9bcc41416a0ddc704c69ecd0e5d958d16c1171c7be27097342a57980692b1000fd13c1de893404fab0d150ce675e0bc4efa96e06748d392754"; + sha512 = "cbda95a34ea17ade522efb156ee8ef91dcef1042f74051ce3ae5dfad3e1c1e7e0123ea11e254c4d75e247cce4e6cb344d7e0febf79b3e4257ae2c31660606e7e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/it/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/it/firefox-71.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "e02f944ca83b869785b92a40a5e13f088275cffe26084f85f5d866ce5f9b0d0234e7a9fb5907e4f97663fb00091005ca73142d14f99465c3a8b1888aaa5784de"; + sha512 = "91dc374147434282a5edb683852684704b6f815030a1ff074eefe000ca02448e586dc8b9149e542805c8492374cee12c82d3ac6b1b25c5859a4f15c1133f4327"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ja/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/ja/firefox-71.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "83611da83e6cf95dbbb3dea3586ac3fc5ab9e770a75a55e3868543c9f43fe481f5e6775dd45eb1cbeda06bb60619fe7867af64c7c8c2efc862e7f23fdd0d0ac1"; + sha512 = "aa3d2df0c6e3024b52ba1545b0cc1e2a9f497ec3a44a12215aa400cf0a34219fdba700c88608351bcb5f181877e86ffd937536f4e3ac7556a571e5c789eadf01"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ka/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/ka/firefox-71.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "94683999f9bf4ccb13dcce3f993291e5568a3a4f107bccae6f8b95a2d05c8e68a62e9d24ba9c60264c17a027f1848e82cce6fd143994e69e2000688bc61df543"; + sha512 = "bd71a4e7ee05a78f7e4799b09d0a066d1291efefc04285710554da6f9c1ab214a30fbe881cbefdc9400550f4fcef0595f9bbfe767cdfcbe79106c487bedfafc0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/kab/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/kab/firefox-71.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "fd1bdb8ff2df2e8c18ab7d13b1e07b128291b410607571426dce5054e8e6b221eadedce560c5e16d65ca2917910df02f74d6573323f7a26375f1ffcba080f22e"; + sha512 = "5c51f3101964b07d347fb7399c7fa4cd337feb8384a94a721c87d89c9f4bb83031a464348cfa292fec77bb1278101d23f2378591353c7adc11a7c761e89056de"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/kk/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/kk/firefox-71.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "3c53e12ccf2698778d579c09a26a522a038c4510d7af8fc9accbdbcb2c9013e12e243b88c03e7075ea76258abf2d234fe0ff7a06538f6d8e0f363ca3887617ed"; + sha512 = "3c2702e37a8b0072d4f0ec72cb804f8b1213087541cb15276cf7fa5e195c488cc8cb039f6941a04268468b3a0e0a691dad6b60f2a0207ca32d296e3f51765a97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/km/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/km/firefox-71.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "2d3bab56eed0ef36ee41b11071dc2ee0407c675421fb23fe095ac81ecc492813bac115d03b3e832c33b03fb2df89b37a6153a388b44e540d48af93234cd41888"; + sha512 = "8ac646139529b3ced44de93e92a5f4cd79d0dda1024b3d1e03a8498c905fd425695551e0e4d1a477fedf85866ad8ce7979a2750f49eaf6091326c6283bf0384b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/kn/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/kn/firefox-71.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "b4dbb60f0aeaa203483a8c7c79afa9a9e8214b032507c0754b4320eabc40a39fc0a242709779faa38affc2e570dbfd70e1843d712c361ed9a3c52dca17b72eb9"; + sha512 = "55ed6b542998adb0fd68782a970997ba0e9d854edf764724590b938bf52642c2aebee881898f0b7fa2bc890ca258910e5252c23532fe7f55a7fe2ed3d55970fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ko/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/ko/firefox-71.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "9c3e9876dc6363282cb302a65c3cf82bb14fb022e3f125fdad2e554d70501ef2b275826c4dcf064119463ceb93e6f0b8dab8c273364d1331d6ba5244eb0119c0"; + sha512 = "181855fb4bffda99f5da78659f2a4740e9478a6923af3863cd90439b698148617634d4367d584831d6c01343bfb297765a9f531aa3370d25d2f51ff6b02bf96a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/lij/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/lij/firefox-71.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "689c0b271e7efd6c45de879d573cd5fed31d1ee2445849ac3442559f11d33a500fe70e861b54b288cb84ed42434071f9da79db2c1c8f7460ebd53445079439ae"; + sha512 = "cd6e1c38473f000bfe0d04043597587fa73fd67b4037e5016a7f38d72968751e5f738afae5a9b6624dd38f858d5eec555c53c0f4c850e1689a0ceb90f72f3a8b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/lt/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/lt/firefox-71.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "92ba0cf69d128848f2fc4dd86171ed7e4eb56c6dcf868d3918c7fbf41bb76305839f410567bb1ee7bf4ff114b858127dfb0320f2672560cb38141c88b601070e"; + sha512 = "2a2bc2f1deda93c00692b82f2cc0b7affb1245fd670cf6a74b538352c7113c7440be647b3c2af20aedb191fc30ea8d17799b01a8fbe29f962398b153b4c7059a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/lv/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/lv/firefox-71.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "54587e5040c387431e94b4739a9e34020d7dce1777195122d513175b71ecdb44663c416fa648ed648cbf4f6279b7fcecbf819f6fc3a61155698f0dcff5f42212"; + sha512 = "2101aa80644b84ff5b7babb098dbc60e651324087111a06a4698df38a2ffeea8ac8cef2de276aedc7d0292595f3ebaac51263fda0f473ba4d240484060a047cf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/mk/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/mk/firefox-71.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "b7943903f7bd3783e5c3776d35125b19ed88e87f6449f25a5b26dead87407d0180cb21b67c89971d3e975d454098d22706c74a33d21c2888a90a0af9ef7b601a"; + sha512 = "e8a527675db8b53a439eaa7334f7df3d7261132537b84e12e0f8ad9afd2fed8e9e1ab8af57cd9bf65347b76f4ebd98caddfbc66fc5a28a3660569d5b1163bfaa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/mr/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/mr/firefox-71.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "07e742844231a1dc7a09a268501934c63caaa482ed7117d1a498c66b6f5c1d559e3b0d59cac06b9c3d358add59a13912af1dd11a6c2cf72d5cca97b68ecd1c32"; + sha512 = "23e8aa5cf74353b35c75a2c357c839c5dc950f1f422db44dd951233d725c8595753c24b0d903de42739ce7d3ba90cf033daafa5389d6bdfe14952024c37709db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ms/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/ms/firefox-71.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "c649789abaac00c55ed415bdbd9c28185c56795754324517f5044cd753aedc004482501537c67c42afa616ddb5890a4ec992379fa30a28b8a492a0e559a73f95"; + sha512 = "8a7d73de2b8fe4c853f42c258a4f6539f1904478526cbe525452c57ecf62f3eee1d7e6ffc7b6410f0b22ea966f300b4fdfb31e4b63fa14a2311a01d4d1511b5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/my/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/my/firefox-71.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "06049a7770f621a9a72b5e563b485b81caad533410db23558679100f7a422fa1cf2a85233cc1bfd5d5b9c1705f8299544b4cbb4f52de3c73cf33bbe64cf845bd"; + sha512 = "797413eada2e49730047a2762dfd5ff6a62edd55db2bc7e2b7459f7ebbb2b381c8b218ca5def31e95007ddf68bc047f27732d044a57cbd6153ebdd89d452ab50"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/nb-NO/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/nb-NO/firefox-71.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "5f80bdb4a310d46cf5b3b36567964f444c75c92e19b5ae5cab81847b2b601f04ee3d43a2325b8bd6d7ed3422f146e90612785b25f982bbf95a86057344ae35dd"; + sha512 = "1b2ad84cde2dbd9c44919ff5a6f366a8ad2bc4fbc3605ce681fc46e9c959a25e18635549be87c6172ec1e4a1163ee41debff84c93b4171169291172b4d3ff605"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ne-NP/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/ne-NP/firefox-71.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "f35496c71aa7efbab365e80050ef218fd4bad1e8c015bb97df65aa0e4f16613b531d40bbcf4739aa462077026259ea6f1d7ac71b10e51e04e75d120dcbab3ca1"; + sha512 = "6aff26975371a2e86410e9a3bef1ed576e09b8620e7686ef549d5028163533ed003de84b1ffb1e5ff7c27c5c0de8914de7ec6169074b634ec987614fcb879f7a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/nl/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/nl/firefox-71.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "21327076b9196d799a40d28f1fea66f59944bbb0757fde66aba2b0f8b929a0d45a01bb0901c4b6eff4e0e5f7f033a44d2dac83c94494b7f95003c3dd620f1ce4"; + sha512 = "a8844ceb5d28eafac4ad333f83df118cafa6af3b56940b4423d08f8bcfba5a486c64d93e34c5888c4c4ac9cdfc511db8a306c3d7475917c310825e40e3848bc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/nn-NO/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/nn-NO/firefox-71.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "dc444e5546d1985d0ee4bbe2394e9e51131b46b9e41dae54c1402a9b08aa7de4a7d73fb57bd677af151420e71073ac398d28f4ae324b4e6e3028f01fdb98bd76"; + sha512 = "fddf3fde15aa2836813a9ae8856bc0a02b04111b51ea575549617a2ffbf7b3c3f7934b73e22658afc4a8b832b75f39b30cc6bb791ee13ed44514fdcf6da9f470"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/oc/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/oc/firefox-71.0b6.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "0c0fbf38f078c0fc4ae38112611f164808c7b9fbc4e3ef7d57e622e918f5c581915095d5bf7c92cc0ef9beb67cb04ba9b1ae1e011b7c8f91f23a79a326481931"; + sha512 = "7bad80877ee57c083cbce7b25ec32ab59335c8663dc234690e5a191866dacf0e3f95de933d33e15c6d3f87df71731233eea335881ca730d1c7b195afdc76c521"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/pa-IN/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/pa-IN/firefox-71.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "b9f07313118ddfd5147866045e047f9ae7cefa0116d86aaf7f5dbaa2a64bf14f7a56bb748e115945d04aeb1dc4572d54b3d122c1e775062ee1de366c710726d8"; + sha512 = "edde3835516fce3978884afb7a7eb3282a0d64230141437493503ec8477cd11e0b6cc00288c8d58d21da2bc2f7c11bf099e2853312082429b49ae0714ef2329f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/pl/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/pl/firefox-71.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "bd1e920304e1bb7bf6cf198c5537f1b106b1484b7ecf683e1424d208b736d2a3ab40c7e885a385611ba6f033a2ae4fb00cf6113810a20dd8808a34ceb11c7b38"; + sha512 = "fe2dcde2d35076ec8ce050d2904df053d9521947d68ec4506ff39b4be2a8105ded64ab2cb4387953f3a71514957c67386a4e005b4ddeec847320b0d827003026"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/pt-BR/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/pt-BR/firefox-71.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "e1bb5ca89ea0b60cb2997b9dba3fdb25e90914899f38a51d4506cb9bbd3d61f33d32ec3a9d2d79857d339f107134a021e0253b6a54916b48b6aaa5ef4aa08638"; + sha512 = "532327f4e3e54a70bee7b8961d9b0d5e515755b2c45244f414547903104605d533fe6fab6f86e0c5d42ef7617d6f8b4301a836b26ba1da97741d2702ff9da1f8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/pt-PT/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/pt-PT/firefox-71.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "622bab9fe052fcfcdeb4d12b6b8773ed08e14dcf51fdecad24a638811a2f25c1a1efa13d7aa45dcdf06726eb366ee78c4abc7d22016303a9048df9af314c14bf"; + sha512 = "22b8a905f1cdb09048cdf93ab719668f4f87f10927a8adebbfd3a88e15c3c59a9afdec25f4b20ef5680e07bd9b9a603dbfee5e4bbb5bb26319e0aad383f23eaa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/rm/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/rm/firefox-71.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "b02769fd926eebc180eab8f3ab9aab7d2a8d78d81f51116ef156865c74b60ac76ec75656455557dcfda2323c3dbbb438f8979de64309851f5b77c01175fc4b24"; + sha512 = "f5fa4bc45af9bb1bda5665691183b7c3d3d897c5e2c93693e8fdef34584e09b3f9cf03c2e6a6257f01b2aa75c32c168c5978299baae1622c406a89a7429c4095"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ro/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/ro/firefox-71.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "572204e2a2a6d7535ce36ba9479f1fd634069a1fd9799eac6a3e5dcf02133859f4574ab7dc36018be88e53ab5a8bafb561e5994d013c0b9da7c9ea467183bb81"; + sha512 = "9e69d45cc3a7ddbe4c541528ca65e06a62b943bb6d7e5fd512cc071282e53b55fefad23bfcd3f9e864dac75c593f9c60e92fc231db217ebe8de6a3fa35722a00"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ru/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/ru/firefox-71.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "42a99586fa8d07827a597c83fdfc746beea7504e800037efe0e82b65868dcb0e1ba6dd2aa401dbe64a30879d521215d180bb39906ad332d9e362405036da48ef"; + sha512 = "57ec718c444a261667ec837d8edd9141baf2f556c070bb2303b5c1d34abb29769fad186951ac15f5c72df7d63a4b823f61713e696615cf44b4173099235945f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/si/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/si/firefox-71.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "288b629c23e7bd61b64b3f5947a93753ca780906b537d1f97892424c7ea9f890008370f5ce44e74062196558e9a088856236c98031996f5d9b40b454827fb1cd"; + sha512 = "71c53d3bbeef8339d7428288dae67da992d72608a08ac337b8cac6a26ab65316dae865686e6b8813f0fe6d8d070a2d0d4ad59e0015bc1d2be96ba530ee69b90b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/sk/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/sk/firefox-71.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "47b295382b39a040171ad46268da5005173a1206a3ea26c7dd8138d287ded24740f031456dccd2fdd72266691aa2d893ffc93211ebff2759666a643e3e448915"; + sha512 = "fc262886813d19157238c7a575a21cd4ba37d30c4b5479532faeda51936438239c8f6f6c537051b7dfef7757d69afcdc5d6b6284091289deed28bae11aad150b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/sl/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/sl/firefox-71.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "fec91027bc619c7a6d0092db4493e40ab31311191117e1cbb39bac33450c9f8705356405b6ee38b52201ba39e4da8141505759f891c7e6ae3d8d22f9ae29a629"; + sha512 = "4623e812e069fe0478028d5297c4e3785b08c8ab524daab85a2dfc4610de0e99686fb6831a565640e167567d29f7ab2b8868cc566368f8d0222ac4def539be32"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/son/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/son/firefox-71.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "8a1eff23ddf4391e77947519a5178724ba9393370669bc05764b971bdd930ca8ef9ede4cb0ba60c50daa2214d4212c6159f7379e16ec9a5c538ad8d7d39f0ff4"; + sha512 = "89c8808d7de54fea98c2137cc1ee5a23ca00d5da79a4077f5ae361728a38cd0cc21768512fff4434f8152c555ffba4daaf837716cd9f0ecaf49d692b1c4f1aba"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/sq/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/sq/firefox-71.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "3811b809979c87996b8db041cef14b7987331067dffcedcedebf36b9b9569c70088a38a624361b25ea5dde2af6005fbbe5add558cde41d5cfed7687a2bd96847"; + sha512 = "b041525c4bf2a99444a2936d6a7ea9b56d1feada9dc992b63c4c3d5ea911d494843bc60419f60126e96992c95396f5edec6dfdcac19186ec0d9c8a8d45e635f1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/sr/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/sr/firefox-71.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "fbbc294a2f387e6ac44e4edc1a9b9a384d3677abdb6717e550f774d731037d0a7ce8036f25229efbacff75423e9a185423d2a39ac951c77ae62653097bc9ce26"; + sha512 = "7a3fe5cfdec0c2a1ddcbc1fe466381db0bf80c9f3c592b1370be9931674bc2d8068bba61f5584ede38c6090e214f5156f38dc474c9a89fbd79aa7d8a98d4aae8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/sv-SE/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/sv-SE/firefox-71.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "0fbe4d264e97ce88bda435f7c8da09e589407030945b51b68004b5df2c0994bbe294a87b7a18a2e03a8d1de05cccbe2f23ecc59dbd1945c28b80c75e0ba45c1c"; + sha512 = "807dafdfd5879993ddb4f637ccbb8bce23120a63c081970b1171793a0d050a0ac63b90ed6f5ed72a49292c2934fe7a5202cc7c607776ed5ee34ddea066843406"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ta/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/ta/firefox-71.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "57b86a405d32d9ca991c995316d51fc6f9363dcdbba2d0d1d601f302afaf863911e035d30ad67751210b4e3c726b3734b62b63b7dab6cc2f69a172bd8c62493e"; + sha512 = "843b2591a1bdfb80213f0ad067a36f8d0ab2aca987ccb5a2293d618eab2851aa3e06c1cf93022c52bc65c6eb774292a1e3a6b286ff563d05c4243c3315fe0d1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/te/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/te/firefox-71.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "54ac916b2352b545ac8f5a9ccea2cc1ea5b3e267dadec7bcb06c3db7406f4dc5f7479a0f2c3954e9e19d093fed849df50b45c51d69753626149757633039a4b5"; + sha512 = "cfb573aac3dcaf4de8b0807296081a9116fe67734bd2577c48b408130f408ee1316a0788b6bbe668af322d2deaa458e1ce4270f2d27a50b458f39d06291b46a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/th/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/th/firefox-71.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "95ea774a8266d51054e7af4db09503963641981c8db332c8119e61c3d6349234aae202cc3e9726449454440f10f8ead17e4d6c682f261410937f7355cb7668b6"; + sha512 = "2f07b01e2d1abf2da8b8c106d017064137a239501e1244a276019aa1327f7cdd96a047db6b3b7903f83a1491dad4be5f49eb26031d418c85397178761fcc448a"; + } + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/tl/firefox-71.0b6.tar.bz2"; + locale = "tl"; + arch = "linux-x86_64"; + sha512 = "cba0777a6113a40f5f593ac6c236b068095e226748794975cf0e63dbb79d95a414758e6aa5c88099ec716ff9c215a713a8d9c1ea33ceaf98ac607b708badde3b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/tr/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/tr/firefox-71.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "44b70293b353fed9b8435de36178ef6ee3fea108ad4ee129a1631eb32714c06aa23d58064746cd62a0f407b1f0557da38bc749c3113f3ba1d1b5d049eaac126f"; + sha512 = "ba1a2b45f774e21bc62ab6d0c4f75b3340e261f57ce3138cd0d6000dfcad816a9cc141a601e0571be01a259d3ac58cc46425765cb11eb8f3f4e85fd584153d81"; + } + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/trs/firefox-71.0b6.tar.bz2"; + locale = "trs"; + arch = "linux-x86_64"; + sha512 = "6efa7b972d21256750945583916d2bf0968230beccb9ff69415543205631f8a45b946427790afa295d146f1a948a4bf8f331662c847bb698d185bcd18c269e15"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/uk/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/uk/firefox-71.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "ec6beef8f0b068b7c301a4a1a0c769b66ed5af08414d5306549b9b077592b06a2eafc175ecb097b9ab5033dad15344e52588506685222c14f73411a5fb9faeba"; + sha512 = "a9626d32502bd1c6c8de055a46dfcc85f20ebe5f456a012fe2ad079fbc75d6ef0f7718a440697152308cc59c857bb2f1ab570042ffacac1ba854a93f3957438e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/ur/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/ur/firefox-71.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "d1efd485f869b6555672d80057dfecdf7775cd45bde0711ad90dcdac8ffab4b46bf04e9350a0aa7629d9939c953f434e75b6aa458cc835e6cd06efcc7fa1bccf"; + sha512 = "ca98d745302107243aeb6c4a66c4ab62a830b81f083f2d974dfd6fa8c58b485913c8d066fe15638d871d08f22a5f11a5258b301effa9e188516550a682009e5f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/uz/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/uz/firefox-71.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "b7cae3888e2bc4a7b31a0b7313b7476799b16055f7af8e4016083da8a71f40f523f9963d79f53bd6a96c1bffe2fe2d34d62518bdbd9ad137fe17f4c175fd0f06"; + sha512 = "681d256f7d3509b36cddd1d985ddefa3c2227e5fd165a4cc8049d400d3fa9a68d8d97aa0084253b355754044fcaed9cd335f23fc1670b76e9e77448dcd2ea647"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/vi/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/vi/firefox-71.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "aa4aa778e35e72122fd857c736c226d62e5f6ec73f1075500728e90f9c2ddaf9c0e6033d1785b4102918a6db32a744617552769c29cedde655e9a3f0b173a4e3"; + sha512 = "cd15b665c4816fcb07a16629f6a53cf096f9e4964b33d67179e603559b99480f188a4820b05e5318c11282423e9c31dd84acd59544230fb0a9a976f0ccd74a26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/xh/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/xh/firefox-71.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "41619782aca727c09262de57a128fdc7936cd4b3ace84565cf687a006bd462a3218682c56693efbb233df221c66b2b545cd701b025d6b3a5308b132ff87b35a4"; + sha512 = "c5684a4ccb695038722ebacb677e54d56ef7cc14dd82b1ffc376caa6799a931e89a86f061f01a5fedc183c77a5e2625e409a99a089fec07dd0a0a3fee1f9d48e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/zh-CN/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/zh-CN/firefox-71.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "befc922f6256bd8416758c4fcae972e939e645a752a97863ac0b432310605cbe46dea4c713d4ed86189a9f4094131fdbffec10b4d771b061335baeb180b75ea7"; + sha512 = "54559f2db9a61921c32b371cc031fa6d6140f7f98cc6d8535ee043c6192cfbec4ff3d4f6eb999abc1003d6118e9d0c2ea0d9b18e4fc9e36573565c8a9f524cec"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-x86_64/zh-TW/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-x86_64/zh-TW/firefox-71.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "3bd89f88ca805e3b19edacb97efcbf50ffb2f4b3baf67c1d64d9c475922c6ca5ace13e07de292f95efc0f78bd1b0fe9e9e9198288c3d874263c7be6175291eb0"; + sha512 = "4a413a9697cfd2a4fa070454e5e08563493ff463fd1f0db2b059ea74291d2345ea4b548894e9c0b91b7ea633fbfa8dcc5a4f69362096dac007d49d19a752e9d8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ach/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/ach/firefox-71.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "800146462c9bdef3a5cc021995ec558ba02fa1b5310973286d1360327aaa9967430d1432775c44c21dfcde6b06d39f9b7b7568661734f70f1452e78071ee440b"; + sha512 = "01e5a9943e1daa5036fa68a93dc193bdf699f65971b81adfdf20b97fb06c55ac63a9dca66bef31d1bc4940e6f318deca66387fd8b26bd4284871f61a259087d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/af/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/af/firefox-71.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "61b65cbb84523e3cf98e59847d07ec5766b2db3d5fd27c4633add006d428aed40c77f100dd87ab222b29d95bfa4cd7e2f7fc8ebae2fb4712935f51546939dbac"; + sha512 = "ea54247e9408b4e6ed9c7419384ec28cfe9b5c6cf421a640d1ec9872d5f013b567119ec45c019af393ee673c11eceed7316bfc58d7d7c619d1058176e7a89567"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/an/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/an/firefox-71.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "f9808793e9657622de595b529fb6341c13ded793177413ff5f829712f7054f42c98de5a5e153deb3f8b8f3b3fc8e80fc3737e1dc5ec577731744bd0e992d7be0"; + sha512 = "2d855a70932911b500d48c7a48c020e11b97eab44de44397a702e3f3bd6eb3511df4b13a8a65cd539f55aaf1f31990a6b796e3822ca594c880aafcf4e2af9163"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ar/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/ar/firefox-71.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "9ab1dbce20235787d945f3ea6ada45ba174dbb9169f206c2aabeaa2fae8bba6f4cf55577c1985f59f62d2a302d97ad2e3d7b7baa68682e4ecf3b8978410b45ec"; + sha512 = "5b1fbd9890fdcfca4e10cbc46ae39baae49928f226de643ec6e281d62fcfd6a8aa09a704ca2bb7cb5311d743e0124ea71054d54397a558c22c464848f4fd417a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ast/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/ast/firefox-71.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "c5e4aedcdccddd1968564170d7f74deacec13e801bb19cb97ffeb7923924d66649b2bfcd0823d8e2b27b737bf5b0b558c57f931f1ff8b6928d2e2ad0c63d270c"; + sha512 = "a52a770a0a5a001846e7aea1ce9d55e36193b3afbb10dd31b6d1eae8fc861d74b3b5899cbd380edf567e401e9c560aa863720b52f746e81a5dac98f9db409381"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/az/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/az/firefox-71.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "d67fba709c62bd06288bfe80bee2e08f370824420b52b07bd0e8c6dccc350770f0710e22ce55f9ac4bf989aea74cc3db1ee026baa7fde967fdf14f8dd9694702"; + sha512 = "918deb37443c2459efb50c6756a02e7f2c0606c101ad925e1029c8215414d788eacde29067a2b683b4bbaa77895948126936795d309e3ef60f02987b599873e2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/be/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/be/firefox-71.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "9fcf25f380bad5cea7c8fcceecd0734239bcf10d3081a22a24899103c96a388596135676a0769a8c2cdcce0ae7abc67e8a0b65621725de4201919d250bc28f02"; + sha512 = "d7436a7b071932c5d37a1554966bd65e1b286047f00c4a66a3adcd90ba88054d8c4b42ed0781a41c3218e97ff9d79774eb2768ec0044f9dec0e1b956a0a0c139"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/bg/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/bg/firefox-71.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "a7a5818af9299a4b63098c102019134dcd74001a92a2d672d2c3c9e8dad6a58c28fdfd14ab10b96262ce34fca4947905f100a5d89df0e106df3c8b9a0a1796b1"; + sha512 = "1e68849a322575f78aebb284dfedbb1e07163227edf5580521d10bc69d389a66c4653993cf2384249f3627f30a6e61eecb9f8572c076e659ab9faa3b5313a3a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/bn/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/bn/firefox-71.0b6.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "60de18a8524a67dfb90ee9d272ec06e70b4393b3ed76acc7c86a545af561b323710add4a4d8a896982dd8bb48bf3e32496fe800abf50fed509d91f0e54a8d04a"; + sha512 = "79dfa0fbaabe7c7b2e9088812313ee97a28e69e5b893463788784c79ff421c0a7588534b0467ab77b17c3130fdf071a166b96a16afeb44fc7abc5774a2fbd34e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/br/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/br/firefox-71.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "61cca84ee862455860c3889480852df1ea62dfd9ef18209ca24fde83b3971ed7788811b4c6ad57a19d32525fa67ac82ece938700682385a4b99587959bc2af9b"; + sha512 = "17c6540f7351716e7ee3ecff540b78d34fde5197d35df0ca7c6836087a90bde7b833a64df7adcc1ea50a947ec1b38b73fb0439b70472a4835c307575ecfd1c80"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/bs/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/bs/firefox-71.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "45fa72a908bd24e6e8f35fbb1337b394850eeabc7d52252007a93f1f2993d4e43fadd3254a41664ecd76da29ed3b72dbebd95bf0735c71f07d9d19f3e3f723b9"; + sha512 = "792855fa81350074cb493750cdabfeeb408349713c9eb52764647e25c102542fcd0a5d9d4ca4a038fd00fddda1316c0c771041778405f753b030d6c2cbac4cc5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ca/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/ca-valencia/firefox-71.0b6.tar.bz2"; + locale = "ca-valencia"; + arch = "linux-i686"; + sha512 = "67c66f28063842ddf346a2106b31a75769a946b6a8129f6fc92bd8466b23ad3e60c5c513d8bae0245d0c05dd892c4a4fd5dfc0ca06e523bbac23b9d9e3d88d78"; + } + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/ca/firefox-71.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "53f9de3f0720b489cb7ae59c2dd2b7c0cbc6bb7306e802253562fb508ce0ff1415cf5b76c0a3eb085e592562cc1d39817009ba1e668e4c68f4ee0c8b5947cfa0"; + sha512 = "a9c3d735f8e8e377b04b906df33c32c0649dee9ffde4314de517532b8487bb212441af50821bdcdcc346b3725a526f01ee6ca817fbbca624882094343fe9ffa8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/cak/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/cak/firefox-71.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "ccac21ab9baea681bb170309fa3c1e7762aa731e49b831a4a45bb5a1477bf2582e1ea9ec78c8c63838589fbfe74b3f8e31653caf7c13355cc92de959b0d6820d"; + sha512 = "5eb719e1d95194ba6a4d4153b6ed0c831a95ea41d5572230a661d3985445f3eea73190499a8c127de4ba461f8ab5a885a88050ce6129fe1a9abc784e5d335abf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/cs/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/cs/firefox-71.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "ac08d633f909edb3663d7e7cf5a27c1226d91a244786f941fc4fe771a7d5104183fa43782b8d838bbb50ee9342be081e28467b4dfaaae1c4b2a39233d5a9e31d"; + sha512 = "5c0b01697415bf3f2e47f2f707dbd618229f0e286b391c5baa0a0dde9de4f008c05d218c3dc8dade652f81723e7d1d2ca47561ed9f55eba8e3c8edcb67e6b717"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/cy/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/cy/firefox-71.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "176f3b9699e0b2b8c7f108add3a07b90664e7eb5170c9669cb5b67f2b0a6c0b2a6c47cfb2e34494467aa865f12c12c525fc967761878b92e067baff2d6e625ae"; + sha512 = "9250627374247087905c38cbb90d394e11f1d4a788620c7e534ca8ff1ed00bfc9d3060371af326f79651bd7c70ab3727fb8ef2e8b51b7cb202b35e9c60fa9fe9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/da/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/da/firefox-71.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "29b8ccdfd4f202f418ce2005e5edff4f69d3c3c337ee78069ee9c13b9fd3e90d29b28ad2801d8133119ae3048b6a09ac8105dc4fbaf1dd8f267fd15bb9ed31a5"; + sha512 = "7e5823171ecdeea65661e1b90fcee824ce43604027843d12ee9bc46ad8d348892c4748493cab69490726c9fa27019948ddd0aef203a44e99502356e2d3632e3b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/de/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/de/firefox-71.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "c041f802e2c5d57f013f018e192f2c62271ee15f53a7bdc9adbb447f5b3319e4da0c9743b0cf8ce4dfb03e94d0b81e0f8256b749c4eb3ea3a3b9833bbee28db2"; + sha512 = "ccfdeff8354f5c05651954d37be71a1d4b6803517451fecd8051833e25b22996e3afb3e4b471e7348b43409d5ba05cfa9f1555920bc9a48e32417261701e852c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/dsb/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/dsb/firefox-71.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "a6ed5dba712d1c5512f5e0e1caad7f0b0f7e2ccacd891bad54aee79cb749bb79610a46ebc75bb662352bb8419d8e0f047c0b0f8214f11edf8153708040188b5b"; + sha512 = "92db1f66b8ce5b5bda5122d8fc9420944ea904adf98ce353086042627d2e6da63eb61bb49d8275021bf32bd8fc8fe96a798f457b03ca0dd27e55535e7163f9c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/el/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/el/firefox-71.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "987c29ca1d3b65bef9b5464b2d2c945cb66a6be671ce09b421218c3fbc6aeea0de6e5f7c2105943ca41b7f56d7aea25f8bdf4289eeff4618a92cf45c4234ed05"; + sha512 = "839ed54492a56ece40b3408f051b093eb81762b6725ede4d633a24e9041883c47b36be5fb69701a7a7142041fe3b6112b7f17347f3e41070883ac3accf3e6a95"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/en-CA/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/en-CA/firefox-71.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "7e85aee04f790b6efe29ca592c38cd2962636d7b8b5901e1779fe371b7a8546f700fab25ae5a53d170afe67c3ac64345954b358965010e65fe1a63ef803dcfd2"; + sha512 = "ae6f7ba7b3323d9017549bd05113a909552c538bd9781cdef0e4cc65f203e1628d3c589c2d9c34d8475d641b0cf4cc394ef3240b1d1a5d22244d4a38ca8d931d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/en-GB/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/en-GB/firefox-71.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "a16b6b40a0c52c53b28113e5bc681b56846664899e5876d47b873816a8ee7cd309a1e49057b0bffbd923e5faa354f1f8ae4e01172ffb24062d7451fe361e8941"; + sha512 = "de4da5a471f6127f04b84e5fd88b5f8c3757a790557c8e7aff8490575fef1409ddc3cf32073c83296acf9cfdda7f2291b086e8bee163d9b95187d8d0d804afee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/en-US/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/en-US/firefox-71.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "de2716443b6dc3757fe58d42ef4fc526c1218601650ba7ccb0b0a9f77b7acb04a4e4af2c79b7587ab8d8e3515ca6602b563fb54ac5e102ca30952c39843c7d31"; + sha512 = "d0a6f31a44076ae24134b306483855fe969c28f95987f2b035d165bb6397f78545e331926a992ae271f6fff4bd66341b9dc46f89f8762b5fdb7d3099d21ac49e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/eo/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/eo/firefox-71.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "bb0b25735ec9bc607661fed392c0dc841185f84b06410dc0c2b7a05245d62cdc4978285246d2b281b08507ae2de2b4fe561dc115d838a10e581e484cc12dffd0"; + sha512 = "ed6fdc01e9ca1c3e65385d4625a5df22acff9e3b4753f42ee30a134d3f68483b868875be68bea4bad74ca920e3734c447bfd1150bd86c8349fbccabb19c2b9ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/es-AR/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/es-AR/firefox-71.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "6161b532fb8412151cb007fe0fa679ff0f195206d71b4a07f8b312a28c0fa0041f32e960fc6f88f3c88e54a850a24d00dc370e8a3a16fcc5b420c0a9cfe2e674"; + sha512 = "35910231c2227d230a8a73c56a94d93e9941ca940aeec99093fa5bfa12835347138b4ccfc0fe7c1bfb002da7ce6c90a14185f62f6bb88d5645b19c34c7281bd2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/es-CL/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/es-CL/firefox-71.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "490f550d9091a70a9a693acd80f24cd644188a3ed0199781c5c04583ae2a66b623df8a5d1a5d3b1c7617a214aef09f99d306577db5bca1034ed1afdea8d909d8"; + sha512 = "6373fc5559ffe2887a0d4c042ba1417d8cbf3f32be687068cf194357d7b3ae7609dadc4cdf9dca45a2d4e02fabd587320ecac4c33acd22c05eca3ec44bc1f1f3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/es-ES/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/es-ES/firefox-71.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "cb648224649c1f5a22c7b5eef4a4b4cb7381a76009cc1a4b0f2db7f1ca850f21ce3f5f4effe9e114f2ab55a0ca4a3f0180b5e7610cd895cbf1d8eff24a77ea82"; + sha512 = "9a55ae7f5d686d722878fd09aa161f9e03746f016d42afad7d4591fcc2cd2d399552f467d44944cc610d6dc6abd4f60bbd07d78305df5e0cf7bd5f5a4f382be8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/es-MX/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/es-MX/firefox-71.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "bb5c9f06d2b17507f9036192558029a6068bc4b62c1403e228284722fd1011ca002b5b7669320c3613fb8362433a13a05960945c56721a220fd8e45e2908367c"; + sha512 = "6f7ca858aeb314f10f85f8b9e881281ca430bb5e97fa5fb79340a9e1215b5086986616c0a97484e54fd57e6b433dc4dd7aaea9c7f66ee0a6c0b210e37efcb2e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/et/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/et/firefox-71.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "642e8fb33bbffe1dbfec0caee8299051678c930b5b8382b7dbb27a139aa01edc737566b3b88444425296f29bedb30acf7e1e4bc39aabe37a4705271b0ddfa2e6"; + sha512 = "0c9a7d9de35cfb1d1e4ef1416a1862913cbd96ad35cc2f223e965adf8b0f23161b96d55a60acd87fee13698c05bd78d5d80d80c95e92c0bbe2587493421a5f06"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/eu/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/eu/firefox-71.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "b6856d8c07830809434528ade2e85da9577562e69e6753e0a3ba96e9e015642b77ee5cd913b017fe7ea96cd1eb985d8eed013c38e61078f37e155baf7d115711"; + sha512 = "8f09a5426aa0e57c81947a59efa98395072489514f0d1ac6cc9bcda111692db8eb7436bc8ab3c08c5c5af2a5b1cca5269ba766e2d8b0c89b8ea327babd035916"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/fa/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/fa/firefox-71.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "46f320dd9b746cfbdf6d41e6ed4fee3c36027a21bf69eec769dc656d4c4620ee702e4f6bd82a3121f14218a68948bcdc032a215bb0effe93d35b5f5e044152d2"; + sha512 = "6dfa007d83c6c06793744ae966dc30a2c0a5d15a1e1090fa918a9a0e48a95f2b17eb1287814976bf4578f37465e8db70967bff1ae36bef963d64bb3d94772df2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ff/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/ff/firefox-71.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "f32d17a087c4fa5ab1ac6b692709b067607b5a9efaf8d15fdc3d52f9bf02db3b3e460fb1350ee17f583a8b32e1823d91aa472451598dbc3eba2774b953b32195"; + sha512 = "2c99cba49a717c539bee467f9f5ef558013a91fd2ed9065b7624abf838cf35dbb5451aa330030be750f6edb7d3c0683402a0a67bfa60761d730f9a5d674a0956"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/fi/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/fi/firefox-71.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "ed4ce81ee0446841d989ea575654463ea8186e2e1b71e771380f2cb0ce6b2858ac8903330623be00c57a2a50f639ae320e794681647292fb6ed060fdc850d50c"; + sha512 = "dec8b214998417d9c6c4599b87a738daf808e0462ee0cf4ad652d3baa953ed270d862f255af480060da5a37639d6fb5f17bbe111d5df30da32478447d14860c0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/fr/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/fr/firefox-71.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "0b199767300180ed093b32685373d1b702a2d09587df3a4d99fc9f0d6b82c41b4002e83fd26be00b24dab4c1c3d38552d46676a5df52a69474f623ee94d72657"; + sha512 = "9409852541a316c8bed8a56a5a9ef8a919bc635c4f0ad686c2b194c174f5d90cafcaeb4f12b7f24a79a43051a0eacb3569df2579ccb600e78e92c0788a354a6f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/fy-NL/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/fy-NL/firefox-71.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "8e714668d8ad01ee6dc9cd5e5f607f393ec09434e62d1d08a55f4312a52b31591e64064bbf0da28e2e47d0c571e895e9061197ceb36d1ab5899f09de549b86c4"; + sha512 = "57cf81ccff549109b337451b4c97038db249d7bfb56469ed0810ba0ded24b66166d310b4cf447ddd006878cfe4a3b6c74a9056c2c5b88757880d0c51f8c0458b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ga-IE/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/ga-IE/firefox-71.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "4156af0bb459848815ec4bef7b91f69328cc44d9b23f56911849098d4b30422f013ac74597dbfe6610df093439170b5566e87a290e33dcb6b32d5e2e95525622"; + sha512 = "9ca53ed31c2aba78e0e738ab3bc864e5bd9acc19c7414a229b1197fa7b464d11ee5665d5300b805587001e613e8f3375c5be8bdd0ac3ab0c4f7270bbf9f0bb3d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/gd/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/gd/firefox-71.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "c2d188a2f4a63f9cc106b2dcb64d3277aea07de0f4290fec560927d8ac577ae57c0f6f9dab998833a51924f1f4eb94cbce9312ac7bc69205a64fe766093c0847"; + sha512 = "35a02ab1f906ea13b79f42ec6dfe9225dcff87bf66f9078aa514a5bac3ad5335ac76e4ef61576d287db0a2a87de42faa18f14cb07e9c5518842742dabf77dc32"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/gl/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/gl/firefox-71.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "c9427d99935fdfbf3b5ae3b0e9ab9f2b31b0a7b0d5b55b14effa1fd979d5f32b73016c939821f1db6eea286047334486b017b9000803e6ede4bcd4a564e89c10"; + sha512 = "8d0022da05342ccbf5a3cd16f12efef4268c4c3a8595357951732310bb2c8b0b948cc93f6098e82b199097d2a6fc6584b092f64a8be76b9e4a341ff5d98e01bc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/gn/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/gn/firefox-71.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "e039e1bf1f0250c1179b3bd185c1a612754f496d39e087059bc485af6a280c15cecab6e7869a63357c7b0dd713ef3efe5ceb6cc4c1f7334fc67560722e63b523"; + sha512 = "02a86e64360fc8640ab491b81162709132f2ce05d412fecce5054dd8e17d29cc212c2faa00837ae99367f6be0ca92631d412d51a1466f3dbaabf4a147dc3c4dc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/gu-IN/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/gu-IN/firefox-71.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "9a8d9a076e521a8b5a4f1cb3c06538d9cfcfbfe32862b48301c202a212beeea2d888964d317bfffbb4e4b5a56ef06ff2acda22f0b129a2521d23a5234817fcec"; + sha512 = "f27330d3610a1cb39826d778fa72d6387ef305a136285955ffe0d95a86b03bb414215c7cff9def0c55fadd4b1fc42ded4f8d1b3bdb94407e2ee9e9c252e1fd84"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/he/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/he/firefox-71.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "763c4dc5241d3ec4337c17d4f7c7ef13667ad1a7ace2e71b65ead7fc4e771ffceb1eb1772c340ed8349cf401b1d9c4fa7f4e16031f5227e45a8e813e08437159"; + sha512 = "fcb1ab26f3a38d58d778ca799b6903d0956e53b352db864e213d1f64bf0be4615ced48be942b3db27024f545a070c4948f6f715e799d697c783f3c781eac355a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/hi-IN/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/hi-IN/firefox-71.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "a6092b8f611976117489fb9a860a801aac9fd598394be0b42e88091760a7f05c10d04d4e90b228a801ce784a981f4770c78e544614a68c2d9a0e8ab13fb89ff4"; + sha512 = "df4a66dfd0d55e31f98bf919c827234a0df7d6100daeac0ee16a1f2c7bfa06a3453bb0ee139537ab334ad7670d5bb9933ff8fb3a84c5d20b82b3f8a6313048ac"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/hr/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/hr/firefox-71.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "ae2d26a2e98cc180699fa5f0a8fa1426525db4ccba99a57841fc8499e9595f0231de7802cfe347a81906d3abec3503b624ff224b1392ecaece17468ba12bad9c"; + sha512 = "57520871eaefe4d4abd8e7cb2ff02339b35b5ce9cb307d158e859e141e59f737245eae2b72178d8bb23c1b8b7aae8b743476e02743617d7400e1b043e7886402"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/hsb/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/hsb/firefox-71.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "0524a4f4ba2ddd3143f9f95e07749aa5f8c37c8f31cc9030f220a99d1a8d270b61ebb63ee3118edc79712f3af3f1795ded34492144d0dcf1857f04cbb3cf3451"; + sha512 = "33746773e8a0bdb03c03aab367425d4da1934ef4ef469e061364b68953fbb824c1f3bfa7b1b513b81140150258d9ef07ad133b3506336294100d24b6d54319ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/hu/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/hu/firefox-71.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "64f4bd68c9a62965162bea7ca4bcf15369f9d3c69c0f6080d0bd660202f2a546f39835b8987e26da3752adc366164b451f842f2694305bf60a2b085749b13827"; + sha512 = "d15539bf57efaa88a8df9f002c57f31c057e21994265a4e52c8d2680f9839cb271fe50ce7de50a03bd080ddf77e19ba216161e00ba772de6870966ef826d72a3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/hy-AM/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/hy-AM/firefox-71.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "6d33a2bf17038e24c323bd53372974062fe5a11278eb535518637ee68712f4c2da93a3dd3378161f1e67efc51a06c746578af10f02c81fd25b747820e963b5f6"; + sha512 = "b90e40c357f35045c9a4cfb3bf10b50a0623d8ba7006880482d377dfa532d1c7afb8c67ae7e96b4b2ebfff3d3a72ed515533cfc2a7fdbee5ed21ca1689885829"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ia/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/ia/firefox-71.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "0e4a78c9c03e7d87a934023cd0608426794f3e9818c7929b1e12bb300cc11d576334396c1125ceda555907363288726e286f6a376d6e301f386854ad3b437d35"; + sha512 = "3fae3c87c43e3409daf907e1cda6e336a88b7aecf0767003c9ca2e81ea48dda830f7d2d999bfae8e84699adbc581daa964c8748f98f29a9496cf66739bdc3a01"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/id/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/id/firefox-71.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "76b89937f37aedf1534b8e06601c9d59680426a55b3df3726318f438de1ec259c335876a1da31c6996e54c0d9efcc651e1504f764d4b426db2f0d97a1ca1e9ff"; + sha512 = "d6b604e2ba835747710120bad9af28d99179bbef2936fa1cf04bca89706f9ffa871d71127e21f1d2a8730a478c2b8d36dfa53fd77cf8775e6129b78fd552bda6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/is/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/is/firefox-71.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "17c164cc5a95f3e89e2bbddf58442da84dcfe784812163b68740dd1caa9ab823333c3188abf579601437217e0e9e58871424d1227b4ade6a0fc77e5798ef9099"; + sha512 = "a4150baaa6a24e1fda1ed51aa57770b7796e5b8dfa41fa514625cb18dc322ccf1a92c6726dffe7e47123ab27f9f3f51e65bc26956ca851c66b647324e1db12eb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/it/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/it/firefox-71.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "ae37e92971d2f0c6ce322011e66c2857aa73518f1d4e8d26c3c2cf1d99bea8909ff2541146b6789096af5141cd927dc82f91ffb9f7eaa0fcf4276d4782e72a97"; + sha512 = "8e6fd4396aa94274ef7e93780f3c6afa6921cda75bfea904e41a34247357569d00a4b7a85d3846faf4454d11658c49601a677ed7a9717c199b4fa36ccd0ff3cb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ja/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/ja/firefox-71.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "32690138d8c3dc2be001579602269ab5e89b7509f6d289a4cd0fb50b90e7a9a61ea57af8b064f904833504f0d523f1bab0a03f456fb75c967cc87f3e8e331b9e"; + sha512 = "192f402abc0ac43280fd2c3c26984dffe78c33fb27dda0b3be1292a055ea16ce7457c3d9b1d10fb8508ed2455dc50bfc7911fe36487ac3c3fb901a197a8f908f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ka/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/ka/firefox-71.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "6611137ec50a1a35b7ee3fa15a2066fd3231717ed6f7a4884c36306653226ee4211e8364e4872029d9b1967f69d10b799a4d58131d082f882e1b39e758132ebf"; + sha512 = "d16f350268fe5650dfd8a650c96a3c4e23286c8171e3c7b4e351d71ab5a28e7cf71e4156bf4ad9d443ed991795cc67527bee1c07fb45371165e01229356c5b45"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/kab/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/kab/firefox-71.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "f06c8fb18639967870bd581d2757ea66631f35b167688f4693198f6d70d1f61985946216410c401f0aa881e566df5a0f13d085e1ee880a35fb9ed21b0fefddea"; + sha512 = "f85f5267aff327edc5efb3614634bf6343831f65c53a718efbdb3ef7d8e3f7dc9d763ea79d0e369b75025e105c17c16943fbb218717a2d7421d1ca1acfdf4424"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/kk/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/kk/firefox-71.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "b22bae385110057cd77440101e27234afd17dc74602bf05763975ebc68e0940b4501ff168613fb664b2087a2782fe44a52589ab9972cfa44f9097513460cada5"; + sha512 = "512d930738589959d8fe274bb5d8adf77061a21b5b7939d42fd434bf7606468143097dd9fe0aef41e0061ae03cbf0a76e7b82fe137168a293e0a56728622dac0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/km/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/km/firefox-71.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "7c49611ba0dfaed7717f385925ccc621f5313496235a90c3851d26f11ec183541553979e6efe67f36faf7997d1e27a15e3d5646f33ed884fd66e6553c93d7db6"; + sha512 = "4b00a6e18bc6f02c7dcb003991c4363acc0289dab251388b5d80d2217ec434a4a72f042ab884ad0ec934ad21eab367e2c8772d9e52fc1b2c782e8cde4e3e5b60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/kn/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/kn/firefox-71.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "c1fa863fa066a7832975963afbcf63aff6caf702ee8c58e2d54705e61b1863d71b81d7d0b9b8da7cf41d7c950a66820d8e1137a32ef91bb283ffad9b36b84388"; + sha512 = "4153802579839e946d6f481aaa0bdd3dfbc7e8eeadb8f2cfacfe16741438e203d75fc06a96d8533ea26c3fc6ed9b4b8de235166bd9b3def7c506cee7ea9bd456"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ko/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/ko/firefox-71.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "8d179e7660331ba4c90f666ad3792064cce4fc551144ae3a8d550f620765e43274ad18ca9eeef988c2a7ea612dcf82dfb65cf225f875b154a4d4a4c11e5d7a64"; + sha512 = "1af1a017467c60833a882e42459adc9240b139b472809417daec15f058e93b7d862ed66346c5d8edd2ed472c7768c6939a94c74a9f774f8fee038e5eb2d5d001"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/lij/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/lij/firefox-71.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "e36bd824232bb3d7d7fb4779e3207cdd504d84861bd0b5b2ced6a29ecb9d16b10e2fb267162ca96452f52e8089a085021869eb107ad8ba5cfdb49f8e42e56648"; + sha512 = "20011e79a9d2907e5acd74b0aac4b007aa7c5c29e86163e9b8ffe1e00cfa9deb62586c9564e2193a003cf5e6ddfee9eb93f873c5d2a7d3abb1586fb5484fa7e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/lt/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/lt/firefox-71.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "4ec494f1fc2260d73aabd695a29441d12620a8118945974e8a0ca6f21a0e9e49bf8a6378d4409f26f05cef369c990e1432d0b11eec99b98399e994703ba286f6"; + sha512 = "b4666068b53dfdb843a8b46e9969a5a653c57b30753fc2a45e661ba3ce9dcc0713e485d3dd39885901de7bf2f2b54138b3a2dcc13411ece5216758aaa38d6e53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/lv/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/lv/firefox-71.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "3ffa772cecb4cea1c775b20b3ce505c2d84a9918c1422d85c5a2bde80c4b1432f223d828343af04c7c9518ae54bd7771e8144b66165aae1bdd140e068d0bda1d"; + sha512 = "e3546ddd2c656438a13b1bc5f4478f8bf814fea7044d168c21017d581447dbc506faaef443b09cc01899ac59862cf60633822d2f8cb73170e5999c4029c378a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/mk/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/mk/firefox-71.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "e8cf48b2e4a841c6101ab0759db844dce8865bcaf056dc0d2a5c43653bf86602dcdb337422a8149a4d4527f33ff79509d4c4a3fc221ca50c0f78fac80d7e45a2"; + sha512 = "b45084736ede3cc740e81aa59e7fb423d17c724075fba27ddcfb584a651d4cc9b0f3bae95a296dc9001485bb089efa1fcd1ea1cef030238e556c78f1d0215957"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/mr/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/mr/firefox-71.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "a6be024f8c41f106157845fec1d5d4a5f81456d76f174883e8bc3d2f1d8dae327b20de89539980fef316baabdaf2cdf058dc91c12bbad1fefa0f374d66ac3222"; + sha512 = "3df7b84e1e315040b6b16faf8ad8d82b1fc29d3e52c49e86c302209721e7c43e454b30ecc9b89807529c5137a0788db300aa30a21d3fcc31017c834bd86064a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ms/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/ms/firefox-71.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "4beb0656f90497f480a171d762d3b85260f4f7388847260faa15bf7835bffb88a2d44657401b5d0680992864b1a4ee8acf6a6f56d3e9f41b6704808f775076ee"; + sha512 = "9a66335f84f29399793706d69cfe4369c320d1cb36934f57f9c0d4e04f29584b0e9a9717dcd88df19d23814610ed84da3192e8d2d2dfea1713cc40db1c3d9f94"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/my/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/my/firefox-71.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "98c47dd55ce49f4933a1fd67626a6edaaa20b4945ffa21195f19c9676f284081d32de83047dcd6d0e7737be94deae34fd306484f0ea80527bf0e3117cb67fd04"; + sha512 = "8586219819669d4451cea83044fb9debe2b6db389ba24b8dcb927361e4f48c818e7e7eda073004985c13a78c25f8cd7cc2e02dc4c188b2dab0a30dc707d5aada"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/nb-NO/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/nb-NO/firefox-71.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "5d51f3e4dcdb82995c456e164bd4875e735029238ad47e7361c2af29c2c22ad43398279dad33356a858e054e268e846bdc72d8a82e869f12d2871dea8f6a75a0"; + sha512 = "32f847d6bf444eefb03de167dd695543ea69f62b9205016e18c4f099e9312f6db87f879d9050266c47db43ea50b952b5236997aea0a5a980c90f2ab414ebef8a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ne-NP/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/ne-NP/firefox-71.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "794aee0947e1a3b81534fee16e3d7efef9fe6d8eebd8ec18b8bb120b3a3cdfcb4929882d09e8ee15136f65d88c0d6c25cbf8570f86e8c0f337f86f12fb11580c"; + sha512 = "90fffda6e1fc345a1dd3c993d206c2101b8a5f8b03abd3801124a4c0fbb3c9a6cbde09cffe9c181f2d6eaae42af4dcb19a79983d9588be4ee2ffbf3dd270adcb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/nl/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/nl/firefox-71.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "e63f00aa526cdc8cb4eba86f4b920dc38e0a5f9eaef0a4103bf380f72b9fe2421aa4ee1417bca18da719ee01d57964c2edf21c4697121d70820686ad2f7379df"; + sha512 = "eec4bf72b0c13cfef5111d64f5d7e01b0542d48d8796c4b807914b620352656bdaaa0e01a6625719dd33aa53edb9288101542639e37c262fa49b14a7ce24e776"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/nn-NO/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/nn-NO/firefox-71.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "d9e30d8d820ef5b07f6814cb5e37e3918b321968229d33911afa815ea6e727f4d3b505a397b60f1c1e679dfb79f9e130de450c10f8946035153f535060b9d4cc"; + sha512 = "f82dd5a5f2bae8610551dc340930054f291f13c39d4cd56c0c1c6df47434d0d7a350dd5f4e05ba5aba73a985af228db67a780c9a9084e3ce8b4acad86a613386"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/oc/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/oc/firefox-71.0b6.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "94004a03a0b07fb91a30677168d19ecfb29d5613483da62859cc68d9e392f94ecfd87f29b5f3c44cdfbb3fe067216fe4f6db997da2368aeb289fb7b1d83029a6"; + sha512 = "4e8796ffdafc1a30056b972cc7f2287aa4dc5ac1460601b23e0364abb3507832bd10f8cc0feae3e1dc2bbd8835be693d7b301554d7ccbaae401cddc58c703562"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/pa-IN/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/pa-IN/firefox-71.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "5d4d9952600b81a93ed62314a536d91729ff6a423ae9359436e632c9d807b13ac19fd6b1d2034839450ed5ba5411b91afeb52d0cfd74ec84a1924b6036563b74"; + sha512 = "5586ae4d8db7dbc7e2a0c3ac67d55a3a161aafa342690a58c92465911cf1329f2aa9d239d861295455038c894ef29c84e5cb4a06460661e679f118dd8b15480b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/pl/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/pl/firefox-71.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "6f3f628b38e06494d528c96071c0ba0738582da37f16a4a28eacbd17aa7574f1ef795c662ad09b8a15637bc25fb6b791e1bc54b3d530031c66450f5f7ba3ca76"; + sha512 = "055aa65d85674a79352b3d634dabb320bb7c2fd978c5b011f3e3f537ce1436fdc3e2cc2a316d0163cf095c1b9afa2e4d8a5a1ff1bbc9bddd280cbd88a018bd73"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/pt-BR/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/pt-BR/firefox-71.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "e97eb866f17277db6303c58411fb5f4ef561884c0e5437dc09d3da63145107a8ba5862a8d965d4c5ba38f40930e82c440ae1a26b023f6a212ce177c77df72f4f"; + sha512 = "840391d56d7d31cd26338d49f64a56a6c48f52566fb3d534b5c6484e0062cdc024c2a30f65036f3255e26688574969e831ec431e071d575fb56b560b65031539"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/pt-PT/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/pt-PT/firefox-71.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "81cd5a4c5b2a89079a45826f34ebd6564a929e1ba73dd07efa7d8a8b4958a36fa083377bd0e7b6b1e86a83a749f1117f3e7f2703961e668cced5cbdca8e95c10"; + sha512 = "fa1fc0eddaf1ce287ce48796d8e6f1ebd279277e1c33a11f2d4f7abb32424664f555d27abf317930e1053769e48aad3bbeb09e54bfe3c680a99381d42e54fa18"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/rm/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/rm/firefox-71.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "2b78c41faea2f3f91be9c21de826e5e8a2533a76dc925458e2f75f085fbce71bda63dfbaedfe988f29ef9384a0ecbf4599174a210269c6adf3f875d227374385"; + sha512 = "e035ccb63bc220aa283eb561ee92962d00848e6a02f5d4869a82345ffad05c9e2b638dab551d532621e3b00266692fa33a7277acf8156f368d917290d7740472"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ro/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/ro/firefox-71.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "d01b01df0d9e25635b85abec0e0ac081beee02a97bc50b1902b271aa4ae5cacb410d7b9644d76785d54622553eeb8f4ca4f85e40c7867c6f99840de570974a2c"; + sha512 = "9c1071cdb64f479a3753554e3e0f9f1a31e3ef480722cbb510dc9265c6a1d9efec855d60a09628998abacaee39dce6dbc1d6bf5336644c8f160ebad6515fb356"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ru/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/ru/firefox-71.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "36ac6ec95c9c1e3d5caf1315854324bd0cb41fd6e83dabd81d3af2189fcd111ea7ab8a384e5a07f4618c9046b8f59c3590c6bb8d1a12a2475d19d7d65940a26f"; + sha512 = "287aecdf7a132ace21be8a215502f6edd00f824ecdb0ef68633d54f0983b63795ac06dbdc046762f036559b1632672366716beac300e85f54735a4d54ef8f79a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/si/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/si/firefox-71.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "796878bd3a982443558d042c64520d6cd65c1eb247c6630e1c1073c75be3a2d3e3d4f164deb44336ff536c6a7a81650c0806de79cc3698d6215fb87ff2ca50e8"; + sha512 = "38c0e1f89b30b87f61fe42755ceacb8b139fd2993410163f2d80b892ff081321753fb2c9b3ee95307afdcb3deba08a825887f23b9c75b0091fde181a1435452a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/sk/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/sk/firefox-71.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "48f3179f9ac81ef1c69a44540adf994874a91770eb1b2af51804a791c10540485a61af2b1fd337f7cec86682c5a3df24e8e030add48773459b8ba7caba6e88ed"; + sha512 = "49c0b47c5cbf7736a757971bb12d08de0c88a405984f3049b54706c6113d9766159e18230076564cc38bd1e9515d8f9a0adc294b73bea96c34c0b72b5ceaf492"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/sl/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/sl/firefox-71.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "5ca3ddfef139448e411bb226cd2abb3a8fc4100986a294bedc5bcc4a1906a6b0ab82f6e3d536dfa66e404bd5b7eed671e98cb22f1d082764cc5d3080fa0363f2"; + sha512 = "53604559cf49c2a6a509ef51d6abc293384213553f14e7f2617452f314454dbde480e561de646efffecc31e3aef44375d07765a8387abd2edb515bacf9771729"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/son/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/son/firefox-71.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "a14b7a55043d2aeec02d1f28f30038e0ffbc3f76df1c5abad04413673d5e6d7290feab39e0ff40bfc35bf993fc49311b0cca38735c367da233808910c2a864f7"; + sha512 = "ad1cadc39f09b935a032188664fd4a068e6936a650f6bdadab834718a9ce061b2920004b0f3e59a27a5cc43bbd142d7e2a5125485c67a691614b64f88118fc8f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/sq/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/sq/firefox-71.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "ea1575fefd6ffccb7a6ab428663de5e80b48062e13d3424d05b5aa3b86972236839f6a0df7546b5ead27be0a40293f2e9d74472d2756d9fa86bad18d478993de"; + sha512 = "661adfb7a6f0a584a16042909c0427f9870d3ee57c0be44e6fa6a359076a201813cf55de5b39d6e00f90d419565e4f808e0a8dabe6bf8e3ab9e77de29dff00b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/sr/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/sr/firefox-71.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "8c5ecc59a41613ac259e1f1515e6475fada7cb7c33650722ad9d36005b8aa173afaab254eec004be082bd74406c88aa4754dc3f4dd131b9761fc82778a7dc573"; + sha512 = "2ca948e7ae31e2151842801c021bc4e9ccb2261e52d22749b051bb6a56fd96b14bc39b7c461d3d081ebad876d387d2bcbeac6813dce413a9e8e1d7116389aad6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/sv-SE/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/sv-SE/firefox-71.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "f6446ff3add515a7fe46af9752206c05632cb95b5e65e19c331556a6e4e304f765f8cfc9cd90fec2892fe7302230a5b3b85c462a557e7074e255ecd94befbcd8"; + sha512 = "297e10d7e5cd95b536f51705fe5ecc5b35ba4d9efce371f42fb809106ea3cc0a0804fa43b37b6850f6ac8e95de4367bc05b8de4b539bc1a9e3fa6999c6d19984"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ta/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/ta/firefox-71.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "03302b3da44fa586df13d2f20faee5da5e82151550498d7c0e0fc70efca8a98db47443bdd0289fe90d602ca53c1e82c9f610cc8432fefe5c99878faacd0c9153"; + sha512 = "3139fcb90ddfe70788f538c9b625c624cbdca69668370f526fdc074039ee2e543da49f020a6b813c1ed8414ffb12dde10be5505bb13781bb108b43f4bb3af703"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/te/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/te/firefox-71.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "49b3921154e909685e8e52a892a2af322e650109fa6b17bcebd62908e71b5b30c0346905c2422124629d93e1cded40b6f81222ad4871057ac482c1df7ca3b53f"; + sha512 = "0f4534486ecc0c9f53456e68e411ebe673a150b08b3d9c6e903b4e5d1de94f77bbfc326802fd5d74796c55fa00434d0db4b3a053c3a730588a96323e43f3b2e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/th/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/th/firefox-71.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "497da9beff43403f2b09da713474dde509ea2a71145fc8006a852536e4ab71a83586d67d6b7238b3b0ed3d135db6bb2716716b959463b13d92935f2b1ee147ef"; + sha512 = "3a673aeca702239df98e2218260b0d38361aad8e00f8f9d7cc025b861aeb737fef909a2220eda8aa5c26e393811aa55b06eea2d969685ffce579e472a40c9f22"; + } + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/tl/firefox-71.0b6.tar.bz2"; + locale = "tl"; + arch = "linux-i686"; + sha512 = "f97d4709087089be241523fd52acdd95f073cd4a793e7013c00a07dea21b6c493071faa0269402c8024498719e86fcf9cb11a919a0ae0f0143d64dfd9f4eaf61"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/tr/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/tr/firefox-71.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "43762b9401ad7337e0ff00003a07d374271ab032a4609bf9abb1fc3a69ab578e45721395d06aa4fdf41e15a71bf503156632b5e3d6f94b5d6e62592c78a267a9"; + sha512 = "0747a36b046240198ac2b7359785fe930746629fce71d2a1d8728fe7cbbe775bc41ec0cce4c7ac5710e1e4087f908fdf97e03d192519b682107361615c724f2d"; + } + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/trs/firefox-71.0b6.tar.bz2"; + locale = "trs"; + arch = "linux-i686"; + sha512 = "84f4d764ea2c3daebe6bdd1fe3a46fae22a065bf5e7e6e96114730fac60dc9f4b1887b12ef82e9adc705552c6668f165777e7c7a69d5052285eb27b45a4c04d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/uk/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/uk/firefox-71.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "e10bbbf8a8f899f2a7b57bed9a846d6b490303c456027b034a750dce6b21416415eb0d9420629d008d901ab903e7c643fe7ad5bdf5aab511da9977d536d71ffe"; + sha512 = "7a7e224493a742489a299bc38595d3a43c06cd38241085c5b909cf45b240df8de238bc4e3e7caa786f591e87c20f00cc19bdfcfca29d378d523daca81b156788"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/ur/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/ur/firefox-71.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "9155b7efa37b299ce74ed6faacafb354947430265a34fea9e101a9f0947a57a4a3b001bc7b583002ea08d3b7f33074926c4f6184b563fa5a1811b2b7a9b05fd6"; + sha512 = "32b2c6cd8fe45cacc4ffb3fd9c553dc5ef2b733c695bd051b2cd036f53f0373151223b68c7b5585c446183199f9dcf161d26717e0ee3dae65eea8baad638658d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/uz/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/uz/firefox-71.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "a3a3aeaa6cfa114e619ba9685dbf9d796015f26b9fbb4529f69d17f8c40c0771d58ff044cd4f97123096244f29b964f1756868e35b5dec3fb79f7b32b7a31ab2"; + sha512 = "b89fd5af10fa965d420d951ac9f7c6fb214c05f86cc95373b41037935f83d845e889f9030a72788cc8909ab35f17d4e922a26fbf1f482157d496fa9e56921369"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/vi/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/vi/firefox-71.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "167a38acc587a4479fcd15d1e47f34e0412e846a0689a119c1f382ef119bfab3035450326d086f6c8efd67a93300df234d53165609c47e94327b4415f40d88c3"; + sha512 = "221da3c7dda82bedb9e33dcc7eac7cc4f59e8e5b71d97e85097f93cdf96dba6c9dc1e1648483bfcd2250a635f7641a08d7752a035de33bb3ec33862dab764170"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/xh/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/xh/firefox-71.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "6a0ab1589a56d6563431d2e5f01e6c01a65be6865cb4b4d52a21b6438727d378ded049730374d3400603286104e4e05f246829b9a45513998db6c9c14597d6cc"; + sha512 = "29536e222d83f30bc71c06b8ddc4ee04d3bccf119c2c1be8934b9cc8da57da5e38bb14434e410804e2919fb0ed21a1be87a361b6c923da131b1fffa194fefcd2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/zh-CN/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/zh-CN/firefox-71.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "f3e20c68a34ba6aca4bffd07d0bc1e5676ef7f2d9b56aa175431825e90221255bfaa76e40a6fdacf812172317deadd3e3a29756331ccb09aba5804ae58d2ca8d"; + sha512 = "6bc526bfb6245e6ac109d2f9ae5805bc6da09f06a5a58e2c78953b59fb66114c24ffe01a90568a9d8cab40b9c17912111e9a21ed89dc3c65dd4e0cbfe1bf20d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/70.0b2/linux-i686/zh-TW/firefox-70.0b2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/71.0b6/linux-i686/zh-TW/firefox-71.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "dea1df5beec52f0d12e18907922bbd2f27b4a20c87874c199d04671f636fbfebfc1d64bf0c8935ae41c139d4beaf08e164aabe47da8be67d4855b1fb924aabfb"; + sha512 = "68599169c727d5bf4795960dd6128a75a4208b74c258f4b8dd8dfef398c1369a8b9d4a3cff96f55f1fad14e412f966946fe888bb5fd162ad09528b62eb930c62"; } ]; } diff --git a/pkgs/applications/networking/calls/default.nix b/pkgs/applications/networking/calls/default.nix index 63caf836ad9..065f264f152 100644 --- a/pkgs/applications/networking/calls/default.nix +++ b/pkgs/applications/networking/calls/default.nix @@ -9,24 +9,26 @@ , gom , gsound , evolution-data-server +, folks , desktop-file-utils , libpeas , dbus +, vala , xorg , xvfb_run , libxml2 }: stdenv.mkDerivation rec { - pname = "calls-unstable"; - version = "2019-10-09"; + pname = "calls"; + version = "unstable-2019-10-29"; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; - repo = pname; - rev = "4b4cfa04266ebbe2f3da5abd9624ea07aa159fea"; - sha256 = "0qvnddjpkh6gsywzdi24lmjlbwi0q54m1xa6hiaf1ch1j7kcv8fr"; + repo = "calls"; + rev = "9fe575053d8f01c3a76a6c20d39f0816166d5afd"; + sha256 = "01inx4mvrzvklwrfryw5hw9p89v8cn78m3qmv97g7a3v0h5c0n35"; }; nativeBuildInputs = [ @@ -34,27 +36,29 @@ stdenv.mkDerivation rec { ninja pkgconfig desktop-file-utils + vala ]; buildInputs = [ modemmanager libhandy evolution-data-server + folks gom gsound gtk3 libhandy libpeas - libxml2 ]; checkInputs = [ dbus xvfb_run - xorg.xauth ]; mesonFlags = [ + # docs fail to build + # https://source.puri.sm/Librem5/calls/issues/99 "-Dgtk_doc=false" ]; diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix new file mode 100644 index 00000000000..67e91870f1a --- /dev/null +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "atlantis"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "runatlantis"; + repo = "atlantis"; + rev = "v${version}"; + sha256 = "08k2dgz6rph68647ah1rdp7hqa5h1ar4gdy7vdjy5kn7gz21gmri"; + }; + + modSha256 = "1i4s3xcq2qc3zy00wk2l77935ilm6n5k1msilmdnj0061ia4860y"; + + subPackages = [ "." ]; + + meta = with stdenv.lib; { + homepage = https://github.com/runatlantis/atlantis; + description = "Terraform Pull Request Automation"; + platforms = platforms.all; + license = licenses.asl20; + maintainers = with maintainers; [ jpotier ]; + }; +} diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index 8956828fa76..d0186fb9b4c 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, go, removeReferencesTo, buildGoPackage }: buildGoPackage rec { pname = "cni-plugins"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - sha256 = "0gyxa6mhiyxqw4wpn6r7wgr2kyvflzbdcqsk5ch0b6zih98144ia"; + sha256 = "0dc4fs08x4x518yhgvq3drjvansnc0cb8rm4h5wiw7k3whjii3cd"; }; goDeps = ./plugins-deps.nix; @@ -35,6 +35,6 @@ buildGoPackage rec { homepage = https://github.com/containernetworking/plugins; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ cstrahan saschagrunert ]; }; } diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 655f5f9c0b2..87500ababa2 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -1,48 +1,25 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - version = "2.15.1"; +buildGoModule rec { pname = "helm"; + version = "3.0.0"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "1afbymgpax7kgjjv1c9xb4dm7gcrhn2g69piamdq1k0ng348k5w0"; + sha256 = "0gx5gmj1470q3gj8v043dmm31skf83p1ckzdcfzx8wdjlglsljrj"; }; + modSha256 = "0xjzzwmq3i77anb7w2qfnz7vc0gxq02lylj0xs6dzwl543winshm"; goPackagePath = "k8s.io/helm"; - subPackages = [ "cmd/helm" "cmd/tiller" "cmd/rudder" ]; - - goDeps = ./deps.nix; - - # Thsese are the original flags from the helm makefile - buildFlagsArray = '' - -ldflags=-X k8s.io/helm/pkg/version.Version=v${version} -X k8s.io/helm/pkg/version.GitTreeState=clean -X k8s.io/helm/pkg/version.BuildMetadata= - -w - -s - ''; - - preBuild = '' - # This is a hack(?) to flatten the dependency tree the same way glide or dep would - # Otherwise you'll get errors like - # have DeepCopyObject() "k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/runtime".Object - # want DeepCopyObject() "k8s.io/apimachinery/pkg/runtime".Object - rm -rf $NIX_BUILD_TOP/go/src/k8s.io/kubernetes/vendor - rm -rf $NIX_BUILD_TOP/go/src/k8s.io/apiextensions-apiserver/vendor - ''; - - postInstall = '' - mkdir -p $bin/share/bash-completion/completions - mkdir -p $bin/share/zsh/site-functions - $bin/bin/helm completion bash > $bin/share/bash-completion/completions/helm - $bin/bin/helm completion zsh > $bin/share/zsh/site-functions/_helm - ''; + subPackages = [ "cmd/helm" ]; + buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.gitCommit=v${version}" ]; meta = with stdenv.lib; { homepage = https://github.com/kubernetes/helm; description = "A package manager for kubernetes"; license = licenses.asl20; - maintainers = [ maintainers.rlupton20 maintainers.edude03 ]; + maintainers = with maintainers; [ rlupton20 edude03 saschagrunert ]; }; } diff --git a/pkgs/applications/networking/cluster/helm/deps.nix b/pkgs/applications/networking/cluster/helm/deps.nix deleted file mode 100644 index ffc6a5cb1b8..00000000000 --- a/pkgs/applications/networking/cluster/helm/deps.nix +++ /dev/null @@ -1,1191 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "v0.26.0"; - sha256 = "149v3ci17g6wd2pm18mzcncq5qpl9hwdjnz3rlbn5rfidyn46la1"; - }; - } - { - goPackagePath = "github.com/Azure/go-ansiterm"; - fetch = { - type = "git"; - url = "https://github.com/Azure/go-ansiterm"; - rev = "d6e3b3328b78"; - sha256 = "010khrkhkf9cxlvvb6ncqv4c1qcdmpbz9jn38g4fxf4xsma8xx1q"; - }; - } - { - goPackagePath = "github.com/Azure/go-autorest"; - fetch = { - type = "git"; - url = "https://github.com/Azure/go-autorest"; - rev = "v11.1.0"; - sha256 = "1jmr04qkl9fgmj56czn2979ng0f6ygfbk2khv2xyx368686xc1d6"; - }; - } - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/MakeNowJust/heredoc"; - fetch = { - type = "git"; - url = "https://github.com/MakeNowJust/heredoc"; - rev = "bb23615498cd"; - sha256 = "17m780i9afj3sbmcrgwgzarfly4x9376w56qblkqnzdkv6vps22i"; - }; - } - { - goPackagePath = "github.com/Masterminds/goutils"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/goutils"; - rev = "v1.1.0"; - sha256 = "180px47gj936qyk5bkv5mbbgiil9abdjq6kwkf7sq70vyi9mcfiq"; - }; - } - { - goPackagePath = "github.com/Masterminds/semver"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/semver"; - rev = "v1.4.2"; - sha256 = "0k2fpk2x8jbvqkqxx5hkx1ygrsppzmzypqb90i1r33yq7ac7zlxj"; - }; - } - { - goPackagePath = "github.com/Masterminds/sprig"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/sprig"; - rev = "9f8fceff796f"; - sha256 = "0m6h88xcs8zc2b1g6zaksfn9kyqhr8q9508h57jb6papx7w54yl2"; - }; - } - { - goPackagePath = "github.com/Masterminds/vcs"; - fetch = { - type = "git"; - url = "https://github.com/Masterminds/vcs"; - rev = "v1.11.1"; - sha256 = "1062m73h0pp5d0574lf6px4jsjgywnsbkw50inxx3zal5r185ydm"; - }; - } - { - goPackagePath = "github.com/PuerkitoBio/purell"; - fetch = { - type = "git"; - url = "https://github.com/PuerkitoBio/purell"; - rev = "v1.1.0"; - sha256 = "0vsxyn1fbm7g873b8kf3hcsgqgncb5nmfq3zfsc35a9yhzarka91"; - }; - } - { - goPackagePath = "github.com/PuerkitoBio/urlesc"; - fetch = { - type = "git"; - url = "https://github.com/PuerkitoBio/urlesc"; - rev = "de5bf2ad4578"; - sha256 = "0n0srpqwbaan1wrhh2b7ysz543pjs1xw2rghvqyffg9l0g8kzgcw"; - }; - } - { - goPackagePath = "github.com/adisbladis/vgo2nix"; - fetch = { - type = "git"; - url = "https://github.com/adisbladis/vgo2nix"; - rev = "56ac56bb0d96"; - sha256 = "1jbxbgcqkal8cdhj2nfbw92fn1fs9ng1df9sf92vgf0m1xzq2mc3"; - }; - } - { - goPackagePath = "github.com/alecthomas/assert"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/assert"; - rev = "405dbfeb8e38"; - sha256 = "1l567pi17k593nrd1qlbmiq8z9jy3qs60px2a16fdpzjsizwqx8l"; - }; - } - { - goPackagePath = "github.com/alecthomas/colour"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/colour"; - rev = "60882d9e2721"; - sha256 = "0iq566534gbzkd16ixg7fk298wd766821vvs80838yifx9yml5vs"; - }; - } - { - goPackagePath = "github.com/alecthomas/kingpin"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/kingpin"; - rev = "v2.2.6"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "github.com/alecthomas/repr"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/repr"; - rev = "117648cd9897"; - sha256 = "05v1rgzdqc8razf702laagrvhvx68xd9yxxmzd3dyz0d6425pdrp"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cf"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/asaskevich/govalidator"; - fetch = { - type = "git"; - url = "https://github.com/asaskevich/govalidator"; - rev = "766470278477"; - sha256 = "1lmynw9vkgrxv7nh60wdywv0nx4gjlkiar433wydhpc2h3m5q968"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "3a771d992973"; - sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; - }; - } - { - goPackagePath = "github.com/chai2010/gettext-go"; - fetch = { - type = "git"; - url = "https://github.com/chai2010/gettext-go"; - rev = "c6fed771bfd5"; - sha256 = "1p9gzj39x4gyhc552n3dmi3kc224gwilawa5kcg8rla31qkwlsky"; - }; - } - { - goPackagePath = "github.com/client9/misspell"; - fetch = { - type = "git"; - url = "https://github.com/client9/misspell"; - rev = "v0.3.4"; - sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; - }; - } - { - goPackagePath = "github.com/cpuguy83/go-md2man"; - fetch = { - type = "git"; - url = "https://github.com/cpuguy83/go-md2man"; - rev = "v1.0.4"; - sha256 = "0hmkrq4gdzb6mwllmh4p1y7vrz7hyr8xqagpk9nyr5dhygvnnq2v"; - }; - } - { - goPackagePath = "github.com/cyphar/filepath-securejoin"; - fetch = { - type = "git"; - url = "https://github.com/cyphar/filepath-securejoin"; - rev = "v0.2.2"; - sha256 = "0id32zjb92wm569m29nfrzz5mw9z1glr3klayr6j134pp4h1sgq4"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/dgrijalva/jwt-go"; - fetch = { - type = "git"; - url = "https://github.com/dgrijalva/jwt-go"; - rev = "01aeca54ebda"; - sha256 = "10dmb5xxn5wijn299h483z0klprprkq7n1azakm3ysp50sr11ywg"; - }; - } - { - goPackagePath = "github.com/docker/distribution"; - fetch = { - type = "git"; - url = "https://github.com/docker/distribution"; - rev = "edc3ab29cdff"; - sha256 = "1nqjaq1q6fs3c0avpb02sib0a906xfbk3m74hk2mqjdbyx9y8b4m"; - }; - } - { - goPackagePath = "github.com/docker/docker"; - fetch = { - type = "git"; - url = "https://github.com/docker/docker"; - rev = "a9fbbdc8dd87"; - sha256 = "0vkr9fs8qv3ydpm4f4b3jsx1f3cxpws78f2kwpyn00y1gb3lpnpc"; - }; - } - { - goPackagePath = "github.com/docker/spdystream"; - fetch = { - type = "git"; - url = "https://github.com/docker/spdystream"; - rev = "449fdfce4d96"; - sha256 = "1412cpiis971iq1kxrirzirhj2708ispjh0x0dh879b66x8507sl"; - }; - } - { - goPackagePath = "github.com/emicklei/go-restful"; - fetch = { - type = "git"; - url = "https://github.com/emicklei/go-restful"; - rev = "ff4f55a20633"; - sha256 = "1v5lj5142abz3gvbygp6xghpdx4ps2lwswl8559ivaidahwnc21c"; - }; - } - { - goPackagePath = "github.com/evanphx/json-patch"; - fetch = { - type = "git"; - url = "https://github.com/evanphx/json-patch"; - rev = "v4.2.0"; - sha256 = "0cfvyhl3hjfc4z8hbkfc40yafv6r7y513zgp3jwf88isbd13r7a6"; - }; - } - { - goPackagePath = "github.com/exponent-io/jsonpath"; - fetch = { - type = "git"; - url = "https://github.com/exponent-io/jsonpath"; - rev = "d6023ce2651d"; - sha256 = "1qkzaxsjs7yg1672sk67nr119j7jc4751yzgii0j3nbipjv321kc"; - }; - } - { - goPackagePath = "github.com/fatih/camelcase"; - fetch = { - type = "git"; - url = "https://github.com/fatih/camelcase"; - rev = "f6a740d52f96"; - sha256 = "15vb86adns1izvbzjw0lmmzrwlarhbxw5qalhx10vzzdx73wh4ai"; - }; - } - { - goPackagePath = "github.com/gofrs/flock"; - fetch = { - type = "git"; - url = "https://github.com/gofrs/flock"; - rev = "v0.7.1"; - sha256 = "1xn48643h991p383hlhzd6k5v9akx8c6dcy93fz37fwqrrhzpb03"; - }; - } - { - goPackagePath = "github.com/ghodss/yaml"; - fetch = { - type = "git"; - url = "https://github.com/ghodss/yaml"; - rev = "c7ce16629ff4"; - sha256 = "10cyv1gy3zwwkr04kk8cvhifb7xddakyvnk5s13yfcqj9hcjz8d1"; - }; - } - { - goPackagePath = "github.com/go-kit/kit"; - fetch = { - type = "git"; - url = "https://github.com/go-kit/kit"; - rev = "v0.8.0"; - sha256 = "1rcywbc2pvab06qyf8pc2rdfjv7r6kxdv2v4wnpqnjhz225wqvc0"; - }; - } - { - goPackagePath = "github.com/go-logfmt/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/go-logfmt/logfmt"; - rev = "v0.3.0"; - sha256 = "1gkgh3k5w1xwb2qbjq52p6azq3h1c1rr6pfwjlwj1zrijpzn2xb9"; - }; - } - { - goPackagePath = "github.com/go-openapi/jsonpointer"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/jsonpointer"; - rev = "v0.19.0"; - sha256 = "0sv2k1fwj6rsigc9489c19ap0jib1d0widm040h0sjdw2nadh3i2"; - }; - } - { - goPackagePath = "github.com/go-openapi/jsonreference"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/jsonreference"; - rev = "v0.19.0"; - sha256 = "1d0rk17wn755xsfi9pxifdpgs2p23bc0rkf95kjwxczyy6jbqdaj"; - }; - } - { - goPackagePath = "github.com/go-openapi/spec"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/spec"; - rev = "v0.17.2"; - sha256 = "14n5x2nxlj2x62v3km96yw7rncxk2b9v94k3j0c22r43c60m38mx"; - }; - } - { - goPackagePath = "github.com/go-openapi/swag"; - fetch = { - type = "git"; - url = "https://github.com/go-openapi/swag"; - rev = "v0.17.2"; - sha256 = "1hhgbx59f7lcsqiza2is8q9walhf8mxfkwj7xql1scrn6ms2jmlv"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "v1.4.0"; - sha256 = "1jwz2j3vd5hlzmnkh20d4276yd8cxy7pac3x3dfi52jkm82ms99n"; - }; - } - { - goPackagePath = "github.com/go-stack/stack"; - fetch = { - type = "git"; - url = "https://github.com/go-stack/stack"; - rev = "v1.8.0"; - sha256 = "0wk25751ryyvxclyp8jdk5c3ar0cmfr8lrjb66qbg4808x66b96v"; - }; - } - { - goPackagePath = "github.com/gobwas/glob"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/glob"; - rev = "v0.2.3"; - sha256 = "0jxk1x806zn5x86342s72dq2qy64ksb3zrvrlgir2avjhwb18n6z"; - }; - } - { - goPackagePath = "github.com/gogo/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/gogo/protobuf"; - rev = "v1.1.1"; - sha256 = "1525pq7r6h3s8dncvq8gxi893p2nq8dxpzvq0nfl5b4p6mq0v1c2"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/golang/groupcache"; - fetch = { - type = "git"; - url = "https://github.com/golang/groupcache"; - rev = "02826c3e7903"; - sha256 = "0w46bsllddfij66nrg8jbfjsr54birvfww8a2fj9fmgyig5syn2x"; - }; - } - { - goPackagePath = "github.com/golang/mock"; - fetch = { - type = "git"; - url = "https://github.com/golang/mock"; - rev = "v1.1.1"; - sha256 = "0ap8wb6pdl6ccmdb43advjll2ly4sz26wsc3axw0hbrjrybybzgy"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.2.0"; - sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; - }; - } - { - goPackagePath = "github.com/google/btree"; - fetch = { - type = "git"; - url = "https://github.com/google/btree"; - rev = "7d79101e329e"; - sha256 = "1c1hsy5s2pfawg3l9954jmqmy4yc2zp3f7i87m00km2yqgb8xpd0"; - }; - } - { - goPackagePath = "github.com/google/gofuzz"; - fetch = { - type = "git"; - url = "https://github.com/google/gofuzz"; - rev = "24818f796faf"; - sha256 = "0cq90m2lgalrdfrwwyycrrmn785rgnxa3l3vp9yxkvnv88bymmlm"; - }; - } - { - goPackagePath = "github.com/google/uuid"; - fetch = { - type = "git"; - url = "https://github.com/google/uuid"; - rev = "064e2069ce9c"; - sha256 = "1b1ibx3rbiv7xwa9kz4b4zpp1fza5cjnn8v6749b4vrkjjmp3rqb"; - }; - } - { - goPackagePath = "github.com/googleapis/gnostic"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gnostic"; - rev = "0c5108395e2d"; - sha256 = "0jf3cp5clli88gpjf24r6wxbkvngnc1kf59d4cgjczsn2wasvsfc"; - }; - } - { - goPackagePath = "github.com/gophercloud/gophercloud"; - fetch = { - type = "git"; - url = "https://github.com/gophercloud/gophercloud"; - rev = "c818fa66e4c8"; - sha256 = "0igz47lpdxgpfb4ckrrs64vr4wkkiqaamk4wf5d3il4dc2g06azw"; - }; - } - { - goPackagePath = "github.com/gosuri/uitable"; - fetch = { - type = "git"; - url = "https://github.com/gosuri/uitable"; - rev = "v0.0.1"; - sha256 = "1ff68fv9g1df91fwbrcq83ar429gb4fi2vsd22zjmhvmbqx2zkil"; - }; - } - { - goPackagePath = "github.com/gregjones/httpcache"; - fetch = { - type = "git"; - url = "https://github.com/gregjones/httpcache"; - rev = "787624de3eb7"; - sha256 = "1zqlg9pkj7r6fqw7wv3ywvbz3bh0hvzifs2scgcraj812q5189w5"; - }; - } - { - goPackagePath = "github.com/grpc-ecosystem/go-grpc-prometheus"; - fetch = { - type = "git"; - url = "https://github.com/grpc-ecosystem/go-grpc-prometheus"; - rev = "0c1b191dbfe5"; - sha256 = "0d7vybd4yy9a9clk03578xdpyhifxsy3qv6iiglrrnblbmpgksjc"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "v0.5.0"; - sha256 = "12k2cp2k615fjvfa5hyb9k2alian77wivds8s65diwshwv41939f"; - }; - } - { - goPackagePath = "github.com/huandu/xstrings"; - fetch = { - type = "git"; - url = "https://github.com/huandu/xstrings"; - rev = "v1.2.0"; - sha256 = "0bn1kac5vcspxdpx4bygr4gngdbk67pnbqc04b0f7a4ny25n10iq"; - }; - } - { - goPackagePath = "github.com/imdario/mergo"; - fetch = { - type = "git"; - url = "https://github.com/imdario/mergo"; - rev = "v0.3.5"; - sha256 = "1mvgn89vp39gcpvhiq4n7nw5ipj7fk6h03jgc6fjwgvwvss213pb"; - }; - } - { - goPackagePath = "github.com/inconshreveable/mousetrap"; - fetch = { - type = "git"; - url = "https://github.com/inconshreveable/mousetrap"; - rev = "v1.0.0"; - sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; - }; - } - { - goPackagePath = "github.com/jmoiron/sqlx"; - fetch = { - type = "git"; - url = "https://github.com/jmoiron/sqlx"; - rev = "v1.2.0"; - sha256 = "0pmi2asx157f5738g19fzyxb9g8yyfbpjyh2a2ykr9mafvp60rfd"; - }; - } - { - goPackagePath = "github.com/json-iterator/go"; - fetch = { - type = "git"; - url = "https://github.com/json-iterator/go"; - rev = "ab8a2e0c74be"; - sha256 = "1x3wz44p1238gpyzkiiilvvrq9q8dwjdm9kdidq65yjq0zcn0sq4"; - }; - } - { - goPackagePath = "github.com/julienschmidt/httprouter"; - fetch = { - type = "git"; - url = "https://github.com/julienschmidt/httprouter"; - rev = "v1.2.0"; - sha256 = "1k8bylc9s4vpvf5xhqh9h246dl1snxrzzz0614zz88cdh8yzs666"; - }; - } - { - goPackagePath = "github.com/kisielk/gotool"; - fetch = { - type = "git"; - url = "https://github.com/kisielk/gotool"; - rev = "v1.0.0"; - sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; - }; - } - { - goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; - fetch = { - type = "git"; - url = "https://github.com/konsorten/go-windows-terminal-sequences"; - rev = "v1.0.1"; - sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; - }; - } - { - goPackagePath = "github.com/kr/logfmt"; - fetch = { - type = "git"; - url = "https://github.com/kr/logfmt"; - rev = "b84e30acd515"; - sha256 = "02ldzxgznrfdzvghfraslhgp19la1fczcbzh7wm2zdc6lmpd1qq9"; - }; - } - { - goPackagePath = "github.com/lib/pq"; - fetch = { - type = "git"; - url = "https://github.com/lib/pq"; - rev = "v1.0.0"; - sha256 = "1zqnnyczaf00xi6xh53vq758v5bdlf0iz7kf22l02cal4i6px47i"; - }; - } - { - goPackagePath = "github.com/liggitt/tabwriter"; - fetch = { - type = "git"; - url = "https://github.com/liggitt/tabwriter"; - rev = "89fcab3d43de"; - sha256 = "04q8d0jk1ymvy7pv1dgfbqzk8gcjfa77psg1lk30ghlisf54pakg"; - }; - } - { - goPackagePath = "github.com/mailru/easyjson"; - fetch = { - type = "git"; - url = "https://github.com/mailru/easyjson"; - rev = "60711f1a8329"; - sha256 = "0234jp6134wkihdpdwq1hvzqblgl5khc1wp6dyi2h0hgh88bhdk1"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.3"; - sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; - }; - } - { - goPackagePath = "github.com/mattn/go-runewidth"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-runewidth"; - rev = "v0.0.1"; - sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; - }; - } - { - goPackagePath = "github.com/mattn/go-sqlite3"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-sqlite3"; - rev = "v1.9.0"; - sha256 = "14vw8bwyaz9lrd1rqhfri5cwpimiimhp75pkbqxxsjsr5jz89s7m"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "v1.0.1"; - sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-wordwrap"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-wordwrap"; - rev = "ad45545899c7"; - sha256 = "0ny1ddngvwfj3njn7pmqnf3l903lw73ynddw15x8ymp7hidv27v9"; - }; - } - { - goPackagePath = "github.com/modern-go/concurrent"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/concurrent"; - rev = "bacd9c7ef1dd"; - sha256 = "0s0fxccsyb8icjmiym5k7prcqx36hvgdwl588y0491gi18k5i4zs"; - }; - } - { - goPackagePath = "github.com/modern-go/reflect2"; - fetch = { - type = "git"; - url = "https://github.com/modern-go/reflect2"; - rev = "v1.0.1"; - sha256 = "06a3sablw53n1dqqbr2f53jyksbxdmmk8axaas4yvnhyfi55k4lf"; - }; - } - { - goPackagePath = "github.com/mwitkow/go-conntrack"; - fetch = { - type = "git"; - url = "https://github.com/mwitkow/go-conntrack"; - rev = "cc309e4a2223"; - sha256 = "0nbrnpk7bkmqg9mzwsxlm0y8m7s9qd9phr1q30qlx2qmdmz7c1mf"; - }; - } - { - goPackagePath = "github.com/opencontainers/go-digest"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/go-digest"; - rev = "a6d0ee40d420"; - sha256 = "1paz3na2xkhi10p5bk7f7gbh5yykfgr9f9i2gcc13rb461yq6fmg"; - }; - } - { - goPackagePath = "github.com/orivej/e"; - fetch = { - type = "git"; - url = "https://github.com/orivej/e"; - rev = "ac3492690fda"; - sha256 = "11jizr28kfkr6zscjxg95pqi6cjp08aqnhs41sdhc98nww78ilkr"; - }; - } - { - goPackagePath = "github.com/orivej/go-nix"; - fetch = { - type = "git"; - url = "https://github.com/orivej/go-nix"; - rev = "dae45d921a44"; - sha256 = "17hfmsz8hs3h2d5c06j1bvbw8ijrhzm3iz911z5zydsl4x7y0cgy"; - }; - } - { - goPackagePath = "github.com/peterbourgon/diskv"; - fetch = { - type = "git"; - url = "https://github.com/peterbourgon/diskv"; - rev = "v2.0.1"; - sha256 = "1mxpa5aad08x30qcbffzk80g9540wvbca4blc1r2qyzl65b8929b"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.8.0"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } - { - goPackagePath = "github.com/pkg/profile"; - fetch = { - type = "git"; - url = "https://github.com/pkg/profile"; - rev = "v1.2.1"; - sha256 = "0blqmvgqvdbqmh3fp9pfdxc9w1qfshrr0zy9whj0sn372bw64qnr"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "v0.9.2"; - sha256 = "02b4yg6rfag0m3j0i39sillcm5xczwv8h133vn12yr8qw04cnigs"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "5c3871d89910"; - sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "v0.2.0"; - sha256 = "02kym6lcfnlq23qbv277jr0q1n7jj0r14gqg93c7wn7gc44jv3vp"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "1dc9a6cbc91a"; - sha256 = "1zlv1x30xp7z5c3vn5vp870v4bjim0zcidzc3mr2l3xhazc0svab"; - }; - } - { - goPackagePath = "github.com/rubenv/sql-migrate"; - fetch = { - type = "git"; - url = "https://github.com/rubenv/sql-migrate"; - rev = "1007f53448d7"; - sha256 = "1cd7wpgym7yzzv4n7bsmg9gh1g7mqlljih3881arqlq11083d3mc"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "300106c228d5"; - sha256 = "1bcqwb9lk2sijn5q3kqp7sadhh0ysbxlj5bxjspk9yp5bp733cbh"; - }; - } - { - goPackagePath = "github.com/sergi/go-diff"; - fetch = { - type = "git"; - url = "https://github.com/sergi/go-diff"; - rev = "v1.0.0"; - sha256 = "0swiazj8wphs2zmk1qgq75xza6m19snif94h2m6fi8dqkwqdl7c7"; - }; - } - { - goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "10ef21a441db"; - sha256 = "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.2.0"; - sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "fe5e611709b0"; - sha256 = "1pn7g9jmhqc9yg6x02dgp4phiggnnxz8a11pv5y4vxhrvkjm6h71"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "v1.0.3"; - sha256 = "1cj3cjm7d3zk0mf1xdybh0jywkbbw7a6yr3y22x9sis31scprswd"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.1"; - sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.2.2"; - sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; - }; - } - { - goPackagePath = "github.com/technosophos/moniker"; - fetch = { - type = "git"; - url = "https://github.com/technosophos/moniker"; - rev = "a5dbd03a2245"; - sha256 = "1z273gvbwr09lcxwd10wyvxmxjln93r952sr1w9hqxcgc1f8l3vl"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "0709b304e793"; - sha256 = "0i05s09y5pavmfh71fgih7syxg58x7a4krgd8am6d3mnahnmab5c"; - }; - } - { - goPackagePath = "golang.org/x/lint"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/lint"; - rev = "c67002cb31c3"; - sha256 = "0gymbggskjmphqxqcx4s0vnlcz7mygbix0vhwcwv5r67c0bf6765"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "65e2d4e15006"; - sha256 = "0aqcmh0sp723d6hwgrv7pnrs4crns2ngr4x43jd4v985cbn455x7"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "d2e6202438be"; - sha256 = "0wbn75fd10485nb93bm4kqldqifdim5xqy4v7r5sdvimvf3fyhn7"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "42b317875d0f"; - sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "b90733256f2e"; - sha256 = "1dsqa48ai4rrqf0sxypnmjg5c6sbp63mj5ljr7qadam06r5m2q98"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.0"; - sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; - }; - } - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "f51c12702a4d"; - sha256 = "07wc6g2fvafkr6djsscm0jpbpl4135khhb6kpyx1953hi5d1jvyy"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "6cd1fcedba52"; - sha256 = "00hl0vkmy8impsnmc2dmm55sdhia95k0kqcrjbdpynryn1lamn5d"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "v1.1.0"; - sha256 = "1pz202zszg8f35dk5pfhwgcdi3r6dx1l4yk6x6ly7nb4j45zi96x"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/google/go-genproto"; - rev = "c66870c02cf8"; - sha256 = "0siq7sv68556ygqi2d2zmvx8l1xjqdc0fylqzci5h1mq2i14bayn"; - }; - } - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "v1.18.0"; - sha256 = "17drwyj3fi5sdz5ndlj7888b3gin6brs3jnh7gh6i15k97l6gf4n"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "v2.2.6"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "20d25e280405"; - sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; - }; - } - { - goPackagePath = "gopkg.in/gorp.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/gorp.v1"; - rev = "v1.7.2"; - sha256 = "0zwkq4cv71vp7cmpfcs54908g1amr0cdxv1b8h1icf64jjawb1lb"; - }; - } - { - goPackagePath = "gopkg.in/inf.v0"; - fetch = { - type = "git"; - url = "https://gopkg.in/inf.v0"; - rev = "v0.9.0"; - sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82"; - }; - } - { - goPackagePath = "gopkg.in/square/go-jose.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/square/go-jose.v2"; - rev = "89060dee6a84"; - sha256 = "04ak01zs9qibr6qvc6l0zdjj9pgccpbvxz6rdwrqv698i1q3qfpd"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.1"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; - }; - } - { - goPackagePath = "honnef.co/go/tools"; - fetch = { - type = "git"; - url = "https://github.com/dominikh/go-tools"; - rev = "88497007e858"; - sha256 = "0rinkyx3r2bq45mgcasnn5jb07cwbv3p3s2wwcrzxsarsj6wa5lc"; - }; - } - { - goPackagePath = "k8s.io/api"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/api"; - rev = "6e4e0e4f393b"; - sha256 = "0y7nxxywq2qx74a5vsg0h2jkfj879wbv6bjran12401fv0vsdlp1"; - }; - } - { - goPackagePath = "k8s.io/apiextensions-apiserver"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/apiextensions-apiserver"; - rev = "727a075fdec8"; - sha256 = "1p8bdl299hrmkq2hfh7sqhsv7c3ig1i0jy8mcgq0hqjix94a87cj"; - }; - } - { - goPackagePath = "k8s.io/apimachinery"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/apimachinery"; - rev = "6a84e37a896d"; - sha256 = "1ys06ixidvpcj9sgk0c2i5vsz11gg3h8xcpc9kqxfsik36cw1akk"; - }; - } - { - goPackagePath = "k8s.io/apiserver"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/apiserver"; - rev = "1ec86e4da56c"; - sha256 = "0my2r4ynbxgpbbrjgcrdrqazhhn2jwk8jkk8ymjks28gzs2i510s"; - }; - } - { - goPackagePath = "k8s.io/cli-runtime"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/cli-runtime"; - rev = "d644b00f3b79"; - sha256 = "1zcmfpyp6m9xl8dia56yb00ixra3ag5d43v2f5zlnrwphq967a8p"; - }; - } - { - goPackagePath = "k8s.io/client-go"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/client-go"; - rev = "1a26190bd76a"; - sha256 = "1b77zf0sip2cilkr40b2jm1kk71212s4clmbs2xl57b4n945yy1d"; - }; - } - { - goPackagePath = "k8s.io/cloud-provider"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/cloud-provider"; - rev = "9c9d72d1bf90"; - sha256 = "15iwal7nn1b7jwrvrhlzvdnf0381lccpw3jrlww8sfmxqsp860in"; - }; - } - { - goPackagePath = "k8s.io/klog"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/klog"; - rev = "8e90cee79f82"; - sha256 = "1hzy767dj0ya111al54k3g9xa40bsy7j81fi0sh7gyl1azw0h8dk"; - }; - } - { - goPackagePath = "k8s.io/kube-openapi"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/kube-openapi"; - rev = "b3a7cee44a30"; - sha256 = "1ald0jjliln5ipdniwfcrm4yal9aa4jr07d3ljrhhh2fj72c6dsp"; - }; - } - { - goPackagePath = "k8s.io/kubernetes"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/kubernetes"; - rev = "v1.14.1"; - sha256 = "0s06x9jk9b6r0i39nl0bmvwjgdp3qikgfbw5cnzi5mv03hc2li8s"; - }; - } - { - goPackagePath = "k8s.io/utils"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes/utils"; - rev = "c2654d5206da"; - sha256 = "1849p8xhiyk53mpg3mwpsmsm5ps5sa2p54bv7b38m415qxsn2d1x"; - }; - } - { - goPackagePath = "sigs.k8s.io/kustomize"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes-sigs/kustomize"; - rev = "v2.0.3"; - sha256 = "1dfkpx9rllj1bzm5f52bx404kdds3zx1h38yqri9ha3p3pcb1bbb"; - }; - } - { - goPackagePath = "sigs.k8s.io/yaml"; - fetch = { - type = "git"; - url = "https://github.com/kubernetes-sigs/yaml"; - rev = "v1.1.0"; - sha256 = "1p7hvjdr5jsyk7nys1g1pmgnf3ys6n320i6hds85afppk81k01kb"; - }; - } - { - goPackagePath = "vbom.ml/util"; - fetch = { - type = "git"; - url = "https://github.com/fvbommel/util"; - rev = "db5cfe13f5cc"; - sha256 = "1k9c3ihhkrcmhd26pwd62mp2ll7icr2q65i5pkymnfnhhv40p682"; - }; - } -] diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 9bf29d87812..598284dcb25 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -1,28 +1,20 @@ -{ stdenv -, lib -, buildEnv -, buildGoPackage -, fetchFromGitHub -, makeWrapper -, runCommand -, writeText -, terraform-providers -}: +{ stdenv, lib, buildEnv, buildGoPackage, fetchFromGitHub, makeWrapper +, runCommand, writeText, terraform-providers }: let goPackagePath = "github.com/hashicorp/terraform"; generic = { version, sha256, ... }@attrs: - let attrs' = builtins.removeAttrs attrs ["version" "sha256"]; in - buildGoPackage ({ + let attrs' = builtins.removeAttrs attrs [ "version" "sha256" ]; + in buildGoPackage ({ name = "terraform-${version}"; inherit goPackagePath; src = fetchFromGitHub { - owner = "hashicorp"; - repo = "terraform"; - rev = "v${version}"; + owner = "hashicorp"; + repo = "terraform"; + rev = "v${version}"; inherit sha256; }; @@ -40,10 +32,17 @@ let ''; meta = with stdenv.lib; { - description = "Tool for building, changing, and versioning infrastructure"; - homepage = https://www.terraform.io/; + description = + "Tool for building, changing, and versioning infrastructure"; + homepage = "https://www.terraform.io/"; license = licenses.mpl20; - maintainers = with maintainers; [ zimbatm peterhoeg kalbasit marsam ]; + maintainers = with maintainers; [ + zimbatm + peterhoeg + kalbasit + marsam + babariviere + ]; }; } // attrs'); @@ -54,38 +53,54 @@ let actualPlugins = plugins terraform.plugins; # Wrap PATH of plugins propagatedBuildInputs, plugins may have runtime dependencies on external binaries - wrapperInputs = lib.unique (lib.flatten (lib.catAttrs "propagatedBuildInputs" (builtins.filter (x: x != null) actualPlugins))); + wrapperInputs = lib.unique (lib.flatten + (lib.catAttrs "propagatedBuildInputs" + (builtins.filter (x: x != null) actualPlugins))); passthru = { - withPlugins = newplugins: withPlugins (x: newplugins x ++ actualPlugins); + withPlugins = newplugins: + withPlugins (x: newplugins x ++ actualPlugins); full = withPlugins lib.attrValues; # Ouch - overrideDerivation = f: (pluggable (terraform.overrideDerivation f)).withPlugins plugins; - overrideAttrs = f: (pluggable (terraform.overrideAttrs f)).withPlugins plugins; - override = x: (pluggable (terraform.override x)).withPlugins plugins; + overrideDerivation = f: + (pluggable (terraform.overrideDerivation f)).withPlugins plugins; + overrideAttrs = f: + (pluggable (terraform.overrideAttrs f)).withPlugins plugins; + override = x: + (pluggable (terraform.override x)).withPlugins plugins; }; - in # Don't bother wrapping unless we actually have plugins, since the wrapper will stop automatic downloading # of plugins, which might be counterintuitive if someone just wants a vanilla Terraform. - if actualPlugins == [] - then terraform.overrideAttrs (orig: { passthru = orig.passthru // passthru; }) - else lib.appendToName "with-plugins"(stdenv.mkDerivation { - inherit (terraform) name; - buildInputs = [ makeWrapper ]; - - buildCommand = '' - mkdir -p $out/bin/ - makeWrapper "${terraform.bin}/bin/terraform" "$out/bin/terraform" \ - --set NIX_TERRAFORM_PLUGIN_DIR "${buildEnv { name = "tf-plugin-env"; paths = actualPlugins; }}/bin" \ - --prefix PATH : "${lib.makeBinPath wrapperInputs}" - ''; - - inherit passthru; - }); - in withPlugins (_: []); - - plugins = removeAttrs terraform-providers ["override" "overrideDerivation" "recurseForDerivations"]; + in if actualPlugins == [ ] then + terraform.overrideAttrs + (orig: { passthru = orig.passthru // passthru; }) + else + lib.appendToName "with-plugins" (stdenv.mkDerivation { + inherit (terraform) name; + buildInputs = [ makeWrapper ]; + + buildCommand = '' + mkdir -p $out/bin/ + makeWrapper "${terraform.bin}/bin/terraform" "$out/bin/terraform" \ + --set NIX_TERRAFORM_PLUGIN_DIR "${ + buildEnv { + name = "tf-plugin-env"; + paths = actualPlugins; + } + }/bin" \ + --prefix PATH : "${lib.makeBinPath wrapperInputs}" + ''; + + inherit passthru; + }); + in withPlugins (_: [ ]); + + plugins = removeAttrs terraform-providers [ + "override" + "overrideDerivation" + "recurseForDerivations" + ]; in rec { terraform_0_11 = pluggable (generic { version = "0.11.14"; @@ -97,8 +112,8 @@ in rec { terraform_0_11-full = terraform_0_11.full; terraform_0_12 = pluggable (generic { - version = "0.12.13"; - sha256 = "11nbr9avw6jx349jdmxgxiawk8i5mpw3p4rrl89yly0wfhg0fh4a"; + version = "0.12.14"; + sha256 = "0pq4sfnnlj91gxyxvyzzrgglnvh8xpan90gnc9jvnnb23iv4q96l"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); @@ -112,8 +127,8 @@ in rec { resource "random_id" "test" {} ''; terraform = terraform_0_11.withPlugins (p: [ p.random ]); - test = runCommand "terraform-plugin-test" { buildInputs = [terraform]; } - '' + test = + runCommand "terraform-plugin-test" { buildInputs = [ terraform ]; } '' set -e # make it fail outside of sandbox export HTTP_PROXY=http://127.0.0.1:0 HTTPS_PROXY=https://127.0.0.1:0 diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index 589cd04057e..a84de638066 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "davmail"; - version = "5.2.0"; + version = "5.4.0"; src = fetchurl { - url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}-2961.zip"; - sha256 = "0jw6sjg7k7zg8ab0srz6cjjj5hnw5ppxx1w35sw055dlg54fh2m5"; + url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}-3135.zip"; + sha256 = "05n2j5canh046744arvni6yfdsandvjkld93w3p7rg116jrh19gq"; }; sourceRoot = "."; diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index e5b962b2493..dbfc87b8e8d 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -78,6 +78,9 @@ in rm $out/share/mattermost-desktop/create_desktop_file.sh mkdir -p $out/share/applications mv Mattermost.desktop $out/share/applications/Mattermost.desktop + substituteInPlace \ + $out/share/applications/Mattermost.desktop \ + --replace /share/mattermost-desktop/mattermost-desktop /bin/mattermost-desktop patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 564e5e17b0a..e39f01a92c0 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -59,7 +59,7 @@ let in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.27.4"; # Please backport all updates to the stable channel. + version = "1.28.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -69,7 +69,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1aza1s70xzx9qkv7b5mpfi4zgdn5dq3rl03lx3jixij3x3pxg5sj"; + sha256 = "14cd635fax99l5jk70jy0mjnvw01b0gbv666szc4ajamm36l2bkr"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix index 85b73141966..54b3e10b5e2 100644 --- a/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/pkgs/applications/networking/mailreaders/afew/default.nix @@ -1,19 +1,19 @@ -{ stdenv, pythonPackages, notmuch }: +{ stdenv, python3Packages, notmuch }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "afew"; version = "2.0.0"; - src = pythonPackages.fetchPypi { + src = python3Packages.fetchPypi { inherit pname version; sha256 = "0j60501nm242idf2ig0h7p6wrg58n5v2p6zfym56v9pbvnbmns0s"; }; - nativeBuildInputs = with pythonPackages; [ sphinx setuptools_scm ]; + nativeBuildInputs = with python3Packages; [ sphinx setuptools_scm ]; - propagatedBuildInputs = with pythonPackages; [ - pythonPackages.setuptools pythonPackages.notmuch chardet dkimpy - ] ++ stdenv.lib.optional (!pythonPackages.isPy3k) subprocess32; + propagatedBuildInputs = with python3Packages; [ + python3Packages.setuptools python3Packages.notmuch chardet dkimpy + ] ++ stdenv.lib.optional (!python3Packages.isPy3k) subprocess32; makeWrapperArgs = [ ''--prefix PATH ':' "${notmuch}/bin"'' @@ -22,7 +22,7 @@ pythonPackages.buildPythonApplication rec { outputs = [ "out" "doc" ]; postBuild = '' - python setup.py build_sphinx -b html,man + ${python3Packages.python.interpreter} setup.py build_sphinx -b html,man ''; postInstall = '' diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix index 7d7972c3e58..9f05020f2c3 100644 --- a/pkgs/applications/networking/mailreaders/imapfilter.nix +++ b/pkgs/applications/networking/mailreaders/imapfilter.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "imapfilter"; - version = "2.6.13"; + version = "2.6.14"; src = fetchFromGitHub { owner = "lefcha"; repo = "imapfilter"; rev = "v${version}"; - sha256 = "02997rnnvid3rfkxmlgjpbspi4svdmq8r8wd2zvf25iadim3hxqi"; + sha256 = "09aq9gw1vz0zl6k4fb4zdm6cpjhddsl13asfjx3qy21pbw0azmj6"; }; makeFlagsArray = "PREFIX=$(out)"; diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 81dc935f40d..4305294297a 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "20191102"; + version = "20191111"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "0x5f9zbvxsxg5y2ir4xq4xw1q2snaxkidhdyhcxw5ljw3qqwhlyq"; + sha256 = "16xr7wdmjw0i72xbnyyh098wx4cr0m8w2cr1szdi1b14p4kpgr67"; }; buildInputs = [ diff --git a/pkgs/applications/networking/protocol/default.nix b/pkgs/applications/networking/protocol/default.nix index 7fdb062ef80..8785d2449b3 100644 --- a/pkgs/applications/networking/protocol/default.nix +++ b/pkgs/applications/networking/protocol/default.nix @@ -1,14 +1,14 @@ { stdenv, buildPythonApplication, fetchFromGitHub }: buildPythonApplication { - pname = "protocol"; - version = "20171226"; + pname = "protocol-unstable"; + version = "2019-03-28"; src = fetchFromGitHub { owner = "luismartingarcia"; repo = "protocol"; - rev = "d450da7d8a58595d8ef82f1d199a80411029fc7d"; - sha256 = "1g31s2xx0bw8ak5ag1c6mv0p0b8bj5dp3lkk9mxaf2ndj1m1qdkw"; + rev = "4e8326ea6c2d288be5464c3a7d9398df468c0ada"; + sha256 = "13l10jhf4vghanmhh3pn91b2jdciispxy0qadz4n08blp85qn9cm"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/sync/onedrive/default.nix b/pkgs/applications/networking/sync/onedrive/default.nix index b1a5e8e74cb..0767ce2f294 100644 --- a/pkgs/applications/networking/sync/onedrive/default.nix +++ b/pkgs/applications/networking/sync/onedrive/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "onedrive"; - version = "2.3.10"; + version = "2.3.11"; src = fetchFromGitHub { owner = "abraunegg"; repo = "onedrive"; rev = "v${version}"; - sha256 = "0ks22anxih63zwlc11z0gi531wvcricbkv1wlkrgfihi58l8fhfk"; + sha256 = "08k5b3izqzk9mjjny5y47i3q5sl0w37xdqrhaacjxwm0jib9w0mh"; }; nativeBuildInputs = [ @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { description = "A complete tool to interact with OneDrive on Linux"; homepage = "https://github.com/abraunegg/onedrive"; license = licenses.gpl3; - maintainers = with maintainers; [ doronbehar ]; + maintainers = with maintainers; [ doronbehar srgom ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/office/atlassian-cli/default.nix b/pkgs/applications/office/atlassian-cli/default.nix index 6ef6e51527e..6894f1ca635 100644 --- a/pkgs/applications/office/atlassian-cli/default.nix +++ b/pkgs/applications/office/atlassian-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "atlassian-cli"; - version = "8.5.0"; + version = "9.0.0"; src = fetchzip { url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip"; - sha256 = "0c9jq7q0bx0db0zhdh89bv1ijfg7cddbx04v451vl8caqcyhkfgz"; + sha256 = "1z8723krq65fcy5aapgiz216vrpw2nw8fbn1h3a4zpis7kw8qp0f"; extraPostFetch = "chmod go-w $out"; }; diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index a5de74a6f16..6b26870ee44 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -25,6 +25,7 @@ buildPythonApplication rec { markdown2 ply simplejson + jaraco_functools ]; # CLI test expects fava on $PATH. Not sure why static_url fails. diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index a7b0afe0754..9fdeecfee36 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, dpkg, which +{ fetchurl, stdenv, mkDerivation, dpkg, which , makeWrapper , alsaLib , desktop-file-utils @@ -90,7 +90,7 @@ let in -stdenv.mkDerivation { +mkDerivation { pname = "mendeley"; inherit version; @@ -106,6 +106,8 @@ stdenv.mkDerivation { dontUnpack = true; + dontWrapQtApps = true; + installPhase = '' dpkg-deb -x $src $out mv $out/opt/mendeleydesktop/{bin,lib,share} $out @@ -115,7 +117,7 @@ stdenv.mkDerivation { --set-rpath ${stdenv.lib.makeLibraryPath deps}:$out/lib \ $out/bin/mendeleydesktop - wrapProgram $out/bin/mendeleydesktop \ + wrapQtApp $out/bin/mendeleydesktop \ --add-flags "--unix-distro-build" \ ${stdenv.lib.optionalString autorunLinkHandler # ignore errors installing the link handler ''--run "$out/bin/install-mendeley-link-handler.sh $out/bin/mendeleydesktop ||:"''} diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index a1b92e7e4e1..d4056dca7bf 100644 --- a/pkgs/applications/radio/urh/default.nix +++ b/pkgs/applications/radio/urh/default.nix @@ -1,25 +1,31 @@ { stdenv, lib, fetchFromGitHub, python3Packages , hackrf, rtl-sdr, airspy, limesuite, libiio +, qt5 , USRPSupport ? false, uhd }: python3Packages.buildPythonApplication rec { pname = "urh"; - version = "2.7.3"; + version = "2.8.0"; src = fetchFromGitHub { owner = "jopohl"; repo = pname; rev = "v${version}"; - sha256 = "1jrrj9c4ddm37m8j0g693xjimpnlvx7lan5kxish5p14xpwdak35"; + sha256 = "1c87lff9bqhf574420ycqz88x6ad5hmy36wrb8pi0dqd1s1d72qb"; }; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; buildInputs = [ hackrf rtl-sdr airspy limesuite libiio ] ++ lib.optional USRPSupport uhd; propagatedBuildInputs = with python3Packages; [ - pyqt5 numpy psutil cython pyzmq pyaudio + pyqt5 numpy psutil cython pyzmq pyaudio setuptools ]; + postFixup = '' + wrapQtApp $out/bin/urh + ''; + doCheck = false; meta = with lib; { diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix index 7789f4cf8ba..7cc71e4978a 100644 --- a/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem +{ stdenv, mkDerivation, fetchurl, makeDesktopItem , libXrender, libXrandr, libXcursor, libX11, libXext, libXi, libxcb , libGL, glib, nss, nspr, expat, alsaLib , qtbase, qtdeclarative, qtsvg, qtlocation, qtwebchannel, qtwebengine @@ -11,7 +11,7 @@ let qtbase qtdeclarative qtsvg qtlocation qtwebchannel qtwebengine ]; in - stdenv.mkDerivation rec { + mkDerivation rec { pname = "eagle"; version = "9.5.0"; diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index 6f338f21478..eeb3a6b6d36 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation { pname = "why3"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = https://gforge.inria.fr/frs/download.php/file/37903/why3-1.2.0.tar.gz; - sha256 = "0xz001jhi71ja8vqrjz27v63bidrzj4qvg1yqarq6p4dmpxhk348"; + url = https://gforge.inria.fr/frs/download.php/file/38185/why3-1.2.1.tar.gz; + sha256 = "014gkwisjp05x3342zxkryb729p02ngx1hcjjsrplpa53jzgz647"; }; buildInputs = with ocamlPackages; [ diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index ca9a87abe13..7cd1b2eb99f 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -93,13 +93,16 @@ stdenv.mkDerivation rec { # Fix library paths cd $out/libexec/Mathematica/Executables for path in mathematica MathKernel Mathematica WolframKernel wolfram math; do - sed -i -e 's#export LD_LIBRARY_PATH$#export LD_LIBRARY_PATH=${zlib}/lib:\''${LD_LIBRARY_PATH}#' $path + sed -i -e "2iexport LD_LIBRARY_PATH=${zlib}/lib:\''${LD_LIBRARY_PATH}\n" $path done # Fix xkeyboard config path for Qt for path in mathematica Mathematica; do sed -i -e "2iexport QT_XKB_CONFIG_ROOT=\"${xkeyboard_config}/share/X11/xkb\"\n" $path done + + # Remove some broken libraries + rm $out/libexec/Mathematica/SystemFiles/Libraries/Linux-x86-64/libz.so* ''; preFixup = '' diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 751f3c3aebe..ed4e82f766c 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -1,28 +1,26 @@ -{ - stdenv -, python -}: +{ stdenv, python3Packages }: -python.buildPythonPackage rec { +python3Packages.buildPythonApplication rec { pname = "snakemake"; - version = "5.4.4"; + version = "5.7.4"; - propagatedBuildInputs = with python; [ + propagatedBuildInputs = with python3Packages; [ appdirs ConfigArgParse datrie docutils GitPython jsonschema + psutil pyyaml ratelimiter requests wrapt ]; - src = python.fetchPypi { + src = python3Packages.fetchPypi { inherit pname version; - sha256 = "157323e0e1be34302edbbf399b2acbe25a4291bceffd47a0469963a970c9375f"; + sha256 = "11f2f00c505d928b91332056667d49c96ed1694bf78e798ce27613948d44a2a2"; }; doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index 09c9169e434..64ef6db980b 100644 --- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -1,19 +1,26 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchzip, unixtools, which }: stdenv.mkDerivation rec { pname = "git-extras"; - version = "4.7.0"; + version = "5.0.0"; - src = fetchurl { + src = fetchzip { url = "https://github.com/tj/git-extras/archive/${version}.tar.gz"; - sha256 = "0pab4f5kmmcn333aswkgndf1fgilc41h8h0rk3lviz0yi8j59vaq"; + sha256 = "0c839kc5mhi1iqhc696p4dj67i5hm2gi4d8cvdpskaapb124mj2f"; }; + nativeBuildInputs = [ unixtools.column which ]; + dontBuild = true; - installFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" ]; + preInstall = '' + patchShebangs . + ''; + + installFlags = [ "PREFIX=${placeholder "out"}" ]; postInstall = '' + # bash completion is already handled by make install install -D etc/git-extras-completion.zsh $out/share/zsh/site-functions/_git_extras ''; diff --git a/pkgs/applications/video/celluloid/default.nix b/pkgs/applications/video/celluloid/default.nix index 47a82470137..22fac11b018 100644 --- a/pkgs/applications/video/celluloid/default.nix +++ b/pkgs/applications/video/celluloid/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "celluloid"; - version = "0.17"; + version = "0.18"; src = fetchFromGitHub { owner = "celluloid-player"; repo = "celluloid"; rev = "v${version}"; - sha256 = "0pnxjv6n2q6igxdr8wzbahcj7vccw4nfjdk8fjdnaivf2lyrpv2d"; + sha256 = "1j8z75y98liirr41rlcn89cshvp1xp71cspcclm6wx455i7q2cg1"; }; nativeBuildInputs = [ @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { postPatch = '' patchShebangs meson-post-install.py src/generate-authors.py - sed -i '/gtk-update-icon-cache/s/^/#/' meson-post-install.py ''; doCheck = true; @@ -59,6 +58,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/celluloid-player/celluloid"; license = licenses.gpl3Plus; + maintainers = with maintainers; [ worldofpeace ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 78e0544fa1d..f3c7d376100 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -39,7 +39,7 @@ , pulseSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null , rubberbandSupport ? stdenv.isLinux, rubberband ? null , screenSaverSupport ? true, libXScrnSaver ? null -, sambaSupport ? true, samba ? null +, sambaSupport ? stdenv.isLinux, samba ? null , sdl2Support ? true, SDL2 ? null , sndioSupport ? true, sndio ? null , speexSupport ? true, speex ? null diff --git a/pkgs/applications/video/obs-studio/fix-search-path.patch b/pkgs/applications/video/obs-studio/fix-search-path.patch new file mode 100644 index 00000000000..4503447ff5d --- /dev/null +++ b/pkgs/applications/video/obs-studio/fix-search-path.patch @@ -0,0 +1,13 @@ +diff --git a/external/FindLibObs.cmake b/external/FindLibObs.cmake +index ab0a3de..19c63ee 100644 +--- a/external/FindLibObs.cmake ++++ b/external/FindLibObs.cmake +@@ -95,7 +95,7 @@ if(LIBOBS_FOUND) + + set(LIBOBS_INCLUDE_DIRS ${LIBOBS_INCLUDE_DIR} ${W32_PTHREADS_INCLUDE_DIR}) + set(LIBOBS_LIBRARIES ${LIBOBS_LIB} ${W32_PTHREADS_LIB}) +- include(${LIBOBS_INCLUDE_DIR}/../cmake/external/ObsPluginHelpers.cmake) ++ include(external/ObsPluginHelpers.cmake) + + # allows external plugins to easily use/share common dependencies that are often included with libobs (such as FFmpeg) + if(NOT DEFINED INCLUDED_LIBOBS_CMAKE_MODULES) diff --git a/pkgs/applications/video/obs-studio/obs-ndi.nix b/pkgs/applications/video/obs-studio/obs-ndi.nix new file mode 100644 index 00000000000..450ebf4ac20 --- /dev/null +++ b/pkgs/applications/video/obs-studio/obs-ndi.nix @@ -0,0 +1,39 @@ +# We don't have a wrapper which can supply obs-studio plugins so you have to +# somewhat manually install this: + +# nix-env -f "<nixpkgs>" -iA obs-ndi +# mkdir -p ~/.config/obs-studio/plugins +# ln -s ~/.nix-profile/share/obs/obs-plugins/obs-ndi ~/.config/obs-studio/plugins/ + +{ stdenv, fetchFromGitHub, obs-studio, cmake, qt5 }: + +stdenv.mkDerivation rec { + pname = "obs-ndi"; + version = "4.7.1"; + + src = fetchFromGitHub { + owner = "Palakis"; + repo = "obs-ndi"; + rev = version; + sha256 = "040fkbf3f3qgqcrd3072y3zrjb4fwga8zr10jym744xd7bgyylqh"; + }; + + patches = [ ./fix-search-path.patch ]; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ obs-studio qt5.qtbase ]; + + cmakeFlags = [ + "-DLIBOBS_INCLUDE_DIR=${obs-studio}/include/obs" + "-DLIBOBS_LIB=${obs-studio}/lib" + "-DCMAKE_CXX_FLAGS=-I${obs-studio.src}/UI/obs-frontend-api" + ]; + + meta = with stdenv.lib; { + description = "Network A/V plugin for OBS Studio"; + homepage = https://github.com/Palakis/obs-ndi; + maintainers = with maintainers; [ peti ]; + license = licenses.gpl2; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index 89df7dae4a4..a3576557f34 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { project = "conmon"; name = "${project}-${version}"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "containers"; repo = project; rev = "v${version}"; - sha256 = "1ha5vhjlb12kshh0j1vpl1vjk8ym9w2j1x762y6zdspkdha1w3dv"; + sha256 = "0xsirdsgq84bsjb1xgzv3pnjhm9l13vwj79zd8rjdd7p28wsxb0y"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/build-support/fetchgit/private.nix b/pkgs/build-support/fetchgit/private.nix deleted file mode 100644 index 6731cf87fbd..00000000000 --- a/pkgs/build-support/fetchgit/private.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ fetchgit, runCommand, makeWrapper, openssh }: args: derivation ((fetchgit args).drvAttrs // { - SSH_AUTH_SOCK = if (builtins.tryEval <ssh-auth-sock>).success - then builtins.toString <ssh-auth-sock> - else null; - - GIT_SSH = let - config = let - sshConfigFile = if (builtins.tryEval <ssh-config-file>).success - then <ssh-config-file> - else builtins.trace '' - Please set your nix-path such that ssh-config-file points to a file that will allow ssh to access private repositories. The builder will not be able to see any running ssh agent sessions unless ssh-auth-sock is also set in the nix-path. - - Note that the config file and any keys it points to must be readable by the build user, which depending on your nix configuration means making it readable by the build-users-group, the user of the running nix-daemon, or the user calling the nix command which started the build. Similarly, if using an ssh agent ssh-auth-sock must point to a socket the build user can access. - - You may need StrictHostKeyChecking=no in the config file. Since ssh will refuse to use a group-readable private key, if using build-users you will likely want to use something like IdentityFile /some/directory/%u/key and have a directory for each build user accessible to that user. - '' "/var/lib/empty/config"; - in builtins.toString sshConfigFile; - - ssh-wrapped = runCommand "fetchgit-ssh" { - nativeBuildInputs = [ makeWrapper ]; - } '' - mkdir -p $out/bin - makeWrapper ${openssh}/bin/ssh $out/bin/ssh --prefix PATH : "$out/bin" --add-flags "-F ${config}" "$@" - ''; - in "${ssh-wrapped}/bin/ssh"; -}) diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 6300587a7d1..7d23a3a7f8f 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, curl }: # Note that `curl' may be `null', in case of the native stdenvNoCC. +{ lib, buildPackages ? { inherit stdenvNoCC; }, stdenvNoCC, curl }: # Note that `curl' may be `null', in case of the native stdenvNoCC. let @@ -10,7 +10,7 @@ let # resulting store derivations (.drv files) much smaller, which in # turn makes nix-env/nix-instantiate faster. mirrorsFile = - stdenvNoCC.mkDerivation ({ + buildPackages.stdenvNoCC.mkDerivation ({ name = "mirrors-list"; builder = ./write-mirror-list.sh; preferLocalBuild = true; diff --git a/pkgs/build-support/ocaml/default.nix b/pkgs/build-support/ocaml/default.nix index cc2001c66e2..3957b955a2c 100644 --- a/pkgs/build-support/ocaml/default.nix +++ b/pkgs/build-support/ocaml/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (args // { setupHook = if setupHook == null && hasSharedObjects then writeText "setupHook.sh" '' - export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/" + export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/" '' else setupHook; diff --git a/pkgs/data/fonts/xits-math/default.nix b/pkgs/data/fonts/xits-math/default.nix index 24e9f2a3935..db0ed425dee 100644 --- a/pkgs/data/fonts/xits-math/default.nix +++ b/pkgs/data/fonts/xits-math/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchFromGitHub, python2Packages, fontforge }: +{ stdenv, fetchFromGitHub, python3Packages}: stdenv.mkDerivation rec { pname = "xits-math"; - version = "1.200"; + version = "1.301"; src = fetchFromGitHub { owner = "alif-type"; repo = "xits"; rev = "v${version}"; - sha256 = "0s1qqqg3zv9k4wqn1vkx0z895fjccg96n58syc1d5f2wba9kyfcm"; + sha256 = "043g0gnjc7wn1szvrs0rc1vvrq1qmhqh45b0y2kwrlxsgprpv8ll"; }; - nativeBuildInputs = [ fontforge ] ++ (with python2Packages; [ python fonttools ]); + nativeBuildInputs = (with python3Packages; [ python fonttools fontforge ]); postPatch = '' rm *.otf @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/khaledhosny/xits-math; + homepage = "https://github.com/alif-type/xits"; description = "OpenType implementation of STIX fonts with math support"; license = licenses.ofl; platforms = platforms.all; diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix index b052a104240..36a1d050cb8 100644 --- a/pkgs/desktops/deepin/dde-api/default.nix +++ b/pkgs/desktops/deepin/dde-api/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { pname = "dde-api"; - version = "3.18.4.1"; + version = "5.0.0"; goPackagePath = "pkg.deepin.io/dde/api"; @@ -32,7 +32,7 @@ buildGoPackage rec { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0bcjp5ijwa4wmx6p43lik6vjlb7d5rk7nf8xl495i3yk9x70wyfa"; + sha256 = "0iv4krj6dqdknwvmax7aj40k1h96259kqcfnljadrwpl7cvsvp5p"; }; goDeps = ./deps.nix; diff --git a/pkgs/desktops/deepin/dde-api/deps.nix b/pkgs/desktops/deepin/dde-api/deps.nix index a3b5e20effc..5ebe1f6af95 100644 --- a/pkgs/desktops/deepin/dde-api/deps.nix +++ b/pkgs/desktops/deepin/dde-api/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + rev = "fb15b899a75114aa79cc930e33c46b577cc664b1"; + sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; }; } { @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + rev = "f65c72e2690dc4b403c8bd637baf4611cd4c069b"; + sha256 = "04jyqm7m3m01ppfy1f9xk4qvrwvs78q9zml6llyf2b3v5k6b2bbc"; }; } { @@ -32,8 +32,8 @@ fetch = { type = "git"; url = "https://github.com/disintegration/imaging"; - rev = "465faf0892b5c7b3325643b0e47282e1331672e7"; - sha256 = "1z9rkphmqgyphznl53pp1gmf0dfrfrmr95bx46p422ldml26c5a0"; + rev = "9aab30e6aa535fe3337b489b76759ef97dfaf362"; + sha256 = "015amm3x989hl3r4gxnixj602fl9j8z53n0lrq804cbfbk7a31fw"; }; } { @@ -41,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/fogleman/gg"; - rev = "f194ddec6f45226fc9e1b4a61b7237f186edd543"; - sha256 = "095g5hpqvpy5w9l4kb65cif013snsvlbw6sgln0kwdix0z099j3i"; + rev = "4dc34561c649343936bb2d29e23959bd6d98ab12"; + sha256 = "1x1finzdrr80dd3r7wvf7zb184yjf4dawz7s581p2dr64dcialww"; }; } { @@ -77,8 +77,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/image"; - rev = "7e034cad644213bc79b336b52fce73624259aeca"; - sha256 = "04n4yi0p2yjv8sr9dmnzwc2k6hvzzvl6jdq2xd043kvjwzk583va"; + rev = "e7c1f5e7dbb87d8921928a6d9fc52fb31ce73b24"; + sha256 = "0czp897aicqw1dgybj0hc2zzwb20rhqkdqm7siqci3yk7yk9cymf"; }; } { @@ -86,8 +86,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "3b0461eec859c4b73bb64fdc8285971fd33e3938"; - sha256 = "0l00c8l0a8xnv6qdpwfzxxsr58jggacgzdrwiprrfx2xqm37b6d5"; + rev = "daa7c04131f568e31c51927b359a2d197a357058"; + sha256 = "17gbfvb5iqyayzw0zd6q218zsbf7x74rflvn18wkxvsw95n1y54h"; }; } { diff --git a/pkgs/desktops/deepin/dde-calendar/default.nix b/pkgs/desktops/deepin/dde-calendar/default.nix index 427cb1249c9..3d4800a7510 100644 --- a/pkgs/desktops/deepin/dde-calendar/default.nix +++ b/pkgs/desktops/deepin/dde-calendar/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "dde-calendar"; - version = "1.2.10"; + version = "5.0.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "00aqx24jccf88vvkpb9svyjz8knrqyjgd0152psf9dxc9q13f61h"; + sha256 = "1zzr3crkz4l5l135y0m53vqhv7fkrbvbspk8295swz9gsm3f7ah9"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/dde-control-center/default.nix b/pkgs/desktops/deepin/dde-control-center/default.nix index 0871e004e5f..0aaacee2ba4 100644 --- a/pkgs/desktops/deepin/dde-control-center/default.nix +++ b/pkgs/desktops/deepin/dde-control-center/default.nix @@ -8,13 +8,13 @@ mkDerivation rec { pname = "dde-control-center"; - version = "4.10.11"; + version = "5.0.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1ip8wjwf0n9q8xnqymzh8lz0j5gcnns976n291np6k5kdh2wqhr5"; + sha256 = "10bx8bpvi3ib32a3l4nyb1j0iq3bch8jm9wfm6d5v0ym1zb92x3b"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix index da217186e27..31451dca91a 100644 --- a/pkgs/desktops/deepin/dde-daemon/default.nix +++ b/pkgs/desktops/deepin/dde-daemon/default.nix @@ -8,7 +8,7 @@ buildGoPackage rec { pname = "dde-daemon"; - version = "3.27.2.6"; + version = "5.0.0"; goPackagePath = "pkg.deepin.io/dde/daemon"; @@ -16,7 +16,7 @@ buildGoPackage rec { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "14g138h23f1lh1y98pdrfhnph1m7pw8lq8ypiwv9qf3fmdyn35d4"; + sha256 = "08jri31bvzbaxaq78rpp46ndv0li2dij63hakvd9b9gs786srql1"; }; patches = [ diff --git a/pkgs/desktops/deepin/dde-daemon/deps.nix b/pkgs/desktops/deepin/dde-daemon/deps.nix index c9a15ad88d4..bcc5ab81808 100644 --- a/pkgs/desktops/deepin/dde-daemon/deps.nix +++ b/pkgs/desktops/deepin/dde-daemon/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + rev = "fb15b899a75114aa79cc930e33c46b577cc664b1"; + sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; }; } { @@ -14,8 +14,8 @@ fetch = { type = "git"; url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + rev = "f65c72e2690dc4b403c8bd637baf4611cd4c069b"; + sha256 = "04jyqm7m3m01ppfy1f9xk4qvrwvs78q9zml6llyf2b3v5k6b2bbc"; }; } { @@ -77,8 +77,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/image"; - rev = "7e034cad644213bc79b336b52fce73624259aeca"; - sha256 = "04n4yi0p2yjv8sr9dmnzwc2k6hvzzvl6jdq2xd043kvjwzk583va"; + rev = "e7c1f5e7dbb87d8921928a6d9fc52fb31ce73b24"; + sha256 = "0czp897aicqw1dgybj0hc2zzwb20rhqkdqm7siqci3yk7yk9cymf"; }; } { @@ -86,8 +86,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "3b0461eec859c4b73bb64fdc8285971fd33e3938"; - sha256 = "0l00c8l0a8xnv6qdpwfzxxsr58jggacgzdrwiprrfx2xqm37b6d5"; + rev = "daa7c04131f568e31c51927b359a2d197a357058"; + sha256 = "17gbfvb5iqyayzw0zd6q218zsbf7x74rflvn18wkxvsw95n1y54h"; }; } { @@ -95,8 +95,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/text"; - rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + rev = "4b67af870c6ffd08258ef1202f371aebccaf7b68"; + sha256 = "01mhy1xs2dh18kp6wdk1xnb34lbzv2qkvdwj7w5ha2qgm5rrm4ik"; }; } { diff --git a/pkgs/desktops/deepin/dde-dock/default.nix b/pkgs/desktops/deepin/dde-dock/default.nix index fc25d007f20..afa245eefe9 100644 --- a/pkgs/desktops/deepin/dde-dock/default.nix +++ b/pkgs/desktops/deepin/dde-dock/default.nix @@ -7,13 +7,13 @@ let unwrapped = mkDerivation rec { pname = "dde-dock"; - version = "4.10.3"; + version = "5.0.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "17iy78r0frpv42g521igfdcgdklbifzig1wzxq2nl14fq0bgxg4v"; + sha256 = "12dshsqhzajnxm7r53qg0c84b6xlj313qnssnx2m25z4jdp5i7pr"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/dde-file-manager/default.nix b/pkgs/desktops/deepin/dde-file-manager/default.nix index 081c93a65c8..ba7505b5b2f 100644 --- a/pkgs/desktops/deepin/dde-file-manager/default.nix +++ b/pkgs/desktops/deepin/dde-file-manager/default.nix @@ -1,22 +1,23 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, avfs, dde-daemon, dde-dock, - dde-polkit-agent, dde-qt-dbus-factory, deepin, deepin-anything, - deepin-desktop-schemas, deepin-gettext-tools, deepin-movie-reborn, - deepin-shortcut-viewer, deepin-terminal, dtkcore, dtkwidget, - ffmpegthumbnailer, file, glib, gnugrep, gsettings-qt, gvfs, - jemalloc, kcodecs, libX11, libsecret, polkit, polkit-qt, poppler, - procps, qmake, qt5integration, qtmultimedia, qtsvg, qttools, - qtx11extras, runtimeShell, samba, shadow, taglib, udisks2-qt5, - xdg-user-dirs, xorg, zlib, wrapGAppsHook }: +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, avfs, dde-daemon, + dde-dock, dde-polkit-agent, dde-qt-dbus-factory, deepin, + deepin-anything, deepin-desktop-schemas, deepin-gettext-tools, + deepin-movie-reborn, deepin-shortcut-viewer, deepin-terminal, + disomaster, dtkcore, dtkwidget, ffmpegthumbnailer, file, glib, + gnugrep, gsettings-qt, gvfs, jemalloc, kcodecs, libX11, libsecret, + polkit, polkit-qt, poppler, procps, qmake, qt5integration, + qtmultimedia, qtsvg, qttools, qtx11extras, runtimeShell, samba, + shadow, taglib, udisks2-qt5, xdg-user-dirs, xorg, zlib, + wrapGAppsHook }: mkDerivation rec { pname = "dde-file-manager"; - version = "4.8.6.4"; + version = "5.0.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1m0ykw5a91rm5xcah8bzk21xsambqvncj8104ihdhf9h0z9kdmm2"; + sha256 = "0n2nl09anqdq0n5yn688n385rn81lcpybs0sa8m311k3k9ndkkyr"; }; nativeBuildInputs = [ @@ -39,6 +40,7 @@ mkDerivation rec { deepin-movie-reborn.dev deepin-shortcut-viewer deepin-terminal + disomaster dtkcore dtkwidget ffmpegthumbnailer diff --git a/pkgs/desktops/deepin/dde-launcher/default.nix b/pkgs/desktops/deepin/dde-launcher/default.nix index b36d87604e7..ca5fa6d0906 100644 --- a/pkgs/desktops/deepin/dde-launcher/default.nix +++ b/pkgs/desktops/deepin/dde-launcher/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "dde-launcher"; - version = "4.6.13"; + version = "5.0.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1lwwn2qjbd4i7wx18mi8n7hzdh832i3kdadrivr10sbafdank7ky"; + sha256 = "0zh6bb0r3pgjrnw9rba46ghdzza1ka1mv7r1znf8gw24wsjgjcpn"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/dde-network-utils/default.nix b/pkgs/desktops/deepin/dde-network-utils/default.nix index 5397439949b..0c8e7e8d137 100644 --- a/pkgs/desktops/deepin/dde-network-utils/default.nix +++ b/pkgs/desktops/deepin/dde-network-utils/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "dde-network-utils"; - version = "0.1.4"; + version = "5.0.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0nj9lf455lf2hyqv6xwhm4vrr825ldbl83azzrrzqs6p781x65i1"; + sha256 = "0670kfnkplf7skkd1ql6y9x15kmrcbdv1005qwkg4vn8hic6s0z3"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/dde-polkit-agent/default.nix index 9d181c188d4..533b0a0fdea 100644 --- a/pkgs/desktops/deepin/dde-polkit-agent/default.nix +++ b/pkgs/desktops/deepin/dde-polkit-agent/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "dde-polkit-agent"; - version = "0.2.10"; + version = "5.0.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0syg121slpd6d9xpifgcf85lg9ca0k96cl1g3rjvsmczs2d2ffgf"; + sha256 = "00p8syx6rfwhq7wdsk37hm9mvwd0kwj9h0s39hii892h1psd84q9"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix index a0e1e35ad85..cdbefb406ad 100644 --- a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix +++ b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dde-qt-dbus-factory"; - version = "1.1.5"; + version = "5.0.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1jzfblsmnfpgym95mmbd8mjkk8wqqfb0kz6n6fy742hmqlzrpsj7"; + sha256 = "1wbh4jgvy3c09ivy0vvfk0azkg4d2sv37y23c9rq49jb3sakcjgm"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/dde-session-ui/default.nix b/pkgs/desktops/deepin/dde-session-ui/default.nix index bad409303d9..e71262cc8e9 100644 --- a/pkgs/desktops/deepin/dde-session-ui/default.nix +++ b/pkgs/desktops/deepin/dde-session-ui/default.nix @@ -7,13 +7,13 @@ mkDerivation rec { pname = "dde-session-ui"; - version = "4.9.12"; + version = "5.0.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "00i45xv87wx9cww1d445lg6zjbhda5kki8nhsaav8gf2d4cmwzf4"; + sha256 = "1gy9nlpkr9ayrs1z2dvd7h0dqlw6fq2m66d9cs48qyfkr6c8l9jj"; }; nativeBuildInputs = [ @@ -89,8 +89,8 @@ mkDerivation rec { substituteInPlace lightdm-deepin-greeter/scripts/lightdm-deepin-greeter --replace "/usr/bin/lightdm-deepin-greeter" "$out/bin/lightdm-deepin-greeter" substituteInPlace session-ui-guardien/guardien.cpp --replace "dde-lock" "$out/bin/dde-lock" substituteInPlace session-ui-guardien/guardien.cpp --replace "dde-shutdown" "$out/bin/dde-shutdown" - substituteInPlace session-widgets/lockworker.cpp --replace "dde-switchtogreeter" "$out/bin/dde-switchtogreeter" - substituteInPlace session-widgets/lockworker.cpp --replace "which" "${which}/bin/which" + substituteInPlace dde-lock/lockworker.cpp --replace "dde-switchtogreeter" "$out/bin/dde-switchtogreeter" + substituteInPlace dde-lock/lockworker.cpp --replace "which" "${which}/bin/which" substituteInPlace session-widgets/userinfo.cpp --replace "/usr/share/wallpapers/deepin" "${deepin-wallpapers}/share/wallpapers/deepin" substituteInPlace widgets/fullscreenbackground.cpp --replace "/usr/share/wallpapers/deepin" "${deepin-wallpapers}/share/wallpapers/deepin" substituteInPlace widgets/kblayoutwidget.cpp --replace "setxkbmap" "${setxkbmap}/bin/setxkbmap" diff --git a/pkgs/desktops/deepin/deepin-anything/default.nix b/pkgs/desktops/deepin/deepin-anything/default.nix index 7c88102c5f3..38ebe664b85 100644 --- a/pkgs/desktops/deepin/deepin-anything/default.nix +++ b/pkgs/desktops/deepin/deepin-anything/default.nix @@ -3,7 +3,7 @@ mkDerivation rec { pname = "deepin-anything"; - version = "0.1.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "linuxdeepin"; diff --git a/pkgs/desktops/deepin/deepin-calculator/default.nix b/pkgs/desktops/deepin/deepin-calculator/default.nix index 97d2b53da70..201316638a8 100644 --- a/pkgs/desktops/deepin/deepin-calculator/default.nix +++ b/pkgs/desktops/deepin/deepin-calculator/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "deepin-calculator"; - version = "1.0.11"; + version = "5.0.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "10bfq0h8v0a8i46gcbsy79l194g8sc0ysg289ndrra209fhwlidq"; + sha256 = "0f26y7b3giybybhvlzbnwcw8kidzvhq66h0c15n9ww81gnlqf7v5"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/deepin-desktop-base/default.nix index ba826eb9063..7ffba88d153 100644 --- a/pkgs/desktops/deepin/deepin-desktop-base/default.nix +++ b/pkgs/desktops/deepin/deepin-desktop-base/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "deepin-desktop-base"; - version = "2019.06.19"; + version = "2019.07.10"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1r158x4z4qalv4q1ni3aln05krdzblvr7y6wyciwl7cr5ag1i1jy"; + sha256 = "0rs7bjy35k5gc5nbba1cijhdz16zny30lgmcf2ckx1pkdszk2vra"; }; nativeBuildInputs = [ deepin.setupHook ]; diff --git a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix index 4f2427e8237..fe2062a3d96 100644 --- a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix +++ b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "deepin-desktop-schemas"; - version = "3.13.6"; + version = "3.13.9"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "03jqb47kjyb9b43m2yincfjn2i43ma1pn1hddyicrrpg937caa81"; + sha256 = "1c69j6s7561zb1hrd1j3ihji1nvpgfzfgnp6svsv8jd8dg8vs8l1"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/deepin-image-viewer/default.nix index 733f4846f5c..bf9d1db2120 100644 --- a/pkgs/desktops/deepin/deepin-image-viewer/default.nix +++ b/pkgs/desktops/deepin/deepin-image-viewer/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "deepin-image-viewer"; - version = "1.3.17"; + version = "5.0.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0hz4f1kqcycyvggwfzpkblhhha87rqd427hq0mf31jfh5x17ymnh"; + sha256 = "01524hfdy3wvdf07n9b3qb8jdpxzg2hwjpl4gxvr68qws5nbnb3c"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix index 046f589263b..0c14ddff178 100644 --- a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix +++ b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix @@ -1,16 +1,16 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qttools, qtx11extras, +{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, pkgconfig, qttools, qtx11extras, dtkcore, dtkwidget, ffmpeg, ffmpegthumbnailer, mpv, pulseaudio, libdvdnav, libdvdread, xorg, deepin }: mkDerivation rec { pname = "deepin-movie-reborn"; - version = "3.2.24"; + version = "5.0.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "16mxym7dm6qk90q2w7xqm62047rq0lirrjmnnpaxshzaww9gngkh"; + sha256 = "0cly8q0514a58s3h3wsvx9yxar7flz6i2q8xkrkfjias22b3z7b0"; }; outputs = [ "out" "dev" ]; @@ -19,6 +19,7 @@ mkDerivation rec { cmake pkgconfig qttools + deepin.setupHook ]; buildInputs = [ @@ -37,11 +38,24 @@ mkDerivation rec { xorg.xcbproto ]; + patches = [ + # fix: build failed if cannot find dtk-settings tool + (fetchpatch { + url = "https://github.com/linuxdeepin/deepin-movie-reborn/commit/fbb307b.patch"; + sha256 = "0915za0khki0729rvcfpxkh6vxhqwc47cgcmjc90kfq1004221vx"; + }) + ]; + NIX_LDFLAGS = "-ldvdnav"; + postPatch = '' - sed -i src/CMakeLists.txt -e "s,/usr/lib/dtk2,${dtkcore}/lib/dtk2," + searchHardCodedPaths # debugging + sed -i src/libdmr/libdmr.pc.in -e "s,/usr,$out," -e 's,libdir=''${prefix}/,libdir=,' + + substituteInPlace src/deepin-movie.desktop \ + --replace "Exec=deepin-movie" "Exec=$out/bin/deepin-movie" ''; passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; diff --git a/pkgs/desktops/deepin/deepin-screenshot/default.nix b/pkgs/desktops/deepin/deepin-screenshot/default.nix index e77aa5e68c6..0e0db458aca 100644 --- a/pkgs/desktops/deepin/deepin-screenshot/default.nix +++ b/pkgs/desktops/deepin/deepin-screenshot/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "deepin-screenshot"; - version = "4.2.1"; + version = "5.0.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "16wy1ywp4lm7fg488laqxgxpir745rbpj9z410r6x7krpgjds189"; + sha256 = "0h1kcf9i8q6rz4jhym3yf84zr6svzff0hh9sl7b24sflzkxx6zwk"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix index 62c6c7ed925..217dbc2b0db 100644 --- a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix +++ b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix @@ -3,7 +3,7 @@ mkDerivation rec { pname = "deepin-shortcut-viewer"; - version = "1.3.5"; + version = "5.0.0"; src = fetchFromGitHub { owner = "linuxdeepin"; diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix index bb2ab7bc8a1..7a4d0662bbb 100644 --- a/pkgs/desktops/deepin/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/deepin-terminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, ninja, vala_0_44, +{ stdenv, fetchFromGitHub, pkgconfig, cmake, ninja, vala_0_40, gettext, at-spi2-core, dbus, epoxy, expect, gtk3, json-glib, libXdmcp, libgee, libpthreadstubs, librsvg, libsecret, libtasn1, libxcb, libxkbcommon, p11-kit, pcre, vte, wnck, libselinux, gnutls, pcre2, @@ -6,20 +6,20 @@ stdenv.mkDerivation rec { pname = "deepin-terminal"; - version = "3.2.6"; + version = "5.0.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = "deepin-terminal"; rev = version; - sha256 = "09s5gvzfxfb353kb61x1b6z3h2aqgln3s3mah3f3zkf5y8hrp2pj"; + sha256 = "1929saj828b438d07caw3cjhqq60v6gni7mi3fqrg9wdjz81xwv7"; }; nativeBuildInputs = [ pkgconfig cmake ninja - vala_0_44 # xcb.vapi:411.3-411.48: error: missing return statement at end of subroutine body + vala_0_40 # xcb.vapi:411.3-411.48: error: missing return statement at end of subroutine body gettext libselinux libsepol utillinux # required by gio deepin.setupHook diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 5d4b6f73244..a2bb4ed19d9 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -37,6 +37,7 @@ let }; deepin-turbo = callPackage ./deepin-turbo { }; deepin-wallpapers = callPackage ./deepin-wallpapers { }; + disomaster = callPackage ./disomaster { }; dpa-ext-gnomekeyring = callPackage ./dpa-ext-gnomekeyring { }; dtkcore = callPackage ./dtkcore { }; dtkwidget = callPackage ./dtkwidget { }; diff --git a/pkgs/desktops/deepin/disomaster/default.nix b/pkgs/desktops/deepin/disomaster/default.nix new file mode 100644 index 00000000000..37140d84191 --- /dev/null +++ b/pkgs/desktops/deepin/disomaster/default.nix @@ -0,0 +1,41 @@ +{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qtbase, libisoburn, deepin }: + +mkDerivation rec { + pname = "disomaster"; + version = "5.0.0"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "13144gq0mpbpclzxc79fb1kirh0vvi50jvjnbpla9s8lvh59xl62"; + }; + + nativeBuildInputs = [ + deepin.setupHook + pkgconfig + qmake + ]; + + buildInputs = [ + libisoburn + qtbase + ]; + + postPatch = '' + searchHardCodedPaths # debugging + + sed -i '/^QMAKE_PKGCONFIG_DESTDIR/i QMAKE_PKGCONFIG_PREFIX = $$PREFIX' \ + libdisomaster/libdisomaster.pro + ''; + + passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; + + meta = with stdenv.lib; { + description = "A libisoburn wrapper for Qt"; + homepage = https://github.com/linuxdeepin/disomaster; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo worldofpeace ]; + }; +} diff --git a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix index f645be0f4d9..394bdd52b3d 100644 --- a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix +++ b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { pname = "dpa-ext-gnomekeyring"; - version = "0.1.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "linuxdeepin"; diff --git a/pkgs/desktops/deepin/dtkcore/default.nix b/pkgs/desktops/deepin/dtkcore/default.nix index 2ed10f99368..3d9dd33772b 100644 --- a/pkgs/desktops/deepin/dtkcore/default.nix +++ b/pkgs/desktops/deepin/dtkcore/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "dtkcore"; - version = "2.0.14"; + version = "2.1.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "0yc6zx8rhzg9mj2brggcsr1jy1pzfvgqy1h305y2dwnx5haazd04"; + sha256 = "0xdh6mmrv8yr6mjmlwj0fv037parkkwfwlaibcbrskwxqp9iri1y"; }; nativeBuildInputs = [ @@ -31,12 +31,13 @@ mkDerivation rec { qmakeFlags = [ "DTK_VERSION=${version}" + "LIB_INSTALL_DIR=${placeholder "out"}/lib" "MKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs" ]; postFixup = '' - chmod +x $out/lib/dtk2/*.py - wrapPythonProgramsIn "$out/lib/dtk2" "$out $pythonPath" + chmod +x $out/lib/libdtk-${version}/DCore/bin/*.py + wrapPythonProgramsIn "$out/lib/libdtk-${version}/DCore/bin" "$out $pythonPath" searchHardCodedPaths $out # debugging ''; @@ -45,7 +46,7 @@ mkDerivation rec { passthru.updateScript = deepin.updateScript { inherit ;name = "${pname}-${version}"; }; meta = with stdenv.lib; { - description = "Deepin tool kit core modules"; + description = "Deepin tool kit core library"; homepage = https://github.com/linuxdeepin/dtkcore; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/desktops/deepin/dtkwidget/default.nix b/pkgs/desktops/deepin/dtkwidget/default.nix index 54c4163fcd1..2e0cfef036a 100644 --- a/pkgs/desktops/deepin/dtkwidget/default.nix +++ b/pkgs/desktops/deepin/dtkwidget/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "dtkwidget"; - version = "2.0.14"; + version = "2.1.1"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "11ws0rl7rhlgwbqd4nqpqxhngf4lcyfrrdq33wzxwdlk33d69i1h"; + sha256 = "0yqrm1p0k1843ldvcd79dxl26ybyl5kljl6vwhzc58sx7pw4qmvh"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/deepin/dtkwm/default.nix b/pkgs/desktops/deepin/dtkwm/default.nix index 4807c3d312b..0251f8097d5 100644 --- a/pkgs/desktops/deepin/dtkwm/default.nix +++ b/pkgs/desktops/deepin/dtkwm/default.nix @@ -1,15 +1,14 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qtx11extras, dtkcore, - deepin }: +{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, pkgconfig, qmake, qtx11extras, dtkcore, deepin }: mkDerivation rec { pname = "dtkwm"; - version = "2.0.11"; + version = "2.0.12"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "10l89i84vsh5knq9wg2php7vfg5rj5c9hrrl9rjlcidn1rz8yx6f"; + sha256 = "0rdzzqsggqarldwb4yp5s4sf5czicgxbdmibjn0pw32129r2d1g3"; }; nativeBuildInputs = [ @@ -22,6 +21,14 @@ mkDerivation rec { qtx11extras ]; + patches = [ + # Set DTK_MODULE_NAME + (fetchpatch { + url = "https://github.com/linuxdeepin/dtkwm/commit/2490891a.patch"; + sha256 = "0krydxjpnaihkgs1n49b6mcf3rd3lkispcnkb1j5vpfs9hp9f48j"; + }) + ]; + outRef = placeholder "out"; qmakeFlags = [ diff --git a/pkgs/desktops/deepin/go-dbus-generator/default.nix b/pkgs/desktops/deepin/go-dbus-generator/default.nix index 12562976490..d564f2c8875 100644 --- a/pkgs/desktops/deepin/go-dbus-generator/default.nix +++ b/pkgs/desktops/deepin/go-dbus-generator/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "go-dbus-generator"; - version = "0.6.6"; + version = "5.0.0"; src = fetchFromGitHub { owner = "linuxdeepin"; diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix index fff92b595f8..f5ed22f2f8e 100644 --- a/pkgs/desktops/deepin/go-lib/default.nix +++ b/pkgs/desktops/deepin/go-lib/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "go-lib"; - version = "1.10.2"; + version = "5.0.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "05z7ayl23cm8mbn4vkn3isy5kgwxljc26ifmzrhmnqm5yibd6lsf"; + sha256 = "0j1ik5hfrysqgync8cyv815cwyjn67k8n69x6llxdp39jli1k8q0"; }; buildInputs = [ diff --git a/pkgs/desktops/deepin/qcef/default.nix b/pkgs/desktops/deepin/qcef/default.nix index ffbc230d2e2..b43d74d15c7 100644 --- a/pkgs/desktops/deepin/qcef/default.nix +++ b/pkgs/desktops/deepin/qcef/default.nix @@ -40,7 +40,7 @@ in mkDerivation rec { pname = "qcef"; - version = "1.1.6"; + version = "1.1.7"; srcs = [ (fetchFromGitHub { @@ -53,8 +53,8 @@ mkDerivation rec { (fetchFromGitHub { owner = "linuxdeepin"; repo = "cef-binary"; - rev = "059a0c9cef4e289a50dc7a2f4c91fe69db95035e"; - sha256 = "1h7cq63n94y2a6fprq4g63admh49rcci7avl5z9kdimkhqb2jb84"; + rev = "fecf00339545d2819224333cc506d5aa22ae8008"; + sha256 = "06i1zc7ciy7d0qhndiwpjrsii0x5i5hg9j6ddi4w5yf1nzgsrj4n"; name = "cef-binary"; }) ]; diff --git a/pkgs/desktops/deepin/qt5integration/default.nix b/pkgs/desktops/deepin/qt5integration/default.nix index 97e60be6d67..0ffa3d006bc 100644 --- a/pkgs/desktops/deepin/qt5integration/default.nix +++ b/pkgs/desktops/deepin/qt5integration/default.nix @@ -4,7 +4,7 @@ mkDerivation rec { pname = "qt5integration"; - version = "0.3.12"; + version = "5.0.0"; src = fetchFromGitHub { owner = "linuxdeepin"; diff --git a/pkgs/desktops/deepin/udisks2-qt5/default.nix b/pkgs/desktops/deepin/udisks2-qt5/default.nix index 51c38f6d347..1809f191838 100644 --- a/pkgs/desktops/deepin/udisks2-qt5/default.nix +++ b/pkgs/desktops/deepin/udisks2-qt5/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "udisks2-qt5"; - version = "0.0.1"; + version = "5.0.0"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - sha256 = "1gk4jmq7mrzk181r6man2rz1iyzkfasz7053a30h4nn24mq8ikig"; + sha256 = "0mqxm6ixzpbg0rr6ly2kvnkpag8gjza67ya7jv4i4rihbq1d0wzi"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index 6cc6848b316..d0a7a890355 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -37,9 +37,7 @@ lib.makeScope pkgs.newScope (self: with self; { gnome_python_desktop = callPackage ./bindings/gnome-python-desktop { }; - gnome_vfs = callPackage ./platform/gnome-vfs { - openssl = pkgs.openssl_1_0_2; - }; + gnome_vfs = callPackage ./platform/gnome-vfs { }; libgnome = callPackage ./platform/libgnome { }; diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix index c15f43b542a..7196840978f 100644 --- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix +++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, dbus-glib +{ stdenv, fetchurl, fetchpatch, pkgconfig, libxml2, bzip2, openssl, dbus-glib , glib, gamin, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }: stdenv.mkDerivation rec { @@ -20,6 +20,18 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ GConf glib ]; + # struct SSL is opaque in openssl-1.1; and the SSL_free() man page + # says that one should not free members of it manually (in both + # the openssl-1.0 and openssl-1.1 man pages). + # https://bugs.gentoo.org/592540 + patches = [ (fetchpatch { + name = "gnome-vfs-2.24.4-openssl-1.1.patch"; + url = "https://bugs.gentoo.org/attachment.cgi?id=535944"; + sha256 = "1q4icapvmwmd5rjah7rr0bqazzk5cg36znmjlpra20n9y27nz040"; + extraPrefix = ""; + }) + ]; + postPatch = "find . -name Makefile.in | xargs sed 's/-DG_DISABLE_DEPRECATED//g' -i "; doCheck = false; # needs dbus daemon diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index b39376a3092..8fad9e3c288 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -1,5 +1,5 @@ { fetchurl, fetchpatch, substituteAll, stdenv, pkgconfig, gnome3, gettext, gobject-introspection, upower, cairo -, pango, cogl, clutter, libstartup_notification, zenity, libcanberra-gtk3 +, pango, cogl, json-glib, libstartup_notification, zenity, libcanberra-gtk3 , ninja, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libinput , gsettings-desktop-schemas, glib, gtk3, gnome-desktop , geocode-glib, pipewire, libgudev, libwacom, xwayland, meson @@ -9,6 +9,7 @@ , wrapGAppsHook , sysprof , desktop-file-utils +, libcap_ng }: stdenv.mkDerivation rec { @@ -30,6 +31,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ # required for pkgconfig to detect mutter-clutter libXtst + json-glib + libcap_ng ]; nativeBuildInputs = [ @@ -46,7 +49,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib gobject-introspection gtk3 gsettings-desktop-schemas upower - gnome-desktop cairo pango cogl clutter zenity libstartup_notification + gnome-desktop cairo pango cogl zenity libstartup_notification geocode-glib libinput libgudev libwacom libcanberra-gtk3 zenity xkeyboard_config libxkbfile libxkbcommon pipewire xwayland @@ -54,6 +57,9 @@ stdenv.mkDerivation rec { ]; patches = [ + # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking + # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381 + ./drop-inheritable.patch # TODO: submit upstream ./0001-build-use-get_pkgconfig_variable-for-sysprof-dbusdir.patch (substituteAll { diff --git a/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch b/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch new file mode 100644 index 00000000000..574ed572561 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/mutter/drop-inheritable.patch @@ -0,0 +1,132 @@ +From e9c772e265b2293af031c79f4bbc99b5847dfe3c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= <torhedinbronner@gmail.com> +Date: Sat, 19 Oct 2019 13:26:05 +0200 +Subject: [PATCH] drop inheritable + +Adapted from https://gitlab.gnome.org/GNOME/mutter/commit/c53c47ae123b03cc66044d2b846342123ecb3a01 + +We only want to drop inheritable though, to prevent the ambient set leaking further than gnome-shell. + +--- + config.h.meson | 3 +++ + meson.build | 5 +++++ + meson_options.txt | 6 ++++++ + src/core/main.c | 11 +++++++++++ + src/meson.build | 1 + + 5 files changed, 26 insertions(+) + +diff --git a/config.h.meson b/config.h.meson +index 0bab71848..202fb7ed1 100644 +--- a/config.h.meson ++++ b/config.h.meson +@@ -58,6 +58,9 @@ + /* Xwayland applications allowed to issue keyboard grabs */ + #mesondefine XWAYLAND_GRAB_DEFAULT_ACCESS_RULES + ++/* Defined if libcap-ng is available */ ++#mesondefine HAVE_LIBCAPNG ++ + /* XKB base prefix */ + #mesondefine XKB_BASE + +diff --git a/meson.build b/meson.build +index 3322bd3b1..01c8020fa 100644 +--- a/meson.build ++++ b/meson.build +@@ -35,6 +35,7 @@ libstartup_notification_req = '>= 0.7' + libcanberra_req = '>= 0.26' + libwacom_req = '>= 0.13' + atk_req = '>= 2.5.3' ++libcapng_req = '>= 0.7.9' + + # optional version requirements + udev_req = '>= 228' +@@ -125,6 +126,7 @@ xau_dep = dependency('xau') + ice_dep = dependency('ice') + atk_dep = dependency('atk', version: atk_req) + libcanberra_dep = dependency('libcanberra', version: libcanberra_req) ++libcapng_dep = dependency('libcap-ng', required: get_option('libcapng')) + + # For now always require X11 support + have_x11 = true +@@ -256,6 +258,7 @@ have_core_tests = false + have_cogl_tests = false + have_clutter_tests = false + have_installed_tests = false ++have_libcapng = libcapng_dep.found() + + if have_tests + have_core_tests = get_option('core_tests') +@@ -361,6 +364,7 @@ cdata.set('HAVE_LIBWACOM', have_libwacom) + cdata.set('HAVE_SM', have_sm) + cdata.set('HAVE_STARTUP_NOTIFICATION', have_startup_notification) + cdata.set('HAVE_INTROSPECTION', have_introspection) ++cdata.set('HAVE_LIBCAPNG', have_libcapng) + cdata.set('HAVE_PROFILER', have_profiler) + + xkb_base = xkeyboard_config_dep.get_pkgconfig_variable('xkb_base') +@@ -443,6 +447,7 @@ output = [ + ' Startup notification..... ' + have_startup_notification.to_string(), + ' Introspection............ ' + have_introspection.to_string(), + ' Profiler................. ' + have_profiler.to_string(), ++ ' libcap-ng................ ' + have_libcapng.to_string(), + '', + ' Tests:', + '', +diff --git a/meson_options.txt b/meson_options.txt +index 73aa7adde..8bfaacd9a 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -152,3 +152,9 @@ option('xwayland_grab_default_access_rules', + value: 'gnome-boxes,remote-viewer,virt-viewer,virt-manager,vinagre,vncviewer,Xephyr', + description: 'Comma delimited list of applications ressources or class allowed to issue X11 grabs in Xwayland' + ) ++ ++option('libcapng', ++ type: 'feature', ++ value: 'auto', ++ description: 'Enable libcap-ng support' ++) +diff --git a/src/core/main.c b/src/core/main.c +index 7f4f666d2..b27968f13 100644 +--- a/src/core/main.c ++++ b/src/core/main.c +@@ -66,6 +66,10 @@ + #include <girepository.h> + #endif + ++#ifdef HAVE_LIBCAPNG ++#include <cap-ng.h> ++#endif ++ + #if defined(HAVE_NATIVE_BACKEND) && defined(HAVE_WAYLAND) + #include <systemd/sd-login.h> + #endif /* HAVE_WAYLAND && HAVE_NATIVE_BACKEND */ +@@ -673,6 +677,12 @@ meta_run (void) + if (!meta_display_open ()) + meta_exit (META_EXIT_ERROR); + ++#ifdef HAVE_LIBCAPNG ++ capng_clear(CAPNG_SELECT_BOTH); ++ capng_update(CAPNG_ADD, CAPNG_EFFECTIVE|CAPNG_PERMITTED, CAP_SYS_NICE); ++ capng_apply(CAPNG_SELECT_BOTH); ++#endif ++ + g_main_loop_run (meta_main_loop); + + meta_finalize (); +diff --git a/src/meson.build b/src/meson.build +index 90d80734f..a9fffa2c2 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -18,6 +18,7 @@ mutter_pkg_deps = [ + glib_dep, + gsettings_desktop_schemas_dep, + gtk3_dep, ++ libcapng_dep, + pango_dep, + ] + +-- +2.23.0 + diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix index e381860ca2c..dc7e0ed222f 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix @@ -22,6 +22,7 @@ , writeTextFile , writeShellScriptBin , xkeyboard_config +, runCommand }: let @@ -141,6 +142,13 @@ let DesktopNames=GNOME-Flashback;GNOME; ''; }; + + mkSystemdTargetForWm = { wmName }: + runCommand "gnome-flashback-${wmName}.target" {} '' + mkdir -p $out/lib/systemd/user + cp "${gnome-flashback}/lib/systemd/user/gnome-session-x11@gnome-flashback-metacity.target" \ + "$out/lib/systemd/user/gnome-session-x11@gnome-flashback-${wmName}.target" + ''; }; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 084ced822c7..c047d9e50ee 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -24,6 +24,7 @@ , enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins , name ? "gcc" , libcCross ? null +, threadsCross ? null # for MinGW , crossStageStatic ? false , # Strip kills static libs of other archs (hence no cross) stripped ? stdenv.hostPlatform == stdenv.buildPlatform @@ -48,10 +49,14 @@ assert stdenv.hostPlatform.isDarwin -> gnused != null; # The go frontend is written in c++ assert langGo -> langCC; +# threadsCross is just for MinGW +assert threadsCross != null -> stdenv.targetPlatform.isWindows; + with stdenv.lib; with builtins; -let version = "4.8.5"; +let majorVersion = "4"; + version = "${majorVersion}.8.5"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -172,6 +177,8 @@ stdenv.mkDerivation ({ ++ (optional hostPlatform.isDarwin gnused) ; + depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; + preConfigure = import ../common/pre-configure.nix { inherit (stdenv) lib; inherit version hostPlatform langJava langGo; @@ -253,24 +260,13 @@ stdenv.mkDerivation ({ ++ optionals javaAwtGtk [ gmp mpfr ] )); - EXTRA_TARGET_FLAGS = optionals - (targetPlatform != hostPlatform && libcCross != null) - ([ - "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}" - ] ++ optionals (! crossStageStatic) [ - "-B${libcCross.out}${libcCross.libdir or "/lib"}" - ]); - - EXTRA_TARGET_LDFLAGS = optionals - (targetPlatform != hostPlatform && libcCross != null) - ([ - "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}" - ] ++ (if crossStageStatic then [ - "-B${libcCross.out}${libcCross.libdir or "/lib"}" - ] else [ - "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}" - "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}" - ])); + inherit + (import ../common/extra-target-flags.nix { + inherit stdenv crossStageStatic libcCross threadsCross; + }) + EXTRA_TARGET_FLAGS + EXTRA_TARGET_LDFLAGS + ; passthru = { inherit langC langCC langObjC langObjCpp langFortran langGo version; diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index a2a9f39a94e..78027bcdac4 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -24,6 +24,7 @@ , enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins , name ? "gcc" , libcCross ? null +, threadsCross ? null # for MinGW , crossStageStatic ? false , # Strip kills static libs of other archs (hence no cross) stripped ? stdenv.hostPlatform == stdenv.buildPlatform @@ -48,10 +49,14 @@ assert stdenv.hostPlatform.isDarwin -> gnused != null; # The go frontend is written in c++ assert langGo -> langCC; +# threadsCross is just for MinGW +assert threadsCross != null -> stdenv.targetPlatform.isWindows; + with stdenv.lib; with builtins; -let version = "4.9.4"; +let majorVersion = "4"; + version = "${majorVersion}.9.4"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -178,6 +183,8 @@ stdenv.mkDerivation ({ ++ (optional hostPlatform.isDarwin gnused) ; + depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; + preConfigure = import ../common/pre-configure.nix { inherit (stdenv) lib; inherit version hostPlatform langJava langGo; @@ -259,24 +266,13 @@ stdenv.mkDerivation ({ ++ optionals javaAwtGtk [ gmp mpfr ] )); - EXTRA_TARGET_FLAGS = optionals - (targetPlatform != hostPlatform && libcCross != null) - ([ - "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}" - ] ++ optionals (! crossStageStatic) [ - "-B${libcCross.out}${libcCross.libdir or "/lib"}" - ]); - - EXTRA_TARGET_LDFLAGS = optionals - (targetPlatform != hostPlatform && libcCross != null) - ([ - "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}" - ] ++ (if crossStageStatic then [ - "-B${libcCross.out}${libcCross.libdir or "/lib"}" - ] else [ - "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}" - "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}" - ])); + inherit + (import ../common/extra-target-flags.nix { + inherit stdenv crossStageStatic libcCross threadsCross; + }) + EXTRA_TARGET_FLAGS + EXTRA_TARGET_LDFLAGS + ; passthru = { inherit langC langCC langObjC langObjCpp langFortran langGo version; diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 775245aae42..a6aab5c26d4 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -24,6 +24,7 @@ , enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins , name ? "gcc" , libcCross ? null +, threadsCross ? null # for MinGW , crossStageStatic ? false , # Strip kills static libs of other archs (hence no cross) stripped ? stdenv.hostPlatform == stdenv.buildPlatform @@ -46,10 +47,14 @@ assert stdenv.hostPlatform.isDarwin -> gnused != null; # The go frontend is written in c++ assert langGo -> langCC; +# threadsCross is just for MinGW +assert threadsCross != null -> stdenv.targetPlatform.isWindows; + with stdenv.lib; with builtins; -let version = "5.5.0"; +let majorVersion = "5"; + version = "${majorVersion}.5.0"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -62,6 +67,10 @@ let version = "5.5.0"; ++ optional stdenv.hostPlatform.isMusl (fetchpatch { url = https://raw.githubusercontent.com/richfelker/musl-cross-make/e84b1bd1fc12a3def33111ca6df522cd6e5ec361/patches/gcc-5.3.0/0001-musl.diff; sha256 = "0pppbf8myi2kjhm3z3479ihn1cm60kycfv60gj8yy1bs0pl1qcfm"; + }) + ++ optional (!crossStageStatic && targetPlatform.isMinGW) (fetchpatch { + url = "https://raw.githubusercontent.com/lhmouse/MINGW-packages/${import ../common/mfcgthreads-patches-repo.nix}/mingw-w64-gcc-git/9000-gcc-${majorVersion}-branch-Added-mcf-thread-model-support-from-mcfgthread.patch"; + sha256 = "074bl5n27d1ksa31pvzj4vd8xd46r118k0w94gdv3s1vydg7mah0"; }); javaEcj = fetchurl { @@ -184,6 +193,8 @@ stdenv.mkDerivation ({ ++ (optional hostPlatform.isDarwin gnused) ; + depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; + NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; preConfigure = import ../common/pre-configure.nix { @@ -266,24 +277,13 @@ stdenv.mkDerivation ({ ++ optionals javaAwtGtk [ gmp mpfr ] )); - EXTRA_TARGET_FLAGS = optionals - (targetPlatform != hostPlatform && libcCross != null) - ([ - "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}" - ] ++ optionals (! crossStageStatic) [ - "-B${libcCross.out}${libcCross.libdir or "/lib"}" - ]); - - EXTRA_TARGET_LDFLAGS = optionals - (targetPlatform != hostPlatform && libcCross != null) - ([ - "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}" - ] ++ (if crossStageStatic then [ - "-B${libcCross.out}${libcCross.libdir or "/lib"}" - ] else [ - "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}" - "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}" - ])); + inherit + (import ../common/extra-target-flags.nix { + inherit stdenv crossStageStatic libcCross threadsCross; + }) + EXTRA_TARGET_FLAGS + EXTRA_TARGET_LDFLAGS + ; passthru = { inherit langC langCC langObjC langObjCpp langFortran langGo version; diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 3f5644e9450..4ec24dbe88e 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -1,4 +1,4 @@ -{ stdenv, targetPackages, fetchurl, noSysDirs +{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs , langC ? true, langCC ? true, langFortran ? false , langObjC ? stdenv.targetPlatform.isDarwin , langObjCpp ? stdenv.targetPlatform.isDarwin @@ -24,6 +24,7 @@ , enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins , name ? "gcc" , libcCross ? null +, threadsCross ? null # for MinGW , crossStageStatic ? false , # Strip kills static libs of other archs (hence no cross) stripped ? stdenv.hostPlatform == stdenv.buildPlatform @@ -46,10 +47,14 @@ assert stdenv.hostPlatform.isDarwin -> gnused != null; # The go frontend is written in c++ assert langGo -> langCC; +# threadsCross is just for MinGW +assert threadsCross != null -> stdenv.targetPlatform.isWindows; + with stdenv.lib; with builtins; -let version = "6.5.0"; +let majorVersion = "6"; + version = "${majorVersion}.5.0"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -59,7 +64,10 @@ let version = "6.5.0"; ++ optional noSysDirs ../no-sys-dirs.patch ++ optional langFortran ../gfortran-driving.patch ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch - ; + ++ optional (!crossStageStatic && targetPlatform.isMinGW) (fetchpatch { + url = "https://raw.githubusercontent.com/lhmouse/MINGW-packages/${import ../common/mfcgthreads-patches-repo.nix}/mingw-w64-gcc-git/9000-gcc-${majorVersion}-branch-Added-mcf-thread-model-support-from-mcfgthread.patch"; + sha256 = "1c449jgm1vx9g4kv82bxmvlgrwb8f6kwkl0gqmjlmhf7f4hjy2nr"; + }); javaEcj = fetchurl { # The `$(top_srcdir)/ecj.jar' file is automatically picked up at @@ -186,6 +194,8 @@ stdenv.mkDerivation ({ ++ (optional hostPlatform.isDarwin gnused) ; + depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; + NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; preConfigure = import ../common/pre-configure.nix { @@ -268,24 +278,13 @@ stdenv.mkDerivation ({ ++ optionals javaAwtGtk [ gmp mpfr ] )); - EXTRA_TARGET_FLAGS = optionals - (targetPlatform != hostPlatform && libcCross != null) - ([ - "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}" - ] ++ optionals (! crossStageStatic) [ - "-B${libcCross.out}${libcCross.libdir or "/lib"}" - ]); - - EXTRA_TARGET_LDFLAGS = optionals - (targetPlatform != hostPlatform && libcCross != null) - ([ - "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}" - ] ++ (if crossStageStatic then [ - "-B${libcCross.out}${libcCross.libdir or "/lib"}" - ] else [ - "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}" - "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}" - ])); + inherit + (import ../common/extra-target-flags.nix { + inherit stdenv crossStageStatic libcCross threadsCross; + }) + EXTRA_TARGET_FLAGS + EXTRA_TARGET_LDFLAGS + ; passthru = { inherit langC langCC langObjC langObjCpp langFortran langGo version; diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index f780bfdfc76..aa46a526389 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -17,6 +17,7 @@ , enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins , name ? "gcc" , libcCross ? null +, threadsCross ? null # for MinGW , crossStageStatic ? false , # Strip kills static libs of other archs (hence no cross) stripped ? stdenv.hostPlatform == stdenv.buildPlatform @@ -35,10 +36,14 @@ assert stdenv.hostPlatform.isDarwin -> gnused != null; # The go frontend is written in c++ assert langGo -> langCC; +# threadsCross is just for MinGW +assert threadsCross != null -> stdenv.targetPlatform.isWindows; + with stdenv.lib; with builtins; -let version = "7.4.0"; +let majorVersion = "7"; + version = "${majorVersion}.4.0"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -59,7 +64,11 @@ let version = "7.4.0"; }) ++ optional langFortran ../gfortran-driving.patch ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch - ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch; + ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch + ++ optional (!crossStageStatic && targetPlatform.isMinGW) (fetchpatch { + url = "https://raw.githubusercontent.com/lhmouse/MINGW-packages/${import ../common/mfcgthreads-patches-repo.nix}/mingw-w64-gcc-git/9000-gcc-${majorVersion}-branch-Added-mcf-thread-model-support-from-mcfgthread.patch"; + sha256 = "1nyjnshpq5gbcbbpfv27hy4ajvycmgkpiabkjlxnnrnq1d99k1ay"; + }); /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; @@ -161,6 +170,8 @@ stdenv.mkDerivation ({ ++ (optional hostPlatform.isDarwin gnused) ; + depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.cc.isClang && langFortran) "-Wno-unused-command-line-argument"; NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; @@ -232,24 +243,13 @@ stdenv.mkDerivation ({ LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); - EXTRA_TARGET_FLAGS = optionals - (targetPlatform != hostPlatform && libcCross != null) - ([ - "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}" - ] ++ optionals (! crossStageStatic) [ - "-B${libcCross.out}${libcCross.libdir or "/lib"}" - ]); - - EXTRA_TARGET_LDFLAGS = optionals - (targetPlatform != hostPlatform && libcCross != null) - ([ - "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}" - ] ++ (if crossStageStatic then [ - "-B${libcCross.out}${libcCross.libdir or "/lib"}" - ] else [ - "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}" - "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}" - ])); + inherit + (import ../common/extra-target-flags.nix { + inherit stdenv crossStageStatic libcCross threadsCross; + }) + EXTRA_TARGET_FLAGS + EXTRA_TARGET_LDFLAGS + ; passthru = { inherit langC langCC langObjC langObjCpp langFortran langGo version; diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index dc051d9c4b6..0874d4d085a 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, targetPackages, fetchurl, noSysDirs +{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs , langC ? true, langCC ? true, langFortran ? false , langObjC ? stdenv.targetPlatform.isDarwin , langObjCpp ? stdenv.targetPlatform.isDarwin @@ -17,6 +17,7 @@ , enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins , name ? "gcc" , libcCross ? null +, threadsCross ? null # for MinGW , crossStageStatic ? false , # Strip kills static libs of other archs (hence no cross) stripped ? stdenv.hostPlatform == stdenv.buildPlatform @@ -35,10 +36,14 @@ assert stdenv.hostPlatform.isDarwin -> gnused != null; # The go frontend is written in c++ assert langGo -> langCC; +# threadsCross is just for MinGW +assert threadsCross != null -> stdenv.targetPlatform.isWindows; + with stdenv.lib; with builtins; -let version = "8.3.0"; +let majorVersion = "8"; + version = "${majorVersion}.3.0"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -51,7 +56,11 @@ let version = "8.3.0"; }) */ ++ optional langFortran ../gfortran-driving.patch ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch - ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch; + ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch + ++ optional (!crossStageStatic && targetPlatform.isMinGW) (fetchpatch { + url = "https://raw.githubusercontent.com/lhmouse/MINGW-packages/${import ../common/mfcgthreads-patches-repo.nix}/mingw-w64-gcc-git/9000-gcc-${majorVersion}-branch-Added-mcf-thread-model-support-from-mcfgthread.patch"; + sha256 = "1in5kvcknlpi9z1vvjw6jfmwy8k12zvbqlqfnq84qpm99r0rh00a"; + }); /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; @@ -153,6 +162,8 @@ stdenv.mkDerivation ({ ++ (optional hostPlatform.isDarwin gnused) ; + depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; + NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; preConfigure = import ../common/pre-configure.nix { @@ -219,24 +230,13 @@ stdenv.mkDerivation ({ LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); - EXTRA_TARGET_FLAGS = optionals - (targetPlatform != hostPlatform && libcCross != null) - ([ - "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}" - ] ++ optionals (! crossStageStatic) [ - "-B${libcCross.out}${libcCross.libdir or "/lib"}" - ]); - - EXTRA_TARGET_LDFLAGS = optionals - (targetPlatform != hostPlatform && libcCross != null) - ([ - "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}" - ] ++ (if crossStageStatic then [ - "-B${libcCross.out}${libcCross.libdir or "/lib"}" - ] else [ - "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}" - "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}" - ])); + inherit + (import ../common/extra-target-flags.nix { + inherit stdenv crossStageStatic libcCross threadsCross; + }) + EXTRA_TARGET_FLAGS + EXTRA_TARGET_LDFLAGS + ; passthru = { inherit langC langCC langObjC langObjCpp langFortran langGo version; diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 57f4a72c135..f16dcb59b46 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -1,4 +1,4 @@ -{ stdenv, targetPackages, fetchurl, noSysDirs +{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs , langC ? true, langCC ? true, langFortran ? false , langObjC ? stdenv.targetPlatform.isDarwin , langObjCpp ? stdenv.targetPlatform.isDarwin @@ -17,6 +17,7 @@ , enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins , name ? "gcc" , libcCross ? null +, threadsCross ? null # for MinGW , crossStageStatic ? false , # Strip kills static libs of other archs (hence no cross) stripped ? stdenv.hostPlatform == stdenv.buildPlatform @@ -35,10 +36,14 @@ assert stdenv.hostPlatform.isDarwin -> gnused != null; # The go frontend is written in c++ assert langGo -> langCC; +# threadsCross is just for MinGW +assert threadsCross != null -> stdenv.targetPlatform.isWindows; + with stdenv.lib; with builtins; -let version = "9.2.0"; +let majorVersion = "9"; + version = "${majorVersion}.2.0"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -50,7 +55,11 @@ let version = "9.2.0"; sha256 = ""; # TODO: uncomment and check hash when available. }) */ ++ optional langFortran ../gfortran-driving.patch - ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch; + ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch + ++ optional (!crossStageStatic && targetPlatform.isMinGW) (fetchpatch { + url = "https://raw.githubusercontent.com/lhmouse/MINGW-packages/${import ../common/mfcgthreads-patches-repo.nix}/mingw-w64-gcc-git/9000-gcc-${majorVersion}-branch-Added-mcf-thread-model-support-from-mcfgthread.patch"; + sha256 = "1in5kvcknlpi9z1vvjw6jfmwy8k12zvbqlqfnq84qpm99r0rh00a"; + }); /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; @@ -152,6 +161,8 @@ stdenv.mkDerivation ({ ++ (optional hostPlatform.isDarwin gnused) ; + depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; + NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; preConfigure = import ../common/pre-configure.nix { @@ -218,24 +229,13 @@ stdenv.mkDerivation ({ LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); - EXTRA_TARGET_FLAGS = optionals - (targetPlatform != hostPlatform && libcCross != null) - ([ - "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}" - ] ++ optionals (! crossStageStatic) [ - "-B${libcCross.out}${libcCross.libdir or "/lib"}" - ]); - - EXTRA_TARGET_LDFLAGS = optionals - (targetPlatform != hostPlatform && libcCross != null) - ([ - "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}" - ] ++ (if crossStageStatic then [ - "-B${libcCross.out}${libcCross.libdir or "/lib"}" - ] else [ - "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}" - "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}" - ])); + inherit + (import ../common/extra-target-flags.nix { + inherit stdenv crossStageStatic libcCross threadsCross; + }) + EXTRA_TARGET_FLAGS + EXTRA_TARGET_LDFLAGS + ; passthru = { inherit langC langCC langObjC langObjCpp langFortran langGo version; diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 7554818e0a0..3b96f432e96 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -22,7 +22,7 @@ }: assert cloog != null -> stdenv.lib.versionOlder version "5"; -assert langJava -> stdenv.lib.versionOlder version "6"; +assert langJava -> stdenv.lib.versionOlder version "7"; let inherit (stdenv) @@ -50,7 +50,7 @@ let "--disable-decimal-float" # requires libc "--disable-libmpx" # requires libc ] ++ lib.optionals crossMingw [ - "--with-headers=${libcCross}/include" + "--with-headers=${lib.getDev libcCross}/include" "--with-gcc" "--with-gnu-as" "--with-gnu-ld" @@ -63,7 +63,7 @@ let "--enable-__cxa_atexit" "--enable-long-long" "--enable-threads=${if targetPlatform.isUnix then "posix" - else if targetPlatform.isWindows then "win32" + else if targetPlatform.isWindows then "mcf" else "single"}" "--enable-nls" "--disable-decimal-float" # No final libdecnumber (it may work only in 386) diff --git a/pkgs/development/compilers/gcc/common/extra-target-flags.nix b/pkgs/development/compilers/gcc/common/extra-target-flags.nix new file mode 100644 index 00000000000..bce9a8d4738 --- /dev/null +++ b/pkgs/development/compilers/gcc/common/extra-target-flags.nix @@ -0,0 +1,30 @@ +{ stdenv, crossStageStatic, libcCross, threadsCross }: + +let + inherit (stdenv) lib hostPlatform targetPlatform; +in + +{ + EXTRA_TARGET_FLAGS = let + mkFlags = dep: lib.optionals (targetPlatform != hostPlatform && dep != null) ([ + "-idirafter ${lib.getDev dep}${dep.incdir or "/include"}" + ] ++ stdenv.lib.optionals (! crossStageStatic) [ + "-B${lib.getLib dep}${dep.libdir or "/lib"}" + ]); + in mkFlags libcCross + ++ lib.optionals (!crossStageStatic) (mkFlags threadsCross) + ; + + EXTRA_TARGET_LDFLAGS = let + mkFlags = dep: lib.optionals (targetPlatform != hostPlatform && dep != null) ([ + "-Wl,-L${lib.getLib dep}${dep.libdir or "/lib"}" + ] ++ (if crossStageStatic then [ + "-B${lib.getLib dep}${dep.libdir or "/lib"}" + ] else [ + "-Wl,-rpath,${lib.getLib dep}${dep.libdir or "/lib"}" + "-Wl,-rpath-link,${lib.getLib dep}${dep.libdir or "/lib"}" + ])); + in mkFlags libcCross + ++ lib.optionals (!crossStageStatic) (mkFlags threadsCross) + ; +} diff --git a/pkgs/development/compilers/gcc/common/mfcgthreads-patches-repo.nix b/pkgs/development/compilers/gcc/common/mfcgthreads-patches-repo.nix new file mode 100644 index 00000000000..f8822c6dba0 --- /dev/null +++ b/pkgs/development/compilers/gcc/common/mfcgthreads-patches-repo.nix @@ -0,0 +1 @@ +"740f233da00c4fb5bcc225b2e29768824bcecc58" diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix index ef55806ce08..5344b659169 100644 --- a/pkgs/development/compilers/gcc/snapshot/default.nix +++ b/pkgs/development/compilers/gcc/snapshot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, targetPackages, fetchurl, noSysDirs +{ stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs , langC ? true, langCC ? true, langFortran ? false , langObjC ? stdenv.targetPlatform.isDarwin , langObjCpp ? stdenv.targetPlatform.isDarwin @@ -17,6 +17,7 @@ , enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins , name ? "gcc" , libcCross ? null +, threadsCross ? null # for MinGW , crossStageStatic ? false , # Strip kills static libs of other archs (hence no cross) stripped ? stdenv.hostPlatform == stdenv.buildPlatform @@ -36,10 +37,14 @@ assert stdenv.hostPlatform.isDarwin -> gnused != null; # The go frontend is written in c++ assert langGo -> langCC; +# threadsCross is just for MinGW +assert threadsCross != null -> stdenv.targetPlatform.isWindows; + with stdenv.lib; with builtins; -let version = "7-20170409"; +let majorVersion = "7"; + version = "${majorVersion}-20170409"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -47,7 +52,11 @@ let version = "7-20170409"; [ ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch - ++ optional langFortran ../gfortran-driving.patch; + ++ optional langFortran ../gfortran-driving.patch + ++ optional (!crossStageStatic && targetPlatform.isMinGW) (fetchpatch { + url = "https://raw.githubusercontent.com/lhmouse/MINGW-packages/${import ../common/mfcgthreads-patches-repo.nix}/mingw-w64-gcc-git/9000-gcc-${majorVersion}-branch-Added-mcf-thread-model-support-from-mcfgthread.patch"; + sha256 = "1nyjnshpq5gbcbbpfv27hy4ajvycmgkpiabkjlxnnrnq1d99k1ay"; + }); /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; @@ -119,6 +128,8 @@ stdenv.mkDerivation ({ ++ (optional hostPlatform.isDarwin gnused) ; + depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; + NIX_LDFLAGS = stdenv.lib.optionalString hostPlatform.isSunOS "-lm -ldl"; preConfigure = import ../common/pre-configure.nix { @@ -186,24 +197,13 @@ stdenv.mkDerivation ({ LIBRARY_PATH = optionals (targetPlatform == hostPlatform) (makeLibraryPath (optional (zlib != null) zlib)); - EXTRA_TARGET_FLAGS = optionals - (targetPlatform != hostPlatform && libcCross != null) - ([ - "-idirafter ${getDev libcCross}${libcCross.incdir or "/include"}" - ] ++ optionals (! crossStageStatic) [ - "-B${libcCross.out}${libcCross.libdir or "/lib"}" - ]); - - EXTRA_TARGET_LDFLAGS = optionals - (targetPlatform != hostPlatform && libcCross != null) - ([ - "-Wl,-L${libcCross.out}${libcCross.libdir or "/lib"}" - ] ++ (if crossStageStatic then [ - "-B${libcCross.out}${libcCross.libdir or "/lib"}" - ] else [ - "-Wl,-rpath,${libcCross.out}${libcCross.libdir or "/lib"}" - "-Wl,-rpath-link,${libcCross.out}${libcCross.libdir or "/lib"}" - ])); + inherit + (import ../common/extra-target-flags.nix { + inherit stdenv crossStageStatic libcCross threadsCross; + }) + EXTRA_TARGET_FLAGS + EXTRA_TARGET_LDFLAGS + ; passthru = { inherit langC langCC langObjC langObjCpp langFortran langGo version; diff --git a/pkgs/development/compilers/intel-graphics-compiler/default.nix b/pkgs/development/compilers/intel-graphics-compiler/default.nix index c8fbffcc164..183e1f2a085 100644 --- a/pkgs/development/compilers/intel-graphics-compiler/default.nix +++ b/pkgs/development/compilers/intel-graphics-compiler/default.nix @@ -24,13 +24,13 @@ in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "1.0.10"; + version = "1.0.2714.1"; src = fetchFromGitHub { owner = "intel"; repo = "intel-graphics-compiler"; rev = "igc-${version}"; - sha256 = "1yqd2zvvvxxxzb5d3v0f03n0jdivid5l2cj11dw7ff7xz7jwiv2i"; + sha256 = "0ys03sv08fg8q06lb6k5088xirnwms4nzazxp3kbdjm973n7imxc"; }; nativeBuildInputs = [ clang cmake bison flex llvm python ]; diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index 068791406e8..3e966f1ea44 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -94,6 +94,9 @@ in stdenv.mkDerivation ({ rm test/tools/llvm-dwarfdump/X86/debug_addr_dwarf4.s rm test/tools/llvm-dwarfdump/X86/debug_addr_unsupported_version.s rm test/tools/llvm-dwarfdump/X86/debug_addr_version_mismatch.s + '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' + # Seems to require certain floating point hardware (NEON?) + rm test/ExecutionEngine/frem.ll '' + '' patchShebangs test/BugPoint/compile-custom.ll.py ''; diff --git a/pkgs/development/compilers/llvm/9/llvm.nix b/pkgs/development/compilers/llvm/9/llvm.nix index 9bc7e1fc20b..c8f78f5f7f2 100644 --- a/pkgs/development/compilers/llvm/9/llvm.nix +++ b/pkgs/development/compilers/llvm/9/llvm.nix @@ -75,6 +75,15 @@ in stdenv.mkDerivation (rec { rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp # valgrind unhappy with musl or glibc, but fails w/musl only rm test/CodeGen/AArch64/wineh4.mir + '' + optionalString stdenv.hostPlatform.isAarch32 '' + # skip failing X86 test cases on 32-bit ARM + rm test/DebugInfo/X86/convert-debugloc.ll + rm test/DebugInfo/X86/convert-inlined.ll + rm test/DebugInfo/X86/convert-linked.ll + rm test/tools/dsymutil/X86/op-convert.test + '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' + # Seems to require certain floating point hardware (NEON?) + rm test/ExecutionEngine/frem.ll '' + '' patchShebangs test/BugPoint/compile-custom.ll.py diff --git a/pkgs/development/compilers/purescript/purescript/default.nix b/pkgs/development/compilers/purescript/purescript/default.nix index 7a677821687..149a38231b4 100644 --- a/pkgs/development/compilers/purescript/purescript/default.nix +++ b/pkgs/development/compilers/purescript/purescript/default.nix @@ -18,19 +18,19 @@ let in stdenv.mkDerivation rec { pname = "purescript"; - version = "0.13.3"; + version = "0.13.4"; src = if stdenv.isDarwin then fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; - sha256 = "04ylhqadj7wnclhiar9il6fkrxmh9qkz6fpas7z3b37w4qg0gshl"; + sha256 = "0rqjair1r1yr1k8rva3ly16dv5594f4s8xwpnrz9n7x3f99mk4fx"; } else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "1xcn694qfql87pdjh09hhvfvpakzxb2hagss61vh9msqq3s96l3z"; + sha256 = "1ajzi5ikgzgdfrgq36r9pc3yc6f7h0qgnqcq414zd66z08mbggng"; }; diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 5d7d0ce6684..20286dcc43c 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/rtop \ --prefix PATH : "${utop}/bin" \ - --set CAML_LD_LIBRARY_PATH ${ocaml_lwt}/lib/ocaml/${ocaml.version}/site-lib:$CAML_LD_LIBRARY_PATH \ - --set OCAMLPATH $out/lib/ocaml/${ocaml.version}/site-lib:$OCAMLPATH + --prefix CAML_LD_LIBRARY_PATH : "${ocaml_lwt}/lib/ocaml/${ocaml.version}/site-lib" \ + --prefix OCAMLPATH : "$out/lib/ocaml/${ocaml.version}/site-lib" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index 8a7d680010d..ceaf6f4c225 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -1,6 +1,6 @@ { stdenv, removeReferencesTo, pkgsBuildBuild, pkgsBuildHost, pkgsBuildTarget , fetchurl, file, python2 -, llvm_7, darwin, git, cmake, rustPlatform +, llvm_9, darwin, git, cmake, rustPlatform , pkgconfig, openssl , which, libffi , withBundledLLVM ? false @@ -12,12 +12,12 @@ let inherit (stdenv.lib) optional optionalString; inherit (darwin.apple_sdk.frameworks) Security; - llvmSharedForBuild = pkgsBuildBuild.llvm_7.override { enableSharedLibraries = true; }; - llvmSharedForHost = pkgsBuildHost.llvm_7.override { enableSharedLibraries = true; }; - llvmSharedForTarget = pkgsBuildTarget.llvm_7.override { enableSharedLibraries = true; }; + llvmSharedForBuild = pkgsBuildBuild.llvm_9.override { enableSharedLibraries = true; }; + llvmSharedForHost = pkgsBuildHost.llvm_9.override { enableSharedLibraries = true; }; + llvmSharedForTarget = pkgsBuildTarget.llvm_9.override { enableSharedLibraries = true; }; # For use at runtime - llvmShared = llvm_7.override { enableSharedLibraries = true; }; + llvmShared = llvm_9.override { enableSharedLibraries = true; }; in stdenv.mkDerivation rec { pname = "rustc"; inherit version; diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index d4e536484c4..90dd233a2bb 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -4,18 +4,18 @@ stdenv.mkDerivation rec { pname = "unison-code-manager"; - milestone_id = "M1d"; + milestone_id = "M1e"; version = "1.0.${milestone_id}-alpha"; src = if (stdenv.isDarwin) then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-osx.tar.gz"; - sha256 = "0cgkqwniw2fclsxgx6b1kgjmylqnn67kjs61iygzbpip8nvcm7pv"; + sha256 = "1jcjc8drjnvr67174ym9cppzi5zdq7jrj98xmf8gvrbx45v2gc6h"; } else fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-linux64.tar.gz"; - sha256 = "0rpz40d23daad16r2s4appiay3brbk0awp38yamavlr6dh23c9ws"; + sha256 = "1jq6xx879lqv3hxq8azg1rp72hy63qsn5w9nx95i4dzmmgwp0xx1"; }; # The tarball is just the prebuilt binary, in the archive root. @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Modern, statically-typed purely functional language"; - homepage = http://unisonweb.org/posts/; - license = licenses.free; + homepage = https://unisonweb.org/; + license = with licenses; [ mit bsd3 ]; maintainers = [ maintainers.virusdave ]; platforms = [ "x86_64-darwin" "x86_64-linux" ]; }; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index f729c3c8373..5308296c833 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -517,9 +517,9 @@ self: super: builtins.intersectAttrs super { # https://github.com/plow-technologies/servant-streaming/issues/12 servant-streaming-server = dontCheck super.servant-streaming-server; - # https://github.com/haskell-servant/servant/pull/1128 - servant-client-core = if (pkgs.lib.getVersion super.servant-client-core) == "0.15" then - appendPatch super.servant-client-core ./patches/servant-client-core-streamBody.patch + # https://github.com/haskell-servant/servant/pull/1238 + servant-client-core = if (pkgs.lib.getVersion super.servant-client-core) == "0.16" then + appendPatch super.servant-client-core ./patches/servant-client-core-redact-auth-header.patch else super.servant-client-core; diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix index 96774f71730..45c1a8fbd33 100644 --- a/pkgs/development/haskell-modules/generic-stack-builder.nix +++ b/pkgs/development/haskell-modules/generic-stack-builder.nix @@ -20,6 +20,10 @@ let in stdenv.mkDerivation (args // { + # Doesn't work in the sandbox. Pass `--option sandbox relaxed` or + # `--option sandbox false` to be able to build this + __noChroot = true; + buildInputs = buildInputs ++ lib.optional (stdenv.hostPlatform.libc == "glibc") glibcLocales; diff --git a/pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch b/pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch index 26ea0eaa5a8..48cf6a035af 100644 --- a/pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch +++ b/pkgs/development/haskell-modules/patches/ghc-paths-nix-ghcjs.patch @@ -43,13 +43,13 @@ index c87565d..88b3db4 100644 +ghc = fromMaybe GHC_PATHS_GHC nixGhc +ghc_pkg = fromMaybe GHC_PATHS_GHC_PKG nixGhcPkg diff --git a/Setup.hs b/Setup.hs -index fad5026..1651650 100644 +index f2d1733..ca4792e 100644 --- a/Setup.hs +++ b/Setup.hs -@@ -27,13 +27,13 @@ main = defaultMainWithHooks simpleUserHooks { - defaultPostConf :: Args -> ConfigFlags -> PackageDescription -> LocalBuildInfo -> IO () - defaultPostConf args flags pkgdescr lbi = do +@@ -39,13 +39,13 @@ main = defaultMainWithHooks simpleUserHooks { + #else libdir_ <- rawSystemProgramStdoutConf (fromFlag (configVerbosity flags)) + #endif - ghcProgram (withPrograms lbi) ["--print-libdir"] + ghcjsProgram (withPrograms lbi) ["--print-libdir"] let libdir = reverse $ dropWhile isSpace $ reverse libdir_ diff --git a/pkgs/development/haskell-modules/patches/servant-client-core-redact-auth-header.patch b/pkgs/development/haskell-modules/patches/servant-client-core-redact-auth-header.patch new file mode 100644 index 00000000000..0f6a34f4f26 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/servant-client-core-redact-auth-header.patch @@ -0,0 +1,75 @@ +diff --git a/servant-client-core.cabal b/servant-client-core.cabal +index 5789da601..3faf65bb4 100644 +--- a/servant-client-core.cabal ++++ b/servant-client-core.cabal +@@ -96,6 +96,7 @@ test-suite spec + main-is: Spec.hs + other-modules: + Servant.Client.Core.Internal.BaseUrlSpec ++ Servant.Client.Core.RequestSpec + + -- Dependencies inherited from the library. No need to specify bounds. + build-depends: +diff --git a/src/Servant/Client/Core/Request.hs b/src/Servant/Client/Core/Request.hs +index 73756e702..0276d46f8 100644 +--- a/src/Servant/Client/Core/Request.hs ++++ b/src/Servant/Client/Core/Request.hs +@@ -64,8 +64,32 @@ data RequestF body path = Request + , requestHeaders :: Seq.Seq Header + , requestHttpVersion :: HttpVersion + , requestMethod :: Method +- } deriving (Generic, Typeable, Eq, Show, Functor, Foldable, Traversable) ++ } deriving (Generic, Typeable, Eq, Functor, Foldable, Traversable) + ++instance (Show a, Show b) => ++ Show (Servant.Client.Core.Request.RequestF a b) where ++ showsPrec p req ++ = showParen ++ (p >= 11) ++ ( showString "Request {requestPath = " ++ . showsPrec 0 (requestPath req) ++ . showString ", requestQueryString = " ++ . showsPrec 0 (requestQueryString req) ++ . showString ", requestBody = " ++ . showsPrec 0 (requestBody req) ++ . showString ", requestAccept = " ++ . showsPrec 0 (requestAccept req) ++ . showString ", requestHeaders = " ++ . showsPrec 0 (redactSensitiveHeader <$> requestHeaders req)) ++ . showString ", requestHttpVersion = " ++ . showsPrec 0 (requestHttpVersion req) ++ . showString ", requestMethod = " ++ . showsPrec 0 (requestMethod req) ++ . showString "}" ++ where ++ redactSensitiveHeader :: Header -> Header ++ redactSensitiveHeader ("Authorization", _) = ("Authorization", "<REDACTED>") ++ redactSensitiveHeader h = h + instance Bifunctor RequestF where bimap = bimapDefault + instance Bifoldable RequestF where bifoldMap = bifoldMapDefault + instance Bitraversable RequestF where +diff --git a/test/Servant/Client/Core/RequestSpec.hs b/test/Servant/Client/Core/RequestSpec.hs +new file mode 100644 +index 000000000..99a1db7d3 +--- /dev/null ++++ b/test/Servant/Client/Core/RequestSpec.hs +@@ -0,0 +1,19 @@ ++{-# OPTIONS_GHC -fno-warn-orphans #-} ++{-# LANGUAGE OverloadedStrings #-} ++module Servant.Client.Core.RequestSpec (spec) where ++ ++ ++import Prelude () ++import Prelude.Compat ++import Control.Monad ++import Data.List (isInfixOf) ++import Servant.Client.Core.Request ++import Test.Hspec ++ ++spec :: Spec ++spec = do ++ describe "Request" $ do ++ describe "show" $ do ++ it "redacts the authorization header" $ do ++ let request = void $ defaultRequest { requestHeaders = pure ("authorization", "secret") } ++ isInfixOf "secret" (show request) `shouldBe` False diff --git a/pkgs/development/haskell-modules/patches/servant-client-core-streamBody.patch b/pkgs/development/haskell-modules/patches/servant-client-core-streamBody.patch deleted file mode 100644 index ebadd215cb7..00000000000 --- a/pkgs/development/haskell-modules/patches/servant-client-core-streamBody.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff --git a/src/Servant/Client/Core/Internal/HasClient.hs b/src/Servant/Client/Core/Internal/HasClient.hs -index 712007006..6be92ec6d 100644 ---- a/src/Servant/Client/Core/Internal/HasClient.hs -+++ b/src/Servant/Client/Core/Internal/HasClient.hs -@@ -16,6 +16,8 @@ module Servant.Client.Core.Internal.HasClient where - import Prelude () - import Prelude.Compat - -+import Control.Concurrent.MVar -+ (modifyMVar, newMVar) - import qualified Data.ByteString as BS - import qualified Data.ByteString.Lazy as BL - import Data.Foldable -@@ -36,13 +38,14 @@ import qualified Network.HTTP.Types as H - import Servant.API - ((:<|>) ((:<|>)), (:>), AuthProtect, BasicAuth, BasicAuthData, - BuildHeadersTo (..), Capture', CaptureAll, Description, -- EmptyAPI, FramingUnrender (..), FromSourceIO (..), Header', -- Headers (..), HttpVersion, IsSecure, MimeRender (mimeRender), -+ EmptyAPI, FramingRender (..), FramingUnrender (..), -+ FromSourceIO (..), Header', Headers (..), HttpVersion, -+ IsSecure, MimeRender (mimeRender), - MimeUnrender (mimeUnrender), NoContent (NoContent), QueryFlag, - QueryParam', QueryParams, Raw, ReflectMethod (..), RemoteHost, - ReqBody', SBoolI, Stream, StreamBody', Summary, ToHttpApiData, -- Vault, Verb, WithNamedContext, contentType, getHeadersHList, -- getResponse, toQueryParam, toUrlPiece) -+ ToSourceIO (..), Vault, Verb, WithNamedContext, contentType, -+ getHeadersHList, getResponse, toQueryParam, toUrlPiece) - import Servant.API.ContentTypes - (contentTypes) - import Servant.API.Modifiers -@@ -538,7 +541,7 @@ instance (MimeRender ct a, HasClient m api) - hoistClientMonad pm (Proxy :: Proxy api) f (cl a) - - instance -- ( HasClient m api -+ ( HasClient m api, MimeRender ctype chunk, FramingRender framing, ToSourceIO chunk a - ) => HasClient m (StreamBody' mods framing ctype a :> api) - where - -@@ -547,7 +550,39 @@ instance - hoistClientMonad pm _ f cl = \a -> - hoistClientMonad pm (Proxy :: Proxy api) f (cl a) - -- clientWithRoute _pm Proxy _req _body = error "HasClient @StreamBody" -+ clientWithRoute pm Proxy req body -+ = clientWithRoute pm (Proxy :: Proxy api) -+ $ setRequestBody (RequestBodyStreamChunked givesPopper) (contentType ctypeP) req -+ where -+ ctypeP = Proxy :: Proxy ctype -+ framingP = Proxy :: Proxy framing -+ -+ sourceIO = framingRender -+ framingP -+ (mimeRender ctypeP :: chunk -> BL.ByteString) -+ (toSourceIO body) -+ -+ -- not pretty. -+ givesPopper :: (IO BS.ByteString -> IO ()) -> IO () -+ givesPopper needsPopper = S.unSourceT sourceIO $ \step0 -> do -+ ref <- newMVar step0 -+ -+ -- Note sure we need locking, but it's feels safer. -+ let popper :: IO BS.ByteString -+ popper = modifyMVar ref nextBs -+ -+ needsPopper popper -+ -+ nextBs S.Stop = return (S.Stop, BS.empty) -+ nextBs (S.Error err) = fail err -+ nextBs (S.Skip s) = nextBs s -+ nextBs (S.Effect ms) = ms >>= nextBs -+ nextBs (S.Yield lbs s) = case BL.toChunks lbs of -+ [] -> nextBs s -+ (x:xs) | BS.null x -> nextBs step' -+ | otherwise -> return (step', x) -+ where -+ step' = S.Yield (BL.fromChunks xs) s - - - diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix index a6acd603c81..5816b3a175c 100644 --- a/pkgs/development/interpreters/hy/default.nix +++ b/pkgs/development/interpreters/hy/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pythonPackages }: +{ stdenv, fetchurl, python2Packages }: -pythonPackages.buildPythonApplication rec { +python2Packages.buildPythonApplication rec { pname = "hy"; version = "0.17.0"; - src = pythonPackages.fetchPypi { + src = python2Packages.fetchPypi { inherit pname version; sha256 = "1gdbqsirsdxj320wnp7my5awzs1kfs6m4fqmkzbd1zd47qzj0zfi"; }; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with python2Packages; [ appdirs astor clint diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index 4017a4db86c..42c68ed7e80 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pythonPackages, pkgconfig, SDL2 +{ stdenv, fetchurl, python2Packages, pkgconfig, SDL2 , libpng, ffmpeg, freetype, glew, libGLU_combined, fribidi, zlib , glib }: -with pythonPackages; +with python2Packages; stdenv.mkDerivation rec { pname = "renpy"; diff --git a/pkgs/development/libraries/arb/default.nix b/pkgs/development/libraries/arb/default.nix index 0e24d556b1a..6393e25f561 100644 --- a/pkgs/development/libraries/arb/default.nix +++ b/pkgs/development/libraries/arb/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint}: stdenv.mkDerivation rec { pname = "arb"; - version = "2.16.0"; + version = "2.17.0"; src = fetchFromGitHub { owner = "fredrik-johansson"; repo = pname; rev = version; - sha256 = "0478671wfwy3gl26sbxh1jq1ih36z4k72waa8y2y2lvn649gb7cd"; + sha256 = "05lpy3hkl5f8ik19aw40cqydrb932xaf2n8hbq9ib5dnk7f010p1"; }; buildInputs = [mpir gmp mpfr flint]; configureFlags = [ @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { inherit version; description = ''A library for arbitrary-precision interval arithmetic''; + homepage = "http://arblib.org/"; license = stdenv.lib.licenses.lgpl21Plus; maintainers = with maintainers; [ raskin timokau ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/argp-standalone/default.nix b/pkgs/development/libraries/argp-standalone/default.nix index 17093deae00..8fe3bd287c1 100644 --- a/pkgs/development/libraries/argp-standalone/default.nix +++ b/pkgs/development/libraries/argp-standalone/default.nix @@ -43,6 +43,8 @@ stdenv.mkDerivation { doCheck = true; + makeFlags = [ "AR:=$(AR)" ]; + enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix index e277617c0ff..f6f3493002a 100644 --- a/pkgs/development/libraries/arrow-cpp/default.nix +++ b/pkgs/development/libraries/arrow-cpp/default.nix @@ -93,7 +93,7 @@ in stdenv.mkDerivation rec { ]; in '' ctest -L unittest -V \ - --exclude-regex '(${builtins.concatStringsSep "|" excludedTests})' + --exclude-regex '^(${builtins.concatStringsSep "|" excludedTests})$' ''); meta = { diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index 58d44a54137..1bce315878d 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -1,6 +1,25 @@ -{ stdenv, autoconf, automake, libtool, gnome3, which, fetchgit, libgtop, libwnck3, glib, vala, pkgconfig -, libstartup_notification, gobject-introspection, gtk-doc, docbook_xsl -, xorgserver, dbus, python2, wrapGAppsHook }: +{ stdenv +, pantheon +, autoconf +, automake +, libtool +, gnome3 +, which +, fetchgit +, libgtop +, libwnck3 +, glib +, vala +, pkgconfig +, libstartup_notification +, gobject-introspection +, gtk-doc +, docbook_xsl +, xorgserver +, dbus +, python3 +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "bamf"; @@ -9,14 +28,16 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; src = fetchgit { - url = https://git.launchpad.net/~unity-team/bamf; + url = "https://git.launchpad.net/~unity-team/bamf"; rev = version; sha256 = "1klvij1wyhdj5d8sr3b16pfixc1yk8ihglpjykg7zrr1f50jfgsz"; }; nativeBuildInputs = [ + (python3.withPackages (ps: with ps; [ lxml ])) # Tests autoconf automake + dbus docbook_xsl gnome3.gnome-common gobject-introspection @@ -25,13 +46,8 @@ stdenv.mkDerivation rec { pkgconfig vala which - # Tests - python2 - python2.pkgs.libxslt - python2.pkgs.libxml2 - dbus - xorgserver wrapGAppsHook + xorgserver ]; buildInputs = [ @@ -41,6 +57,11 @@ stdenv.mkDerivation rec { libwnck3 ]; + patches = [ + # Port tests and checks to python3 lxml. + ./gtester2xunit-python3.patch + ]; + # Fix hard-coded path # https://bugs.launchpad.net/bamf/+bug/1780557 postPatch = '' @@ -49,8 +70,8 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--enable-headless-tests" "--enable-gtk-doc" + "--enable-headless-tests" ]; # fix paths @@ -67,7 +88,9 @@ stdenv.mkDerivation rec { doCheck = false; # glib-2.62 deprecations - NIX_CFLAGS_COMPILE = [ "-DGLIB_DISABLE_DEPRECATION_WARNINGS" ]; + NIX_CFLAGS_COMPILE = [ + "-DGLIB_DISABLE_DEPRECATION_WARNINGS" + ]; meta = with stdenv.lib; { description = "Application matching framework"; @@ -78,6 +101,6 @@ stdenv.mkDerivation rec { homepage = https://launchpad.net/bamf; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = with maintainers; [ davidak ]; + maintainers = with maintainers; [ davidak ] ++ pantheon.maintainers; }; } diff --git a/pkgs/development/libraries/bamf/gtester2xunit-python3.patch b/pkgs/development/libraries/bamf/gtester2xunit-python3.patch new file mode 100644 index 00000000000..8dc47854194 --- /dev/null +++ b/pkgs/development/libraries/bamf/gtester2xunit-python3.patch @@ -0,0 +1,53 @@ +diff --git a/configure.ac b/configure.ac +index 41cb7db..93ef0ec 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -115,9 +115,9 @@ GTK_DOC_CHECK(1.0) + + AC_PATH_PROG([PYTHON],[python]) + AC_MSG_CHECKING(for gtester2xunit dependencies) +-if !($PYTHON -c "import libxslt, libxml2" 2> /dev/null); then ++if !($PYTHON -c "import lxml" 2> /dev/null); then + AC_MSG_RESULT([no]) +- AC_MSG_ERROR([You need to install python-libxslt1 and python-libxml2]); ++ AC_MSG_ERROR([You need to install python-lxml]); + fi + AC_MSG_RESULT([yes]) + +@@ -189,6 +189,6 @@ ${PACKAGE}-${VERSION} + Introspection: ${enable_introspection} + Headless tests: ${enable_headless_tests} + Coverage Reporting: ${use_gcov} +- Export actions menus: ${enable_export_actions_menu} ++ Export actions menus: ${enable_export_actions_menu} + + EOF +diff --git a/tests/gtester2xunit.py b/tests/gtester2xunit.py +index fbe3c66..861d541 100755 +--- a/tests/gtester2xunit.py ++++ b/tests/gtester2xunit.py +@@ -1,18 +1,17 @@ + #! /usr/bin/python + from argparse import ArgumentParser +-import libxslt +-import libxml2 + import sys + import os ++from lxml import etree + + XSL_TRANSFORM='/usr/share/gtester2xunit/gtester.xsl' + + def transform_file(input_filename, output_filename, xsl_file): +- gtester = libxml2.parseFile(xsl_file) +- style = libxslt.parseStylesheetDoc(gtester) +- doc = libxml2.parseFile(input_filename) +- result = style.applyStylesheet(doc, None) +- result.saveFormatFile(filename=output_filename, format=True) ++ gtester = etree.parse(xsl_file) ++ style = etree.XSLT(gtester) ++ doc = etree.parse(input_filename) ++ result = style(doc) ++ result.write(filename=output_filename, format=True) + + + def get_output_filename(input_filename): diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index bc8b7a8c760..5ae6200473b 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl +, autoreconfHook , enableLargeConfig ? false # doc: https://github.com/ivmai/bdwgc/blob/v7.6.6/doc/README.macros#L179 }: @@ -22,12 +23,17 @@ stdenv.mkDerivation rec { ''; patches = # https://github.com/ivmai/bdwgc/pull/208 - lib.optional stdenv.hostPlatform.isRiscV ./riscv.patch; + lib.optional stdenv.hostPlatform.isRiscV ./riscv.patch + # boehm-gc whitelists GCC threading models + ++ lib.optional stdenv.hostPlatform.isMinGW ./mcfgthread.patch; configureFlags = [ "--enable-cplusplus" "--with-libatomic-ops=none" ] ++ lib.optional enableLargeConfig "--enable-large-config"; + nativeBuildInputs = + lib.optional stdenv.hostPlatform.isMinGW autoreconfHook; + doCheck = true; # not cross; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/boehm-gc/mcfgthread.patch b/pkgs/development/libraries/boehm-gc/mcfgthread.patch new file mode 100644 index 00000000000..c4aa996aebd --- /dev/null +++ b/pkgs/development/libraries/boehm-gc/mcfgthread.patch @@ -0,0 +1,11 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -277,7 +277,7 @@ case "$THREADS" in + ;; + esac + ;; +- win32) ++ win32 | mcf) + AC_DEFINE(GC_THREADS) + use_parallel_mark=$enable_parallel_mark + if test "${enable_parallel_mark}" != no \ diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index b3310e44ae0..ccdf4662719 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -3,6 +3,8 @@ , libssh, libtheora, libva, libdrm, libvorbis, libvpx, lzma, libpulseaudio, soxr , x264, x265, xvidcore, zlib, libopus, speex, nv-codec-headers, dav1d , openglSupport ? false, libGLU_combined ? null +, libmfxSupport ? false, intel-media-sdk ? null +, libaomSupport ? false, libaom ? null # Build options , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime , multithreadBuild ? true # Multithreading via pthreads/win32 threads @@ -62,6 +64,8 @@ let in assert openglSupport -> libGLU_combined != null; +assert libmfxSupport -> intel-media-sdk != null; +assert libaomSupport -> libaom != null; stdenv.mkDerivation rec { @@ -135,6 +139,8 @@ stdenv.mkDerivation rec { (ifMinVer "0.6" (enableFeature vpxSupport "libvpx")) (ifMinVer "2.4" "--enable-lzma") (ifMinVer "2.2" (enableFeature openglSupport "opengl")) + (ifMinVer "4.2" (enableFeature libmfxSupport "libmfx")) + (ifMinVer "4.2" (enableFeature libaomSupport "libaom")) (disDarwinOrArmFix (ifMinVer "0.9" "--enable-libpulse") "0.9" "--disable-libpulse") (ifMinVer "2.5" (if sdlSupport && reqMin "3.2" then "--enable-sdl2" else if sdlSupport then "--enable-sdl" else null)) # autodetected before 2.5, SDL1 support removed in 3.2 for SDL2 (ifMinVer "1.2" "--enable-libsoxr") @@ -163,6 +169,8 @@ stdenv.mkDerivation rec { bzip2 fontconfig freetype gnutls libiconv lame libass libogg libssh libtheora libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus speex nv-codec-headers ] ++ optional openglSupport libGLU_combined + ++ optional libmfxSupport intel-media-sdk + ++ optional vpxSupport libaom ++ optional vpxSupport libvpx ++ optionals (!isDarwin && !isAarch32) [ libpulseaudio ] # Need to be fixed on Darwin and ARM ++ optional ((isLinux || isFreeBSD) && !isAarch32) libva diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix index 5b98d6523b9..f1a2e865bb7 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix +++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix @@ -2,7 +2,7 @@ runCommand "fc-cache" { - buildInputs = [ fontconfig.bin ]; + nativeBuildInputs = [ fontconfig.bin ]; preferLocalBuild = true; allowSubstitutes = false; passAsFile = [ "fontDirs" ]; diff --git a/pkgs/development/libraries/gettext/CVE-2018-18751-bison.patch b/pkgs/development/libraries/gettext/CVE-2018-18751-bison.patch deleted file mode 100644 index b734c1c8b02..00000000000 --- a/pkgs/development/libraries/gettext/CVE-2018-18751-bison.patch +++ /dev/null @@ -1,323 +0,0 @@ -This patch was generated by re-running Bison 3.0.4 on pro-gram-gen.y after -applying CVE-2018-18751.patch. This patch removes the need to add bison to -nativeBuildInputs. - ---- a/gettext-tools/src/po-gram-gen.c -+++ b/gettext-tools/src/po-gram-gen.c -@@ -568,9 +568,9 @@ static const yytype_uint8 yytranslate[] = - static const yytype_uint16 yyrline[] = - { - 0, 169, 169, 171, 172, 173, 174, 179, 187, 195, -- 216, 240, 249, 258, 269, 278, 292, 301, 315, 321, -- 332, 338, 350, 361, 372, 376, 391, 414, 422, 434, -- 442 -+ 216, 237, 246, 255, 266, 275, 289, 298, 312, 318, -+ 329, 335, 347, 358, 369, 373, 388, 411, 419, 431, -+ 439 - }; - #endif - -@@ -1419,14 +1419,11 @@ yyreduce: - check_obsolete ((yyvsp[-3].message_intro), (yyvsp[-1].string)); - check_obsolete ((yyvsp[-3].message_intro), (yyvsp[0].rhs)); - if (!(yyvsp[-3].message_intro).obsolete || pass_obsolete_entries) -- { -- do_callback_message ((yyvsp[-3].message_intro).ctxt, string2, &(yyvsp[-3].message_intro).pos, (yyvsp[-1].string).string, -- (yyvsp[0].rhs).rhs.msgstr, (yyvsp[0].rhs).rhs.msgstr_len, &(yyvsp[0].rhs).pos, -- (yyvsp[-3].message_intro).prev_ctxt, -- (yyvsp[-3].message_intro).prev_id, (yyvsp[-3].message_intro).prev_id_plural, -- (yyvsp[-3].message_intro).obsolete); -- free ((yyvsp[-1].string).string); -- } -+ do_callback_message ((yyvsp[-3].message_intro).ctxt, string2, &(yyvsp[-3].message_intro).pos, (yyvsp[-1].string).string, -+ (yyvsp[0].rhs).rhs.msgstr, (yyvsp[0].rhs).rhs.msgstr_len, &(yyvsp[0].rhs).pos, -+ (yyvsp[-3].message_intro).prev_ctxt, -+ (yyvsp[-3].message_intro).prev_id, (yyvsp[-3].message_intro).prev_id_plural, -+ (yyvsp[-3].message_intro).obsolete); - else - { - free_message_intro ((yyvsp[-3].message_intro)); -@@ -1435,11 +1432,11 @@ yyreduce: - free ((yyvsp[0].rhs).rhs.msgstr); - } - } --#line 1439 "po-gram-gen.c" /* yacc.c:1646 */ -+#line 1436 "po-gram-gen.c" /* yacc.c:1646 */ - break; - - case 11: --#line 241 "po-gram-gen.y" /* yacc.c:1646 */ -+#line 238 "po-gram-gen.y" /* yacc.c:1646 */ - { - check_obsolete ((yyvsp[-2].message_intro), (yyvsp[-1].stringlist)); - check_obsolete ((yyvsp[-2].message_intro), (yyvsp[0].string)); -@@ -1448,11 +1445,11 @@ yyreduce: - string_list_destroy (&(yyvsp[-1].stringlist).stringlist); - free ((yyvsp[0].string).string); - } --#line 1452 "po-gram-gen.c" /* yacc.c:1646 */ -+#line 1449 "po-gram-gen.c" /* yacc.c:1646 */ - break; - - case 12: --#line 250 "po-gram-gen.y" /* yacc.c:1646 */ -+#line 247 "po-gram-gen.y" /* yacc.c:1646 */ - { - check_obsolete ((yyvsp[-2].message_intro), (yyvsp[-1].stringlist)); - check_obsolete ((yyvsp[-2].message_intro), (yyvsp[0].rhs)); -@@ -1461,22 +1458,22 @@ yyreduce: - string_list_destroy (&(yyvsp[-1].stringlist).stringlist); - free ((yyvsp[0].rhs).rhs.msgstr); - } --#line 1465 "po-gram-gen.c" /* yacc.c:1646 */ -+#line 1462 "po-gram-gen.c" /* yacc.c:1646 */ - break; - - case 13: --#line 259 "po-gram-gen.y" /* yacc.c:1646 */ -+#line 256 "po-gram-gen.y" /* yacc.c:1646 */ - { - check_obsolete ((yyvsp[-1].message_intro), (yyvsp[0].stringlist)); - po_gram_error_at_line (&(yyvsp[-1].message_intro).pos, _("missing 'msgstr' section")); - free_message_intro ((yyvsp[-1].message_intro)); - string_list_destroy (&(yyvsp[0].stringlist).stringlist); - } --#line 1476 "po-gram-gen.c" /* yacc.c:1646 */ -+#line 1473 "po-gram-gen.c" /* yacc.c:1646 */ - break; - - case 14: --#line 270 "po-gram-gen.y" /* yacc.c:1646 */ -+#line 267 "po-gram-gen.y" /* yacc.c:1646 */ - { - (yyval.message_intro).prev_ctxt = NULL; - (yyval.message_intro).prev_id = NULL; -@@ -1485,11 +1482,11 @@ yyreduce: - (yyval.message_intro).pos = (yyvsp[0].string).pos; - (yyval.message_intro).obsolete = (yyvsp[0].string).obsolete; - } --#line 1489 "po-gram-gen.c" /* yacc.c:1646 */ -+#line 1486 "po-gram-gen.c" /* yacc.c:1646 */ - break; - - case 15: --#line 279 "po-gram-gen.y" /* yacc.c:1646 */ -+#line 276 "po-gram-gen.y" /* yacc.c:1646 */ - { - check_obsolete ((yyvsp[-1].prev), (yyvsp[0].string)); - (yyval.message_intro).prev_ctxt = (yyvsp[-1].prev).ctxt; -@@ -1499,11 +1496,11 @@ yyreduce: - (yyval.message_intro).pos = (yyvsp[0].string).pos; - (yyval.message_intro).obsolete = (yyvsp[0].string).obsolete; - } --#line 1503 "po-gram-gen.c" /* yacc.c:1646 */ -+#line 1500 "po-gram-gen.c" /* yacc.c:1646 */ - break; - - case 16: --#line 293 "po-gram-gen.y" /* yacc.c:1646 */ -+#line 290 "po-gram-gen.y" /* yacc.c:1646 */ - { - check_obsolete ((yyvsp[-1].string), (yyvsp[0].stringlist)); - (yyval.prev).ctxt = (yyvsp[-1].string).string; -@@ -1512,11 +1509,11 @@ yyreduce: - (yyval.prev).pos = (yyvsp[-1].string).pos; - (yyval.prev).obsolete = (yyvsp[-1].string).obsolete; - } --#line 1516 "po-gram-gen.c" /* yacc.c:1646 */ -+#line 1513 "po-gram-gen.c" /* yacc.c:1646 */ - break; - - case 17: --#line 302 "po-gram-gen.y" /* yacc.c:1646 */ -+#line 299 "po-gram-gen.y" /* yacc.c:1646 */ - { - check_obsolete ((yyvsp[-2].string), (yyvsp[-1].stringlist)); - check_obsolete ((yyvsp[-2].string), (yyvsp[0].string)); -@@ -1526,21 +1523,21 @@ yyreduce: - (yyval.prev).pos = (yyvsp[-2].string).pos; - (yyval.prev).obsolete = (yyvsp[-2].string).obsolete; - } --#line 1530 "po-gram-gen.c" /* yacc.c:1646 */ -+#line 1527 "po-gram-gen.c" /* yacc.c:1646 */ - break; - - case 18: --#line 316 "po-gram-gen.y" /* yacc.c:1646 */ -+#line 313 "po-gram-gen.y" /* yacc.c:1646 */ - { - (yyval.string).string = NULL; - (yyval.string).pos = (yyvsp[0].pos).pos; - (yyval.string).obsolete = (yyvsp[0].pos).obsolete; - } --#line 1540 "po-gram-gen.c" /* yacc.c:1646 */ -+#line 1537 "po-gram-gen.c" /* yacc.c:1646 */ - break; - - case 19: --#line 322 "po-gram-gen.y" /* yacc.c:1646 */ -+#line 319 "po-gram-gen.y" /* yacc.c:1646 */ - { - check_obsolete ((yyvsp[-2].pos), (yyvsp[-1].stringlist)); - check_obsolete ((yyvsp[-2].pos), (yyvsp[0].pos)); -@@ -1548,21 +1545,21 @@ yyreduce: - (yyval.string).pos = (yyvsp[0].pos).pos; - (yyval.string).obsolete = (yyvsp[0].pos).obsolete; - } --#line 1552 "po-gram-gen.c" /* yacc.c:1646 */ -+#line 1549 "po-gram-gen.c" /* yacc.c:1646 */ - break; - - case 20: --#line 333 "po-gram-gen.y" /* yacc.c:1646 */ -+#line 330 "po-gram-gen.y" /* yacc.c:1646 */ - { - (yyval.string).string = NULL; - (yyval.string).pos = (yyvsp[0].pos).pos; - (yyval.string).obsolete = (yyvsp[0].pos).obsolete; - } --#line 1562 "po-gram-gen.c" /* yacc.c:1646 */ -+#line 1559 "po-gram-gen.c" /* yacc.c:1646 */ - break; - - case 21: --#line 339 "po-gram-gen.y" /* yacc.c:1646 */ -+#line 336 "po-gram-gen.y" /* yacc.c:1646 */ - { - check_obsolete ((yyvsp[-2].pos), (yyvsp[-1].stringlist)); - check_obsolete ((yyvsp[-2].pos), (yyvsp[0].pos)); -@@ -1570,11 +1567,11 @@ yyreduce: - (yyval.string).pos = (yyvsp[0].pos).pos; - (yyval.string).obsolete = (yyvsp[0].pos).obsolete; - } --#line 1574 "po-gram-gen.c" /* yacc.c:1646 */ -+#line 1571 "po-gram-gen.c" /* yacc.c:1646 */ - break; - - case 22: --#line 351 "po-gram-gen.y" /* yacc.c:1646 */ -+#line 348 "po-gram-gen.y" /* yacc.c:1646 */ - { - check_obsolete ((yyvsp[-1].pos), (yyvsp[0].stringlist)); - plural_counter = 0; -@@ -1582,30 +1579,30 @@ yyreduce: - (yyval.string).pos = (yyvsp[-1].pos).pos; - (yyval.string).obsolete = (yyvsp[-1].pos).obsolete; - } --#line 1586 "po-gram-gen.c" /* yacc.c:1646 */ -+#line 1583 "po-gram-gen.c" /* yacc.c:1646 */ - break; - - case 23: --#line 362 "po-gram-gen.y" /* yacc.c:1646 */ -+#line 359 "po-gram-gen.y" /* yacc.c:1646 */ - { - check_obsolete ((yyvsp[-1].pos), (yyvsp[0].stringlist)); - (yyval.string).string = string_list_concat_destroy (&(yyvsp[0].stringlist).stringlist); - (yyval.string).pos = (yyvsp[-1].pos).pos; - (yyval.string).obsolete = (yyvsp[-1].pos).obsolete; - } --#line 1597 "po-gram-gen.c" /* yacc.c:1646 */ -+#line 1594 "po-gram-gen.c" /* yacc.c:1646 */ - break; - - case 24: --#line 373 "po-gram-gen.y" /* yacc.c:1646 */ -+#line 370 "po-gram-gen.y" /* yacc.c:1646 */ - { - (yyval.rhs) = (yyvsp[0].rhs); - } --#line 1605 "po-gram-gen.c" /* yacc.c:1646 */ -+#line 1602 "po-gram-gen.c" /* yacc.c:1646 */ - break; - - case 25: --#line 377 "po-gram-gen.y" /* yacc.c:1646 */ -+#line 374 "po-gram-gen.y" /* yacc.c:1646 */ - { - check_obsolete ((yyvsp[-1].rhs), (yyvsp[0].rhs)); - (yyval.rhs).rhs.msgstr = XNMALLOC ((yyvsp[-1].rhs).rhs.msgstr_len + (yyvsp[0].rhs).rhs.msgstr_len, char); -@@ -1617,11 +1614,11 @@ yyreduce: - (yyval.rhs).pos = (yyvsp[-1].rhs).pos; - (yyval.rhs).obsolete = (yyvsp[-1].rhs).obsolete; - } --#line 1621 "po-gram-gen.c" /* yacc.c:1646 */ -+#line 1618 "po-gram-gen.c" /* yacc.c:1646 */ - break; - - case 26: --#line 392 "po-gram-gen.y" /* yacc.c:1646 */ -+#line 389 "po-gram-gen.y" /* yacc.c:1646 */ - { - check_obsolete ((yyvsp[-4].pos), (yyvsp[-3].pos)); - check_obsolete ((yyvsp[-4].pos), (yyvsp[-2].number)); -@@ -1640,11 +1637,11 @@ yyreduce: - (yyval.rhs).pos = (yyvsp[-4].pos).pos; - (yyval.rhs).obsolete = (yyvsp[-4].pos).obsolete; - } --#line 1644 "po-gram-gen.c" /* yacc.c:1646 */ -+#line 1641 "po-gram-gen.c" /* yacc.c:1646 */ - break; - - case 27: --#line 415 "po-gram-gen.y" /* yacc.c:1646 */ -+#line 412 "po-gram-gen.y" /* yacc.c:1646 */ - { - string_list_init (&(yyval.stringlist).stringlist); - string_list_append (&(yyval.stringlist).stringlist, (yyvsp[0].string).string); -@@ -1652,11 +1649,11 @@ yyreduce: - (yyval.stringlist).pos = (yyvsp[0].string).pos; - (yyval.stringlist).obsolete = (yyvsp[0].string).obsolete; - } --#line 1656 "po-gram-gen.c" /* yacc.c:1646 */ -+#line 1653 "po-gram-gen.c" /* yacc.c:1646 */ - break; - - case 28: --#line 423 "po-gram-gen.y" /* yacc.c:1646 */ -+#line 420 "po-gram-gen.y" /* yacc.c:1646 */ - { - check_obsolete ((yyvsp[-1].stringlist), (yyvsp[0].string)); - (yyval.stringlist).stringlist = (yyvsp[-1].stringlist).stringlist; -@@ -1665,11 +1662,11 @@ yyreduce: - (yyval.stringlist).pos = (yyvsp[-1].stringlist).pos; - (yyval.stringlist).obsolete = (yyvsp[-1].stringlist).obsolete; - } --#line 1669 "po-gram-gen.c" /* yacc.c:1646 */ -+#line 1666 "po-gram-gen.c" /* yacc.c:1646 */ - break; - - case 29: --#line 435 "po-gram-gen.y" /* yacc.c:1646 */ -+#line 432 "po-gram-gen.y" /* yacc.c:1646 */ - { - string_list_init (&(yyval.stringlist).stringlist); - string_list_append (&(yyval.stringlist).stringlist, (yyvsp[0].string).string); -@@ -1677,11 +1674,11 @@ yyreduce: - (yyval.stringlist).pos = (yyvsp[0].string).pos; - (yyval.stringlist).obsolete = (yyvsp[0].string).obsolete; - } --#line 1681 "po-gram-gen.c" /* yacc.c:1646 */ -+#line 1678 "po-gram-gen.c" /* yacc.c:1646 */ - break; - - case 30: --#line 443 "po-gram-gen.y" /* yacc.c:1646 */ -+#line 440 "po-gram-gen.y" /* yacc.c:1646 */ - { - check_obsolete ((yyvsp[-1].stringlist), (yyvsp[0].string)); - (yyval.stringlist).stringlist = (yyvsp[-1].stringlist).stringlist; -@@ -1690,11 +1687,11 @@ yyreduce: - (yyval.stringlist).pos = (yyvsp[-1].stringlist).pos; - (yyval.stringlist).obsolete = (yyvsp[-1].stringlist).obsolete; - } --#line 1694 "po-gram-gen.c" /* yacc.c:1646 */ -+#line 1691 "po-gram-gen.c" /* yacc.c:1646 */ - break; - - --#line 1698 "po-gram-gen.c" /* yacc.c:1646 */ -+#line 1695 "po-gram-gen.c" /* yacc.c:1646 */ - default: break; - } - /* User semantic actions sometimes alter yychar, and that requires diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 9547c6c31ad..3c1e98730fa 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -1,24 +1,16 @@ -{ stdenv, lib, fetchurl, libiconv, xz, bison, automake115x, autoconf }: +{ stdenv, lib, fetchurl, libiconv, xz }: -let allowBisonDependency = !stdenv.isDarwin; in stdenv.mkDerivation rec { pname = "gettext"; - version = "0.19.8.1"; + version = "0.20.1"; src = fetchurl { url = "mirror://gnu/gettext/${pname}-${version}.tar.gz"; - sha256 = "0hsw28f9q9xaggjlsdp2qmbp2rbd1mp0njzan2ld9kiqwkq2m57z"; + sha256 = "0p3zwkk27wm2m2ccfqm57nj7vqkmfpn7ja1nf65zmhz8qqs5chb6"; }; patches = [ ./absolute-paths.diff - (fetchurl { - name = "CVE-2018-18751.patch"; - url = "https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=patch;h=dce3a16e5e9368245735e29bf498dcd5e3e474a4"; - sha256 = "1lpjwwcjr1sb879faj0xyzw02kma0ivab6xwn3qciy13qy6fq5xn"; - }) - ] ++ lib.optionals (!allowBisonDependency) [ - # Only necessary for CVE-2018-18751.patch: - ./CVE-2018-18751-bison.patch + ./gettext.git-2336451ed68d91ff4b5ae1acbc1eca30e47a86a9.patch ]; outputs = [ "out" "man" "doc" "info" ]; @@ -54,14 +46,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ xz xz.bin - ] - # Only necessary for CVE-2018-18751.patch (unless CVE-2018-18751-bison.patch - # is also applied): - ++ lib.optional allowBisonDependency bison - ++ [ - # Only necessary for CVE-2018-18751.patch: - automake115x - autoconf ]; # HACK, see #10874 (and 14664) buildInputs = stdenv.lib.optional (!stdenv.isLinux && !stdenv.hostPlatform.isCygwin) libiconv; diff --git a/pkgs/development/libraries/gettext/gettext.git-2336451ed68d91ff4b5ae1acbc1eca30e47a86a9.patch b/pkgs/development/libraries/gettext/gettext.git-2336451ed68d91ff4b5ae1acbc1eca30e47a86a9.patch new file mode 100644 index 00000000000..4a19b11507a --- /dev/null +++ b/pkgs/development/libraries/gettext/gettext.git-2336451ed68d91ff4b5ae1acbc1eca30e47a86a9.patch @@ -0,0 +1,82 @@ +From 2336451ed68d91ff4b5ae1acbc1eca30e47a86a9 Mon Sep 17 00:00:00 2001 +From: Bruno Haible <bruno@clisp.org> +Date: Sun, 19 May 2019 13:10:06 +0200 +Subject: [PATCH] msgmerge: Fix behaviour of --for-msgfmt on PO files with no + translations. + +Reported by Don Lawrence <dlawrence@iecok.com> +in <https://lists.freedesktop.org/archives/p11-glue/2019-May/000700.html> +via Daiki Ueno +in <https://lists.gnu.org/archive/html/bug-gettext/2019-05/msg00124.html>. + +* gettext-tools/src/msgmerge.c (main): Treat force_po like true if for_msgfmt +is true. +* gettext-tools/tests/msgmerge-26: Add test of PO file with no translations. +--- + gettext-tools/src/msgmerge.c | 4 ++-- + gettext-tools/tests/msgmerge-26 | 36 +++++++++++++++++++++++++++++++++--- + 2 files changed, 35 insertions(+), 5 deletions(-) + +diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c +index cd762c0..92c9b7a 100644 +--- a/gettext-tools/src/msgmerge.c ++++ b/gettext-tools/src/msgmerge.c +@@ -520,8 +520,8 @@ There is NO WARRANTY, to the extent permitted by law.\n\ + else + { + /* Write the merged message list out. */ +- msgdomain_list_print (result, output_file, output_syntax, force_po, +- false); ++ msgdomain_list_print (result, output_file, output_syntax, ++ for_msgfmt || force_po, false); + } + + exit (EXIT_SUCCESS); +diff --git a/gettext-tools/tests/msgmerge-26 b/gettext-tools/tests/msgmerge-26 +index cd3862e..b86f7a0 100755 +--- a/gettext-tools/tests/msgmerge-26 ++++ b/gettext-tools/tests/msgmerge-26 +@@ -73,7 +73,37 @@ msgstr "Papaya" + EOF + + : ${DIFF=diff} +-${DIFF} mm-test26.ok mm-test26.out +-result=$? ++${DIFF} mm-test26.ok mm-test26.out || Exit 1 + +-exit $result ++# Test with a PO file that has no translated messages. ++ ++cat <<\EOF > mm-test26a.in1 ++msgid "" ++msgstr "" ++"Content-Type: text/plain; charset=UTF-8\n" ++ ++msgid "Hello world" ++msgstr "Hallo Welt" ++EOF ++ ++cat <<\EOF > mm-test26a.in2 ++msgid "" ++msgstr "" ++"Content-Type: text/plain; charset=ASCII\n" ++ ++msgid "Hello, world!" ++msgstr "" ++EOF ++ ++: ${MSGMERGE=msgmerge} ++${MSGMERGE} --for-msgfmt -o mm-test26a.tmp mm-test26a.in1 mm-test26a.in2 \ ++ || Exit 1 ++LC_ALL=C tr -d '\r' < mm-test26a.tmp > mm-test26a.out || Exit 1 ++ ++cat <<\EOF > mm-test26a.ok ++msgid "" ++msgstr "Content-Type: text/plain; charset=UTF-8\n" ++EOF ++ ++: ${DIFF=diff} ++${DIFF} mm-test26a.ok mm-test26a.out || Exit 1 +-- +1.9.1 + diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index 735ab4e6e18..de8556ccc96 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -1,16 +1,40 @@ -{ stdenv, fetchurl, fetchpatch, meson, ninja, gettext +{ stdenv +, fetchurl +, meson +, ninja +, gettext , config -, pkgconfig, python3, gst-plugins-base, orc +, pkgconfig +, python3 +, gst-plugins-base +, orc , gobject-introspection , enableZbar ? true -, faacSupport ? false, faac ? null -, faad2, libass, libkate, libmms, librdf, ladspaH -, libnice, webrtc-audio-processing, lilv, lv2, serd, sord, sratom -, libbs2b, libmodplug, mpeg2dec -, openjpeg, libopus, librsvg +, faacSupport ? false +, faac ? null +, faad2 +, libass +, libkate +, libmms +, librdf +, ladspaH +, libnice +, webrtc-audio-processing +, lilv +, lv2 +, serd +, sord +, sratom +, libbs2b +, libmodplug +, mpeg2dec +, openjpeg +, libopus +, librsvg , bluez , chromaprint , curl +, darwin , directfb , fdk_aac , flite @@ -27,7 +51,7 @@ , libusb1 , neon , openal -, opencv3 +, opencv4 , openexr , openh264 , pango @@ -38,10 +62,20 @@ , srtp , zbar , wayland-protocols -, wildmidi, fluidsynth, libvdpau, wayland -, libwebp, xvidcore, gnutls, mjpegtools -, libGLU_combined, libintl, libgme -, openssl, x265, libxml2 +, wildmidi +, fluidsynth +, libvdpau +, wayland +, libwebp +, xvidcore +, gnutls +, mjpegtools +, libGLU_combined +, libintl +, libgme +, openssl +, x265 +, libxml2 , srt }: @@ -49,113 +83,127 @@ assert faacSupport -> faac != null; let inherit (stdenv.lib) optional optionals; -in -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "gst-plugins-bad"; - version = "1.16.0"; + version = "1.16.1"; - meta = with stdenv.lib; { - description = "Gstreamer Bad Plugins"; - homepage = "https://gstreamer.freedesktop.org"; - longDescription = '' - a set of plug-ins that aren't up to par compared to the - rest. They might be close to being good quality, but they're missing - something - be it a good code review, some documentation, a set of tests, - a real live maintainer, or some actual wide use. - ''; - license = licenses.lgpl2Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ matthewbauer ]; - }; + outputs = [ "out" "dev" ]; - preConfigure = '' - patchShebangs . - ''; + src = fetchurl { + url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + sha256 = "1dddqacxgp77f3nl153x5a6139wdphc9phds2fpqb2cv6faiqj2n"; + }; patches = [ ./fix_pkgconfig_includedir.patch - # Remove when https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/merge_requests/312 is merged and available to us - (fetchpatch { - url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/commit/99790eaad9083cce5ab2b1646489e1a1c0faad1e.patch"; - sha256 = "11bqy4sl05qq5mj4bx5s09rq106s3j0vnpjl4np058im32j69lr3"; - }) - # Remove when https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/merge_requests/312 is merged and available to us - (fetchpatch { - url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/commit/1872da81c48d3a719bd39955fd97deac7d037d74.patch"; - sha256 = "11zwrr5ggflmvr0qfssj7dmhgd3ybiadmy79b4zh24022zgw3xpz"; - }) ]; - src = fetchurl { - url = "${meta.homepage}/src/gst-plugins-bad/${pname}-${version}.tar.xz"; - sha256 = "019b0yqjrcg6jmfd4cc336h1bz5p4wxl58yz1c4sdb96avirs4r2"; - }; - - outputs = [ "out" "dev" ]; - nativeBuildInputs = [ - meson ninja pkgconfig python3 gettext gobject-introspection - ] - ++ optionals stdenv.isLinux [ + meson + ninja + pkgconfig + python3 + gettext + gobject-introspection + ] ++ optionals stdenv.isLinux [ wayland-protocols ]; buildInputs = [ - gst-plugins-base orc - faad2 libass libkate libmms - libnice webrtc-audio-processing # webrtc + gst-plugins-base + orc + faad2 + libass + libkate + libmms + webrtc-audio-processing # webrtc libbs2b - ladspaH librdf # ladspa plug-in - lilv lv2 serd sord sratom # lv2 plug-in - libmodplug mpeg2dec - openjpeg libopus librsvg - bluez - chromaprint + libmodplug + mpeg2dec + openjpeg + libopus + librsvg curl.dev - directfb fdk_aac - flite gsm libaom libdc1394 libde265 - libdrm libdvdnav libdvdread - libgudev - libofa libsndfile libusb1 + mjpegtools neon openal - opencv3 + opencv4 openexr openh264 rtmpdump pango - sbc soundtouch - spandsp srtp - fluidsynth libvdpau - libwebp xvidcore gnutls libGLU_combined - libgme openssl x265 libxml2 + fluidsynth + libvdpau + libwebp + xvidcore + gnutls + libGLU_combined + libgme + openssl + x265 + libxml2 libintl srt - ] - ++ optional enableZbar zbar - ++ optional faacSupport faac - ++ optional stdenv.isLinux wayland + ] ++ optionals enableZbar [ + zbar + ] ++ optionals faacSupport [ + faac + ] ++ optionals stdenv.isLinux [ + bluez + wayland + ] ++ optionals (!stdenv.isDarwin) [ # wildmidi requires apple's OpenAL # TODO: package apple's OpenAL, fix wildmidi, include on Darwin - ++ optional (!stdenv.isDarwin) wildmidi + wildmidi # TODO: mjpegtools uint64_t is not compatible with guint64 on Darwin - ++ optional (!stdenv.isDarwin) mjpegtools; + mjpegtools - mesonFlags = [ - # Enables all features, so that we know when new dependencies are necessary. - "-Dauto_features=enabled" + chromaprint + directfb + flite + libdrm + libgudev + libnice + libofa + librdf + sbc + spandsp + + # ladspa plug-in + ladspaH + librdf # TODO: make build on Darwin + # lv2 plug-in + lilv + lv2 + serd + sord + sratom + ] ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + # For unknown reasons the order is important, e.g. if + # VideoToolbox is last, we get: + # fatal error: 'VideoToolbox/VideoToolbox.h' file not found + VideoToolbox + AudioToolbox + AVFoundation + CoreMedia + CoreVideo + Foundation + MediaToolbox + ]); + + mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Ddts=disabled" # required `libdca` library not packaged in nixpkgs as of writing, and marked as "BIG FAT WARNING: libdca is still in early development" @@ -191,10 +239,50 @@ stdenv.mkDerivation rec { # see https://github.com/NixOS/nixpkgs/issues/54395 "-Dnvdec=disabled" "-Dnvenc=disabled" + ] + ++ optionals stdenv.isDarwin [ + "-Dbluez=disabled" + "-Dchromaprint=disabled" + "-Ddirectfb=disabled" + "-Dflite=disabled" + "-Dkms=disabled" # renders to libdrm output + "-Dofa=disabled" + "-Dlv2=disabled" + "-Dsbc=disabled" + "-Dspandsp=disabled" + "-Ddvb=disabled" + "-Dfbdev=disabled" + "-Duvch264=disabled" # requires gudev + "-Dladspa=disabled" # requires lrdf + "-Dwebrtc=disabled" # requires libnice, which as of writing doesn't work on Darwin in nixpkgs + "-Dwildmidi=disabled" # see dependencies above + ] ++ optionals (!gst-plugins-base.glEnabled) [ + "-Dgl=disabled"] + ++ optionals (!gst-plugins-base.waylandEnabled) [ + "-Dwayland=disabled" + ] ++ optionals (!gst-plugins-base.glEnabled) [ + # `applemedia/videotexturecache.h` requires `gst/gl/gl.h`, + # but its meson build system does not declare the dependency. + "-Dapplemedia=disabled" ]; - enableParallelBuilding = true; + # This package has some `_("string literal")` string formats + # that trip up clang with format security enabled. + hardeningDisable = [ "format" ]; doCheck = false; # fails 20 out of 58 tests, expensive + meta = with stdenv.lib; { + description = "GStreamer Bad Plugins"; + homepage = "https://gstreamer.freedesktop.org"; + longDescription = '' + a set of plug-ins that aren't up to par compared to the + rest. They might be close to being good quality, but they're missing + something - be it a good code review, some documentation, a set of tests, + a real live maintainer, or some actual wide use. + ''; + license = licenses.lgpl2Plus; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ matthewbauer ]; + }; } diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 81d91458132..d38199cf787 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -1,100 +1,153 @@ -{ stdenv, fetchurl, fetchpatch, lib -, pkgconfig, meson, ninja, gettext, gobject-introspection -, python3, gstreamer, orc, pango, libtheora -, libintl, libopus +{ stdenv +, fetchurl +, lib +, pkgconfig +, meson +, ninja +, gettext +, gobject-introspection +, python3 +, gstreamer +, orc +, pango +, libtheora +, libintl +, libopus , isocodes , libjpeg +, libpng , libvisual , tremor # provides 'virbisidec' , libGL -, gtk-doc, docbook_xsl, docbook_xml_dtd_412 -, enableX11 ? stdenv.isLinux, libXv -, enableWayland ? stdenv.isLinux, wayland -, enableAlsa ? stdenv.isLinux, alsaLib -, enableCocoa ? false, darwin -, enableCdparanoia ? (!stdenv.isDarwin), cdparanoia }: +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_43 +, enableX11 ? stdenv.isLinux +, libXv +, enableWayland ? stdenv.isLinux +, wayland +, enableAlsa ? stdenv.isLinux +, alsaLib +# Enabling Cocoa seems to currently not work, giving compile +# errors. Suspected is that a newer version than clang +# is needed than 5.0 but it is not clear. +, enableCocoa ? false +, darwin +, enableGl ? (enableX11 || enableWayland || enableCocoa) +, enableCdparanoia ? (!stdenv.isDarwin) +, cdparanoia +}: stdenv.mkDerivation rec { pname = "gst-plugins-base"; - version = "1.16.0"; + version = "1.16.1"; - meta = with lib; { - description = "Base plugins and helper libraries"; - homepage = https://gstreamer.freedesktop.org; - license = licenses.lgpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ matthewbauer ]; - }; + outputs = [ "out" "dev" ]; src = fetchurl { - url = "${meta.homepage}/src/gst-plugins-base/${pname}-${version}.tar.xz"; - sha256 = "1bmmdwbyy89ayb85xc48y217f6wdmpz96f30zm6v53z2a5xsm4s0"; + url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + sha256 = "0aybbwnzm15074smdk2bamj3ssck3hjvmilvgh49f19xjf4w8g2w"; }; - outputs = [ "out" "dev" ]; + patches = [ + ./fix_pkgconfig_includedir.patch + ]; nativeBuildInputs = [ - pkgconfig python3 gettext gobject-introspection + meson + ninja + pkgconfig + python3 + gettext + gobject-introspection + + # docs gtk-doc - # Without these, enabling the 'gtk_doc' gives us `FAILED: meson-install` - docbook_xsl docbook_xml_dtd_412 - ] - # Broken meson with Darwin. Should hopefully be fixed soon. Tracking - # in https://bugzilla.gnome.org/show_bug.cgi?id=781148. - ++ lib.optionals (!stdenv.isDarwin) [ meson ninja ]; + docbook_xsl + docbook_xml_dtd_43 + ]; - # On Darwin, we currently use autoconf, on all other systems Meson - # TODO Switch to Meson on Darwin as well + buildInputs = [ + orc + libtheora + libintl + libopus + isocodes + libpng + libjpeg + tremor + libGL + ] ++ lib.optional (!stdenv.isDarwin) [ + libvisual + ] ++ lib.optionals stdenv.isDarwin [ + pango + darwin.apple_sdk.frameworks.OpenGL + ] ++ lib.optional enableAlsa alsaLib + ++ lib.optionals enableX11 [ libXv pango ] + ++ lib.optional enableWayland wayland + ++ lib.optional enableCocoa darwin.apple_sdk.frameworks.Cocoa + ++ lib.optional enableCdparanoia cdparanoia; - # TODO How to pass these to Meson? - configureFlags = lib.optionals stdenv.isDarwin [ - "--enable-x11=${if enableX11 then "yes" else "no"}" - "--enable-wayland=${if enableWayland then "yes" else "no"}" - "--enable-cocoa=${if enableCocoa then "yes" else "no"}" - ] - # Introspection fails on my MacBook currently - ++ lib.optional stdenv.isDarwin "--disable-introspection"; + propagatedBuildInputs = [ + gstreamer + ]; - mesonFlags = lib.optionals (!stdenv.isDarwin) [ - # Enables all features, so that we know when new dependencies are necessary. - "-Dauto_features=enabled" + mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Dgl-graphene=disabled" # not packaged in nixpkgs as of writing + "-Dgl_platform=[${lib.optionalString (enableX11 || enableWayland || enableCocoa) "auto"}]" # See https://github.com/GStreamer/gst-plugins-base/blob/d64a4b7a69c3462851ff4dcfa97cc6f94cd64aef/meson_options.txt#L15 for a list of choices "-Dgl_winsys=[${lib.concatStringsSep "," (lib.optional enableX11 "x11" ++ lib.optional enableWayland "wayland" ++ lib.optional enableCocoa "cocoa")}]" # We must currently disable gtk_doc API docs generation, # because it is not compatible with some features being disabled. # See for example - # https://gitlab.gnome.org/GNOME/gnome-build-meta/issues/38 + # https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/issues/564 # for it failing because some Wayland symbols are missing. # This problem appeared between 1.15.1 and 1.16.0. + # In 1.18 they should switch to hotdoc, which should make this issue irrelevant. "-Dgtk_doc=disabled" ] ++ lib.optional (!enableX11) "-Dx11=disabled" # TODO How to disable Wayland? + ++ lib.optional (!enableGl) "-Dgl=disabled" ++ lib.optional (!enableAlsa) "-Dalsa=disabled" ++ lib.optional (!enableCdparanoia) "-Dcdparanoia=disabled" - ; - - buildInputs = [ orc libtheora libintl libopus isocodes libjpeg tremor libGL ] - ++ lib.optional (!stdenv.isDarwin) libvisual - ++ lib.optional enableAlsa alsaLib - ++ lib.optionals enableX11 [ libXv pango ] - ++ lib.optional enableWayland wayland - ++ lib.optional enableCocoa darwin.apple_sdk.frameworks.Cocoa - ++ lib.optional enableCdparanoia cdparanoia; - - propagatedBuildInputs = [ gstreamer ]; + ++ lib.optionals stdenv.isDarwin [ + "-Dlibvisual=disabled" + ]; postPatch = '' - patchShebangs . + patchShebangs common/scangobj-merge.py ''; - enableParallelBuilding = true; + # This package has some `_("string literal")` string formats + # that trip up clang with format security enabled. + hardeningDisable = [ "format" ]; doCheck = false; # fails, wants DRI access for OpenGL - patches = [ - ./fix_pkgconfig_includedir.patch - ]; + passthru = { + # Downstream `gst-*` packages depending on `gst-plugins-base` + # have meson build options like 'gl' etc. that depend + # on these features being built in `-base`. + # If they are not built here, then the downstream builds + # will fail, as they, too, use `-Dauto_features=enabled` + # which would enable these options unconditionally. + # That means we must communicate to these downstream packages + # if the `-base` enabled these options or not, so that + # the can enable/disable those features accordingly. + # The naming `*Enabled` vs `enable*` is intentional to + # distinguish inputs from outputs (what is to be built + # vs what was built) and to make them easier to search for. + glEnabled = enableGl; + waylandEnabled = enableWayland; + }; + + meta = with lib; { + description = "Base GStreamer plug-ins and helper libraries"; + homepage = "https://gstreamer.freedesktop.org"; + license = licenses.lgpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ matthewbauer ]; + }; } diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index f0f01a977fd..bbef0178312 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -1,10 +1,23 @@ -{ stdenv, fetchurl, fetchpatch, meson, ninja -, pkgconfig, gettext, gobject-introspection -, bison, flex, python3, glib, makeWrapper -, libcap,libunwind, darwin +{ stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, pkgconfig +, gettext +, gobject-introspection +, bison +, flex +, python3 +, glib +, makeWrapper +, libcap +, libunwind +, darwin , elfutils # for libdw , bash-completion -, docbook_xsl, docbook_xml_dtd_412 +, docbook_xsl +, docbook_xml_dtd_43 , gtk-doc , lib , CoreServices @@ -12,50 +25,66 @@ stdenv.mkDerivation rec { pname = "gstreamer"; - version = "1.16.0"; + version = "1.16.1"; - meta = with lib ;{ - description = "Open source multimedia framework"; - homepage = https://gstreamer.freedesktop.org; - license = licenses.lgpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ ttuegel matthewbauer ]; - }; + outputs = [ "out" "dev" "devdoc" ]; + outputBin = "dev"; src = fetchurl { - url = "${meta.homepage}/src/gstreamer/${pname}-${version}.tar.xz"; - sha256 = "003wy1p1in85p9sr5jsyhbnwqaiwz069flwkhyx7qhxy31qjz3hf"; + url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + sha256 = "0z9pyhf6zm1r0spw6zym80bvbyx6h8xg9h6535csbnn48ws1q882"; }; patches = [ ./fix_pkgconfig_includedir.patch ]; - outputs = [ "out" "dev" ]; - outputBin = "dev"; - nativeBuildInputs = [ - meson ninja pkgconfig gettext bison flex python3 makeWrapper gobject-introspection + meson + ninja + pkgconfig + gettext + bison + flex + python3 + makeWrapper + gobject-introspection bash-completion + + # documentation gtk-doc - # Without these, enabling the 'gtk_doc' gives us `FAILED: meson-install` - docbook_xsl docbook_xml_dtd_412 + docbook_xsl + docbook_xml_dtd_43 ]; - buildInputs = - lib.optionals stdenv.isLinux [ libcap libunwind elfutils ] - ++ lib.optional stdenv.isDarwin CoreServices; + buildInputs = lib.optionals stdenv.isLinux [ + libcap + libunwind + elfutils + ] ++ lib.optionals stdenv.isDarwin [ + CoreServices + ]; - propagatedBuildInputs = [ glib ]; + propagatedBuildInputs = [ + glib + ]; mesonFlags = [ - # Enables all features, so that we know when new dependencies are necessary. - "-Dauto_features=enabled" "-Ddbghelp=disabled" # not needed as we already provide libunwind and libdw, and dbghelp is a fallback to those "-Dexamples=disabled" # requires many dependencies and probably not useful for our users - ] + ] ++ lib.optionals stdenv.isDarwin [ # darwin.libunwind doesn't have pkgconfig definitions so meson doesn't detect it. - ++ stdenv.lib.optionals stdenv.isDarwin [ "-Dlibunwind=disabled" "-Dlibdw=disabled" ]; + "-Dlibunwind=disabled" + "-Dlibdw=disabled" + ]; + + postPatch = '' + patchShebangs \ + gst/parse/get_flex_version.py \ + gst/parse/gen_grammar.py.in \ + gst/parse/gen_lex.py.in \ + libs/gst/helpers/ptp_helper_post_install.sh + ''; postInstall = '' for prog in "$dev/bin/"*; do @@ -64,21 +93,17 @@ stdenv.mkDerivation rec { done ''; - preConfigure= - # These files are not executable upstream, so we need to - # make them executable for `patchShebangs` to pick them up. - # Can be removed when this is merged and available: - # https://gitlab.freedesktop.org/gstreamer/gstreamer/merge_requests/141 - '' - chmod +x gst/parse/get_flex_version.py - '' + - '' - patchShebangs . - ''; - preFixup = '' moveToOutput "share/bash-completion" "$dev" ''; setupHook = ./setup-hook.sh; + + meta = with lib ;{ + description = "Open source multimedia framework"; + homepage = "https://gstreamer.freedesktop.org"; + license = licenses.lgpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ ttuegel matthewbauer ]; + }; } diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix index 810cee650ca..d62af71d3ae 100644 --- a/pkgs/development/libraries/gstreamer/ges/default.nix +++ b/pkgs/development/libraries/gstreamer/ges/default.nix @@ -1,39 +1,66 @@ -{ stdenv, fetchurl, fetchpatch, meson, ninja -, pkgconfig, python, gst-plugins-base, libxml2 -, flex, perl, gettext, gobject-introspection +{ stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, pkgconfig +, python +, gst-plugins-base +, libxml2 +, flex +, perl +, gettext +, gobject-introspection }: stdenv.mkDerivation rec { pname = "gstreamer-editing-services"; - version = "1.16.0"; + version = "1.16.1"; - meta = with stdenv.lib; { - description = "Library for creation of audio/video non-linear editors"; - homepage = "https://gstreamer.freedesktop.org"; - license = licenses.lgpl2Plus; - platforms = platforms.unix; - }; + outputs = [ "out" "dev" ]; src = fetchurl { - url = "${meta.homepage}/src/gstreamer-editing-services/${pname}-${version}.tar.xz"; - sha256 = "1las94jkx83sxmzi5w6b0xm89dqqwzpdsb6h9w9ixndhnbpzm8w2"; + url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + sha256 = "10375z5mc3bwfs07mhmfx943sbp55z8m8ihp9xpcknkdks7qg168"; }; - outputs = [ "out" "dev" ]; + patches = [ + ./fix_pkgconfig_includedir.patch + ]; + + nativeBuildInputs = [ + meson + ninja + pkgconfig + gettext + gobject-introspection + python + flex + perl + ]; - nativeBuildInputs = [ meson ninja pkgconfig gettext gobject-introspection python flex perl ]; + buildInputs = [ + libxml2 + ]; - propagatedBuildInputs = [ gst-plugins-base libxml2 ]; + propagatedBuildInputs = [ + gst-plugins-base + ]; mesonFlags = [ "-Dgtk_doc=disabled" ]; - patches = [ - ./fix_pkgconfig_includedir.patch - ]; - postPatch = '' + # for some reason, gst-plugins-bad cannot be found + # fortunately, they are only used by tests, which we do not run sed -i -r -e 's/p(bad|good) = .*/p\1 = pbase/' tests/check/meson.build ''; + + meta = with stdenv.lib; { + description = "Library for creation of audio/video non-linear editors"; + homepage = "https://gstreamer.freedesktop.org"; + license = licenses.lgpl2Plus; + platforms = platforms.unix; + }; } diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index c801684b065..1c7107e50fa 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -1,14 +1,37 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, python -, gst-plugins-base, orc, bzip2, gettext -, libv4l, libdv, libavc1394, libiec61883 -, libvpx, speex, flac, taglib, libshout -, cairo, gdk-pixbuf, aalib, libcaca -, libsoup, libpulseaudio, libintl -, darwin, lame, mpg123, twolame +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, python +, gst-plugins-base +, orc +, bzip2 +, gettext +, libv4l +, libdv +, libavc1394 +, libiec61883 +, libvpx +, speex +, flac +, taglib +, libshout +, cairo +, gdk-pixbuf +, aalib +, libcaca +, libsoup +, libpulseaudio +, libintl +, darwin +, lame +, mpg123 +, twolame , gtkSupport ? false, gtk3 ? null -# As of writing, jack2 incurs a Qt dependency (big!) via `ffado`. -# In the fuure we should probably split `ffado`. -, enableJack ? false + # As of writing, jack2 incurs a Qt dependency (big!) via `ffado`. + # In the future we should probably split `ffado`. +, enableJack ? false, jack2 , libXdamage , libXext , libXfixes @@ -16,7 +39,6 @@ , xorg , libgudev , wavpack -, jack2 }: assert gtkSupport -> gtk3 != null; @@ -26,39 +48,44 @@ let in stdenv.mkDerivation rec { pname = "gst-plugins-good"; - version = "1.16.0"; + version = "1.16.1"; - meta = with stdenv.lib; { - description = "Gstreamer Good Plugins"; - homepage = "https://gstreamer.freedesktop.org"; - longDescription = '' - a set of plug-ins that we consider to have good quality code, - correct functionality, our preferred license (LGPL for the plug-in - code, LGPL or LGPL-compatible for the supporting library). - ''; - license = licenses.lgpl2Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ matthewbauer ]; - }; + outputs = [ "out" "dev" ]; src = fetchurl { - url = "${meta.homepage}/src/gst-plugins-good/${pname}-${version}.tar.xz"; - sha256 = "1zdhif1mhf0ihkjpjyrh65g2iz2cawkjjb3h5w8h9ml06grxwjk5"; + url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + sha256 = "07wgz9anf4ram2snp8n1wv6l0q3pd00iaw8bvw3wgklg05lvxflz"; }; - outputs = [ "out" "dev" ]; - patches = [ ./fix_pkgconfig_includedir.patch ]; - nativeBuildInputs = [ pkgconfig python meson ninja gettext ]; - - NIX_LDFLAGS = "-lncurses"; + nativeBuildInputs = [ + pkgconfig + python + meson + ninja + gettext + ]; buildInputs = [ - gst-plugins-base orc bzip2 - libdv libvpx speex flac taglib - cairo gdk-pixbuf aalib libcaca - libsoup libshout lame mpg123 twolame libintl + gst-plugins-base + orc + bzip2 + libdv + libvpx + speex + flac + taglib + cairo + gdk-pixbuf + aalib + libcaca + libsoup + libshout + lame + mpg123 + twolame + libintl libXdamage libXext libXfixes @@ -66,29 +93,59 @@ stdenv.mkDerivation rec { xorg.libXfixes xorg.libXdamage wavpack - ] - ++ optional gtkSupport gtk3 # for gtksink - ++ optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ] - ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 libgudev ] - ++ optionals (stdenv.isLinux && enableJack) [ + ] ++ optional gtkSupport [ + # for gtksink + gtk3 + ] ++ optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Cocoa + ] ++ optionals stdenv.isLinux [ + libv4l + libpulseaudio + libavc1394 + libiec61883 + libgudev + ] ++ optionals (stdenv.isLinux && enableJack) [ jack2 ]; mesonFlags = [ - # Enables all features, so that we know when new dependencies are necessary. - "-Dauto_features=enabled" "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Dqt5=disabled" # not clear as of writing how to correctly pass in the required qt5 deps - ] - ++ optional (!gtkSupport) "-Dgtk3=disabled" - ++ optionals (!stdenv.isLinux || !enableJack) [ + ] ++ optionals (!gtkSupport) [ + "-Dgtk3=disabled" + ] ++ optionals (!stdenv.isLinux || !enableJack) [ "-Djack=disabled" # unclear whether Jack works on Darwin - ] - ++ optionals (!stdenv.isLinux) [ - "-Dv4l2-gudev=disabled" + ] ++ optionals (!stdenv.isLinux) [ + "-Ddv1394=disabled" # Linux only + "-Doss4=disabled" # Linux only + "-Doss=disabled" # Linux only + "-Dpulse=disabled" # TODO check if we can keep this enabled + "-Dv4l2-gudev=disabled" # Linux-only + "-Dv4l2=disabled" # Linux-only + "-Dximagesrc=disabled" # Linux-only + "-Dpulse=disabled" # TODO check if we can keep this enabled + ]; + + + NIX_LDFLAGS = [ + # linking error on Darwin + # https://github.com/NixOS/nixpkgs/pull/70690#issuecomment-553694896 + "-lncurses" ]; # fails 1 tests with "Unexpected critical/warning: g_object_set_is_valid_property: object class 'GstRtpStorage' has no property named ''" doCheck = false; + meta = with stdenv.lib; { + description = "GStreamer Good Plugins"; + homepage = "https://gstreamer.freedesktop.org"; + longDescription = '' + a set of plug-ins that we consider to have good quality code, + correct functionality, our preferred license (LGPL for the plug-in + code, LGPL or LGPL-compatible for the supporting library). + ''; + license = licenses.lgpl2Plus; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ matthewbauer ]; + }; } diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 1847b8d0c12..5319de255e7 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -1,43 +1,46 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig -, python, yasm, gst-plugins-base, orc, bzip2 -, gettext, withSystemLibav ? true, libav ? null +{ stdenv +, lib +, fetchurl +, meson +, ninja +, pkgconfig +, python3 +, gst-plugins-base +, gettext +, libav }: # Note that since gst-libav-1.6, libav is actually ffmpeg. See # https://gstreamer.freedesktop.org/releases/1.6/ for more info. -assert withSystemLibav -> libav != null; - stdenv.mkDerivation rec { pname = "gst-libav"; - version = "1.16.0"; - - meta = { - homepage = https://gstreamer.freedesktop.org; - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.unix; - }; + version = "1.16.1"; src = fetchurl { - url = "${meta.homepage}/src/gst-libav/${pname}-${version}.tar.xz"; - sha256 = "16ixqpfrr7plaaz14n3vagr2q5xbfkv7gpmcsyndrkx98f813b6z"; + url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + sha256 = "1i31ra0l77cfahb6k5xpx45zwvpskzm848aijsbbx9x4x65799g8"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = with stdenv.lib; - [ meson ninja gettext pkgconfig python ] - ++ optional (!withSystemLibav) yasm - ; - - buildInputs = with stdenv.lib; - [ gst-plugins-base orc bzip2 ] - ++ optional withSystemLibav libav - ; + nativeBuildInputs = [ + meson + ninja + gettext + pkgconfig + python3 + ]; - mesonFlags = [ - # Enables all features, so that we know when new dependencies are necessary. - "-Dauto_features=enabled" + buildInputs = [ + gst-plugins-base + libav ]; + meta = with lib; { + description = "FFmpeg/libav plugin for GStreamer"; + homepage = "https://gstreamer.freedesktop.org"; + license = licenses.lgpl2Plus; + platforms = platforms.unix; + }; } diff --git a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix index 5c571fa4a1e..e602a96291e 100644 --- a/pkgs/development/libraries/gstreamer/rtsp-server/default.nix +++ b/pkgs/development/libraries/gstreamer/rtsp-server/default.nix @@ -1,38 +1,50 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig -, gettext, gobject-introspection +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gettext +, gobject-introspection , gst-plugins-base , gst-plugins-bad }: stdenv.mkDerivation rec { pname = "gst-rtsp-server"; - version = "1.16.0"; - - meta = with stdenv.lib; { - description = "Gstreamer RTSP server"; - homepage = "https://gstreamer.freedesktop.org"; - longDescription = '' - a library on top of GStreamer for building an RTSP server. - ''; - license = licenses.lgpl2Plus; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ bkchr ]; - }; + version = "1.16.1"; src = fetchurl { - url = "${meta.homepage}/src/gst-rtsp-server/${pname}-${version}.tar.xz"; - sha256 = "069zy159izy50blci9fli1i2r8jh91qkmgrz1n0xqciy3bn9x3hr"; + url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + sha256 = "0i01f1nr0921z6z4nrh8icz76s2n7i228aqxg1ihvxl65ynsraxh"; }; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja gettext gobject-introspection pkgconfig ]; + nativeBuildInputs = [ + meson + ninja + gettext + gobject-introspection + pkgconfig + ]; - buildInputs = [ gst-plugins-base gst-plugins-bad ]; + buildInputs = [ + gst-plugins-base + gst-plugins-bad + ]; mesonFlags = [ - # Enables all features, so that we know when new dependencies are necessary. - "-Dauto_features=enabled" "-Dexamples=disabled" # requires many dependencies and probably not useful for our users ]; + + meta = with stdenv.lib; { + description = "GStreamer RTSP server"; + homepage = "https://gstreamer.freedesktop.org"; + longDescription = '' + A library on top of GStreamer for building an RTSP server. + ''; + license = licenses.lgpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ bkchr ]; + }; } diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 552ab1ec292..a117190a9e1 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -1,53 +1,76 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, python -, gst-plugins-base, orc, gettext -, a52dec, libcdio, libdvdread -, libmad, libmpeg2, x264, libintl, lib +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, python +, gst-plugins-base +, orc +, gettext +, a52dec +, libcdio +, libdvdread +, libmad +, libmpeg2 +, x264 +, libintl +, lib , opencore-amr , darwin }: stdenv.mkDerivation rec { pname = "gst-plugins-ugly"; - version = "1.16.0"; + version = "1.16.1"; - meta = with lib; { - description = "Gstreamer Ugly Plugins"; - homepage = "https://gstreamer.freedesktop.org"; - longDescription = '' - a set of plug-ins that have good quality and correct functionality, - but distributing them might pose problems. The license on either - the plug-ins or the supporting libraries might not be how we'd - like. The code might be widely known to present patent problems. - ''; - license = licenses.lgpl2Plus; - platforms = platforms.unix; - maintainers = with maintainers; [ matthewbauer ]; - }; + outputs = [ "out" "dev" ]; src = fetchurl { - url = "${meta.homepage}/src/gst-plugins-ugly/${pname}-${version}.tar.xz"; - sha256 = "1hm46c1fy9vl1wfwipsj41zp79cm7in1fpmjw24j5hriy32n82g3"; + url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + sha256 = "07cajqjs8pqchpf2sm87hljx4ibwvkiavqxmacxsr5airar17yab"; }; - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ meson ninja gettext pkgconfig python ]; + nativeBuildInputs = [ + meson + ninja + gettext + pkgconfig + python + ]; buildInputs = [ - gst-plugins-base orc - a52dec libcdio libdvdread - libmad libmpeg2 x264 + gst-plugins-base + orc + a52dec + libcdio + libdvdread + libmad + libmpeg2 + x264 libintl opencore-amr - ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; - [ IOKit CoreFoundation DiskArbitration ]); + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + IOKit + CoreFoundation + DiskArbitration + ]); mesonFlags = [ - # Enables all features, so that we know when new dependencies are necessary. - "-Dauto_features=enabled" "-Dexamples=disabled" # requires many dependencies and probably not useful for our users "-Dsidplay=disabled" # sidplay / sidplay/player.h isn't packaged in nixpkgs as of writing ]; - NIX_LDFLAGS = [ "-lm" ]; + meta = with lib; { + description = "Gstreamer Ugly Plugins"; + homepage = "https://gstreamer.freedesktop.org"; + longDescription = '' + a set of plug-ins that have good quality and correct functionality, + but distributing them might pose problems. The license on either + the plug-ins or the supporting libraries might not be how we'd + like. The code might be widely known to present patent problems. + ''; + license = licenses.lgpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ matthewbauer ]; + }; } diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index adb495689e3..bfa5abc7b53 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -1,49 +1,70 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gst-plugins-base, bzip2, libva, wayland -, libdrm, udev, xorg, libGLU_combined, gstreamer, gst-plugins-bad, nasm -, libvpx, python, fetchpatch +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gst-plugins-base +, bzip2 +, libva +, wayland +, libdrm +, udev +, xorg +, libGLU_combined +, gstreamer +, gst-plugins-bad +, nasm +, libvpx +, python }: stdenv.mkDerivation rec { - pname = "gst-vaapi"; - version = "1.16.0"; + pname = "gstreamer-vaapi"; + version = "1.16.1"; src = fetchurl { - url = "${meta.homepage}/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz"; - sha256 = "07qpynamiz0lniqajcaijh3n7ixs4lfk9a5mfk50sng0dricwzsf"; + url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + sha256 = "0fk0nymvbfc04fv63fj2r6q9vvi431svhkrwpr7kdjvq3rphymyb"; }; - patches = [ - # See: https://mail.gnome.org/archives/distributor-list/2019-September/msg00000.html - # Note that the patch has now been actually accepted upstream. - (fetchpatch { - url = "https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi/commit/a90daabb84f983d2fa05ff3159f7ad59aa648b55.patch"; - sha256 = "0p2qygq6b5h6nxjdfnlzbsyih43hjq5c94ag8sbyyb8pmnids9rb"; - }) - ]; - outputs = [ "out" "dev" ]; - nativeBuildInputs = [ meson ninja pkgconfig bzip2 ]; + nativeBuildInputs = [ + meson + ninja + pkgconfig + bzip2 + ]; buildInputs = [ - gstreamer gst-plugins-base gst-plugins-bad libva wayland libdrm udev - xorg.libX11 xorg.libXext xorg.libXv xorg.libXrandr xorg.libSM - xorg.libICE libGLU_combined nasm libvpx python + gstreamer + gst-plugins-base + gst-plugins-bad + libva + wayland + libdrm + udev + xorg.libX11 + xorg.libXext + xorg.libXv + xorg.libXrandr + xorg.libSM + xorg.libICE + libGLU_combined + nasm + libvpx + python ]; - preConfigure = '' - export GST_PLUGIN_PATH_1_0=$out/lib/gstreamer-1.0 - mkdir -p $GST_PLUGIN_PATH_1_0 - ''; - mesonFlags = [ "-Dexamples=disabled" # requires many dependencies and probably not useful for our users ]; - meta = { - homepage = https://gstreamer.freedesktop.org; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ tstrobel ]; + meta = with stdenv.lib; { + description = "Set of VAAPI GStreamer Plug-ins"; + homepage = "https://gstreamer.freedesktop.org"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ tstrobel ]; + platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix index ad013d1570e..ad424641b81 100644 --- a/pkgs/development/libraries/gstreamer/validate/default.nix +++ b/pkgs/development/libraries/gstreamer/validate/default.nix @@ -1,39 +1,43 @@ -{ stdenv, fetchurl, pkgconfig, gstreamer, gst-plugins-base -, python, gobject-introspection, json-glib +{ stdenv +, fetchurl +, pkgconfig +, gstreamer +, gst-plugins-base +, python +, gobject-introspection +, json-glib }: stdenv.mkDerivation rec { pname = "gst-validate"; - version = "1.16.0"; - - meta = { - description = "Integration testing infrastructure for the GStreamer framework"; - homepage = https://gstreamer.freedesktop.org; - license = stdenv.lib.licenses.lgpl2Plus; - platforms = stdenv.lib.platforms.unix; - }; + version = "1.16.1"; src = fetchurl { - url = "${meta.homepage}/src/gst-validate/${pname}-${version}.tar.xz"; - sha256 = "1jfnd0g9hmdbqfxsx96yc9vpf1w6m33hqwrr6lj4i83kl54awcck"; + url = "${meta.homepage}/src/${pname}/${pname}-${version}.tar.xz"; + sha256 = "1698arvmpb0cvyi8ll1brvs51vs7i3f3fw19iswh8xhj5adrn1vz"; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ - pkgconfig gobject-introspection + pkgconfig + gobject-introspection ]; buildInputs = [ - python json-glib + python + json-glib ]; - propagatedBuildInputs = [ gstreamer gst-plugins-base ]; - - enableParallelBuilding = true; - - mesonFlags = [ - # Enables all features, so that we know when new dependencies are necessary. - "-Dauto_features=enabled" + propagatedBuildInputs = [ + gstreamer + gst-plugins-base ]; + + meta = with stdenv.lib; { + description = "Integration testing infrastructure for the GStreamer framework"; + homepage = "https://gstreamer.freedesktop.org"; + license = licenses.lgpl2Plus; + platforms = platforms.unix; + }; } diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index d561ebcd7af..c41f0a60d06 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -1,11 +1,11 @@ {stdenv, lib, fetchurl, gettext, perlPackages, intltool, pkgconfig, glib, libxml2, sqlite, zlib, sg3_utils, gdk-pixbuf, taglib, - libimobiledevice, pythonPackages, mutagen, + libimobiledevice, python3Packages, mutagen, monoSupport ? false, mono, gtk-sharp-2_0 }: let - inherit (pythonPackages) python pygobject2; + inherit (python3Packages) python pygobject2; in stdenv.mkDerivation rec { name = "libgpod-0.8.3"; src = fetchurl { diff --git a/pkgs/development/libraries/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix index f6dc85b629d..2d7cad84f21 100644 --- a/pkgs/development/libraries/libindicate/default.nix +++ b/pkgs/development/libraries/libindicate/default.nix @@ -4,14 +4,14 @@ , pkgconfig, autoconf , glib, dbus-glib, libdbusmenu , gtkVersion ? "3", gtk2 ? null, gtk3 ? null -, pythonPackages, gobject-introspection, vala, gnome-doc-utils +, python2Packages, gobject-introspection, vala, gnome-doc-utils , monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null }: with lib; let - inherit (pythonPackages) python pygobject2 pygtk; + inherit (python2Packages) python pygobject2 pygtk; in stdenv.mkDerivation rec { name = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}"; in "libindicate-${postfix}-${version}"; diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index f4ce1f6eea0..90bdb06bb7f 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -1,4 +1,19 @@ -{ stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, python3, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gupnp-igd, gst_all_1, gnutls }: +{ stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, pkgconfig +, python3 +, gobject-introspection +, gtk-doc +, docbook_xsl +, docbook_xml_dtd_412 +, glib +, gupnp-igd +, gst_all_1 +, gnutls +}: stdenv.mkDerivation rec { name = "libnice-0.1.16"; @@ -21,27 +36,40 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ - meson ninja pkgconfig python3 gobject-introspection + meson + ninja + pkgconfig + python3 + gobject-introspection + + # documentation gtk-doc - # Without these, enabling the 'gtk_doc' gives us `FAILED: meson-install` - docbook_xsl docbook_xml_dtd_412 + docbook_xsl + docbook_xml_dtd_412 + ]; + + buildInputs = [ + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gnutls + gupnp-igd + ]; + + propagatedBuildInputs = [ + glib ]; - buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gnutls ]; - propagatedBuildInputs = [ glib gupnp-igd ]; mesonFlags = [ - # Enables all features, so that we know when new dependencies are necessary. - "-Dauto_features=enabled" "-Dgtk_doc=enabled" # Disabled by default as of libnice-0.1.15 "-Dexamples=disabled" # requires many dependencies and probably not useful for our users ]; - # TODO; see #53293 etc. - #doCheck = true; + # Tests are flaky + # see https://github.com/NixOS/nixpkgs/pull/53293#issuecomment-453739295 + doCheck = false; meta = with stdenv.lib; { - homepage = https://nice.freedesktop.org/wiki/; - description = "The GLib ICE implementation"; + description = "GLib ICE implementation"; longDescription = '' Libnice is an implementation of the IETF's Interactice Connectivity Establishment (ICE) standard (RFC 5245) and the Session Traversal @@ -49,6 +77,7 @@ stdenv.mkDerivation rec { It provides a GLib-based library, libnice and a Glib-free library, libstun as well as GStreamer elements.''; + homepage = "https://nice.freedesktop.org/wiki/"; platforms = platforms.linux; license = with licenses; [ lgpl21 mpl11 ]; }; diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix index 15aa7c9e22d..d2012760dcf 100644 --- a/pkgs/development/libraries/libpsl/default.nix +++ b/pkgs/development/libraries/libpsl/default.nix @@ -1,5 +1,16 @@ -{ stdenv, fetchurl, autoreconfHook, docbook_xsl, docbook_xml_dtd_43, gtk-doc, lzip -, libidn2, libunistring, libxslt, pkgconfig, python3, valgrind +{ stdenv +, fetchurl +, autoreconfHook +, docbook_xsl +, docbook_xml_dtd_43 +, gtk-doc +, lzip +, libidn2 +, libunistring +, libxslt +, pkgconfig +, python3 +, valgrind , publicsuffix-list }: @@ -12,9 +23,26 @@ stdenv.mkDerivation rec { sha256 = "183hadbira0d2zvv8272lspy31dgm9x26z35c61s5axcd5wd9g9i"; }; - nativeBuildInputs = [ autoreconfHook docbook_xsl docbook_xml_dtd_43 gtk-doc lzip pkgconfig python3 valgrind ]; - buildInputs = [ libidn2 libunistring libxslt ]; - propagatedBuildInputs = [ publicsuffix-list ]; + nativeBuildInputs = [ + autoreconfHook + docbook_xsl + docbook_xml_dtd_43 + gtk-doc + lzip + pkgconfig + python3 + valgrind + ]; + + buildInputs = [ + libidn2 + libunistring + libxslt + ]; + + propagatedBuildInputs = [ + publicsuffix-list + ]; postPatch = '' patchShebangs src/psl-make-dafsa @@ -25,7 +53,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ -# "--enable-gtk-doc" + # "--enable-gtk-doc" "--enable-man" "--enable-valgrind-tests" "--with-psl-distfile=${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat" @@ -35,7 +63,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - doCheck = true; + doCheck = !stdenv.isDarwin; meta = with stdenv.lib; { description = "C library for the Publix Suffix List"; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 7ed50f61224..f5dcb3357f7 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libxml2"; - version = "2.9.9"; + version = "2.9.10"; src = fetchurl { url = "http://xmlsoft.org/sources/${pname}-${version}.tar.gz"; - sha256 = "0wd881jzvqayx0ihzba29jl80k06xj9ywp16kxacdqs3064p1ywl"; + sha256 = "07xynh8hcxb2yb1fs051xrgszjvj37wnxvxgsj10rzmqzy9y3zma"; }; patches = [ # Upstream bugs: @@ -53,6 +53,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # disable test that's problematic with newer pythons: see + # https://mail.gnome.org/archives/xml/2017-August/msg00014.html + preCheck = lib.optionalString (pythonSupport && !(python?pythonOlder && python.pythonOlder "3.5")) '' + echo "" > python/tests/tstLastError.py + ''; + doCheck = (stdenv.hostPlatform == stdenv.buildPlatform) && !stdenv.isDarwin && stdenv.hostPlatform.libc != "musl"; diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index ed77a1873a8..6d12329a7f5 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -10,31 +10,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "libxslt"; - version = "1.1.33"; + version = "1.1.34"; src = fetchurl { url = "http://xmlsoft.org/sources/${pname}-${version}.tar.gz"; - sha256 = "1j1q1swnsy8jgi9x7mclvkrqhfgn09886gdlr9wzk7a08i8n0dlf"; + sha256 = "0zrzz6kjdyavspzik6fbkpvfpbd25r2qg6py5nnjaabrsr3bvccq"; }; - patches = [ - (fetchpatch { - name = "CVE-2019-11068.patch"; - url = "https://gitlab.gnome.org/GNOME/libxslt/commit/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch"; - sha256 = "0pkpb4837km15zgg6h57bncp66d5lwrlvkr73h0lanywq7zrwhj8"; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/libxslt/commit/c5eb6cf3aba0af048596106ed839b4ae17ecbcb1.patch"; - name = "CVE-2019-13117.patch"; - sha256 = "0ynfq8y5h623cypj1426iiz7796n3mqbjqa24ndvh2am6rl5lw15"; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/libxslt/commit/6ce8de69330783977dd14f6569419489875fb71b.patch"; - name = "CVE-2019-13118.patch"; - sha256 = "0bglz9m9sh2vi50qxcm06iqrazw3h45ycgxnp15iankq95z283iq"; - }) - ]; - outputs = [ "bin" "dev" "out" "man" "doc" ] ++ stdenv.lib.optional pythonSupport "py"; buildInputs = [ libxml2.dev ] diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix index 43a5f7dc841..9f9331b90dd 100644 --- a/pkgs/development/libraries/libzip/default.nix +++ b/pkgs/development/libraries/libzip/default.nix @@ -1,37 +1,31 @@ -{ stdenv, fetchurl, perl, zlib }: +{ stdenv, fetchurl, cmake, perl, zlib }: stdenv.mkDerivation rec { pname = "libzip"; - version = "1.3.0"; + version = "1.5.2"; src = fetchurl { url = "https://www.nih.at/libzip/${pname}-${version}.tar.gz"; - sha256 = "1633dvjc08zwwhzqhnv62rjf1abx8y5njmm8y16ik9iwd07ka6d9"; + sha256 = "05ay8cbm882br0ir2cmzrvdq8q5mr1bnf53l4305xzigpd54lsdy"; }; + # Fix pkgconfig file paths postPatch = '' - patchShebangs test-driver - patchShebangs man/handle_links + sed -i CMakeLists.txt \ + -e 's#\\''${exec_prefix}/''${CMAKE_INSTALL_LIBDIR}#''${CMAKE_INSTALL_FULL_LIBDIR}#' \ + -e 's#\\''${prefix}/''${CMAKE_INSTALL_INCLUDEDIR}#''${CMAKE_INSTALL_FULL_INCLUDEDIR}#' ''; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ cmake perl ]; propagatedBuildInputs = [ zlib ]; preCheck = '' - # regress/runtests is a generated file + # regress/runtest is a generated file patchShebangs regress ''; - # At least mysqlWorkbench cannot find zipconf.h; I think also openoffice - # had this same problem. This links it somewhere that mysqlworkbench looks. - postInstall = '' - mkdir -p $dev/lib - mv $out/lib/libzip $dev/lib/libzip - ( cd $dev/include ; ln -s ../lib/libzip/include/zipconf.h zipconf.h ) - ''; - meta = with stdenv.lib; { homepage = https://www.nih.at/libzip; description = "A C library for reading, creating and modifying zip archives"; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 1e7a716fcea..ca73f3bdeb6 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -27,7 +27,7 @@ with stdenv.lib; let - version = "19.2.3"; + version = "19.2.4"; branch = versions.major version; in @@ -42,7 +42,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "0ish3izys9rr8rpr8h56a0jmnrvacn16k8pblv4xqhgy0hjy9rjy"; + sha256 = "03z393jrd1cnh68k5h3mm5yap3hi1jzz3a417ccjxn5vgl7hl009"; }; prePatch = "patchShebangs ."; diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 708ba46b42e..540ea71abfb 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -141,6 +141,7 @@ stdenv.mkDerivation rec { moveToOutput "bin/tset" "$out" moveToOutput "bin/captoinfo" "$out" moveToOutput "bin/infotocap" "$out" + moveToOutput "bin/infocmp" "$out" ''; preFixup = lib.optionalString (!stdenv.hostPlatform.isCygwin && !enableStatic) '' diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index d02247196b1..04018f0e80b 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -1,7 +1,9 @@ { stdenv, fetchurl, pkgconfig # Optional Dependencies -, openssl ? null, libev ? null, zlib ? null, c-ares ? null +, openssl ? null, zlib ? null +, enableLibEv ? !stdenv.hostPlatform.isWindows, libev ? null +, enableCAres ? !stdenv.hostPlatform.isWindows, c-ares ? null , enableHpack ? false, jansson ? null , enableAsioLib ? false, boost ? null , enableGetAssets ? false, libxml2 ? null @@ -28,7 +30,10 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" "lib" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl libev zlib c-ares ] + buildInputs = [ openssl ] + ++ optional enableLibEv libev + ++ [ zlib ] + ++ optional enableCAres c-ares ++ optional enableHpack jansson ++ optional enableAsioLib boost ++ optional enableGetAssets libxml2 diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index 9ca329c6761..f13ae141a81 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "p11-kit"; - version = "0.23.16.1"; + version = "0.23.18.1"; src = fetchFromGitHub { owner = "p11-glue"; repo = pname; rev = version; - sha256 = "0jr62qkbqxp3iawgksk1qc3gp8p6x09sg5v7xac80ghyfxil15wy"; + sha256 = "0l4ndipcbikblfjz729zkscvni5lzdzvbvsar2538pylw556rx73"; }; outputs = [ "out" "dev"]; diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 2e111240758..cf08f989369 100644 --- a/pkgs/development/libraries/pcre/default.nix +++ b/pkgs/development/libraries/pcre/default.nix @@ -29,8 +29,6 @@ in stdenv.mkDerivation { ] ++ optional (variant != null) "--enable-${variant}"; - buildInputs = optional (stdenv.hostPlatform.libc == "msvcrt") windows.mingw_w64_pthreads; - # https://bugs.exim.org/show_bug.cgi?id=2173 patches = [ ./stacksize-detection.patch ]; diff --git a/pkgs/development/libraries/qtpbfimageplugin/default.nix b/pkgs/development/libraries/qtpbfimageplugin/default.nix index 8ad908013bd..5f3f8c4a66a 100644 --- a/pkgs/development/libraries/qtpbfimageplugin/default.nix +++ b/pkgs/development/libraries/qtpbfimageplugin/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qtpbfimageplugin"; - version = "1.4"; + version = "2.0"; src = fetchFromGitHub { owner = "tumic0"; repo = "QtPBFImagePlugin"; rev = version; - sha256 = "0d39i7rmhrmm2df49gd47zm37gnz3fmyr6hfc6hhzvk08jb6956r"; + sha256 = "16qsax1p09gldbg83df77ixaz7bkxl8wm806lc55y19pwnid9m7p"; }; nativeBuildInputs = [ qmake ]; @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { displaying raster MBTiles maps or raster XYZ online maps to also display PBF vector tiles without (almost) any application modifications. ''; - homepage = https://github.com/tumic0/QtPBFImagePlugin; + homepage = "https://github.com/tumic0/QtPBFImagePlugin"; license = licenses.lgpl3; - maintainers = [ maintainers.sikmir ]; + maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index 670d2a832ee..f0513c28934 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rdkafka"; - version = "1.2.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "03h4yxnbnig17zapnnyvvnh1bsp0qalvlpb4fc3bpvs7yj4d8v25"; + sha256 = "1daikjr2wcjxcys41hfw3vg2mqk6cy297pfcl05s90wnjvd7fkqk"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index d2ea22b85a1..2bb56bec8c0 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { "-DWITH_ZLIB=1" "-DWITH_ZSTD=1" "-DWITH_GFLAGS=0" + "-DUSE_RTTI=1" (lib.optional (stdenv.hostPlatform.system == "i686-linux" || stdenv.hostPlatform.system == "x86_64-linux") diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index bb640cb09a5..ce213535519 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -224,7 +224,7 @@ with super; }); luasystem = super.luasystem.override({ - buildInputs = [ + buildInputs = pkgs.lib.optionals pkgs.stdenv.isLinux [ pkgs.glibc ]; }); diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json index ce5373c9b5b..5b95e26be14 100644 --- a/pkgs/development/node-packages/node-packages-v10.json +++ b/pkgs/development/node-packages/node-packages-v10.json @@ -15,6 +15,7 @@ , "bower2nix" , "browserify" , "castnow" +, { "texlab-citeproc-build-deps": "../tools/misc/texlab/citeproc" } , "clean-css" , "coffee-script" , "coinmon" diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index f0396473389..ef0d9cf2a14 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -13,31 +13,31 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.803.17" = { + "@angular-devkit/architect-0.803.18" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.803.17"; + version = "0.803.18"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.803.17.tgz"; - sha512 = "QbuWJhjh78Pb/9574OIjR38hhJCRBd0BtdrRRdTjP7By6liXURnA/OH6iZ9o1jA8It1NvoJQtM2flr8dQf83Mw=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.803.18.tgz"; + sha512 = "/oNutcuUduXH/4nxHSDRTYK3VGP0PkVUniPdo0yjpg8c2dbfoNkt1ILIV82LPaC8sDwjuXGLx0EH70ETtcnBwg=="; }; }; - "@angular-devkit/core-8.3.17" = { + "@angular-devkit/core-8.3.18" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "8.3.17"; + version = "8.3.18"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.17.tgz"; - sha512 = "cR2H/7OxxqagwGfzxwNWDOYN4QpOZ56Fei9JED/2p/K/5UDAowl20o3qP9mTfia/lEhFeyjMBcM8gsHxhJNYJQ=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-8.3.18.tgz"; + sha512 = "SPlQmBlrcaKZeE9srvuFElcen9iOled4lkD3M4cGwe56u6YoJ71oTAtmGiw9nofTtW0PghGVq8WdDQG5BRqX8Q=="; }; }; - "@angular-devkit/schematics-8.3.17" = { + "@angular-devkit/schematics-8.3.18" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "8.3.17"; + version = "8.3.18"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.17.tgz"; - sha512 = "1ttzYGnw5Ux7Nfr/TGyWx3C/rarq5l+dn+5SpKof/8ctvQU1gJaswF492ngPs/jDjaPq5MucKYoX+wTUJHnUhg=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-8.3.18.tgz"; + sha512 = "J9sf/6cSUx2kdXppo/69uZ1gBeM5fcXfnP7MCJCVnsk09QCD9Kr+Xeh8h4WEmLtne7XzI9dcCttHQ5WDNuRulA=="; }; }; "@antora/asciidoc-loader-2.2.0" = { @@ -238,13 +238,13 @@ let sha512 = "27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw=="; }; }; - "@babel/core-7.6.4" = { + "@babel/core-7.7.2" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.6.4"; + version = "7.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.6.4.tgz"; - sha512 = "Rm0HGw101GY8FTzpWSyRbki/jzq+/PkNQJ+nSulrdY6gFGOsNseCqD6KHRYe2E+EdzuBdr2pxCp6s4Uk6eJ+XQ=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.7.2.tgz"; + sha512 = "eeD7VEZKfhK1KUXGiyPFettgF3m513f8FoBSWiQ1xTvl1RAopLs42Wp9+Ze911I6H0N9lNqJMDgoZT7gHsipeQ=="; }; }; "@babel/generator-7.0.0-beta.38" = { @@ -265,130 +265,148 @@ let sha512 = "jsBuXkFoZxk0yWLyGI9llT9oiQ2FeTASmRFE32U+aaDTfoE92t78eroO7PTpU/OrYq38hlcDM6vbfLDaOLy+7w=="; }; }; - "@babel/helper-annotate-as-pure-7.0.0" = { + "@babel/generator-7.7.2" = { + name = "_at_babel_slash_generator"; + packageName = "@babel/generator"; + version = "7.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.7.2.tgz"; + sha512 = "WthSArvAjYLz4TcbKOi88me+KmDJdKSlfwwN8CnUYn9jBkzhq0ZEPuBfkAWIvjJ3AdEV1Cf/+eSQTnp3IDJKlQ=="; + }; + }; + "@babel/helper-annotate-as-pure-7.7.0" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; - version = "7.0.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.0.0.tgz"; - sha512 = "3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q=="; + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.0.tgz"; + sha512 = "k50CQxMlYTYo+GGyUGFwpxKVtxVJi9yh61sXZji3zYHccK9RYliZGSTOgci85T+r+0VFN2nWbGM04PIqwfrpMg=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.1.0" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.7.0" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.1.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.1.0.tgz"; - sha512 = "qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w=="; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.7.0.tgz"; + sha512 = "Cd8r8zs4RKDwMG/92lpZcnn5WPQ3LAMQbCw42oqUh4s7vsSN5ANUZjMel0OOnxDLq57hoDDbai+ryygYfCTOsw=="; }; }; - "@babel/helper-builder-react-jsx-7.3.0" = { + "@babel/helper-builder-react-jsx-7.7.0" = { name = "_at_babel_slash_helper-builder-react-jsx"; packageName = "@babel/helper-builder-react-jsx"; - version = "7.3.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.3.0.tgz"; - sha512 = "MjA9KgwCuPEkQd9ncSXvSyJ5y+j2sICHyrI0M3L+6fnS4wMSNDc1ARXsbTfbb2cXHn17VisSnU/sHFTCxVxSMw=="; + url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.7.0.tgz"; + sha512 = "LSln3cexwInTMYYoFeVLKnYPPMfWNJ8PubTBs3hkh7wCu9iBaqq1OOyW+xGmEdLxT1nhsl+9SJ+h2oUDYz0l2A=="; }; }; - "@babel/helper-call-delegate-7.4.4" = { + "@babel/helper-call-delegate-7.7.0" = { name = "_at_babel_slash_helper-call-delegate"; packageName = "@babel/helper-call-delegate"; - version = "7.4.4"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.4.4.tgz"; - sha512 = "l79boDFJ8S1c5hvQvG+rc+wHw6IuH7YldmRKsYtpbawsxURu/paVy57FZMomGK22/JckepaikOkY0MoAmdyOlQ=="; + url = "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.7.0.tgz"; + sha512 = "Su0Mdq7uSSWGZayGMMQ+z6lnL00mMCnGAbO/R0ZO9odIdB/WNU/VfQKqMQU0fdIsxQYbRjDM4BixIa93SQIpvw=="; }; }; - "@babel/helper-create-class-features-plugin-7.6.0" = { + "@babel/helper-create-class-features-plugin-7.7.0" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.6.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.6.0.tgz"; - sha512 = "O1QWBko4fzGju6VoVvrZg0RROCVifcLxiApnGP3OWfWzvxRZFCoBD81K5ur5e3bVY2Vf/5rIJm8cqPKn8HUJng=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.7.0.tgz"; + sha512 = "MZiB5qvTWoyiFOgootmRSDV1udjIqJW/8lmxgzKq6oDqxdmHUjeP2ZUOmgHdYjmUVNABqRrHjYAYRvj8Eox/UA=="; }; }; - "@babel/helper-define-map-7.5.5" = { + "@babel/helper-create-regexp-features-plugin-7.7.2" = { + name = "_at_babel_slash_helper-create-regexp-features-plugin"; + packageName = "@babel/helper-create-regexp-features-plugin"; + version = "7.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.2.tgz"; + sha512 = "pAil/ZixjTlrzNpjx+l/C/wJk002Wo7XbbZ8oujH/AoJ3Juv0iN/UTcPUHXKMFLqsfS0Hy6Aow8M31brUYBlQQ=="; + }; + }; + "@babel/helper-define-map-7.7.0" = { name = "_at_babel_slash_helper-define-map"; packageName = "@babel/helper-define-map"; - version = "7.5.5"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.5.5.tgz"; - sha512 = "fTfxx7i0B5NJqvUOBBGREnrqbTxRh7zinBANpZXAVDlsZxYdclDp467G1sQ8VZYMnAURY3RpBUAgOYT9GfzHBg=="; + url = "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.7.0.tgz"; + sha512 = "kPKWPb0dMpZi+ov1hJiwse9dWweZsz3V9rP4KdytnX1E7z3cTNmFGglwklzFPuqIcHLIY3bgKSs4vkwXXdflQA=="; }; }; - "@babel/helper-explode-assignable-expression-7.1.0" = { + "@babel/helper-explode-assignable-expression-7.7.0" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.1.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.1.0.tgz"; - sha512 = "NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.7.0.tgz"; + sha512 = "CDs26w2shdD1urNUAji2RJXyBFCaR+iBEGnFz3l7maizMkQe3saVw9WtjG1tz8CwbjvlFnaSLVhgnu1SWaherg=="; }; }; - "@babel/helper-function-name-7.1.0" = { + "@babel/helper-function-name-7.7.0" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.1.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz"; - sha512 = "A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.0.tgz"; + sha512 = "tDsJgMUAP00Ugv8O2aGEua5I2apkaQO7lBGUq1ocwN3G23JE5Dcq0uh3GvFTChPa4b40AWiAsLvCZOA2rdnQ7Q=="; }; }; - "@babel/helper-get-function-arity-7.0.0" = { + "@babel/helper-get-function-arity-7.7.0" = { name = "_at_babel_slash_helper-get-function-arity"; packageName = "@babel/helper-get-function-arity"; - version = "7.0.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz"; - sha512 = "r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ=="; + url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.0.tgz"; + sha512 = "tLdojOTz4vWcEnHWHCuPN5P85JLZWbm5Fx5ZsMEMPhF3Uoe3O7awrbM2nQ04bDOUToH/2tH/ezKEOR8zEYzqyw=="; }; }; - "@babel/helper-hoist-variables-7.4.4" = { + "@babel/helper-hoist-variables-7.7.0" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; - version = "7.4.4"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.4.4.tgz"; - sha512 = "VYk2/H/BnYbZDDg39hr3t2kKyifAm1W6zHRfhx8jGjIHpQEBv9dry7oQ2f3+J703TLu69nYdxsovl0XYfcnK4w=="; + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.0.tgz"; + sha512 = "LUe/92NqsDAkJjjCEWkNe+/PcpnisvnqdlRe19FahVapa4jndeuJ+FBiTX1rcAKWKcJGE+C3Q3tuEuxkSmCEiQ=="; }; }; - "@babel/helper-member-expression-to-functions-7.5.5" = { + "@babel/helper-member-expression-to-functions-7.7.0" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.5.5"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.5.5.tgz"; - sha512 = "5qZ3D1uMclSNqYcXqiHoA0meVdv+xUEex9em2fqMnrk/scphGlGgg66zjMrPJESPwrFJ6sbfFQYUSa0Mz7FabA=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.0.tgz"; + sha512 = "QaCZLO2RtBcmvO/ekOLp8p7R5X2JriKRizeDpm5ChATAFWrrYDcDxPuCIBXKyBjY+i1vYSdcUTMIb8psfxHDPA=="; }; }; - "@babel/helper-module-imports-7.0.0" = { + "@babel/helper-module-imports-7.7.0" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.0.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz"; - sha512 = "aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.7.0.tgz"; + sha512 = "Dv3hLKIC1jyfTkClvyEkYP2OlkzNvWs5+Q8WgPbxM5LMeorons7iPP91JM+DU7tRbhqA1ZeooPaMFvQrn23RHw=="; }; }; - "@babel/helper-module-transforms-7.5.5" = { + "@babel/helper-module-transforms-7.7.0" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.5.5"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.5.5.tgz"; - sha512 = "jBeCvETKuJqeiaCdyaheF40aXnnU1+wkSiUs/IQg3tB85up1LyL8x77ClY8qJpuRJUcXQo+ZtdNESmZl4j56Pw=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.7.0.tgz"; + sha512 = "rXEefBuheUYQyX4WjV19tuknrJFwyKw0HgzRwbkyTbB+Dshlq7eqkWbyjzToLrMZk/5wKVKdWFluiAsVkHXvuQ=="; }; }; - "@babel/helper-optimise-call-expression-7.0.0" = { + "@babel/helper-optimise-call-expression-7.7.0" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.0.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.0.0.tgz"; - sha512 = "u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.0.tgz"; + sha512 = "48TeqmbazjNU/65niiiJIJRc5JozB8acui1OS7bSd6PgxfuovWsvjfWSzlgx+gPFdVveNzUdpdIg5l56Pl5jqg=="; }; }; "@babel/helper-plugin-utils-7.0.0" = { @@ -409,58 +427,58 @@ let sha512 = "CkCYQLkfkiugbRDO8eZn6lRuR8kzZoGXCg3149iTk5se7g6qykSpy3+hELSwquhu+TgHn8nkLiBwHvNX8Hofcw=="; }; }; - "@babel/helper-remap-async-to-generator-7.1.0" = { + "@babel/helper-remap-async-to-generator-7.7.0" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.1.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.1.0.tgz"; - sha512 = "3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.0.tgz"; + sha512 = "pHx7RN8X0UNHPB/fnuDnRXVZ316ZigkO8y8D835JlZ2SSdFKb6yH9MIYRU4fy/KPe5sPHDFOPvf8QLdbAGGiyw=="; }; }; - "@babel/helper-replace-supers-7.5.5" = { + "@babel/helper-replace-supers-7.7.0" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.5.5"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.5.5.tgz"; - sha512 = "XvRFWrNnlsow2u7jXDuH4jDDctkxbS7gXssrP4q2nUD606ukXHRvydj346wmNg+zAgpFx4MWf4+usfC93bElJg=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.7.0.tgz"; + sha512 = "5ALYEul5V8xNdxEeWvRsBzLMxQksT7MaStpxjJf9KsnLxpAKBtfw5NeMKZJSYDa0lKdOcy0g+JT/f5mPSulUgg=="; }; }; - "@babel/helper-simple-access-7.1.0" = { + "@babel/helper-simple-access-7.7.0" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.1.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.1.0.tgz"; - sha512 = "Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.7.0.tgz"; + sha512 = "AJ7IZD7Eem3zZRuj5JtzFAptBw7pMlS3y8Qv09vaBWoFsle0d1kAn5Wq6Q9MyBXITPOKnxwkZKoAm4bopmv26g=="; }; }; - "@babel/helper-split-export-declaration-7.4.4" = { + "@babel/helper-split-export-declaration-7.7.0" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.4.4"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz"; - sha512 = "Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.0.tgz"; + sha512 = "HgYSI8rH08neWlAH3CcdkFg9qX9YsZysZI5GD8LjhQib/mM0jGOZOVkoUiiV2Hu978fRtjtsGsW6w0pKHUWtqA=="; }; }; - "@babel/helper-wrap-function-7.2.0" = { + "@babel/helper-wrap-function-7.7.0" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.2.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.2.0.tgz"; - sha512 = "o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.7.0.tgz"; + sha512 = "sd4QjeMgQqzshSjecZjOp8uKfUtnpmCyQhKQrVJBBgeHAB/0FPi33h3AbVlVp07qQtMD4QgYSzaMI7VwncNK/w=="; }; }; - "@babel/helpers-7.6.2" = { + "@babel/helpers-7.7.0" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.6.2"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.6.2.tgz"; - sha512 = "3/bAUL8zZxYs1cdX2ilEE0WobqbCmKWr/889lf2SS0PpDcpEIY8pb1CCyz0pEcX3pEb+MCbks1jIokz2xLtGTA=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.7.0.tgz"; + sha512 = "VnNwL4YOhbejHb7x/b5F39Zdg5vIQpUUNzJwx0ww1EcVRt41bbGRZWhAURrfY32T5zTT3qwNOQFWpn+P0i0a2g=="; }; }; "@babel/highlight-7.5.0" = { @@ -472,13 +490,13 @@ let sha512 = "7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ=="; }; }; - "@babel/parser-7.6.4" = { + "@babel/parser-7.7.3" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.6.4"; + version = "7.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.6.4.tgz"; - sha512 = "D8RHPW5qd0Vbyo3qb+YjO5nvUVRTXFLQ/FsDxJU2Nqz4uB5EnUN0ZQSEYpvTIbRuttig1XbHWU5oMeQwQSAA+A=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.7.3.tgz"; + sha512 = "bqv+iCo9i+uLVbI0ILzKkvMorqxouI+GbV13ivcARXn9NNEabi2IEz912IgNpT/60BNXac5dgcfjb94NjsF33A=="; }; }; "@babel/plugin-external-helpers-7.0.0" = { @@ -490,31 +508,31 @@ let sha512 = "tZKTMdhZvTy0KCEX5EGQQm1RHr7jUa36q/yax1baEA0yZapVYmu10yW7LTqijITgSq416gPVjrcexiA6y4pJlA=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.2.0" = { + "@babel/plugin-proposal-async-generator-functions-7.7.0" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.2.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.2.0.tgz"; - sha512 = "+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.7.0.tgz"; + sha512 = "ot/EZVvf3mXtZq0Pd0+tSOfGWMizqmOohXmNZg6LNFjHOV+wOPv7BvVYh8oPR8LhpIP3ye8nNooKL50YRWxpYA=="; }; }; - "@babel/plugin-proposal-class-properties-7.5.5" = { + "@babel/plugin-proposal-class-properties-7.7.0" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.5.5"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.5.5.tgz"; - sha512 = "AF79FsnWFxjlaosgdi421vmYG6/jg79bVD0dpD44QdgobzHKuLZ6S3vl8la9qIeSwGi8i1fS0O1mfuDAAdo1/A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.7.0.tgz"; + sha512 = "tufDcFA1Vj+eWvwHN+jvMN6QsV5o+vUlytNKrbMiCeDL0F2j92RURzUsUMWE5EJkLyWxjdUslCsMQa9FWth16A=="; }; }; - "@babel/plugin-proposal-dynamic-import-7.5.0" = { + "@babel/plugin-proposal-dynamic-import-7.7.0" = { name = "_at_babel_slash_plugin-proposal-dynamic-import"; packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.5.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.5.0.tgz"; - sha512 = "x/iMjggsKTFHYC6g11PL7Qy58IK8H5zqfm9e6hu4z1iH2IRyAp9u9dL80zA6R76yFovETFLKz2VJIC2iIPBuFw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.0.tgz"; + sha512 = "7poL3Xi+QFPC7sGAzEIbXUyYzGJwbc2+gSD0AkiC5k52kH2cqHdqxm5hNFfLW3cRSTcx9bN0Fl7/6zWcLLnKAQ=="; }; }; "@babel/plugin-proposal-json-strings-7.2.0" = { @@ -544,13 +562,13 @@ let sha512 = "mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.6.2" = { + "@babel/plugin-proposal-unicode-property-regex-7.7.0" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.6.2"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.6.2.tgz"; - sha512 = "NxHETdmpeSCtiatMRYWVJo7266rrvAC3DTeG5exQBIH/fMIUK7ejDNznBbn3HQl/o9peymRRg7Yqkx6PdUXmMw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.0.tgz"; + sha512 = "mk34H+hp7kRBWJOOAR0ZMGCydgKMD4iN9TpDRp3IIcbunltxEY89XSimc6WbtSLCDrwcdy/EEw7h5CFCzxTchw=="; }; }; "@babel/plugin-syntax-async-generators-7.2.0" = { @@ -571,13 +589,13 @@ let sha512 = "mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w=="; }; }; - "@babel/plugin-syntax-flow-7.2.0" = { + "@babel/plugin-syntax-flow-7.7.0" = { name = "_at_babel_slash_plugin-syntax-flow"; packageName = "@babel/plugin-syntax-flow"; - version = "7.2.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.2.0.tgz"; - sha512 = "r6YMuZDWLtLlu0kqIim5o/3TNRAlWb073HwT3e2nKf9I8IIvOggPrnILYPsrrKilmn/mYEMCf/Z07w3yQJF6dg=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.7.0.tgz"; + sha512 = "vQMV07p+L+jZeUnvX3pEJ9EiXGCjB5CTTvsirFD9rpEuATnoAvLBLoYbw1v5tyn3d2XxSuvEKi8cV3KqYUa0vQ=="; }; }; "@babel/plugin-syntax-json-strings-7.2.0" = { @@ -616,6 +634,15 @@ let sha512 = "bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w=="; }; }; + "@babel/plugin-syntax-top-level-await-7.7.0" = { + name = "_at_babel_slash_plugin-syntax-top-level-await"; + packageName = "@babel/plugin-syntax-top-level-await"; + version = "7.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.7.0.tgz"; + sha512 = "hi8FUNiFIY1fnUI2n1ViB1DR0R4QeK4iHcTlW6aJkrPoTdb8Rf1EMQ6GT3f67DDkYyWgew9DFoOZ6gOoEsdzTA=="; + }; + }; "@babel/plugin-syntax-typescript-7.3.3" = { name = "_at_babel_slash_plugin-syntax-typescript"; packageName = "@babel/plugin-syntax-typescript"; @@ -634,13 +661,13 @@ let sha512 = "ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg=="; }; }; - "@babel/plugin-transform-async-to-generator-7.5.0" = { + "@babel/plugin-transform-async-to-generator-7.7.0" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.5.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.5.0.tgz"; - sha512 = "mqvkzwIGkq0bEF1zLRRiTdjfomZJDV33AH3oQzHVGkI2VzEmXLpKKOBvEVaFZBJdN0XTyH38s9j/Kiqr68dggg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.7.0.tgz"; + sha512 = "vLI2EFLVvRBL3d8roAMqtVY0Bm9C1QzLkdS57hiKrjUBSqsQYrBsMCeOg/0KK7B0eK9V71J5mWcha9yyoI2tZw=="; }; }; "@babel/plugin-transform-block-scoped-functions-7.2.0" = { @@ -661,13 +688,13 @@ let sha512 = "7hvrg75dubcO3ZI2rjYTzUrEuh1E9IyDEhhB6qfcooxhDA33xx2MasuLVgdxzcP6R/lipAC6n9ub9maNW6RKdw=="; }; }; - "@babel/plugin-transform-classes-7.5.5" = { + "@babel/plugin-transform-classes-7.7.0" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.5.5"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.5.5.tgz"; - sha512 = "U2htCNK/6e9K7jGyJ++1p5XRU+LJjrwtoiVn9SzRlDT2KubcZ11OOwy3s24TjHxPgxNwonCYP7U2K51uVYCMDg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.7.0.tgz"; + sha512 = "/b3cKIZwGeUesZheU9jNYcwrEA7f/Bo4IdPmvp7oHgvks2majB5BoT5byAql44fiNQYOPzhk2w8DbgfuafkMoA=="; }; }; "@babel/plugin-transform-computed-properties-7.2.0" = { @@ -688,13 +715,13 @@ let sha512 = "2bGIS5P1v4+sWTCnKNDZDxbGvEqi0ijeqM/YqHtVGrvG2y0ySgnEEhXErvE9dA0bnIzY9bIzdFK0jFA46ASIIQ=="; }; }; - "@babel/plugin-transform-dotall-regex-7.6.2" = { + "@babel/plugin-transform-dotall-regex-7.7.0" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.6.2"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.6.2.tgz"; - sha512 = "KGKT9aqKV+9YMZSkowzYoYEiHqgaDhGmPNZlZxX6UeHC4z30nC1J9IrZuGqbYFB1jaIGdv91ujpze0exiVK8bA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.0.tgz"; + sha512 = "3QQlF7hSBnSuM1hQ0pS3pmAbWLax/uGNCbPBND9y+oJ4Y776jsyujG2k0Sn2Aj2a0QwVOiOFL5QVPA7spjvzSA=="; }; }; "@babel/plugin-transform-duplicate-keys-7.5.0" = { @@ -733,13 +760,13 @@ let sha512 = "9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ=="; }; }; - "@babel/plugin-transform-function-name-7.4.4" = { + "@babel/plugin-transform-function-name-7.7.0" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.4.4"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.4.4.tgz"; - sha512 = "iU9pv7U+2jC9ANQkKeNF6DrPy4GBa4NWQtl6dHB4Pb3izX2JOEvDTFarlNsBj/63ZEzNNIAMs3Qw4fNCcSOXJA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.7.0.tgz"; + sha512 = "P5HKu0d9+CzZxP5jcrWdpe7ZlFDe24bmqP6a6X8BHEBl/eizAsY8K6LX8LASZL0Jxdjm5eEfzp+FIrxCm/p8bA=="; }; }; "@babel/plugin-transform-literals-7.2.0" = { @@ -769,40 +796,40 @@ let sha512 = "n20UsQMKnWrltocZZm24cRURxQnWIvsABPJlw/fvoy9c6AgHZzoelAIzajDHAQrDpuKFFPPcFGd7ChsYuIUMpg=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.6.0" = { + "@babel/plugin-transform-modules-commonjs-7.7.0" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.6.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.6.0.tgz"; - sha512 = "Ma93Ix95PNSEngqomy5LSBMAQvYKVe3dy+JlVJSHEXZR5ASL9lQBedMiCyVtmTLraIDVRE3ZjTZvmXXD2Ozw3g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.0.tgz"; + sha512 = "KEMyWNNWnjOom8vR/1+d+Ocz/mILZG/eyHHO06OuBQ2aNhxT62fr4y6fGOplRx+CxCSp3IFwesL8WdINfY/3kg=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.5.0" = { + "@babel/plugin-transform-modules-systemjs-7.7.0" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.5.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.5.0.tgz"; - sha512 = "Q2m56tyoQWmuNGxEtUyeEkm6qJYFqs4c+XyXH5RAuYxObRNz9Zgj/1g2GMnjYp2EUyEy7YTrxliGCXzecl/vJg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.0.tgz"; + sha512 = "ZAuFgYjJzDNv77AjXRqzQGlQl4HdUM6j296ee4fwKVZfhDR9LAGxfvXjBkb06gNETPnN0sLqRm9Gxg4wZH6dXg=="; }; }; - "@babel/plugin-transform-modules-umd-7.2.0" = { + "@babel/plugin-transform-modules-umd-7.7.0" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.2.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.2.0.tgz"; - sha512 = "BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.7.0.tgz"; + sha512 = "u7eBA03zmUswQ9LQ7Qw0/ieC1pcAkbp5OQatbWUzY1PaBccvuJXUkYzoN1g7cqp7dbTu6Dp9bXyalBvD04AANA=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.6.3" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.7.0" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.6.3"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.6.3.tgz"; - sha512 = "jTkk7/uE6H2s5w6VlMHeWuH+Pcy2lmdwFoeWCVnvIrDUnB5gQqTVI8WfmEAhF2CDEarGrknZcmSFg1+bkfCoSw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.0.tgz"; + sha512 = "+SicSJoKouPctL+j1pqktRVCgy+xAch1hWWTMy13j0IflnyNjaoskj+DwRQFimHbLqO3sq2oN2CXMvXq3Bgapg=="; }; }; "@babel/plugin-transform-new-target-7.4.4" = { @@ -841,22 +868,22 @@ let sha512 = "9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ=="; }; }; - "@babel/plugin-transform-react-jsx-7.3.0" = { + "@babel/plugin-transform-react-jsx-7.7.0" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; - version = "7.3.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.3.0.tgz"; - sha512 = "a/+aRb7R06WcKvQLOu4/TpjKOdvVEKRLWFpKcNuHhiREPgGRB4TQJxq07+EZLS8LFVYpfq1a5lDUnuMdcCpBKg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.7.0.tgz"; + sha512 = "mXhBtyVB1Ujfy+0L6934jeJcSXj/VCg6whZzEcgiiZHNS0PGC7vUCsZDQCxxztkpIdF+dY1fUMcjAgEOC3ZOMQ=="; }; }; - "@babel/plugin-transform-regenerator-7.4.5" = { + "@babel/plugin-transform-regenerator-7.7.0" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.4.5"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.4.5.tgz"; - sha512 = "gBKRh5qAaCWntnd09S8QC7r3auLCqq5DI6O0DlfoyDjslSBVqBibrMdsqO+Uhmx3+BlOmE/Kw1HFxmGbv0N9dA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.0.tgz"; + sha512 = "AXmvnC+0wuj/cFkkS/HFHIojxH3ffSXE+ttulrqWjZZRaUOonfJc60e1wSNT4rV8tIunvu/R3wCp71/tLAa9xg=="; }; }; "@babel/plugin-transform-reserved-words-7.2.0" = { @@ -922,22 +949,22 @@ let sha512 = "2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw=="; }; }; - "@babel/plugin-transform-typescript-7.6.3" = { + "@babel/plugin-transform-typescript-7.7.2" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.6.3"; + version = "7.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.6.3.tgz"; - sha512 = "aiWINBrPMSC3xTXRNM/dfmyYuPNKY/aexYqBgh0HBI5Y+WO5oRAqW/oROYeYHrF4Zw12r9rK4fMk/ZlAmqx/FQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.7.2.tgz"; + sha512 = "UWhDaJRqdPUtdK1s0sKYdoRuqK0NepjZto2UZltvuCgMoMZmdjhgz5hcRokie/3aYEaSz3xvusyoayVaq4PjRg=="; }; }; - "@babel/plugin-transform-unicode-regex-7.6.2" = { + "@babel/plugin-transform-unicode-regex-7.7.0" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.6.2"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.6.2.tgz"; - sha512 = "orZI6cWlR3nk2YmYdb0gImrgCUwb5cBUwjf6Ks6dvNVvXERkwtJWOQaEOjPiu0Gu1Tq6Yq/hruCZZOOi9F34Dw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.0.tgz"; + sha512 = "RrThb0gdrNwFAqEAAx9OWgtx6ICK69x7i9tCnMdVrxQwSDp/Abu9DXFU5Hh16VP33Rmxh04+NGW28NsIkFvFKA=="; }; }; "@babel/polyfill-7.6.0" = { @@ -949,13 +976,13 @@ let sha512 = "q5BZJI0n/B10VaQQvln1IlDK3BTBJFbADx7tv+oXDPIDZuTo37H5Adb9jhlXm/fEN4Y7/64qD9mnrJJG7rmaTw=="; }; }; - "@babel/preset-env-7.6.3" = { + "@babel/preset-env-7.7.1" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.6.3"; + version = "7.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.6.3.tgz"; - sha512 = "CWQkn7EVnwzlOdR5NOm2+pfgSNEZmvGjOhlCHBDq0J8/EStr+G+FvPEiz9B56dR6MoiUFjXhfE4hjLoAKKJtIQ=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.7.1.tgz"; + sha512 = "/93SWhi3PxcVTDpSqC+Dp4YxUu3qZ4m7I76k0w73wYfn7bGVuRIO4QUz95aJksbS+AD1/mT1Ie7rbkT0wSplaA=="; }; }; "@babel/preset-flow-7.0.0" = { @@ -976,22 +1003,22 @@ let sha512 = "A8ia2Wus0OAP6hh28ZgPSCBJEX3Jnql3kg9di/I+Lmg1gbJXgDZBrHr/UGZXl20Vi1lXgMuUq8c8J899KFr5gA=="; }; }; - "@babel/preset-typescript-7.6.0" = { + "@babel/preset-typescript-7.7.2" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; - version = "7.6.0"; + version = "7.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.6.0.tgz"; - sha512 = "4xKw3tTcCm0qApyT6PqM9qniseCE79xGHiUnNdKGdxNsGUc2X7WwZybqIpnTmoukg3nhPceI5KPNzNqLNeIJww=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.7.2.tgz"; + sha512 = "1B4HthAelaLGfNRyrWqJtBEjXX1ulThCrLQ5B2VOtEAznWFIFXFJahgXImqppy66lx/Oh+cOSCQdJzZqh2Jh5g=="; }; }; - "@babel/register-7.6.2" = { + "@babel/register-7.7.0" = { name = "_at_babel_slash_register"; packageName = "@babel/register"; - version = "7.6.2"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/register/-/register-7.6.2.tgz"; - sha512 = "xgZk2LRZvt6i2SAUWxc7ellk4+OYRgS3Zpsnr13nMS1Qo25w21Uu8o6vTOAqNaxiqrnv30KTYzh9YWY2k21CeQ=="; + url = "https://registry.npmjs.org/@babel/register/-/register-7.7.0.tgz"; + sha512 = "HV3GJzTvSoyOMWGYn2TAh6uL6g+gqKTgEZ99Q3+X9UURT1VPT/WcU46R61XftIc5rXytcOHZ4Z0doDlsjPomIg=="; }; }; "@babel/runtime-7.6.2" = { @@ -1003,40 +1030,40 @@ let sha512 = "EXxN64agfUqqIGeEjI5dL5z0Sw0ZwWo1mLTi4mQowCZ42O59b7DRpZAnTC6OqdF28wMBMFKNb/4uFGrVaigSpg=="; }; }; - "@babel/runtime-7.6.3" = { + "@babel/runtime-7.7.2" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.6.3"; + version = "7.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.6.3.tgz"; - sha512 = "kq6anf9JGjW8Nt5rYfEuGRaEAaH1mkv3Bbu6rYvLOpPh/RusSJXuKPEAoZ7L7gybZkchE8+NV5g9vKF4AGAtsA=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.7.2.tgz"; + sha512 = "JONRbXbTXc9WQE2mAZd1p0Z3DZ/6vaQIkgYMSTP3KjRCyd7rCZCcfhCyX+YjwcKxcZ82UrxbRD358bpExNgrjw=="; }; }; - "@babel/runtime-corejs2-7.6.3" = { + "@babel/runtime-corejs2-7.7.2" = { name = "_at_babel_slash_runtime-corejs2"; packageName = "@babel/runtime-corejs2"; - version = "7.6.3"; + version = "7.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.6.3.tgz"; - sha512 = "nuA2o+rgX2+PrNTZ063ehncVcg7sn+tU71BB81SaWRVUbGwCOlb0+yQA1e0QqmzOfRSYOxfvf8cosYqFbJEiwQ=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs2/-/runtime-corejs2-7.7.2.tgz"; + sha512 = "GfVnHchOBvIMsweQ13l4jd9lT4brkevnavnVOej5g2y7PpTRY+R4pcQlCjWMZoUla5rMLFzaS/Ll2s59cB1TqQ=="; }; }; - "@babel/template-7.6.0" = { + "@babel/template-7.7.0" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.6.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.6.0.tgz"; - sha512 = "5AEH2EXD8euCk446b7edmgFdub/qfH1SN6Nii3+fyXP807QRx9Q73A2N5hNwRRslC2H9sNzaFhsPubkS4L8oNQ=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.7.0.tgz"; + sha512 = "OKcwSYOW1mhWbnTBgQY5lvg1Fxg+VyfQGjcBduZFljfc044J5iDlnDSfhQ867O17XHiSCxYHUxHg2b7ryitbUQ=="; }; }; - "@babel/traverse-7.6.3" = { + "@babel/traverse-7.7.2" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.6.3"; + version = "7.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.6.3.tgz"; - sha512 = "unn7P4LGsijIxaAJo/wpoU11zN+2IaClkQAxcJWBNCMS6cmVh802IyLHNkAjQ0iYnRS3nnxk5O3fuXW28IMxTw=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.2.tgz"; + sha512 = "TM01cXib2+rgIZrGJOLaHV/iZUAxf4A0dt5auY6KNZ+cm6aschuJGqKJM3ROTt3raPUdIDk9siAufIFEleRwtw=="; }; }; "@babel/types-7.0.0-beta.38" = { @@ -1057,6 +1084,15 @@ let sha512 = "CqbcpTxMcpuQTMhjI37ZHVgjBkysg5icREQIEZ0eG1yCNwg3oy+5AaLiOKmjsCj6nqOsa6Hf0ObjRVwokb7srA=="; }; }; + "@babel/types-7.7.2" = { + name = "_at_babel_slash_types"; + packageName = "@babel/types"; + version = "7.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/types/-/types-7.7.2.tgz"; + sha512 = "YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA=="; + }; + }; "@calebboyd/semaphore-1.3.1" = { name = "_at_calebboyd_slash_semaphore"; packageName = "@calebboyd/semaphore"; @@ -1066,6 +1102,51 @@ let sha512 = "17z9me12RgAEcMhIgR7f+BiXKbzwF9p1VraI69OxrUUSWGuSMOyOTEHQNVtMKuVrkEDVD0/Av5uiGZPBMYZljw=="; }; }; + "@citation-js/core-0.4.9" = { + name = "_at_citation-js_slash_core"; + packageName = "@citation-js/core"; + version = "0.4.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@citation-js/core/-/core-0.4.9.tgz"; + sha512 = "nVfoZQqJjTsEMIAzUFkJMFqoZuUA03vadiTGBsq0jrbmonTGDVtk50D0/bzwAZVjjoxSWjs5w/DqXXrpcFqFkQ=="; + }; + }; + "@citation-js/date-0.4.4" = { + name = "_at_citation-js_slash_date"; + packageName = "@citation-js/date"; + version = "0.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@citation-js/date/-/date-0.4.4.tgz"; + sha512 = "wD195pZPwCCN8idhxz4HYZbf5mMnPZMRhOipcU8v1orZWqZp6YDRjOplNKo6yX7tf6fB4ZO8QLuNaNjuic5AWQ=="; + }; + }; + "@citation-js/name-0.4.2" = { + name = "_at_citation-js_slash_name"; + packageName = "@citation-js/name"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@citation-js/name/-/name-0.4.2.tgz"; + sha512 = "brSPsjs2fOVzSnARLKu0qncn6suWjHVQtrqSUrnqyaRH95r/Ad4wPF5EsoWr+Dx8HzkCGb/ogmoAzfCsqlTwTQ=="; + }; + }; + "@citation-js/plugin-bibtex-0.4.9" = { + name = "_at_citation-js_slash_plugin-bibtex"; + packageName = "@citation-js/plugin-bibtex"; + version = "0.4.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@citation-js/plugin-bibtex/-/plugin-bibtex-0.4.9.tgz"; + sha512 = "PGfyn8GeJMvhcpr1PiWkJR25N2rH7+t6JQYoN35ngT3KzIIVcpC81dG2jQOy+t10D55tu7H61KfJZGFAnhgpWg=="; + }; + }; + "@citation-js/plugin-csl-0.4.10" = { + name = "_at_citation-js_slash_plugin-csl"; + packageName = "@citation-js/plugin-csl"; + version = "0.4.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@citation-js/plugin-csl/-/plugin-csl-0.4.10.tgz"; + sha512 = "8AnlLKZ9sAK/p2L3vi9IBDxB9D0vXukFC7hjS16WNW5HkHNfb2FN91APEXQfvHbJ0RePy5xvHe5Ou8T1muFeoQ=="; + }; + }; "@cliqz-oss/firefox-client-0.3.1" = { name = "_at_cliqz-oss_slash_firefox-client"; packageName = "@cliqz-oss/firefox-client"; @@ -1390,31 +1471,31 @@ let sha512 = "CNVsCrMge/jq6DCT5buNZ8PACY9RTvPJbCNoIcndfkJOCsNxOx9dnc5qw4pHZdHi8GS6l3qlgkuFKp33iD8J2Q=="; }; }; - "@lerna/add-3.18.0" = { + "@lerna/add-3.18.4" = { name = "_at_lerna_slash_add"; packageName = "@lerna/add"; - version = "3.18.0"; + version = "3.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/add/-/add-3.18.0.tgz"; - sha512 = "Z5EaQbBnJn1LEPb0zb0Q2o9T8F8zOnlCsj6JYpY6aSke17UUT7xx0QMN98iBK+ueUHKjN/vdFdYlNCYRSIdujA=="; + url = "https://registry.npmjs.org/@lerna/add/-/add-3.18.4.tgz"; + sha512 = "R+9RmYrSbcmnmaFL2aB0HJtTq95ePEa0FMS4r4NnA7Xw07l5buVBPOfxv6P8kFrVvIcNpaa7S0Eo/KkbycMhKA=="; }; }; - "@lerna/bootstrap-3.18.0" = { + "@lerna/bootstrap-3.18.4" = { name = "_at_lerna_slash_bootstrap"; packageName = "@lerna/bootstrap"; - version = "3.18.0"; + version = "3.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.18.0.tgz"; - sha512 = "3DZKWIaKvr7sUImoKqSz6eqn84SsOVMnA5QHwgzXiQjoeZ/5cg9x2r+Xj3+3w/lvLoh0j8U2GNtrIaPNis4bKQ=="; + url = "https://registry.npmjs.org/@lerna/bootstrap/-/bootstrap-3.18.4.tgz"; + sha512 = "mvqMyionPSqhbeGhoUQYEBTgbJ47LkONHfQ1AKBET0fJOjIZf6x0pWC17KvfCjsiE017325ySLKDH23z1Kb9ww=="; }; }; - "@lerna/changed-3.18.3" = { + "@lerna/changed-3.18.4" = { name = "_at_lerna_slash_changed"; packageName = "@lerna/changed"; - version = "3.18.3"; + version = "3.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.18.3.tgz"; - sha512 = "xZW7Rm+DlDIGc0EvKGyJZgT9f8FFa4d52mr/Y752dZuXR2qRmf9tXhVloRG39881s2A6yi3jqLtXZggKhsQW4Q=="; + url = "https://registry.npmjs.org/@lerna/changed/-/changed-3.18.4.tgz"; + sha512 = "Ui4UsneDk9gCuJRfTpR5js+Ctt9Je+j+3Q4z7H7HhBn6WeWDTp6FBGJZ7SfrBCdQ47EKK27Mr95LbJ4I77xFfQ=="; }; }; "@lerna/check-working-tree-3.16.5" = { @@ -1435,13 +1516,13 @@ let sha512 = "vdcI7mzei9ERRV4oO8Y1LHBZ3A5+ampRKg1wq5nutLsUA4mEBN6H7JqjWOMY9xZemv6+kATm2ofjJ3lW5TszQg=="; }; }; - "@lerna/clean-3.18.0" = { + "@lerna/clean-3.18.4" = { name = "_at_lerna_slash_clean"; packageName = "@lerna/clean"; - version = "3.18.0"; + version = "3.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/clean/-/clean-3.18.0.tgz"; - sha512 = "BiwBELZNkarRQqj+v5NPB1aIzsOX+Y5jkZ9a5UbwHzEdBUQ5lQa0qaMLSOve/fSkaiZQxe6qnTyatN75lOcDMg=="; + url = "https://registry.npmjs.org/@lerna/clean/-/clean-3.18.4.tgz"; + sha512 = "puuL0sBHIv3Tvq8cdu3kCGfRpdsXuaDGIRha33GVmRPfMBi2GN8nPPysVyWmP99PfgfafO6eT5R3jqXjvASAZA=="; }; }; "@lerna/cli-3.18.0" = { @@ -1525,22 +1606,22 @@ let sha512 = "3iLNlpurc2nV9k22w8ini2Zjm2UPo3xtQgWyqdA6eJjvge0+5AlNAWfPoV6cV+Hc1xDbJD2YDSFpZPJ1ZGilRw=="; }; }; - "@lerna/exec-3.18.0" = { + "@lerna/exec-3.18.4" = { name = "_at_lerna_slash_exec"; packageName = "@lerna/exec"; - version = "3.18.0"; + version = "3.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/exec/-/exec-3.18.0.tgz"; - sha512 = "hwkuzg1+38+pbzdZPhGtLIYJ59z498/BCNzR8d4/nfMYm8lFbw9RgJJajLcdbuJ9LJ08cZ93hf8OlzetL84TYg=="; + url = "https://registry.npmjs.org/@lerna/exec/-/exec-3.18.4.tgz"; + sha512 = "BpBFxyCQXcfess9Nmj/OwQ9e1IhzPzNxqF5JK7dPIjko5oBn5Hm2EWVAcgUGSHKPZGLiOWPu3Wx/C92NtDBS1w=="; }; }; - "@lerna/filter-options-3.18.0" = { + "@lerna/filter-options-3.18.4" = { name = "_at_lerna_slash_filter-options"; packageName = "@lerna/filter-options"; - version = "3.18.0"; + version = "3.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.18.0.tgz"; - sha512 = "UGVcixs3TGzD8XSmFSbwUVVQnAjaZ6Rmt8Vuq2RcR98ULkGB1LiGNMY89XaNBhaaA8vx7yQWiLmJi2AfmD63Qg=="; + url = "https://registry.npmjs.org/@lerna/filter-options/-/filter-options-3.18.4.tgz"; + sha512 = "4giVQD6tauRwweO/322LP2gfVDOVrt/xN4khkXyfkJDfcsZziFXq+668otD9KSLL8Ps+To4Fah3XbK0MoNuEvA=="; }; }; "@lerna/filter-packages-3.18.0" = { @@ -1633,22 +1714,22 @@ let sha512 = "FbbIpH0EpsC+dpAbvxCoF3cn7F1MAyJjEa5Lh3XkDGATOlinMFuKCbmX0NLpOPQZ5zghvrui97cx+jz5F2IlHw=="; }; }; - "@lerna/list-3.18.0" = { + "@lerna/list-3.18.4" = { name = "_at_lerna_slash_list"; packageName = "@lerna/list"; - version = "3.18.0"; + version = "3.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/list/-/list-3.18.0.tgz"; - sha512 = "mpB7Q6T+n2CaiPFz0LuOE+rXphDfHm0mKIwShnyS/XDcii8jXv+z9Iytj8p3rfCH2I1L80j2qL6jWzyGy/uzKA=="; + url = "https://registry.npmjs.org/@lerna/list/-/list-3.18.4.tgz"; + sha512 = "bgtlhAwhjHOTLq0iIuPs30abeuLbwZvVB60Ym8kPp+chh939obKU3vy2KMyX+Gpxf8pzuQG+k986YXcUBvXVsw=="; }; }; - "@lerna/listable-3.18.0" = { + "@lerna/listable-3.18.4" = { name = "_at_lerna_slash_listable"; packageName = "@lerna/listable"; - version = "3.18.0"; + version = "3.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/listable/-/listable-3.18.0.tgz"; - sha512 = "9gLGKYNLSKeurD+sJ2RA+nz4Ftulr91U127gefz0RlmAPpYSjwcJkxwa0UfJvpQTXv9C7yzHLnn0BjyAQRjuew=="; + url = "https://registry.npmjs.org/@lerna/listable/-/listable-3.18.4.tgz"; + sha512 = "EKSsnST5k3dZfw+UTwBH1/sHQ1YfgjYjGxXCabyn55mMgc2GjoDekODMYzZ1TNF2NNy6RgIZ24X2JI8G22nZUw=="; }; }; "@lerna/log-packed-3.16.0" = { @@ -1777,13 +1858,13 @@ let sha512 = "P+lWSFokdyvYpkwC3it9cE0IF2U5yy2mOUbGvvE4iDb9K7TyXGE+7lwtx2thtPvBAfIb7O13POMkv7df03HJeA=="; }; }; - "@lerna/publish-3.18.3" = { + "@lerna/publish-3.18.4" = { name = "_at_lerna_slash_publish"; packageName = "@lerna/publish"; - version = "3.18.3"; + version = "3.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.18.3.tgz"; - sha512 = "XlfWOWIhaSK0Y2sX5ppNWI5Y3CDtlxMcQa1hTbZlC5rrDA6vD32iutbmH6Ix3c6wtvVbSkgA39GWsQEXxPS+7w=="; + url = "https://registry.npmjs.org/@lerna/publish/-/publish-3.18.4.tgz"; + sha512 = "Q+MqM5DUZvk+uT6hdEyO3khXET6LwED0YEuCu8fRwtHad03HkZ9i8PtTY5h8Sn6D6RCyCOlHTuf8O0KKAUy3ow=="; }; }; "@lerna/pulse-till-done-3.13.0" = { @@ -1822,13 +1903,13 @@ let sha512 = "bQlKmO0pXUsXoF8lOLknhyQjOZsCc0bosQDoX4lujBXSWxHVTg1VxURtWf2lUjz/ACsJVDfvHZbDm8kyBk5okA=="; }; }; - "@lerna/run-3.18.0" = { + "@lerna/run-3.18.4" = { name = "_at_lerna_slash_run"; packageName = "@lerna/run"; - version = "3.18.0"; + version = "3.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/run/-/run-3.18.0.tgz"; - sha512 = "sblxHBZ9djaaG7wefPcfEicDqzrB7CP1m/jIB0JvPEQwG4C2qp++ewBpkjRw/mBtjtzg0t7v0nNMXzaWYrQckQ=="; + url = "https://registry.npmjs.org/@lerna/run/-/run-3.18.4.tgz"; + sha512 = "u2ZNO2fVk5kVEpbpn4DLJZZxZ08LFnIFuaXJMAhxvOgvm12ZF2rabA9kZc3NXp5+DedG5nHHgyoyLVVbStKzBA=="; }; }; "@lerna/run-lifecycle-3.16.2" = { @@ -1885,13 +1966,13 @@ let sha512 = "SiJP75nwB8GhgwLKQfdkSnDufAaCbkZWJqEDlKOUPUvVOplRGnfL+BPQZH5nvq2BYSRXsksXWZ4UHVnQZI/HYA=="; }; }; - "@lerna/version-3.18.3" = { + "@lerna/version-3.18.4" = { name = "_at_lerna_slash_version"; packageName = "@lerna/version"; - version = "3.18.3"; + version = "3.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/@lerna/version/-/version-3.18.3.tgz"; - sha512 = "IXXRlyM3Q/jrc+QZio+bgjG4ZaK+4LYmY4Yql1xyY0wZhAKsWP/Q6ho7e1EJNjNC5dUJO99Fq7qB05MkDf2OcQ=="; + url = "https://registry.npmjs.org/@lerna/version/-/version-3.18.4.tgz"; + sha512 = "+gR9H89qSP8iqzNi4tRVQUbWlFMOlhbY6+5TXkP72Ibb/z87O+C46DBqizSMVaPQYdSYjS1c9Xfa1oOhEWxGaw=="; }; }; "@lerna/write-log-file-3.13.0" = { @@ -2110,22 +2191,22 @@ let sha512 = "5/X0AL1ZgoU32fAepTfEoggFinO3rxsMLtzhlUX+RctLrusn/CApJuGFCd0v7GMFhF+8UiCsTTfsu7Fh1HnEJg=="; }; }; - "@octokit/request-error-1.1.0" = { + "@octokit/request-error-1.2.0" = { name = "_at_octokit_slash_request-error"; packageName = "@octokit/request-error"; - version = "1.1.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-1.1.0.tgz"; - sha512 = "06lt8PulL3rKpmwzYLCeLEt1iHFoj8l0PLkObAtp5Cx0Wwd1+5FAa9u6UXjA0kzYsfbjBKF9TtO9CuXelKiYlw=="; + url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-1.2.0.tgz"; + sha512 = "DNBhROBYjjV/I9n7A8kVkmQNkqFAMem90dSxqvPq57e2hBr7mNTX98y3R2zDpqMQHVRpBDjsvsfIGgBzy+4PAg=="; }; }; - "@octokit/rest-16.34.1" = { + "@octokit/rest-16.35.0" = { name = "_at_octokit_slash_rest"; packageName = "@octokit/rest"; - version = "16.34.1"; + version = "16.35.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.34.1.tgz"; - sha512 = "JUoS12cdktf1fv86rgrjC/RvYLuL+o7p57W7zX1x7ANFJ7OvdV8emvUNkFlcidEaOkYrxK3SoWgQFt3FhNmabA=="; + url = "https://registry.npmjs.org/@octokit/rest/-/rest-16.35.0.tgz"; + sha512 = "9ShFqYWo0CLoGYhA1FdtdykJuMzS/9H6vSbbQWDX4pWr4p9v+15MsH/wpd/3fIU+tSxylaNO48+PIHqOkBRx3w=="; }; }; "@octokit/types-2.0.1" = { @@ -2182,6 +2263,15 @@ let sha512 = "USSjRAAQYsZFlv43FUPdD+jEGML5/8oLF0rUzPQTtK4q9kvaXr49F5ZplyLz5lox78cLZ0TxN2bIDQ1xhOkulQ=="; }; }; + "@primer/octicons-9.2.0" = { + name = "_at_primer_slash_octicons"; + packageName = "@primer/octicons"; + version = "9.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@primer/octicons/-/octicons-9.2.0.tgz"; + sha512 = "3vv7bBqVUHhU7ChpmQhmzz3WmHEKKSk9z/xEK5KnU8Egh96RoqKIim07geRj825ISa+IWj9cPdOA1ShqW5k3Yw=="; + }; + }; "@protobufjs/aspromise-1.1.2" = { name = "_at_protobufjs_slash_aspromise"; packageName = "@protobufjs/aspromise"; @@ -2290,22 +2380,22 @@ let sha512 = "MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg=="; }; }; - "@schematics/angular-8.3.17" = { + "@schematics/angular-8.3.18" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "8.3.17"; + version = "8.3.18"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-8.3.17.tgz"; - sha512 = "Ot++j7vpEBKUD+D6eQxIJto+PYR2HPR9hmBoshZ2nt1/mU3OPEpIMIO/OBnbVtGmuzKXdq2n2NvbPtnhlxWplA=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-8.3.18.tgz"; + sha512 = "3cQYcmzsWD/MnqauoSozIu1R7DJvty13BH6+XIorEfguWqOwOwgNIWLMsa0iIcy0+TV3vWFI0KZpCKup2u/I1Q=="; }; }; - "@schematics/update-0.803.17" = { + "@schematics/update-0.803.18" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.803.17"; + version = "0.803.18"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.803.17.tgz"; - sha512 = "42CqIcm0i1BfBXYm6YuE8Q6kEEb0ATYiPYJQTgmb+bZSF2Sl9eAzPBaackW2EwVK1JP3Rdyl2S31OwGvgAk6xA=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.803.18.tgz"; + sha512 = "vJxyL1pbn2lcgSH6HUqgA373iJRXQWxdrxuUaQ56qyq1EoicG7EppKz7OlGyKs+nHR9HhtK0eJc35E7I0lEWgA=="; }; }; "@serverless/cli-1.4.0" = { @@ -2335,13 +2425,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/enterprise-plugin-3.2.1" = { + "@serverless/enterprise-plugin-3.2.3" = { name = "_at_serverless_slash_enterprise-plugin"; packageName = "@serverless/enterprise-plugin"; - version = "3.2.1"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.2.1.tgz"; - sha512 = "CLTuvtEYhmvV7qiYuHkDJxoIIdcRU8OQBUhoBhUscK6UVdsKB2Y4ykz8su0rGg5rdgcaaluJF0+H87oBNw77ag=="; + url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.2.3.tgz"; + sha512 = "YBk+Fa+u2zrS6/3t7bEsSpHPoZ7ubac1snibxS81IcrhJTCX6zYVsnvgoSMdKkor5QW/vPaK7p/M9wWP3sWc4w=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -2353,13 +2443,13 @@ let sha512 = "YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A=="; }; }; - "@serverless/platform-sdk-2.2.0" = { + "@serverless/platform-sdk-2.2.1" = { name = "_at_serverless_slash_platform-sdk"; packageName = "@serverless/platform-sdk"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-sdk/-/platform-sdk-2.2.0.tgz"; - sha512 = "w5A/szD0ZMUIuqUt5HyHllQ9LKO9/mpgv3rtJjLRI5ZJq1GvY4pv2pyQQPxGLT1gv0ER+b5vF+4tfrkx6MEuEw=="; + url = "https://registry.npmjs.org/@serverless/platform-sdk/-/platform-sdk-2.2.1.tgz"; + sha512 = "XOpYzV9AKrWuW1IJqLxhwZZbspUTCe+f/bmkdMCzWZX7HpHtasYWCcAwZN/DsYq/3af/tBp8gkEsYh0GnaAaYg=="; }; }; "@serverless/template-1.1.3" = { @@ -2416,31 +2506,22 @@ let sha512 = "sA7V2JhgqJB9z5uYotgQc5iNDv//y+Mdm39rANxmFjtZMSYJZHkP80arzPjw1mB5ni/sWec7ieYUUFeySZBfVg=="; }; }; - "@snyk/cocoapods-lockfile-parser-2.0.4" = { + "@snyk/cocoapods-lockfile-parser-3.0.0" = { name = "_at_snyk_slash_cocoapods-lockfile-parser"; packageName = "@snyk/cocoapods-lockfile-parser"; - version = "2.0.4"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-2.0.4.tgz"; - sha512 = "d57bajPjqCiNXMuyMmt9Zt98zbjABZUFw+91B705flzV6oB7OThgtA40Eoin6iatYoStIx28bC3T6b0mScy/iA=="; + url = "https://registry.npmjs.org/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.0.0.tgz"; + sha512 = "AebCc+v9vtOL9tFkU4/tommgVsXxqdx6t45kCkBW+FC4PaYvfYEg9Eg/9GqlY9+nFrLFo/uTr+E/aR0AF/KqYA=="; }; }; - "@snyk/composer-lockfile-parser-1.0.3" = { + "@snyk/composer-lockfile-parser-1.2.0" = { name = "_at_snyk_slash_composer-lockfile-parser"; packageName = "@snyk/composer-lockfile-parser"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.0.3.tgz"; - sha512 = "hb+6E7kMzWlcwfe//ILDoktBPKL2a3+RnJT/CXnzRXaiLQpsdkf5li4q2v0fmvd+4v7L3tTN8KM+//lJyviEkg=="; - }; - }; - "@snyk/dep-graph-1.13.0" = { - name = "_at_snyk_slash_dep-graph"; - packageName = "@snyk/dep-graph"; - version = "1.13.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.13.0.tgz"; - sha512 = "e0XcLH6Kgs/lunf6iDjbxEnm9+JYFEJn6eo/PlEUW+SMWBZ2uEXHBTDNp9oxjJou48PngzWMveEkniBAN+ulOQ=="; + url = "https://registry.npmjs.org/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.2.0.tgz"; + sha512 = "kZT+HTqgNcQMeoE5NM9M3jj463M8zI7ZxqZXLw9WoyVs5JTt9g0qFWxIG1cNwZdGVI+y7tzZbNWw9BlMD1vCCQ=="; }; }; "@snyk/dep-graph-1.13.1" = { @@ -2470,13 +2551,13 @@ let sha512 = "ceMD4CBS3qtAg+O0BUvkKdsheUNCqi+/+Rju243Ul8PsUgZnXmGiqfk/2z7DCprRQnxUTra4+IyeDQT7wAheCQ=="; }; }; - "@snyk/snyk-cocoapods-plugin-1.0.3" = { + "@snyk/snyk-cocoapods-plugin-2.0.1" = { name = "_at_snyk_slash_snyk-cocoapods-plugin"; packageName = "@snyk/snyk-cocoapods-plugin"; - version = "1.0.3"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-1.0.3.tgz"; - sha512 = "AHAA7z23nPi1eHODsDxeSkl73Ze3yphuqJjMl39ie323EzBDcb9g6uAACrk0Qn2K/K2D8uyxMAf2zDtc+JGQfw=="; + url = "https://registry.npmjs.org/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.0.1.tgz"; + sha512 = "XVkvaMvMzQ3miJi/YZmsRJSAUfDloYhfg6pXPgzAeAugB4p+cNi01Z68pT62ypB8U/Ugh1Xx2pb9aoOFqBbSjA=="; }; }; "@starptech/expression-parser-0.9.0" = { @@ -2713,6 +2794,15 @@ let sha512 = "8mrhPstU+ZX0Ugya8tl5DsDZ1I5ZwQzbL/8PA0z8Gj0k9nql7nkaMzmPVLj+l/nixWaliXi+EBiLA8bptw3z7Q=="; }; }; + "@types/anymatch-1.3.1" = { + name = "_at_types_slash_anymatch"; + packageName = "@types/anymatch"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/anymatch/-/anymatch-1.3.1.tgz"; + sha512 = "/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA=="; + }; + }; "@types/babel-types-7.0.7" = { name = "_at_types_slash_babel-types"; packageName = "@types/babel-types"; @@ -2731,13 +2821,13 @@ let sha512 = "xH2e58elpj1X4ynnKp9qSnWlsRTIs6n3tgLGNfwAGHwePw0mulHQllV34n0T25uYSu1k0hRKkWXF890B1yS47w=="; }; }; - "@types/bluebird-3.5.28" = { + "@types/bluebird-3.5.29" = { name = "_at_types_slash_bluebird"; packageName = "@types/bluebird"; - version = "3.5.28"; + version = "3.5.29"; src = fetchurl { - url = "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.28.tgz"; - sha512 = "0Vk/kqkukxPKSzP9c8WJgisgGDx5oZDbsLLWIP5t70yThO/YleE+GEm2S1GlRALTaack3O7U5OS5qEm7q2kciA=="; + url = "https://registry.npmjs.org/@types/bluebird/-/bluebird-3.5.29.tgz"; + sha512 = "kmVtnxTuUuhCET669irqQmPAez4KFnFVKvpleVRyfC3g+SHD1hIkFZcWLim9BVcwUBLO59o8VZE4yGCmTif8Yw=="; }; }; "@types/body-parser-1.17.1" = { @@ -2758,6 +2848,24 @@ let sha512 = "YiozPOOsS6bIuz31ilYqR5SlLif4TBWsousN2aCWLi5233nZSX19tFbcQUPdR7xJ8ypPyxkCGNxg0CIV5n9qxQ=="; }; }; + "@types/color-name-1.1.1" = { + name = "_at_types_slash_color-name"; + packageName = "@types/color-name"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz"; + sha512 = "rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ=="; + }; + }; + "@types/concat-stream-1.6.0" = { + name = "_at_types_slash_concat-stream"; + packageName = "@types/concat-stream"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/concat-stream/-/concat-stream-1.6.0.tgz"; + sha1 = "394dbe0bb5fee46b38d896735e8b68ef2390d00d"; + }; + }; "@types/connect-3.4.32" = { name = "_at_types_slash_connect"; packageName = "@types/connect"; @@ -2839,6 +2947,15 @@ let sha512 = "K8d2M5t3tBQimkyaYTXxtHYyoJPUEhy2/omVRnTAKw5FEdT+Ft6lTaTOpoJdHeG+mIwQXXtqiTcYZ6IR8LTzjQ=="; }; }; + "@types/form-data-0.0.33" = { + name = "_at_types_slash_form-data"; + packageName = "@types/form-data"; + version = "0.0.33"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/form-data/-/form-data-0.0.33.tgz"; + sha1 = "c9ac85b2a5fd18435b8c85d9ecb50e6d6c893ff8"; + }; + }; "@types/fs-capacitor-2.0.0" = { name = "_at_types_slash_fs-capacitor"; packageName = "@types/fs-capacitor"; @@ -2902,31 +3019,31 @@ let sha1 = "ff540462d2fb4d0a88441ceaf27d287b01c3d878"; }; }; - "@types/koa-2.0.51" = { + "@types/koa-2.0.52" = { name = "_at_types_slash_koa"; packageName = "@types/koa"; - version = "2.0.51"; + version = "2.0.52"; src = fetchurl { - url = "https://registry.npmjs.org/@types/koa/-/koa-2.0.51.tgz"; - sha512 = "L5e/l6Z+SR9Jk6HM0wNYdkvWhSUBOvi+7Q5Uwn7kE/VmBXX7NIxARMigARWAyXAtXiv5Ry1P2HmebolFdvuIVg=="; + url = "https://registry.npmjs.org/@types/koa/-/koa-2.0.52.tgz"; + sha512 = "cp/GTOhOYwomlSKqEoG0kaVEVJEzP4ojYmfa7EKaGkmkkRwJ4B/1VBLbQZ49Z+WJNvzXejQB/9GIKqMo9XLgFQ=="; }; }; - "@types/koa-compose-3.2.4" = { + "@types/koa-compose-3.2.5" = { name = "_at_types_slash_koa-compose"; packageName = "@types/koa-compose"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/koa-compose/-/koa-compose-3.2.4.tgz"; - sha512 = "ioou0rxkuWL+yBQYsHUQAzRTfVxAg8Y2VfMftU+Y3RA03/MzuFL0x/M2sXXj3PkfnENbHsjeHR1aMdezLYpTeA=="; + url = "https://registry.npmjs.org/@types/koa-compose/-/koa-compose-3.2.5.tgz"; + sha512 = "B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ=="; }; }; - "@types/lodash-4.14.144" = { + "@types/lodash-4.14.146" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.144"; + version = "4.14.146"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.144.tgz"; - sha512 = "ogI4g9W5qIQQUhXAclq6zhqgqNUr7UlFaqDHbch7WLSLeeM/7d3CRaw7GLajxvyFvhJqw4Rpcz5bhoaYtIx6Tg=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.146.tgz"; + sha512 = "JzJcmQ/ikHSv7pbvrVNKJU5j9jL9VLf3/gqs048CEnBVVVEv4kve3vLxoPHGvclutS+Il4SBIuQQ087m1eHffw=="; }; }; "@types/long-4.0.0" = { @@ -2956,22 +3073,31 @@ let sha512 = "tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="; }; }; - "@types/node-10.17.3" = { + "@types/node-10.17.5" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "10.17.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-10.17.5.tgz"; + sha512 = "RElZIr/7JreF1eY6oD5RF3kpmdcreuQPjg5ri4oQ5g9sq7YWU8HkfB3eH8GwAwxf5OaCh0VPi7r4N/yoTGelrA=="; + }; + }; + "@types/node-11.15.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.3"; + version = "11.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.3.tgz"; - sha512 = "QZ9CjUB3QoA3f2afw3utKlfRPhpmufB7jC2+oDhLWnXqoyx333fhKSQDLQu2EK7OE0a15X67eYiRAaJsHXrpMA=="; + url = "https://registry.npmjs.org/@types/node/-/node-11.15.2.tgz"; + sha512 = "BqCU9uIFkUH9Sgo2uLYbmIiFB1T+VBiM8AI/El3LIAI5KzwtckeSG+3WOYZr9aMoX4UIvRFBWBeSaOu6hFue2Q=="; }; }; - "@types/node-12.12.5" = { + "@types/node-12.12.7" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.12.5"; + version = "12.12.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.12.5.tgz"; - sha512 = "KEjODidV4XYUlJBF3XdjSH5FWoMCtO0utnhtdLf1AgeuZLOrRbvmU/gaRCVg7ZaQDjVf3l84egiY0mRNe5xE4A=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.12.7.tgz"; + sha512 = "E6Zn0rffhgd130zbCbAr/JdXfXkoOUFAKNs/rF8qnafSJ8KYaA/j3oz7dcwal+lYjLA7xvdd5J4wdYpCTlP8+w=="; }; }; "@types/node-6.14.9" = { @@ -2983,6 +3109,24 @@ let sha512 = "leP/gxHunuazPdZaCvsCefPQxinqUDsCxCR5xaDUrY2MkYxQRFZZwU5e7GojyYsGB7QVtCi7iVEl/hoFXQYc+w=="; }; }; + "@types/node-7.10.9" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "7.10.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-7.10.9.tgz"; + sha512 = "usSpgoUsRtO5xNV5YEPU8PPnHisFx8u0rokj1BPVn/hDF7zwUDzVLiuKZM38B7z8V2111Fj6kd4rGtQFUZpNOw=="; + }; + }; + "@types/node-8.10.59" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "8.10.59"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-8.10.59.tgz"; + sha512 = "8RkBivJrDCyPpBXhVZcjh7cQxVBSmRk9QM7hOketZzp6Tg79c0N8kkpAIito9bnJ3HCVCHVYz+KHTEbfQNfeVQ=="; + }; + }; "@types/q-1.5.2" = { name = "_at_types_slash_q"; packageName = "@types/q"; @@ -2992,6 +3136,15 @@ let sha512 = "ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw=="; }; }; + "@types/qs-6.9.0" = { + name = "_at_types_slash_qs"; + packageName = "@types/qs"; + version = "6.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.0.tgz"; + sha512 = "c4zji5CjWv1tJxIZkz1oUtGcdOlsH3aza28Nqmm+uNDWBRHoMsjooBEN4czZp1V3iXPihE/VRUOBqg+4Xq0W4g=="; + }; + }; "@types/range-parser-1.2.3" = { name = "_at_types_slash_range-parser"; packageName = "@types/range-parser"; @@ -3028,6 +3181,15 @@ let sha512 = "oprSwp094zOglVrXdlo/4bAHtKTAxX6VT8FOZlBKrmyLbNvE1zxZyJ6yikMVtHIvwP45+ZQGJn+FdXGKTozq0g=="; }; }; + "@types/source-list-map-0.1.2" = { + name = "_at_types_slash_source-list-map"; + packageName = "@types/source-list-map"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz"; + sha512 = "K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA=="; + }; + }; "@types/superagent-3.8.2" = { name = "_at_types_slash_superagent"; packageName = "@types/superagent"; @@ -3037,6 +3199,24 @@ let sha512 = "kdU8ydio1weSvhIIh9rptZ6MdMiR2NQGFnlnZ5qQ7OiQS1ej79zK4GaJ9qX3naSTpOA7iWqwUnZCQpd7SpD1NA=="; }; }; + "@types/tapable-1.0.4" = { + name = "_at_types_slash_tapable"; + packageName = "@types/tapable"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.4.tgz"; + sha512 = "78AdXtlhpCHT0K3EytMpn4JNxaf5tbqbLcbIRoQIHzpTIyjpxLQKRoxU55ujBXAtg3Nl2h/XWvfDa9dsMOd0pQ=="; + }; + }; + "@types/uglify-js-3.0.4" = { + name = "_at_types_slash_uglify-js"; + packageName = "@types/uglify-js"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.0.4.tgz"; + sha512 = "SudIN9TRJ+v8g5pTG8RRCqfqTMNqgWCKKd3vtynhGzkIIjxaicNAMuY5TRadJ6tzDu3Dotf3ngaMILtmOdmWEQ=="; + }; + }; "@types/unist-2.0.3" = { name = "_at_types_slash_unist"; packageName = "@types/unist"; @@ -3055,13 +3235,31 @@ let sha512 = "b3nLFGaGkJ9rzOcuXRfHkZMdjsawuDD0ENL9fzTophtBg8FJHSGbH7daXkEpcwy3v7Xol3pAvsmlYyFhR4pqJw=="; }; }; - "@types/vfile-message-1.0.1" = { + "@types/vfile-message-2.0.0" = { name = "_at_types_slash_vfile-message"; packageName = "@types/vfile-message"; - version = "1.0.1"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/vfile-message/-/vfile-message-2.0.0.tgz"; + sha512 = "GpTIuDpb9u4zIO165fUy9+fXcULdD8HFRNli04GehoMVbeNq7D6OBnqSmg3lxZnC+UvgUhEWKxdKiwYUkGltIw=="; + }; + }; + "@types/webpack-4.39.8" = { + name = "_at_types_slash_webpack"; + packageName = "@types/webpack"; + version = "4.39.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vfile-message/-/vfile-message-1.0.1.tgz"; - sha512 = "mlGER3Aqmq7bqR1tTTIVHq8KSAFFRyGbrxuM8C/H82g6k7r2fS+IMEkIu3D7JHzG10NvPdR8DNx0jr0pwpp4dA=="; + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.39.8.tgz"; + sha512 = "lkJvwNJQUPW2SbVwAZW9s9whJp02nzLf2yTNwMULa4LloED9MYS1aNnGeoBCifpAI1pEBkTpLhuyRmBnLEOZAA=="; + }; + }; + "@types/webpack-sources-0.1.5" = { + name = "_at_types_slash_webpack-sources"; + packageName = "@types/webpack-sources"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.5.tgz"; + sha512 = "zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w=="; }; }; "@types/ws-6.0.3" = { @@ -4351,6 +4549,15 @@ let sha512 = "1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="; }; }; + "ansi-regex-5.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz"; + sha512 = "bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg=="; + }; + }; "ansi-split-1.0.1" = { name = "ansi-split"; packageName = "ansi-split"; @@ -4396,13 +4603,13 @@ let sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; }; - "ansi-styles-4.1.0" = { + "ansi-styles-4.2.0" = { name = "ansi-styles"; packageName = "ansi-styles"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.1.0.tgz"; - sha512 = "Qts4KCLKG+waHc9C4m07weIY8qyeixoS0h6RnbsNVD6Fw+pEZGW3vTyObL3WXpE09Mq4Oi7/lBEyLmOiLtlYWQ=="; + url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.0.tgz"; + sha512 = "7kFQgnEaMdRtwf6uSfUnVr9gSGC7faurn+J/Mv90/W+iTtN0405/nLdopfMWwchyxhbGYl6TC4Sccn9TUkGAgg=="; }; }; "ansi-term-0.0.2" = { @@ -4414,13 +4621,13 @@ let sha1 = "fd753efa4beada0eac99981bc52a3f6ff019deb7"; }; }; - "ansi-to-html-0.6.12" = { + "ansi-to-html-0.6.13" = { name = "ansi-to-html"; packageName = "ansi-to-html"; - version = "0.6.12"; + version = "0.6.13"; src = fetchurl { - url = "https://registry.npmjs.org/ansi-to-html/-/ansi-to-html-0.6.12.tgz"; - sha512 = "qBkIqLW979675mP76yB7yVkzeAWtATegdnDQ0RA3CZzknx0yUlNxMSML4xFdBfTs2GWYFQ1FELfbGbVSPzJ+LA=="; + url = "https://registry.npmjs.org/ansi-to-html/-/ansi-to-html-0.6.13.tgz"; + sha512 = "Ys2/umuaTlQvP9DLkaa7UzRKF2FLrfod/hNHXS9QhXCrw7seObG6ksOGmNz3UoK+adwM8L9vQfG7mvaxfJ3Jvw=="; }; }; "ansi-wrap-0.1.0" = { @@ -5989,13 +6196,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.563.0" = { + "aws-sdk-2.569.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.563.0"; + version = "2.569.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.563.0.tgz"; - sha512 = "ygpsr2jL36Y7gctR1jr6gmHuyk4So3I52H2iOAIIO2bNRKbwse6sBy7vI89JhF5W5NtV3drM7lGcao0DCZ9uEQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.569.0.tgz"; + sha512 = "9i4n/8kR1cq+Ge1n9FzqEBE1kpF8uLEI24wssy0dQD1fks+eNoZ6b3bGMCR1OfYB0KVgIN7ZkUrng1Zu9M4fcA=="; }; }; "aws-sign2-0.6.0" = { @@ -6034,15 +6241,6 @@ let sha1 = "2d8e3e5d0bdbd7327f91bc814f5c57660f81824d"; }; }; - "axios-0.18.1" = { - name = "axios"; - packageName = "axios"; - version = "0.18.1"; - src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.18.1.tgz"; - sha512 = "0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g=="; - }; - }; "babel-code-frame-6.26.0" = { name = "babel-code-frame"; packageName = "babel-code-frame"; @@ -6925,13 +7123,13 @@ let sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4"; }; }; - "big-integer-1.6.47" = { + "big-integer-1.6.48" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.47"; + version = "1.6.48"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.47.tgz"; - sha512 = "9t9f7X3as2XGX8b52GqG6ox0GvIdM86LyIXASJnDCFhYNgt+A+MByQZ3W2PyMRZjEvG5f8TEbSPfEotVuMJnQg=="; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.48.tgz"; + sha512 = "j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w=="; }; }; "big.js-5.2.2" = { @@ -7798,13 +7996,13 @@ let sha512 = "HniEmRONcLP8qKJEw/DXZGwyHfRedYX1HGqhNZ5N2zhn+xIrAjhptkAbXRBGV0GhPb+YTbzObGn3GlAHaBiVnQ=="; }; }; - "buffer-4.9.1" = { + "buffer-4.9.2" = { name = "buffer"; packageName = "buffer"; - version = "4.9.1"; + version = "4.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"; - sha1 = "6d1bb601b07a4efced97094132093027c95bc298"; + url = "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz"; + sha512 = "xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg=="; }; }; "buffer-5.4.3" = { @@ -8419,13 +8617,13 @@ let sha1 = "a2aa5fb1af688758259c32c141426d78923b9b77"; }; }; - "camelcase-keys-6.1.0" = { + "camelcase-keys-6.1.1" = { name = "camelcase-keys"; packageName = "camelcase-keys"; - version = "6.1.0"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.1.0.tgz"; - sha512 = "43tBGDIs3SBDA5R5mYzkiBP3lt2IKhLDp1wVGS9XTq6SR3+7ZNdi/VwBJsk4NKgySoaziTrKM+N8hhT04NBVUA=="; + url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.1.1.tgz"; + sha512 = "kEPCddRFChEzO0d6w61yh0WbBiSv9gBnfZWGfXRYPlGqIdIGef6HMR6pgqVSEWCYkrp8B0AtEpEXNY+Jx0xk1A=="; }; }; "caniuse-api-3.0.0" = { @@ -9067,6 +9265,15 @@ let sha512 = "UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A=="; }; }; + "citeproc-2.2.27" = { + name = "citeproc"; + packageName = "citeproc"; + version = "2.2.27"; + src = fetchurl { + url = "https://registry.npmjs.org/citeproc/-/citeproc-2.2.27.tgz"; + sha512 = "AQIxcXD6ZZch5V9BPaMpwRTjiRgyOvw80OS9bLWEIHwm7E9b5CXoLj9s7LS+cjkD1iuWGYf1qRK1pd40ymzNmQ=="; + }; + }; "class-utils-0.3.6" = { name = "class-utils"; packageName = "class-utils"; @@ -10048,13 +10255,13 @@ let sha512 = "Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow=="; }; }; - "commander-4.0.0" = { + "commander-4.0.1" = { name = "commander"; packageName = "commander"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-4.0.0.tgz"; - sha512 = "SEa2abMBTZuEjLVYpNrAFoRgxPwG4rXP3+SGY6CM/HZGeDzIA7Pzp+7H3AHDukKEpyy2SoSGGPShKqqfH9T9AQ=="; + url = "https://registry.npmjs.org/commander/-/commander-4.0.1.tgz"; + sha512 = "IPF4ouhCP+qdlcmCedhxX4xiGBPyigb8v5NeUp+0LyhwLgxMqyp3S0vl7TAPfS/hiP7FC3caI/PB9lTmP8r1NA=="; }; }; "commist-1.1.0" = { @@ -10264,13 +10471,13 @@ let sha512 = "bzlVWS2THbMetHqXKB8ypsXN4DQ/1qopGwNJi1eYbpwesJcd86FBjFciCQX/YwAhp9bM7NVnPFqZ5LpV7gP0Dg=="; }; }; - "conf-2.2.0" = { + "conf-6.2.0" = { name = "conf"; packageName = "conf"; - version = "2.2.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/conf/-/conf-2.2.0.tgz"; - sha512 = "93Kz74FOMo6aWRVpAZsonOdl2I57jKtHrNmxhumehFQw4X8Sk37SohNY11PG7Q8Okta+UnrVaI006WLeyp8/XA=="; + url = "https://registry.npmjs.org/conf/-/conf-6.2.0.tgz"; + sha512 = "fvl40R6YemHrFsNiyP7TD0tzOe3pQD2dfT2s20WvCaq57A1oV+RImbhn2Y4sQGDz1lB0wNSb7dPcPIvQB69YNA=="; }; }; "config-1.31.0" = { @@ -10561,13 +10768,13 @@ let sha1 = "3243397ae93a71d655b3026834a51590b958b9e8"; }; }; - "conventional-changelog-angular-5.0.5" = { + "conventional-changelog-angular-5.0.6" = { name = "conventional-changelog-angular"; packageName = "conventional-changelog-angular"; - version = "5.0.5"; + version = "5.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.5.tgz"; - sha512 = "RrkdWnL/TVyWV1ayWmSsrWorsTDqjL/VwG5ZSEneBQrd65ONcfeA1cW7FLtNweQyMiKOyriCMTKRSlk18DjTrw=="; + url = "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-5.0.6.tgz"; + sha512 = "QDEmLa+7qdhVIv8sFZfVxU1VSyVvnXPsxq8Vam49mKUcO1Z8VTLEJk9uI21uiJUsnmm0I4Hrsdc9TgkOQo9WSA=="; }; }; "conventional-changelog-core-3.2.3" = { @@ -10606,13 +10813,13 @@ let sha512 = "WpGKsMeXfs21m1zIw4s9H5sys2+9JccTzpN6toXtxhpw2VNF2JUXwIakthKBy+LN4DvJm+TzWhxOMWOs1OFCFQ=="; }; }; - "conventional-commits-parser-3.0.6" = { + "conventional-commits-parser-3.0.7" = { name = "conventional-commits-parser"; packageName = "conventional-commits-parser"; - version = "3.0.6"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.0.6.tgz"; - sha512 = "9FDoCTnNQRhiDRhlRx6UEaxpcKPy6hiHYWZqJO80BAmFlbovAnMcCkdcxGyJGTe8sDidVHEiqPkLoJuG/aUs0A=="; + url = "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-3.0.7.tgz"; + sha512 = "4mx/FRC92z0yIiXGyRVYQFhn0jWDwvxnj2UuLaUi3hJSG4Thall6GXA8YOPHQK2qvotciJandJIVmuSvLgDLbQ=="; }; }; "conventional-recommended-bump-5.0.1" = { @@ -10633,13 +10840,13 @@ let sha1 = "4829c877e9fe49b3161f3bf3673888e204699860"; }; }; - "convert-source-map-1.6.0" = { + "convert-source-map-1.7.0" = { name = "convert-source-map"; packageName = "convert-source-map"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz"; - sha512 = "eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A=="; + url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz"; + sha512 = "4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA=="; }; }; "convert-to-ecmascript-compatible-varname-0.1.5" = { @@ -10822,13 +11029,13 @@ let sha512 = "hTNYHUJT5YyMa1cQQE1naGyU6Eh5D5Jl33sMnCh3+q15ZwWTL/TOy3k8+mUvjTp8bwhO5eECGKULYoVO+fp9ZA=="; }; }; - "cordova-common-3.2.0" = { + "cordova-common-3.2.1" = { name = "cordova-common"; packageName = "cordova-common"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/cordova-common/-/cordova-common-3.2.0.tgz"; - sha512 = "EvlQ6PirfR65hGDoQvsluW00uSS2MTVIRKQ3c1Xvsddx7D5T5JgF3fHWkGik/Y/8yNcpI0zI2NcJyie2z/ak2A=="; + url = "https://registry.npmjs.org/cordova-common/-/cordova-common-3.2.1.tgz"; + sha512 = "xg0EnjnA6EipxXG8cupdlYQYeDA6+ghbN+Pjq88xN1LInwP6Bo7IyGBdSV5QnfjOvzShF9BBwSxBAv0FOO0C2Q=="; }; }; "cordova-create-2.0.0" = { @@ -10876,22 +11083,22 @@ let sha512 = "I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA=="; }; }; - "core-js-3.3.6" = { + "core-js-3.4.1" = { name = "core-js"; packageName = "core-js"; - version = "3.3.6"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.3.6.tgz"; - sha512 = "u4oM8SHwmDuh5mWZdDg9UwNVq5s1uqq6ZDLLIs07VY+VJU91i3h4f3K/pgFvtUQPGdeStrZ+odKyfyt4EnKHfA=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.4.1.tgz"; + sha512 = "KX/dnuY/J8FtEwbnrzmAjUYgLqtk+cxM86hfG60LGiW3MmltIc2yAmDgBgEkfm0blZhUrdr1Zd84J2Y14mLxzg=="; }; }; - "core-js-compat-3.3.6" = { + "core-js-compat-3.4.1" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.3.6"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.3.6.tgz"; - sha512 = "YnwZG/+0/f7Pf6Lr3jxtVAFjtGBW9lsLYcqrxhYJai1GfvrP8DEyEpnNzj/FRQfIkOOfk1j5tTBvPBLWVVJm4A=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.4.1.tgz"; + sha512 = "YdeJI26gLc0CQJ9asLE5obEgBz2I0+CIgnoTbS2T0d5IPQw/OCgCIFR527RmpduxjrB3gSEHoGOCTq9sigOyfw=="; }; }; "core-util-is-1.0.2" = { @@ -11299,13 +11506,13 @@ let sha1 = "2b3a110539c5355f1cd8d314623e870b121ec858"; }; }; - "css-select-2.0.2" = { + "css-select-2.1.0" = { name = "css-select"; packageName = "css-select"; - version = "2.0.2"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/css-select/-/css-select-2.0.2.tgz"; - sha512 = "dSpYaDVoWaELjvZ3mS6IKZM/y2PMPa/XYoEfYNZePL4U/XgyxZNroHEHReDx/d+VgXh9VbCTtFqLkFbmeqeaRQ=="; + url = "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz"; + sha512 = "Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ=="; }; }; "css-select-base-adapter-0.1.1" = { @@ -11353,6 +11560,15 @@ let sha512 = "a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg=="; }; }; + "css-what-3.2.1" = { + name = "css-what"; + packageName = "css-what"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/css-what/-/css-what-3.2.1.tgz"; + sha512 = "WwOrosiQTvyms+Ti5ZC5vGEK0Vod3FTt1ca+payZqvKuGJF+dq7bG63DstxtN0dpm6FxY27a/zS3Wten+gEtGw=="; + }; + }; "cssauron-1.4.0" = { name = "cssauron"; packageName = "cssauron"; @@ -11929,6 +12145,15 @@ let sha512 = "mYtLl1xfZLi1m4RtQYlZgJUNQjl4ZxVnHzIR8nLLgi4q1YT8o/WM+MK/f8yfcc9s5Ir5zRaPZyZU6xs1Syoocg=="; }; }; + "debounce-fn-3.0.1" = { + name = "debounce-fn"; + packageName = "debounce-fn"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/debounce-fn/-/debounce-fn-3.0.1.tgz"; + sha512 = "aBoJh5AhpqlRoHZjHmOzZlRx+wz2xVwGL9rjs+Kj0EWUrL4/h4K7OD176thl2Tdoqui/AaA4xhHrNArGLAaI3Q=="; + }; + }; "debounced-seeker-1.0.0" = { name = "debounced-seeker"; packageName = "debounced-seeker"; @@ -13162,13 +13387,13 @@ let sha512 = "l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA=="; }; }; - "dom-serializer-0.2.1" = { + "dom-serializer-0.2.2" = { name = "dom-serializer"; packageName = "dom-serializer"; - version = "0.2.1"; + version = "0.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.1.tgz"; - sha512 = "sK3ujri04WyjwQXVoK4PU3y8ula1stq10GJZpqHIUgoGZdsGzAGu65BnU3d08aTVSvO7mGPZUc0wTEDL+qGE0Q=="; + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz"; + sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g=="; }; }; "dom-walk-0.1.1" = { @@ -13306,6 +13531,15 @@ let sha512 = "tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ=="; }; }; + "dot-prop-5.2.0" = { + name = "dot-prop"; + packageName = "dot-prop"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-5.2.0.tgz"; + sha512 = "uEUyaDKoSQ1M4Oq8l45hSE26SnTxL6snNnqvK/VWx5wJhmff5z0FUVJDKDanor/6w3kzE3i7XZOk+7wC0EXr1A=="; + }; + }; "dotenv-4.0.0" = { name = "dotenv"; packageName = "dotenv"; @@ -13558,15 +13792,6 @@ let sha1 = "3a83a904e54353287874c564b7549386849a98c9"; }; }; - "ecc-jsbn-0.2.0" = { - name = "ecc-jsbn"; - packageName = "ecc-jsbn"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.2.0.tgz"; - sha1 = "7c98afab245f6df32290473c0abee2f2d39334c7"; - }; - }; "ecdsa-sig-formatter-1.0.11" = { name = "ecdsa-sig-formatter"; packageName = "ecdsa-sig-formatter"; @@ -13684,13 +13909,13 @@ let sha512 = "kS/gEPzZs3Y1rRsbGX4UOSjtP/CeJP0CxSNZHYxGfVM/VgLcv0ZqM7C45YyTj2DI2g7+P9Dd24C+IMIg6D0nYQ=="; }; }; - "electron-to-chromium-1.3.302" = { + "electron-to-chromium-1.3.306" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.302"; + version = "1.3.306"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.302.tgz"; - sha512 = "1qConyiVEbj4xZRBXqtGR003+9tV0rJF0PS6aeO0Ln/UL637js9hdwweCl07meh/kJoI2N4W8q3R3g3F5z46ww=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.306.tgz"; + sha512 = "frDqXvrIROoYvikSKTIKbHbzO6M3/qC6kCIt/1FOa9kALe++c4VAJnwjSFvf1tYLEUsP2n9XZ4XSCyqc3l7A/A=="; }; }; "elegant-spinner-1.0.1" = { @@ -14225,13 +14450,13 @@ let sha512 = "xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg=="; }; }; - "es-to-primitive-1.2.0" = { + "es-to-primitive-1.2.1" = { name = "es-to-primitive"; packageName = "es-to-primitive"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz"; - sha512 = "qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg=="; + url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"; + sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA=="; }; }; "es5-ext-0.10.52" = { @@ -15143,13 +15368,13 @@ let sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; }; }; - "execa-3.2.0" = { + "execa-3.3.0" = { name = "execa"; packageName = "execa"; - version = "3.2.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-3.2.0.tgz"; - sha512 = "kJJfVbI/lZE1PZYDI5VPxp8zXPO9rtxOkhpZ0jMKha56AI9y2gGVC6bkukStQf0ka5Rh15BA5m7cCCH4jmHqkw=="; + url = "https://registry.npmjs.org/execa/-/execa-3.3.0.tgz"; + sha512 = "j5Vit5WZR/cbHlqU97+qcnw9WHRCIL4V1SVe75VcHcD1JRBdt8fv0zw89b7CQHQdUHTt2VjuhcF5ibAgVOxqpg=="; }; }; "execall-1.0.0" = { @@ -15341,13 +15566,13 @@ let sha1 = "f5fc2f9fa9e9a8578634f10e86ba5a4346b96f4f"; }; }; - "ext-1.1.2" = { + "ext-1.2.0" = { name = "ext"; packageName = "ext"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/ext/-/ext-1.1.2.tgz"; - sha512 = "/KLjJdTNyDepCihrk4HQt57nAE1IRCEo5jUt+WgWGCr1oARhibDvmI2DMcSNWood1T9AUWwq+jaV1wvRqaXfnA=="; + url = "https://registry.npmjs.org/ext/-/ext-1.2.0.tgz"; + sha512 = "0ccUQK/9e3NreLFg6K6np8aPyRgwycx+oFGtfx1dSp7Wj00Ozw9r05FgBRlzjf2XBM7LAzwgLyDscRrtSU91hA=="; }; }; "ext-list-2.2.2" = { @@ -16358,13 +16583,13 @@ let sha512 = "ougBA2q6Rn9sZrjZQ9r5pTFxCotlGouySpD2yRIuq5AYwwfIT8HHhVMeSwrN5qJayjHINLJyrnsSkkPCZyfMrQ=="; }; }; - "flow-parser-0.111.1" = { + "flow-parser-0.111.3" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.111.1"; + version = "0.111.3"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.111.1.tgz"; - sha512 = "yo+C0a/fMsGwooxA2xd4kK/kuzSnFC8JZLsIB68mkTllLrF/nSQ8llwD82o8Vxwvisw9IPC/ZC8zqrWmkir9jQ=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.111.3.tgz"; + sha512 = "iEjGZ94OBMcESxnLorXNjJmtd/JtQYXUVrQpfwvtAKkuyawRmv+2LM6nqyOsOJkISEYbyY6ziudRE0u4VyPSVA=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -16484,15 +16709,6 @@ let sha1 = "5214d7537a4d06a4a301c0cc262feb84188002e7"; }; }; - "follow-redirects-1.5.10" = { - name = "follow-redirects"; - packageName = "follow-redirects"; - version = "1.5.10"; - src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz"; - sha512 = "0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ=="; - }; - }; "follow-redirects-1.9.0" = { name = "follow-redirects"; packageName = "follow-redirects"; @@ -16826,15 +17042,6 @@ let sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="; }; }; - "fs-copy-file-sync-1.1.1" = { - name = "fs-copy-file-sync"; - packageName = "fs-copy-file-sync"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-copy-file-sync/-/fs-copy-file-sync-1.1.1.tgz"; - sha512 = "2QY5eeqVv4m2PfyMiEuy9adxNP+ajf+8AR05cEi+OAzPcOj90hvFImeZhTmKLBgSd9EvG33jsD7ZRxsx9dThkQ=="; - }; - }; "fs-exists-sync-0.1.0" = { name = "fs-exists-sync"; packageName = "fs-exists-sync"; @@ -17006,13 +17213,13 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; - "fs2-0.3.6" = { + "fs2-0.3.7" = { name = "fs2"; packageName = "fs2"; - version = "0.3.6"; + version = "0.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/fs2/-/fs2-0.3.6.tgz"; - sha512 = "Zs7c3SBPiiNEEg+w3PTIgxTbWA6ZWVJP+1DlwUCxNDtwQD2qM5pfdho7IaiR0ceu4UVvXRj9l6Ml+X6rs21ERw=="; + url = "https://registry.npmjs.org/fs2/-/fs2-0.3.7.tgz"; + sha512 = "fwfd9MBI/fnXtR/ClVTyeuPXJ+oI5WNyXvBQPmc4btgqLYTKOuBRTRUVjmVpDUri0C88HLwMlc5ESg48fEAGjw=="; }; }; "fsevents-1.2.9" = { @@ -17033,13 +17240,13 @@ let sha512 = "a7YT0SV3RB+DjYcppwVDLtn13UQnmg0SWZS7ezZD0UjnLwXmy8Zm21GMVGLaFGimIqcvyMQaOJBrop8MyOp1kQ=="; }; }; - "fsevents-2.1.1" = { + "fsevents-2.1.2" = { name = "fsevents"; packageName = "fsevents"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.1.tgz"; - sha512 = "4FRPXWETxtigtJW/gxzEDsX1LVbPAM93VleB83kZB+ellqbHMkyt2aJfuzNLRvFPnGi6bcE5SvfxgbXPeKteJw=="; + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz"; + sha512 = "R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA=="; }; }; "fstream-0.1.31" = { @@ -17672,13 +17879,13 @@ let sha512 = "hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A=="; }; }; - "glob-7.1.5" = { + "glob-7.1.6" = { name = "glob"; packageName = "glob"; - version = "7.1.5"; + version = "7.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.5.tgz"; - sha512 = "J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ=="; + url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; + sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; }; }; "glob-base-0.3.0" = { @@ -17780,13 +17987,13 @@ let sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f"; }; }; - "global-agent-2.1.5" = { + "global-agent-2.1.6" = { name = "global-agent"; packageName = "global-agent"; - version = "2.1.5"; + version = "2.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/global-agent/-/global-agent-2.1.5.tgz"; - sha512 = "pYJjCxxNBzYxo6iNO62JZn8iCFVbvpiM0zE4w/G5hBNIvLjnvzIeCVQPMKc3aK8ju5L7Q8NNI/oBSosU0eeSYw=="; + url = "https://registry.npmjs.org/global-agent/-/global-agent-2.1.6.tgz"; + sha512 = "fL+xfraAlc1MXU8Gs0DAg/eHH+H1CjxbK+BLU3Qt55dAVMAQ8fH8k/UrLwV4A+Vk/hl/TePWuTxFnqJzCV1/Kw=="; }; }; "global-dirs-0.1.1" = { @@ -18888,13 +19095,13 @@ let sha512 = "C62CVn7jbjp89yOhhy7vrkSaB7Vk906Gtcw/Ihd+Iufnq+2pwOZjdPmpzpKLWJXPJBMDX3wXg4FqmdOayPcewA=="; }; }; - "hast-util-parse-selector-2.2.2" = { + "hast-util-parse-selector-2.2.3" = { name = "hast-util-parse-selector"; packageName = "hast-util-parse-selector"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.2.tgz"; - sha512 = "jIMtnzrLTjzqgVEQqPEmwEZV+ea4zHRFTP8Z2Utw0I5HuBOXHzUPPQWr6ouJdJqDKLbFU/OEiYwZ79LalZkmmw=="; + url = "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.3.tgz"; + sha512 = "nxbeqjQNxsvo/uYYAw9kij6td05YVUlf1qti09rVfbWSLT5H6wo3c+USIwX6nzXWk5kFZzXnEqO82856r0aM2Q=="; }; }; "hast-util-to-string-1.0.2" = { @@ -19212,13 +19419,13 @@ let sha1 = "3a03edc2214bca3b66424a3e7959349509cb0351"; }; }; - "htmlnano-0.2.4" = { + "htmlnano-0.2.5" = { name = "htmlnano"; packageName = "htmlnano"; - version = "0.2.4"; + version = "0.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/htmlnano/-/htmlnano-0.2.4.tgz"; - sha512 = "wsg7+Hjyi1gHpMUixkeOjeRUNhBBTnEDB//kzvVHR+LUK4p+/31DAyE+pEACT0SQk3W0KE7Xdylk9+uNxdHXLg=="; + url = "https://registry.npmjs.org/htmlnano/-/htmlnano-0.2.5.tgz"; + sha512 = "X1iPSwXG/iF9bVs+/obt2n6F64uH0ETkA8zp7qFDmLW9/+A6ueHGeb/+qD67T21qUY22owZPMdawljN50ajkqA=="; }; }; "htmlparser2-3.10.1" = { @@ -19266,6 +19473,15 @@ let sha1 = "945cfadd66521eaf8f7c84913d377d7b15f24e31"; }; }; + "http-basic-6.0.0" = { + name = "http-basic"; + packageName = "http-basic"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-basic/-/http-basic-6.0.0.tgz"; + sha512 = "7ScbVjuiReYe8S+OZOpNjoKGXrbhJHIrQQe7eq1TpLTJkxH8MPKvnTUzq/TNLjww1hdFQy8yUIC42wuLhCjYcQ=="; + }; + }; "http-cache-semantics-3.8.1" = { name = "http-cache-semantics"; packageName = "http-cache-semantics"; @@ -19393,6 +19609,15 @@ let sha512 = "qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg=="; }; }; + "http-response-object-3.0.2" = { + name = "http-response-object"; + packageName = "http-response-object"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/http-response-object/-/http-response-object-3.0.2.tgz"; + sha512 = "bqX0XTF6fnXSQcEJ2Iuyr75yVakyjIDCqroJQ/aHfSdlM743Cwqoi2nDYMzLGWUcuTWGWy8AAvOKXTfiv6q9RA=="; + }; + }; "http-signature-0.11.0" = { name = "http-signature"; packageName = "http-signature"; @@ -19420,6 +19645,15 @@ let sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; }; }; + "http-signature-1.3.1" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.3.1.tgz"; + sha512 = "Y29YKEc8MQsjch/VzkUVJ+2MXd9WcR42fK5u36CZf4G8bXw2DXMTWuESiB0R6m59JAWxlPPw5/Fri/t/AyyueA=="; + }; + }; "http_ece-1.1.0" = { name = "http_ece"; packageName = "http_ece"; @@ -21121,6 +21355,15 @@ let sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; }; }; + "is-obj-2.0.0" = { + name = "is-obj"; + packageName = "is-obj"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz"; + sha512 = "drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="; + }; + }; "is-object-1.0.1" = { name = "is-object"; packageName = "is-object"; @@ -21850,13 +22093,13 @@ let sha1 = "06d4912255093419477d425633606e0e90782967"; }; }; - "joplin-turndown-4.0.18" = { + "joplin-turndown-4.0.19" = { name = "joplin-turndown"; packageName = "joplin-turndown"; - version = "4.0.18"; + version = "4.0.19"; src = fetchurl { - url = "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.18.tgz"; - sha512 = "YD0pkj2a7+XjjNNI1X9ZIwYthFwNsswvO4gl5aAoWdwJj5m8tunnoSyVenvqleXzAcaURIi/q9EOAQ1jw7xDiQ=="; + url = "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.19.tgz"; + sha512 = "B9XeR7bjsPWhwevnCk+EN8VQmaesDqGP3sjkk+ROMuNoQAj0p0RMkZB3actv6Ej6Q9EnRJm3JokfM3Ua4TVYvA=="; }; }; "joplin-turndown-plugin-gfm-1.0.11" = { @@ -22102,13 +22345,13 @@ let sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="; }; }; - "jshint-2.10.2" = { + "jshint-2.10.3" = { name = "jshint"; packageName = "jshint"; - version = "2.10.2"; + version = "2.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.10.2.tgz"; - sha512 = "e7KZgCSXMJxznE/4WULzybCMNXNAd/bf5TSrvVEq78Q/K8ZwFpmBqQeDtNiHc3l49nV4E/+YeHU/JZjSUIrLAA=="; + url = "https://registry.npmjs.org/jshint/-/jshint-2.10.3.tgz"; + sha512 = "d8AoXcNNYzmm7cdmulQ3dQApbrPYArtVBO6n4xOICe4QsXGNHCAKDcFORzqP52LhK61KX0VhY39yYzCsNq+bxQ=="; }; }; "json-buffer-2.0.11" = { @@ -22255,6 +22498,15 @@ let sha512 = "xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="; }; }; + "json-schema-typed-7.0.2" = { + name = "json-schema-typed"; + packageName = "json-schema-typed"; + version = "7.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-7.0.2.tgz"; + sha512 = "40FRIcBSz4y0Ego3gMpbkhtIgebpxKRgW/7i1FfDNL4/xEPQKBM12tKSiCZFNQvad5K4IS3I5Sc8cxza/KSwog=="; + }; + }; "json-stable-stringify-0.0.1" = { name = "json-stable-stringify"; packageName = "json-stable-stringify"; @@ -22841,13 +23093,13 @@ let sha512 = "eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="; }; }; - "knockout-3.5.0" = { + "knockout-3.5.1" = { name = "knockout"; packageName = "knockout"; - version = "3.5.0"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/knockout/-/knockout-3.5.0.tgz"; - sha512 = "vBUF/IsBDzaejHkNpiquKdc5uPrImXuQ4Mb9lEfNNJ5cyHGI8ThDupR+h3eMFZhfmPE/brfwcIAn/fm0yOvJUg=="; + url = "https://registry.npmjs.org/knockout/-/knockout-3.5.1.tgz"; + sha512 = "wRJ9I4az0QcsH7A4v4l0enUpkS++MBx0BnL/68KaLzJg7x1qmbjSlwEoCNol7KTYZ+pmtI7Eh2J0Nu6/2Z5J/Q=="; }; }; "kuler-1.0.1" = { @@ -24668,13 +24920,13 @@ let sha512 = "+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ=="; }; }; - "loglevel-1.6.4" = { + "loglevel-1.6.6" = { name = "loglevel"; packageName = "loglevel"; - version = "1.6.4"; + version = "1.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.4.tgz"; - sha512 = "p0b6mOGKcGa+7nnmKbpzR6qloPbrgLcnio++E+14Vo/XffOGwZtRpUhr8dTH/x2oCMmEoIU0Zwm3ZauhvYD17g=="; + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.6.tgz"; + sha512 = "Sgr5lbboAUBo3eXCSPL4/KoVz3ROKquOjcctxmHIt+vol2DrqTQe3SwkKKuYhEiWB5kYa13YyopJ69deJ1irzQ=="; }; }; "loglevel-colored-level-prefix-1.0.0" = { @@ -25127,6 +25379,15 @@ let sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA=="; }; }; + "make-dir-3.0.0" = { + name = "make-dir"; + packageName = "make-dir"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/make-dir/-/make-dir-3.0.0.tgz"; + sha512 = "grNJDhb8b1Jm1qeqW5R/O63wUo4UXo2v2HMic6YT9i/HBlF93S8jkMgH7yugvY9ABDShH4VZMn8I+U8+fCNegw=="; + }; + }; "make-error-1.3.5" = { name = "make-error"; packageName = "make-error"; @@ -27063,13 +27324,13 @@ let sha512 = "Hv9USGyH8EsPy0o8pPWE7x3YRIfuZDgMBirzjU6XLebhiSK2g53JlfqgolD0c39ne6wXAfaBNcIAvYe22Bav+Q=="; }; }; - "nanoguard-1.2.1" = { + "nanoguard-1.2.2" = { name = "nanoguard"; packageName = "nanoguard"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/nanoguard/-/nanoguard-1.2.1.tgz"; - sha512 = "XowCxURA68arCQEypYKAxyIvBUP2EkqA8mZCXqJ2yzLpFblxSjiP06PUUpVK2no3cgGhsbRlBrsEuYIflxu79w=="; + url = "https://registry.npmjs.org/nanoguard/-/nanoguard-1.2.2.tgz"; + sha512 = "IMVIZkHP7Ep01foXurcJR59Hj/0yyApNK3JWpVHq2QVdLgo8wGU/ZsodlpL7jJ/m24+lxT0eyavrLCEuYQK2fg=="; }; }; "nanoid-2.1.6" = { @@ -28247,13 +28508,13 @@ let sha1 = "df7c3ed5a277c3f9d4b5d819b05311d10a200ae6"; }; }; - "npm-6.9.2" = { + "npm-6.12.1" = { name = "npm"; packageName = "npm"; - version = "6.9.2"; + version = "6.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.9.2.tgz"; - sha512 = "b0sEGRYrVdcV/DedLrqV4VMpdMHJbvpt9bopivh4K9RisHFMbj+G6RNbB6lRdr9rpYIoqHG9YP9CYmxdI9k81g=="; + url = "https://registry.npmjs.org/npm/-/npm-6.12.1.tgz"; + sha512 = "+pMvUpgSXVBythrv//64j4i6DaLLJ1O0y8kwjNgjAE7atBNGzX4rcOEWvmsuiei6J+mA38O0nUZ/P35GuCD/jg=="; }; }; "npm-bundled-1.0.6" = { @@ -28508,6 +28769,15 @@ let sha512 = "WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg=="; }; }; + "null-loader-0.1.1" = { + name = "null-loader"; + packageName = "null-loader"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/null-loader/-/null-loader-0.1.1.tgz"; + sha1 = "17be9abfcd3ff0e1512f6fc4afcb1f5039378fae"; + }; + }; "num-sort-1.0.0" = { name = "num-sort"; packageName = "num-sort"; @@ -28698,6 +28968,15 @@ let sha512 = "GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ=="; }; }; + "object-inspect-1.7.0" = { + name = "object-inspect"; + packageName = "object-inspect"; + version = "1.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz"; + sha512 = "a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="; + }; + }; "object-is-1.0.1" = { name = "object-is"; packageName = "object-is"; @@ -28860,15 +29139,6 @@ let sha1 = "cb236106341536f0dac4815e06708221cad7fb5e"; }; }; - "octicons-3.5.0" = { - name = "octicons"; - packageName = "octicons"; - version = "3.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/octicons/-/octicons-3.5.0.tgz"; - sha1 = "f7ff5935674d8b114f6d80c454bfaa01797a4e30"; - }; - }; "octokit-pagination-methods-1.1.0" = { name = "octokit-pagination-methods"; packageName = "octokit-pagination-methods"; @@ -29202,13 +29472,13 @@ let sha1 = "9715a8b5f5e7586cff06c8249e039cd7364d3f54"; }; }; - "optionator-0.8.2" = { + "optionator-0.8.3" = { name = "optionator"; packageName = "optionator"; - version = "0.8.2"; + version = "0.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz"; - sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; + url = "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz"; + sha512 = "+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA=="; }; }; "options-0.0.6" = { @@ -29598,13 +29868,13 @@ let sha512 = "3cRXXn3/O0o3+eVmUroJPSj/esxoEFIm0ZOno/T+NzG/VZgPOqQ8WKmlNqubSEpZmCIngEy34unkHGg83ZIBmg=="; }; }; - "p-queue-6.2.0" = { + "p-queue-6.2.1" = { name = "p-queue"; packageName = "p-queue"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/p-queue/-/p-queue-6.2.0.tgz"; - sha512 = "B2LXNONcyn/G6uz2UBFsGjmSa0e/br3jznlzhEyCXg56c7VhEpiT2pZxGOfv32Q3FSyugAdys9KGpsv3kV+Sbg=="; + url = "https://registry.npmjs.org/p-queue/-/p-queue-6.2.1.tgz"; + sha512 = "wV8yC/rkuWpgu9LGKJIb48OynYSrE6lVl2Bx6r8WjbyVKrFAzzQ/QevAvwnDjlD+mLt8xy0LTDOU1freOvMTCg=="; }; }; "p-reduce-1.0.0" = { @@ -29832,15 +30102,6 @@ let sha512 = "b6t7ORo/MwT6xvRiuu1c1do3+CAUd7/0rgc1d3qNHUeP64zxy4ttLIvK7SEHzyfyDLvD9pPuV9mYKHf6MgUkmg=="; }; }; - "parent-dirs-1.0.0" = { - name = "parent-dirs"; - packageName = "parent-dirs"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parent-dirs/-/parent-dirs-1.0.0.tgz"; - sha1 = "b88851d1534013db421ce1695766906d0fbfb392"; - }; - }; "parent-module-1.0.1" = { name = "parent-module"; packageName = "parent-module"; @@ -29868,6 +30129,15 @@ let sha512 = "jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ=="; }; }; + "parse-cache-control-1.0.1" = { + name = "parse-cache-control"; + packageName = "parse-cache-control"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-cache-control/-/parse-cache-control-1.0.1.tgz"; + sha1 = "8eeab3e54fa56920fe16ba38f77fa21aacc2d74e"; + }; + }; "parse-english-4.1.2" = { name = "parse-english"; packageName = "parse-english"; @@ -30480,13 +30750,13 @@ let sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; }; }; - "path-to-regexp-1.7.0" = { + "path-to-regexp-1.8.0" = { name = "path-to-regexp"; packageName = "path-to-regexp"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz"; - sha1 = "59fde0f435badacba103a84e9d3bc64e96b9937d"; + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz"; + sha512 = "n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA=="; }; }; "path-to-regexp-2.2.1" = { @@ -30660,13 +30930,13 @@ let sha1 = "18de2f97e4bf7a9551ad7511942b5496f7aba660"; }; }; - "picomatch-2.1.0" = { + "picomatch-2.1.1" = { name = "picomatch"; packageName = "picomatch"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.1.0.tgz"; - sha512 = "uhnEDzAbrcJ8R3g2fANnSuXZMBtkpSjxTTgn2LeSiQlfmq72enQJWdQllXW24MBLYnA1SBD2vfvx2o0Zw3Ielw=="; + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.1.1.tgz"; + sha512 = "OYMyqkKzK7blWO/+XZYP6w8hH0LDvkBvdvKukti+7kqYFCiEAk+gI3DWnryapc0Dau05ugGTy0foQ6mqn4AHYA=="; }; }; "picture-tuber-1.0.2" = { @@ -30831,6 +31101,15 @@ let sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f"; }; }; + "pkg-up-3.1.0" = { + name = "pkg-up"; + packageName = "pkg-up"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz"; + sha512 = "nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA=="; + }; + }; "pkginfo-0.2.3" = { name = "pkginfo"; packageName = "pkginfo"; @@ -31399,13 +31678,22 @@ let sha512 = "C2hrAPzmRdpuL3iH0TDdQ6XCc9M7Dcc3zEW5BLerY65G4tWWszwv6nG/ksi6ul5i2mx22ubdljgktXCtNkydkw=="; }; }; - "posthtml-parser-0.4.1" = { + "posthtml-0.12.0" = { + name = "posthtml"; + packageName = "posthtml"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/posthtml/-/posthtml-0.12.0.tgz"; + sha512 = "aNUEP/SfKUXAt+ghG51LC5MmafChBZeslVe/SSdfKIgLGUVRE68mrMF4V8XbH07ZifM91tCSuxY3eHIFLlecQw=="; + }; + }; + "posthtml-parser-0.4.2" = { name = "posthtml-parser"; packageName = "posthtml-parser"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.4.1.tgz"; - sha512 = "h7vXIQ21Ikz2w5wPClPakNP6mJeJCK6BT0GpqnQrNNABdR7/TchNlFyryL1Bz6Ww53YWCKkr6tdZuHlxY1AVdQ=="; + url = "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.4.2.tgz"; + sha512 = "BUIorsYJTvS9UhXxPTzupIztOMVNPa/HtAm9KHni9z6qEfiJ1bpOBL5DfUOL9XAc3XkLIEzBzpph+Zbm4AdRAg=="; }; }; "posthtml-render-1.1.5" = { @@ -31480,13 +31768,13 @@ let sha512 = "4rgV2hyc/5Pk0XHH4VjJWHRgVjgRbpMfLQjREAhHBtyW1UvTFkjJEsueGYNYYZd9mn97K+1qv0EBwm11zoaSgA=="; }; }; - "prettier-1.18.2" = { + "prettier-1.19.1" = { name = "prettier"; packageName = "prettier"; - version = "1.18.2"; + version = "1.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.18.2.tgz"; - sha512 = "OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw=="; + url = "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz"; + sha512 = "s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew=="; }; }; "prettier-bytes-1.0.4" = { @@ -31750,6 +32038,15 @@ let sha512 = "nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg=="; }; }; + "promise-8.0.3" = { + name = "promise"; + packageName = "promise"; + version = "8.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/promise/-/promise-8.0.3.tgz"; + sha512 = "HeRDUL1RJiLhyA0/grn+PTShlBAcLuh/1BJGtrvjwbvRDCTLLMEz9rOGCV+R3vHY4MixIuoMEd9Yq/XvsTPcjw=="; + }; + }; "promise-inflight-1.0.1" = { name = "promise-inflight"; packageName = "promise-inflight"; @@ -31831,13 +32128,13 @@ let sha1 = "8e57123c396ab988897fb327fd3aedc3e735e4fe"; }; }; - "prompts-2.2.1" = { + "prompts-2.3.0" = { name = "prompts"; packageName = "prompts"; - version = "2.2.1"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/prompts/-/prompts-2.2.1.tgz"; - sha512 = "VObPvJiWPhpZI6C5m60XOzTfnYg/xc/an+r9VYymj9WJW3B/DIH+REzjpAACPf8brwPeP+7vz3bIim3S+AaMjw=="; + url = "https://registry.npmjs.org/prompts/-/prompts-2.3.0.tgz"; + sha512 = "NfbbPPg/74fT7wk2XYQ7hAIp9zJyZp5Fu19iRbORqqy1BhtrkZ0fPafBU+7bmn8ie69DpT0R6QpJIN2oisYjJg=="; }; }; "promzard-0.3.0" = { @@ -32776,6 +33073,15 @@ let sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; + "purgecss-1.4.1" = { + name = "purgecss"; + packageName = "purgecss"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/purgecss/-/purgecss-1.4.1.tgz"; + sha512 = "5jONV/D/3nfa+lC425+LA+OWe5/LDn4a79cac+TnzJq3VczwnWlpIDdW275hHsGhkzIlqATQsYFLW7or0cSwNQ=="; + }; + }; "push-stream-10.1.2" = { name = "push-stream"; packageName = "push-stream"; @@ -32938,13 +33244,13 @@ let sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; - "qs-6.9.0" = { + "qs-6.9.1" = { name = "qs"; packageName = "qs"; - version = "6.9.0"; + version = "6.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.9.0.tgz"; - sha512 = "27RP4UotQORTpmNQDX8BHPukOnBP3p1uUJY5UnDhaJB+rMt9iMsok724XL+UHU23bEFOHRMQ2ZhI99qOWUMGFA=="; + url = "https://registry.npmjs.org/qs/-/qs-6.9.1.tgz"; + sha512 = "Cxm7/SS/y/Z3MHWSxXb8lIFqgqBowP5JMlTUFyJN88y0SGQhVmZnqFK/PeuMX9LzUyWsqqhNxIyg0jlzq946yA=="; }; }; "query-string-1.0.1" = { @@ -33388,13 +33694,13 @@ let sha512 = "CEjy9LCzhmD7nUpJ1oVOE6s/hBkejlcJEgLQHVnQznOSilOPb+kpKktlLfFDK3/WP43+F80xkUTM2VOkYoSYvQ=="; }; }; - "read-cmd-shim-1.0.4" = { + "read-cmd-shim-1.0.5" = { name = "read-cmd-shim"; packageName = "read-cmd-shim"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.4.tgz"; - sha512 = "Pqpl3qJ/QdOIjRYA0q5DND/gLvGOfpIz/fYVDGYpOXfW/lFrIttmLsBnd6IkyK10+JHU9zhsaudfvrQTBB9YFQ=="; + url = "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.5.tgz"; + sha512 = "v5yCqQ/7okKoZZkBQUAfTsQ3sVJtXdNfbPnI5cceppoxEVLYA3k+VtV2omkeo8MS94JCy4fSiUwlRBAwCVRPUA=="; }; }; "read-metadata-1.0.0" = { @@ -34612,13 +34918,13 @@ let sha512 = "M0b3YWQs7R3Z917WRQy1HHA7Ba7D8hvZg6UE5mLykJxQVE2ju0IXbGlaHPPlkY+WN7wFP+wUMXmBFA0aV6vYGQ=="; }; }; - "retext-english-3.0.3" = { + "retext-english-3.0.4" = { name = "retext-english"; packageName = "retext-english"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/retext-english/-/retext-english-3.0.3.tgz"; - sha512 = "qltUsSjHMvCvpAm90qRvzK1DEBOnhSK3tUQk5aHFCBtiMHccp6FhlCH0mQ9vFcBf5BsG7GEBdPysTlY3g9Lchg=="; + url = "https://registry.npmjs.org/retext-english/-/retext-english-3.0.4.tgz"; + sha512 = "yr1PgaBDde+25aJXrnt3p1jvT8FVLVat2Bx8XeAWX13KXo8OT+3nWGU3HWxM4YFJvmfqvJYJZG2d7xxaO774gw=="; }; }; "retext-equality-3.2.0" = { @@ -34846,13 +35152,13 @@ let sha1 = "df43e80d9bc82ad4430bcfef03f49c717e8b2e8c"; }; }; - "roarr-2.14.3" = { + "roarr-2.14.4" = { name = "roarr"; packageName = "roarr"; - version = "2.14.3"; + version = "2.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/roarr/-/roarr-2.14.3.tgz"; - sha512 = "D4BpKVruUDCJ9DJWcC7T+fx4o10IUYJ7MdmjM4Skx1aqc42CE7LGzPDUAfczibhavNGcnY1IHqJdq16NmiG4rQ=="; + url = "https://registry.npmjs.org/roarr/-/roarr-2.14.4.tgz"; + sha512 = "QMzRAQGZFPgnx4nNWp4Q+WHfiZh2HTSEjNaxFLrEIj3PmcQ1GHL5OjaaIyF9ybUDD2aZ9t3Awc/obrRPils9ng=="; }; }; "rollup-0.67.0" = { @@ -35260,15 +35566,6 @@ let sha1 = "74b6d33c9ae1e001510f179a91168588f1aedaa9"; }; }; - "sax-1.2.1" = { - name = "sax"; - packageName = "sax"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz"; - sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a"; - }; - }; "sax-1.2.4" = { name = "sax"; packageName = "sax"; @@ -35872,13 +36169,13 @@ let sha1 = "415f42702d73d810330292cc5ee86eae1a11a170"; }; }; - "sharp-0.22.1" = { + "sharp-0.23.2" = { name = "sharp"; packageName = "sharp"; - version = "0.22.1"; + version = "0.23.2"; src = fetchurl { - url = "https://registry.npmjs.org/sharp/-/sharp-0.22.1.tgz"; - sha512 = "lXzSk/FL5b/MpWrT1pQZneKe25stVjEbl6uhhJcTULm7PhmJgKKRbTDM/vtjyUuC/RLqL2PRyC4rpKwbv3soEw=="; + url = "https://registry.npmjs.org/sharp/-/sharp-0.23.2.tgz"; + sha512 = "BSo0tq6Jtzwa6GDKvVMNNPCP/HLczrFLGVcorYv7OtxlKx4UPHy7x9DdfT8F+PK7FCFDemVRwtsjWpvaJI9v6w=="; }; }; "shasum-1.0.2" = { @@ -36124,13 +36421,13 @@ let sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3"; }; }; - "simple-peer-9.6.0" = { + "simple-peer-9.6.1" = { name = "simple-peer"; packageName = "simple-peer"; - version = "9.6.0"; + version = "9.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.6.0.tgz"; - sha512 = "NYqSKPu75xhkZYKGJhCbLCG5kfBtDHf8U9ddk4EKFfYNU7XgIisov+V8wMbVVgyMCfn8pm8uOqQQmE50FPDFWA=="; + url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.6.1.tgz"; + sha512 = "/8IOtaXnnVhCkgHFBQKZ+hfx/s0+Ybo0Ijon7OrKUuEf8dEcRZJrrfjkNNgzogLM/mixI2EvnTSpOiKR6cts+w=="; }; }; "simple-sha1-2.1.2" = { @@ -36169,13 +36466,13 @@ let sha1 = "5d3d5751bb39aeba2f710d8eec78768df821f38d"; }; }; - "simple-websocket-8.0.1" = { + "simple-websocket-8.1.0" = { name = "simple-websocket"; packageName = "simple-websocket"; - version = "8.0.1"; + version = "8.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-8.0.1.tgz"; - sha512 = "2QKSRjf+tqFXLVmOQjf95gHeKhuyx2k1ouDjtnE0uKCYw84HfN85HsXo+GmPH+2PIh5BQql++g2AIbHgGAZU4w=="; + url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-8.1.0.tgz"; + sha512 = "24cIbqvC+E2VTgfDqRCWMTthAeZwzwvl5VoehQku6DJE8sYb/s7V/GXr0JplR92mhwsMxAeXnj0UBnyVfLfGhg=="; }; }; "single-line-log-0.4.1" = { @@ -36205,13 +36502,13 @@ let sha512 = "dKKwjIoTOa587TARYLlBRXq2lkbu5Iz35XrEVWpelhBP1m8r2BGOy1QlaZe84GTFHG/BTucEUd2btnNc8QzIVA=="; }; }; - "sisteransi-1.0.3" = { + "sisteransi-1.0.4" = { name = "sisteransi"; packageName = "sisteransi"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.3.tgz"; - sha512 = "SbEG75TzH8G7eVXFSN5f9EExILKfly7SUvVY5DhhYLvfhKqhDFY0OzevWa/zwak0RLRfWS5AvfMWpd9gJvr5Yg=="; + url = "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.4.tgz"; + sha512 = "/ekMoM4NJ59ivGSfKapeG+FWtrmWvA1p6FBZwXrqojw90vJu8lBmrTxCMuBCydKtkaUe2zt4PlxeTKpjwMbyig=="; }; }; "skin-tone-1.0.0" = { @@ -36322,13 +36619,13 @@ let sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; }; }; - "smart-buffer-4.0.2" = { + "smart-buffer-4.1.0" = { name = "smart-buffer"; packageName = "smart-buffer"; - version = "4.0.2"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.0.2.tgz"; - sha512 = "JDhEpTKzXusOqXZ0BUIdH+CjFdO/CR3tLlf5CN34IypI+xMmXW1uB16OOY8z3cICbJlDAVJzNbwBhNO0wt9OAw=="; + url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz"; + sha512 = "iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw=="; }; }; "smartdc-auth-2.3.1" = { @@ -36520,13 +36817,13 @@ let sha512 = "1CYMPChJ9D9LBy3NLqHyv8TY7pR/LMISSr08LhfFw/FpfRZ+gTH8W6bbxCmybAYrOFNCqZkRprqOYDqZQFHipA=="; }; }; - "snyk-php-plugin-1.6.4" = { + "snyk-php-plugin-1.7.0" = { name = "snyk-php-plugin"; packageName = "snyk-php-plugin"; - version = "1.6.4"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.6.4.tgz"; - sha512 = "FFQeimtbwq17nDUS0o0zuKgyjXSX7SpoC9iYTeKvxTXrmKf2QlxTtPvmMM4/hQxehEu1i40ow1Ozw0Ahxm8Dpw=="; + url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.7.0.tgz"; + sha512 = "mDe90xkqSEVrpx1ZC7ItqCOc6fZCySbE+pHVI+dAPUmf1C1LSWZrZVmAVeo/Dw9sJzJfzmcdAFQl+jZP8/uV0A=="; }; }; "snyk-policy-1.13.5" = { @@ -36727,13 +37024,13 @@ let sha512 = "/G/VOI+3DBp0+DJKW4KesGnQkQPFmUCbA/oO2QGT6CWxU7hLGWqU3tyuzeSK/dqcyeHsQg1vTe9jiZI8GU9SCQ=="; }; }; - "socks-2.3.2" = { + "socks-2.3.3" = { name = "socks"; packageName = "socks"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-2.3.2.tgz"; - sha512 = "pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ=="; + url = "https://registry.npmjs.org/socks/-/socks-2.3.3.tgz"; + sha512 = "o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA=="; }; }; "socks-proxy-agent-4.0.2" = { @@ -38194,13 +38491,13 @@ let sha1 = "5ea211cd92d228e184294990a6cc97b366a77cb0"; }; }; - "string-kit-0.10.1" = { + "string-kit-0.10.3" = { name = "string-kit"; packageName = "string-kit"; - version = "0.10.1"; + version = "0.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/string-kit/-/string-kit-0.10.1.tgz"; - sha512 = "qxIqv5bJqYoWzJa0WJFdw9CCoPJ3/9EixXQXVerIYMghd45w0XiESgUchYCEeGg8bQQWHS+TYZW1DcJmHwAxZA=="; + url = "https://registry.npmjs.org/string-kit/-/string-kit-0.10.3.tgz"; + sha512 = "Pn7887wnmb9N0uAYKzqKGj1FWN2GBryiZBkM8mGqQWHoZsTUKDY574RT7ajXbRz4kf0TRKJm1JY5b0bDW0B4cw=="; }; }; "string-length-2.0.0" = { @@ -38275,13 +38572,13 @@ let sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; }; }; - "string-width-4.1.0" = { + "string-width-4.2.0" = { name = "string-width"; packageName = "string-width"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-4.1.0.tgz"; - sha512 = "NrX+1dVVh+6Y9dnQ19pR0pP4FiEIlUvdTGn8pw6CKTNq5sgib2nIhmUNT5TAmhWmvKr3WcxBcP3E8nWezuipuQ=="; + url = "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz"; + sha512 = "zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg=="; }; }; "string.prototype.padstart-3.0.0" = { @@ -38455,6 +38752,15 @@ let sha512 = "DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA=="; }; }; + "strip-ansi-6.0.0" = { + name = "strip-ansi"; + packageName = "strip-ansi"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz"; + sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; + }; + }; "strip-bom-1.0.0" = { name = "strip-bom"; packageName = "strip-bom"; @@ -39067,6 +39373,24 @@ let sha1 = "717d22cc53f0ce1def5594362f3a89a2ebb91105"; }; }; + "sync-request-5.0.0" = { + name = "sync-request"; + packageName = "sync-request"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sync-request/-/sync-request-5.0.0.tgz"; + sha512 = "NKhEA4WacR3mRBIFz1niXrIUTrUVFtP2spzrLMINangebvJ/EFyVv+LMJKvVl6UIrJM4Fburnnj91lRnqb4WkA=="; + }; + }; + "sync-rpc-1.3.4" = { + name = "sync-rpc"; + packageName = "sync-rpc"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sync-rpc/-/sync-rpc-1.3.4.tgz"; + sha512 = "Iug+t1ICVFenUcTnDu8WXFnT+k8IVoLKGh8VA3eXUtl2Rt9SjKX3YEv33OenABqpTPL9QEaHv1+CNn2LK8vMow=="; + }; + }; "syntax-error-1.4.0" = { name = "syntax-error"; packageName = "syntax-error"; @@ -39076,13 +39400,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.14.17" = { + "systeminformation-4.15.3" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.14.17"; + version = "4.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.14.17.tgz"; - sha512 = "CQbT5vnkqNb3JNl41xr8sYA8AX7GoaWP55/jnmFNQY0XQmUuoFshSNUkCkxiDdEC1qu2Vg9s0jR6LLmVSmNJUw=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.15.3.tgz"; + sha512 = "Fx2ARGHtLl2/xLeNoTR8/doXSxUXuAzIN+dyCK9O43j/UETLBt77yTEbTxmYsVD47PYjX1iQTdcY41CZckY+zg=="; }; }; "syswide-cas-5.3.0" = { @@ -39464,13 +39788,13 @@ let sha512 = "I42EWhJ+2aeNQawGx1VtpO0DFI9YcfuvAMNIdKyf/6sRbHJ4P+ZQ/zIT87tE+ln1ymAGcCJds4dolfSAS0AcNg=="; }; }; - "terminal-kit-1.31.4" = { + "terminal-kit-1.31.7" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "1.31.4"; + version = "1.31.7"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.31.4.tgz"; - sha512 = "alrT1vDcKamNxdU8HrN25hTsHBuSWb++HVPVy98xbbUJBTw5l+NiF+ILAO56fl0XQLPOMqVUs0lhqf0B20Lucg=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.31.7.tgz"; + sha512 = "n5WkVXaPnJC7CfqC424lwPt2/ILWks7yFZi24fjiyaT+L23E1urRdjvALHtX1F3Iyjxso54vp86VHvdbXnf84A=="; }; }; "terser-3.17.0" = { @@ -39482,13 +39806,13 @@ let sha512 = "/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ=="; }; }; - "terser-4.3.9" = { + "terser-4.4.0" = { name = "terser"; packageName = "terser"; - version = "4.3.9"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-4.3.9.tgz"; - sha512 = "NFGMpHjlzmyOtPL+fDw3G7+6Ueh/sz4mkaUYa4lJCxOPTNzd0Uj0aZJOmsDYoSQyfuVoWDMSWTPU3huyOm2zdA=="; + url = "https://registry.npmjs.org/terser/-/terser-4.4.0.tgz"; + sha512 = "oDG16n2WKm27JO8h4y/w3iqBGAOSCtq7k8dRmrn4Wf9NouL0b2WpMHGChFGZq4nFAQy1FsNJrVQHfurXOSTmOA=="; }; }; "terser-webpack-plugin-1.4.1" = { @@ -39572,6 +39896,15 @@ let sha1 = "72f792dd9d31705a91ae19ebfcf8b3f968c81da2"; }; }; + "then-request-5.0.0" = { + name = "then-request"; + packageName = "then-request"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/then-request/-/then-request-5.0.0.tgz"; + sha512 = "A3uIVLD33SAvB10PfsxLuQBMV8GVC/6xKBMPOvkJchi6251e5AMJ+Yy+RVKsVsnj0iYNhN2E5SkNSi58H19wsw=="; + }; + }; "thenify-3.3.0" = { name = "thenify"; packageName = "thenify"; @@ -40535,13 +40868,22 @@ let sha512 = "uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA=="; }; }; - "ts-node-8.4.1" = { + "ts-loader-5.4.5" = { + name = "ts-loader"; + packageName = "ts-loader"; + version = "5.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ts-loader/-/ts-loader-5.4.5.tgz"; + sha512 = "XYsjfnRQCBum9AMRZpk2rTYSVpdZBpZK+kDh0TeT3kxmQNBDVIeUjdPjY5RZry4eIAb8XHc4gYSUiUWPYvzSRw=="; + }; + }; + "ts-node-8.5.0" = { name = "ts-node"; packageName = "ts-node"; - version = "8.4.1"; + version = "8.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-8.4.1.tgz"; - sha512 = "5LpRN+mTiCs7lI5EtbXmF/HfMeCjzt7DH9CZwtkr6SywStrNQC723wG+aOWFiLNn7zT3kD/RnFqi3ZUfr4l5Qw=="; + url = "https://registry.npmjs.org/ts-node/-/ts-node-8.5.0.tgz"; + sha512 = "fbG32iZEupNV2E2Fd2m2yt1TdAwR3GTCrJQBHDevIiEBNy1A8kqnyl1fv7jmRmmbtcapFab2glZXHJvfD1ed0Q=="; }; }; "ts-process-promises-1.0.2" = { @@ -40571,13 +40913,22 @@ let sha512 = "4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="; }; }; - "tslint-5.20.0" = { + "tslint-5.20.1" = { name = "tslint"; packageName = "tslint"; - version = "5.20.0"; + version = "5.20.1"; src = fetchurl { - url = "https://registry.npmjs.org/tslint/-/tslint-5.20.0.tgz"; - sha512 = "2vqIvkMHbnx8acMogAERQ/IuINOq6DFqgF8/VDvhEkBqQh/x6SP0Y+OHnKth9/ZcHQSroOZwUQSN18v8KKF0/g=="; + url = "https://registry.npmjs.org/tslint/-/tslint-5.20.1.tgz"; + sha512 = "EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg=="; + }; + }; + "tslint-config-prettier-1.18.0" = { + name = "tslint-config-prettier"; + packageName = "tslint-config-prettier"; + version = "1.18.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tslint-config-prettier/-/tslint-config-prettier-1.18.0.tgz"; + sha512 = "xPw9PgNPLG3iKRxmK7DWr+Ea/SzrvfHtjFt5LBl61gk2UBG/DB9kCXRjv+xyIU1rUtnayLeMUVJBcMX8Z17nDg=="; }; }; "tsscmp-1.0.6" = { @@ -40814,13 +41165,13 @@ let sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; }; }; - "typechecker-4.7.0" = { + "typechecker-4.8.0" = { name = "typechecker"; packageName = "typechecker"; - version = "4.7.0"; + version = "4.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/typechecker/-/typechecker-4.7.0.tgz"; - sha512 = "4LHc1KMNJ6NDGO+dSM/yNfZQRtp8NN7psYrPHUblD62Dvkwsp3VShsbM78kOgpcmMkRTgvwdKOTjctS+uMllgQ=="; + url = "https://registry.npmjs.org/typechecker/-/typechecker-4.8.0.tgz"; + sha512 = "TjffTvOgY4JUHE2FU6fYB/C5+NkERPEoB/JmcZSiVP0s/dykDtFfErlH8xSgH2DnnLDgnE+HMjh5zpCseg0liQ=="; }; }; "typed-function-1.1.0" = { @@ -40868,13 +41219,13 @@ let sha512 = "kk80vLW9iGtjMnIv11qyxLqZm20UklzuR2tL0QAnDIygIUIemcZMxlMWudl9OOt76H3ntVzcTiddQ1/pAAJMYg=="; }; }; - "typescript-3.6.4" = { + "typescript-3.7.2" = { name = "typescript"; packageName = "typescript"; - version = "3.6.4"; + version = "3.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.6.4.tgz"; - sha512 = "unoCll1+l+YK4i4F8f22TaNVPRHcD9PA3yCuZ8g5e0qGqlVlJ/8FSateOLLSagn+Yg5+ZwuPkL8LFUc0Jcvksg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.7.2.tgz"; + sha512 = "ml7V7JfiN2Xwvcer+XAf2csGO1bPBdRbFCkYBczNZggrBZ9c7G3riSUeJmqEU5uOtXNPMhE3n+R4FA/3YOAWOQ=="; }; }; "typescript-eslint-parser-16.0.1" = { @@ -40976,13 +41327,13 @@ let sha512 = "W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg=="; }; }; - "uglify-js-3.6.7" = { + "uglify-js-3.6.8" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.6.7"; + version = "3.6.8"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.7.tgz"; - sha512 = "4sXQDzmdnoXiO+xvmTzQsfIiwrjUCSA95rSP4SEd8tDb51W2TiDOlL76Hl+Kw0Ie42PSItCW8/t6pBNCF2R48A=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.8.tgz"; + sha512 = "XhHJ3S3ZyMwP8kY1Gkugqx3CJh2C3O0y8NPiSxtm1tyD/pktLAkFZsFGpuNfTZddKDQ/bbDBLAd2YyA1pbi8HQ=="; }; }; "uglify-to-browserify-1.0.2" = { @@ -41489,31 +41840,31 @@ let sha512 = "dFil/AN6vqhnQWNCZk0GF/G3+Q5YwsB+PqjnzvpO2wzdRtUJ1E8PN+XRE/PRr/G3FzKjRTJU0haqE0Ekl+O3Ag=="; }; }; - "unist-util-modify-children-1.1.4" = { + "unist-util-modify-children-1.1.5" = { name = "unist-util-modify-children"; packageName = "unist-util-modify-children"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-1.1.4.tgz"; - sha512 = "8iey9wkoB62C7Vi/8zcRUmi4b1f5AYKTwMkyEgLduo2D8+OY65RoSvbn6k9tVNri6qumXxAwXDVlXWQi0sENTw=="; + url = "https://registry.npmjs.org/unist-util-modify-children/-/unist-util-modify-children-1.1.5.tgz"; + sha512 = "XeL5qqyoS3TEueCKEzHusWXE9JBDJPE4rl6LmcLOwlzv0RIZrcMNqKx02GSK3Ms4v45ldu+ltPxG42FBMVdPZw=="; }; }; - "unist-util-position-3.0.3" = { + "unist-util-position-3.0.4" = { name = "unist-util-position"; packageName = "unist-util-position"; - version = "3.0.3"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.0.3.tgz"; - sha512 = "28EpCBYFvnMeq9y/4w6pbnFmCUfzlsc41NJui5c51hOFjBA1fejcwc+5W4z2+0ECVbScG3dURS3JTVqwenzqZw=="; + url = "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.0.4.tgz"; + sha512 = "tWvIbV8goayTjobxDIr4zVTyG+Q7ragMSMeKC3xnPl9xzIc0+she8mxXLM3JVNDDsfARPbCd3XdzkyLdo7fF3g=="; }; }; - "unist-util-remove-position-1.1.3" = { + "unist-util-remove-position-1.1.4" = { name = "unist-util-remove-position"; packageName = "unist-util-remove-position"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.3.tgz"; - sha512 = "CtszTlOjP2sBGYc2zcKA/CvNdTdEs3ozbiJ63IPBxh8iZg42SCCb8m04f8z2+V1aSk5a7BxbZKEdoDjadmBkWA=="; + url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-1.1.4.tgz"; + sha512 = "tLqd653ArxJIPnKII6LMZwH+mb5q+n/GtXQZo6S6csPRs5zB0u79Yw8ouR3wTw8wxvdJFhpP6Y7jorWdCgLO0A=="; }; }; "unist-util-stringify-position-1.1.2" = { @@ -41525,13 +41876,13 @@ let sha512 = "pNCVrk64LZv1kElr0N1wPiHEUoXNVFERp+mlTg/s9R5Lwg87f9bM/3sQB99w+N9D/qnM9ar3+AKDBwo/gm/iQQ=="; }; }; - "unist-util-stringify-position-2.0.1" = { + "unist-util-stringify-position-2.0.2" = { name = "unist-util-stringify-position"; packageName = "unist-util-stringify-position"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.1.tgz"; - sha512 = "Zqlf6+FRI39Bah8Q6ZnNGrEHUhwJOkHde2MHVk96lLyftfJJckaPslKgzhVcviXj8KcE9UJM9F+a4JEiBUTYgA=="; + url = "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.2.tgz"; + sha512 = "nK5n8OGhZ7ZgUwoUbL8uiVRwAbZyzBsB/Ddrlbu6jwwubFza4oe15KlyEaLNMXQW1svOQq4xesUeqA85YrIUQA=="; }; }; "unist-util-visit-1.4.1" = { @@ -42218,15 +42569,6 @@ let sha1 = "6728fc0459c450d796a99c31837569bdf672d728"; }; }; - "uuid-3.3.2" = { - name = "uuid"; - packageName = "uuid"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz"; - sha512 = "yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="; - }; - }; "uuid-3.3.3" = { name = "uuid"; packageName = "uuid"; @@ -42560,13 +42902,13 @@ let sha512 = "y7Y3gH9BsUSdD4KzHsuMaCzRjglXN0W2EcMf0gpvu6+SbsGhMje7xDc8AEoeXy6mIwCKMI6BkjMsRjzQbhMEjQ=="; }; }; - "vfile-4.0.1" = { + "vfile-4.0.2" = { name = "vfile"; packageName = "vfile"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/vfile/-/vfile-4.0.1.tgz"; - sha512 = "lRHFCuC4SQBFr7Uq91oJDJxlnftoTLQ7eKIpMdubhYcVMho4781a8MWXLy3qZrZ0/STD1kRiKc0cQOHm4OkPeA=="; + url = "https://registry.npmjs.org/vfile/-/vfile-4.0.2.tgz"; + sha512 = "yhoTU5cDMSsaeaMfJ5g0bUKYkYmZhAh9fn9TZicxqn+Cw4Z439il2v3oT9S0yjlpqlI74aFOQCt3nOV+pxzlkw=="; }; }; "vfile-find-down-1.0.0" = { @@ -42596,13 +42938,13 @@ let sha512 = "kYGgsSNpYjPxcEoud1aHNFfchsV0Z6Pyc8M5LfD1wX/tV0/bn32MKHDfv4fqV9DBLVuw2YSGOs31nRY/42DfUA=="; }; }; - "vfile-location-2.0.5" = { + "vfile-location-2.0.6" = { name = "vfile-location"; packageName = "vfile-location"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.5.tgz"; - sha512 = "Pa1ey0OzYBkLPxPZI3d9E+S4BmvfVwNAAXrrqGbwTVXWaX2p9kM1zZ+n35UtVM06shmWKH4RPRN8KI80qE3wNQ=="; + url = "https://registry.npmjs.org/vfile-location/-/vfile-location-2.0.6.tgz"; + sha512 = "sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA=="; }; }; "vfile-message-1.1.1" = { @@ -42614,13 +42956,13 @@ let sha512 = "1WmsopSGhWt5laNir+633LszXvZ+Z/lxveBf6yhGsqnQIhlhzooZae7zV6YVM1Sdkw68dtAW3ow0pOdPANugvA=="; }; }; - "vfile-message-2.0.1" = { + "vfile-message-2.0.2" = { name = "vfile-message"; packageName = "vfile-message"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.1.tgz"; - sha512 = "KtasSV+uVU7RWhUn4Lw+wW1Zl/nW8JWx7JCPps10Y9JRRIDeDXf8wfBLoOSsJLyo27DqMyAi54C6Jf/d6Kr2Bw=="; + url = "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.2.tgz"; + sha512 = "gNV2Y2fDvDOOqq8bEe7cF3DXU6QgV4uA9zMR2P8tix11l1r7zju3zry3wZ8sx+BEfuO6WQ7z2QzfWTvqHQiwsA=="; }; }; "vfile-reporter-1.5.0" = { @@ -42866,13 +43208,13 @@ let sha512 = "perEnXQdQOJMTDFNv+UF3h1Y0z4iSiaN9jIlb0OqIYgosPCZGYh/MCUlkFtV2668PL69lRDO32hmvL2yiidUYg=="; }; }; - "vscode-jsonrpc-5.0.0-next.2" = { + "vscode-jsonrpc-5.0.0-next.4" = { name = "vscode-jsonrpc"; packageName = "vscode-jsonrpc"; - version = "5.0.0-next.2"; + version = "5.0.0-next.4"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.0-next.2.tgz"; - sha512 = "Q3/jabZUNviCG9hhF6hHWjhrABevPF9mv0aiE2j8BYCAP2k+aHTpjMyk+04MzaAqWYwXdQuZkLSbcYCCqbzJLg=="; + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.0.0-next.4.tgz"; + sha512 = "Tos3tXP62ZTB9WowWwhvfVNdu1mEwQF/j7DqJuVL4QKhk311gH+mda0PZpG95LWyh5CCRpHMns4vNmMgZQrvXQ=="; }; }; "vscode-languageclient-4.0.1" = { @@ -42929,13 +43271,13 @@ let sha512 = "IL66BLb2g20uIKog5Y2dQ0IiigW0XKrvmWiOvc0yXw80z3tMEzEnHjaGAb3ENuU7MnQqgnYJ1Cl2l9RvNgDi4g=="; }; }; - "vscode-languageserver-protocol-3.15.0-next.10" = { + "vscode-languageserver-protocol-3.15.0-next.11" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; - version = "3.15.0-next.10"; + version = "3.15.0-next.11"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.10.tgz"; - sha512 = "TmbBhKrBoYNX+/pQGwoXmy2qlOfjGBUhwUGIzQoWpj8qtDzYuLof8bi19rGLZ9sVuSHh3anvIyVpGJEqT0QODQ=="; + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.15.0-next.11.tgz"; + sha512 = "tpRnPtyS6q0EYH5RH12AtdMecgu3HVL2bBdBGzeQRN8Tf93I9LY4Fl5TXUNkIBjuxjMshkCM8ikhb+hlnWvB2w=="; }; }; "vscode-languageserver-protocol-3.6.0" = { @@ -42965,13 +43307,13 @@ let sha512 = "lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A=="; }; }; - "vscode-languageserver-types-3.15.0-next.6" = { + "vscode-languageserver-types-3.15.0-next.8" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; - version = "3.15.0-next.6"; + version = "3.15.0-next.8"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.6.tgz"; - sha512 = "+4jfvmZ26oFMSX6EgPRB75PWHoT8pzyWuSSWk0erC4hTzmJq2gWxVLh20bZutZjMmiivawvPshtM3XZhX2SttA=="; + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.15.0-next.8.tgz"; + sha512 = "AEfWrSNyeamWMKPehh/kd3nBnKD9ZGCPhzfxMnW9YNqElSh28G2+Puk3knIQWyaWyV6Bzh28ok9BRJsPzXFCkQ=="; }; }; "vscode-languageserver-types-3.6.0" = { @@ -43073,13 +43415,13 @@ let sha512 = "JlHVZwBBTNVvzmifwjpZYn0oPWH2SgWv5dojlZBsrhablDu95VFD+hriB1rQGwbD+bms6g+rAFhQHk6+NyiS6g=="; }; }; - "vue-eslint-parser-6.0.4" = { + "vue-eslint-parser-6.0.5" = { name = "vue-eslint-parser"; packageName = "vue-eslint-parser"; - version = "6.0.4"; + version = "6.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-6.0.4.tgz"; - sha512 = "GYsDsDWwKaGtnkW4nGUxr01wqIO2FB9/QHQTW1Gl5SUr5OyQvpnR90/D+Gq2cIxURX7aJ7+VyD+37Yx9eFwTgw=="; + url = "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-6.0.5.tgz"; + sha512 = "Bvjlx7rH1Ulvus56KHeLXOjEi3JMOYTa1GAqZr9lBQhd8weK8mV7U7V2l85yokBZEWHJQjLn6X3nosY8TzkOKg=="; }; }; "vue-jscodeshift-adapter-2.0.2" = { @@ -43685,13 +44027,13 @@ let sha1 = "fa4daa92daf32c4ea94ed453c81f04686b575dfe"; }; }; - "with-open-file-0.1.6" = { + "with-open-file-0.1.7" = { name = "with-open-file"; packageName = "with-open-file"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/with-open-file/-/with-open-file-0.1.6.tgz"; - sha512 = "SQS05JekbtwQSgCYlBsZn/+m2gpn4zWsqpCYIrCHva0+ojXcnmUEPsBN6Ipoz3vmY/81k5PvYEWSxER2g4BTqA=="; + url = "https://registry.npmjs.org/with-open-file/-/with-open-file-0.1.7.tgz"; + sha512 = "ecJS2/oHtESJ1t3ZfMI3B7KIDKyfN0O16miWxdn30zdh66Yd3LsRFebXZXq6GU4xfxLf6nVxp9kIqElb5fqczA=="; }; }; "word-wrap-1.2.3" = { @@ -43784,13 +44126,13 @@ let sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q=="; }; }; - "wrap-ansi-6.1.0" = { + "wrap-ansi-6.2.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.1.0.tgz"; - sha512 = "y8j9eJaotnWgJkysmwld5GkLH2KE9srRvqQE2bu1tZb0O9Qgk1mLyz4Q4KIWyjZAi2+6NRqkM/A580IsUseDdw=="; + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz"; + sha512 = "r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA=="; }; }; "wrap-fn-0.1.5" = { @@ -44871,17 +45213,17 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "8.3.17"; + version = "8.3.18"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-8.3.17.tgz"; - sha512 = "1R4IlPnrm6B9drhrCHTu9fBFIqCvOXK1zqYLsdobz6KfdkBcLSFqRqRfgEqADLChkxMo4tedtsftkuqY5Xinrg=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-8.3.18.tgz"; + sha512 = "IWiGlAmVPkl/xWCrki3N45uqdYcjUvtWw9bRM53FF1EKLLbjue6DAVD1HktqgqjTyck0P7QkOXWRilT8rXKcEQ=="; }; dependencies = [ - sources."@angular-devkit/architect-0.803.17" - sources."@angular-devkit/core-8.3.17" - sources."@angular-devkit/schematics-8.3.17" - sources."@schematics/angular-8.3.17" - sources."@schematics/update-0.803.17" + sources."@angular-devkit/architect-0.803.18" + sources."@angular-devkit/core-8.3.18" + sources."@angular-devkit/schematics-8.3.18" + sources."@schematics/angular-8.3.18" + sources."@schematics/update-0.803.18" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" sources."agent-base-4.3.0" @@ -44889,7 +45231,7 @@ in sources."ajv-6.10.2" sources."ansi-colors-4.1.1" sources."ansi-escapes-4.2.1" - sources."ansi-regex-4.1.0" + sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."aproba-1.2.0" sources."asap-2.0.6" @@ -44940,7 +45282,7 @@ in sources."end-of-stream-1.4.4" sources."err-code-1.1.2" sources."es-abstract-1.16.0" - sources."es-to-primitive-1.2.0" + sources."es-to-primitive-1.2.1" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" @@ -44962,7 +45304,7 @@ in sources."genfun-5.0.0" sources."get-stream-4.1.0" sources."getpass-0.1.7" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."graceful-fs-4.2.3" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -45052,7 +45394,7 @@ in }) sources."npm-registry-fetch-4.0.2" sources."oauth-sign-0.9.0" - sources."object-inspect-1.6.0" + sources."object-inspect-1.7.0" sources."object-keys-1.1.1" sources."object.getownpropertydescriptors-2.0.3" sources."once-1.4.0" @@ -45111,8 +45453,8 @@ in }) sources."signal-exit-3.0.2" sources."slash-1.0.0" - sources."smart-buffer-4.0.2" - sources."socks-2.3.2" + sources."smart-buffer-4.1.0" + sources."socks-2.3.3" (sources."socks-proxy-agent-4.0.2" // { dependencies = [ sources."agent-base-4.2.1" @@ -45128,7 +45470,11 @@ in sources."ssri-6.0.1" sources."stream-each-1.2.3" sources."stream-shift-1.0.0" - sources."string-width-4.1.0" + (sources."string-width-4.2.0" // { + dependencies = [ + sources."strip-ansi-6.0.0" + ]; + }) sources."string.prototype.trimleft-2.1.0" sources."string.prototype.trimright-2.1.0" (sources."string_decoder-1.1.1" // { @@ -45136,7 +45482,11 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."strip-ansi-5.2.0" + (sources."strip-ansi-5.2.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + ]; + }) sources."supports-color-5.5.0" sources."symbol-observable-1.2.0" sources."tar-4.4.13" @@ -45196,7 +45546,7 @@ in sources."@iarna/toml-2.2.3" sources."argparse-1.0.10" sources."camelcase-5.3.1" - sources."camelcase-keys-6.1.0" + sources."camelcase-keys-6.1.1" sources."commander-3.0.2" (sources."convict-5.2.0" // { dependencies = [ @@ -45271,7 +45621,7 @@ in ]; }) sources."camelcase-5.3.1" - sources."camelcase-keys-6.1.0" + sources."camelcase-keys-6.1.1" sources."clean-git-ref-2.0.1" sources."clone-2.1.2" sources."clone-buffer-1.0.0" @@ -45290,7 +45640,7 @@ in }) sources."commander-2.20.3" sources."concat-map-0.0.1" - (sources."convert-source-map-1.6.0" // { + (sources."convert-source-map-1.7.0" // { dependencies = [ sources."safe-buffer-5.1.2" ]; @@ -45353,7 +45703,7 @@ in sources."glob-parent-3.1.0" (sources."glob-stream-6.1.0" // { dependencies = [ - sources."glob-7.1.5" + sources."glob-7.1.6" sources."readable-stream-2.3.6" sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" @@ -45512,7 +45862,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.6.7" + sources."uglify-js-3.6.8" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -45568,97 +45918,189 @@ in sources."@apollographql/graphql-language-service-utils-2.0.2" sources."@apollographql/graphql-playground-html-1.6.24" sources."@babel/code-frame-7.5.5" - (sources."@babel/core-7.6.4" // { + (sources."@babel/core-7.7.2" // { dependencies = [ + sources."@babel/generator-7.7.2" + sources."@babel/types-7.7.2" sources."semver-5.7.1" ]; }) sources."@babel/generator-7.6.4" - sources."@babel/helper-annotate-as-pure-7.0.0" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.1.0" - sources."@babel/helper-call-delegate-7.4.4" - sources."@babel/helper-create-class-features-plugin-7.6.0" - sources."@babel/helper-define-map-7.5.5" - sources."@babel/helper-explode-assignable-expression-7.1.0" - sources."@babel/helper-function-name-7.1.0" - sources."@babel/helper-get-function-arity-7.0.0" - sources."@babel/helper-hoist-variables-7.4.4" - sources."@babel/helper-member-expression-to-functions-7.5.5" - sources."@babel/helper-module-imports-7.0.0" - sources."@babel/helper-module-transforms-7.5.5" - sources."@babel/helper-optimise-call-expression-7.0.0" + (sources."@babel/helper-annotate-as-pure-7.7.0" // { + dependencies = [ + sources."@babel/types-7.7.2" + ]; + }) + (sources."@babel/helper-builder-binary-assignment-operator-visitor-7.7.0" // { + dependencies = [ + sources."@babel/types-7.7.2" + ]; + }) + (sources."@babel/helper-call-delegate-7.7.0" // { + dependencies = [ + sources."@babel/types-7.7.2" + ]; + }) + sources."@babel/helper-create-class-features-plugin-7.7.0" + sources."@babel/helper-create-regexp-features-plugin-7.7.2" + (sources."@babel/helper-define-map-7.7.0" // { + dependencies = [ + sources."@babel/types-7.7.2" + ]; + }) + (sources."@babel/helper-explode-assignable-expression-7.7.0" // { + dependencies = [ + sources."@babel/types-7.7.2" + ]; + }) + (sources."@babel/helper-function-name-7.7.0" // { + dependencies = [ + sources."@babel/types-7.7.2" + ]; + }) + (sources."@babel/helper-get-function-arity-7.7.0" // { + dependencies = [ + sources."@babel/types-7.7.2" + ]; + }) + (sources."@babel/helper-hoist-variables-7.7.0" // { + dependencies = [ + sources."@babel/types-7.7.2" + ]; + }) + (sources."@babel/helper-member-expression-to-functions-7.7.0" // { + dependencies = [ + sources."@babel/types-7.7.2" + ]; + }) + (sources."@babel/helper-module-imports-7.7.0" // { + dependencies = [ + sources."@babel/types-7.7.2" + ]; + }) + (sources."@babel/helper-module-transforms-7.7.0" // { + dependencies = [ + sources."@babel/types-7.7.2" + ]; + }) + (sources."@babel/helper-optimise-call-expression-7.7.0" // { + dependencies = [ + sources."@babel/types-7.7.2" + ]; + }) sources."@babel/helper-plugin-utils-7.0.0" sources."@babel/helper-regex-7.5.5" - sources."@babel/helper-remap-async-to-generator-7.1.0" - sources."@babel/helper-replace-supers-7.5.5" - sources."@babel/helper-simple-access-7.1.0" - sources."@babel/helper-split-export-declaration-7.4.4" - sources."@babel/helper-wrap-function-7.2.0" - sources."@babel/helpers-7.6.2" + (sources."@babel/helper-remap-async-to-generator-7.7.0" // { + dependencies = [ + sources."@babel/types-7.7.2" + ]; + }) + (sources."@babel/helper-replace-supers-7.7.0" // { + dependencies = [ + sources."@babel/types-7.7.2" + ]; + }) + (sources."@babel/helper-simple-access-7.7.0" // { + dependencies = [ + sources."@babel/types-7.7.2" + ]; + }) + (sources."@babel/helper-split-export-declaration-7.7.0" // { + dependencies = [ + sources."@babel/types-7.7.2" + ]; + }) + (sources."@babel/helper-wrap-function-7.7.0" // { + dependencies = [ + sources."@babel/types-7.7.2" + ]; + }) + (sources."@babel/helpers-7.7.0" // { + dependencies = [ + sources."@babel/types-7.7.2" + ]; + }) sources."@babel/highlight-7.5.0" - sources."@babel/parser-7.6.4" - sources."@babel/plugin-proposal-async-generator-functions-7.2.0" - sources."@babel/plugin-proposal-class-properties-7.5.5" - sources."@babel/plugin-proposal-dynamic-import-7.5.0" + sources."@babel/parser-7.7.3" + sources."@babel/plugin-proposal-async-generator-functions-7.7.0" + sources."@babel/plugin-proposal-class-properties-7.7.0" + sources."@babel/plugin-proposal-dynamic-import-7.7.0" sources."@babel/plugin-proposal-json-strings-7.2.0" sources."@babel/plugin-proposal-object-rest-spread-7.6.2" sources."@babel/plugin-proposal-optional-catch-binding-7.2.0" - sources."@babel/plugin-proposal-unicode-property-regex-7.6.2" + sources."@babel/plugin-proposal-unicode-property-regex-7.7.0" sources."@babel/plugin-syntax-async-generators-7.2.0" sources."@babel/plugin-syntax-dynamic-import-7.2.0" - sources."@babel/plugin-syntax-flow-7.2.0" + sources."@babel/plugin-syntax-flow-7.7.0" sources."@babel/plugin-syntax-json-strings-7.2.0" sources."@babel/plugin-syntax-object-rest-spread-7.2.0" sources."@babel/plugin-syntax-optional-catch-binding-7.2.0" + sources."@babel/plugin-syntax-top-level-await-7.7.0" sources."@babel/plugin-syntax-typescript-7.3.3" sources."@babel/plugin-transform-arrow-functions-7.2.0" - sources."@babel/plugin-transform-async-to-generator-7.5.0" + sources."@babel/plugin-transform-async-to-generator-7.7.0" sources."@babel/plugin-transform-block-scoped-functions-7.2.0" sources."@babel/plugin-transform-block-scoping-7.6.3" - sources."@babel/plugin-transform-classes-7.5.5" + sources."@babel/plugin-transform-classes-7.7.0" sources."@babel/plugin-transform-computed-properties-7.2.0" sources."@babel/plugin-transform-destructuring-7.6.0" - sources."@babel/plugin-transform-dotall-regex-7.6.2" + sources."@babel/plugin-transform-dotall-regex-7.7.0" sources."@babel/plugin-transform-duplicate-keys-7.5.0" sources."@babel/plugin-transform-exponentiation-operator-7.2.0" sources."@babel/plugin-transform-flow-strip-types-7.6.3" sources."@babel/plugin-transform-for-of-7.4.4" - sources."@babel/plugin-transform-function-name-7.4.4" + sources."@babel/plugin-transform-function-name-7.7.0" sources."@babel/plugin-transform-literals-7.2.0" sources."@babel/plugin-transform-member-expression-literals-7.2.0" sources."@babel/plugin-transform-modules-amd-7.5.0" - sources."@babel/plugin-transform-modules-commonjs-7.6.0" - sources."@babel/plugin-transform-modules-systemjs-7.5.0" - sources."@babel/plugin-transform-modules-umd-7.2.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.6.3" + sources."@babel/plugin-transform-modules-commonjs-7.7.0" + sources."@babel/plugin-transform-modules-systemjs-7.7.0" + sources."@babel/plugin-transform-modules-umd-7.7.0" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.7.0" sources."@babel/plugin-transform-new-target-7.4.4" sources."@babel/plugin-transform-object-super-7.5.5" sources."@babel/plugin-transform-parameters-7.4.4" sources."@babel/plugin-transform-property-literals-7.2.0" - sources."@babel/plugin-transform-regenerator-7.4.5" + sources."@babel/plugin-transform-regenerator-7.7.0" sources."@babel/plugin-transform-reserved-words-7.2.0" sources."@babel/plugin-transform-shorthand-properties-7.2.0" sources."@babel/plugin-transform-spread-7.6.2" sources."@babel/plugin-transform-sticky-regex-7.2.0" sources."@babel/plugin-transform-template-literals-7.4.4" sources."@babel/plugin-transform-typeof-symbol-7.2.0" - sources."@babel/plugin-transform-typescript-7.6.3" - sources."@babel/plugin-transform-unicode-regex-7.6.2" - (sources."@babel/preset-env-7.6.3" // { + sources."@babel/plugin-transform-typescript-7.7.2" + sources."@babel/plugin-transform-unicode-regex-7.7.0" + (sources."@babel/preset-env-7.7.1" // { dependencies = [ + sources."@babel/types-7.7.2" sources."semver-5.7.1" ]; }) sources."@babel/preset-flow-7.0.0" - sources."@babel/preset-typescript-7.6.0" - sources."@babel/register-7.6.2" - (sources."@babel/runtime-7.6.3" // { + sources."@babel/preset-typescript-7.7.2" + (sources."@babel/register-7.7.0" // { + dependencies = [ + sources."make-dir-2.1.0" + sources."pify-4.0.1" + sources."semver-5.7.1" + ]; + }) + (sources."@babel/runtime-7.7.2" // { dependencies = [ sources."regenerator-runtime-0.13.3" ]; }) - sources."@babel/template-7.6.0" - sources."@babel/traverse-7.6.3" + (sources."@babel/template-7.7.0" // { + dependencies = [ + sources."@babel/types-7.7.2" + ]; + }) + (sources."@babel/traverse-7.7.2" // { + dependencies = [ + sources."@babel/generator-7.7.2" + sources."@babel/types-7.7.2" + ]; + }) sources."@babel/types-7.6.3" sources."@endemolshinegroup/cosmiconfig-typescript-loader-1.0.1" sources."@hapi/address-2.1.2" @@ -45737,12 +46179,12 @@ in sources."@types/graphql-upload-8.0.3" sources."@types/http-assert-1.5.1" sources."@types/keygrip-1.0.1" - sources."@types/koa-2.0.51" - sources."@types/koa-compose-3.2.4" + sources."@types/koa-2.0.52" + sources."@types/koa-compose-3.2.5" sources."@types/long-4.0.0" sources."@types/mime-2.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.12.5" + sources."@types/node-12.12.7" sources."@types/range-parser-1.2.3" sources."@types/serve-static-1.13.3" sources."@types/ws-6.0.3" @@ -45870,11 +46312,13 @@ in sources."string-width-3.1.0" ]; }) + sources."ansi-regex-5.0.0" sources."camelcase-5.3.1" sources."cli-boxes-2.2.0" sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.1.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" sources."term-size-2.1.0" sources."type-fest-0.5.2" sources."widest-line-3.1.0" @@ -45966,12 +46410,12 @@ in sources."constant-case-2.0.0" sources."content-disposition-0.5.3" sources."content-type-1.0.4" - sources."convert-source-map-1.6.0" + sources."convert-source-map-1.7.0" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" - sources."core-js-3.3.6" - sources."core-js-compat-3.3.6" + sources."core-js-3.4.1" + sources."core-js-compat-3.4.1" sources."core-util-is-1.0.2" sources."cors-2.8.5" sources."cosmiconfig-5.2.1" @@ -46042,7 +46486,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.1" - sources."electron-to-chromium-1.3.302" + sources."electron-to-chromium-1.3.306" sources."elegant-spinner-1.0.1" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" @@ -46052,7 +46496,7 @@ in sources."envinfo-7.4.0" sources."error-ex-1.3.2" sources."es-abstract-1.16.0" - sources."es-to-primitive-1.2.0" + sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."esm-3.2.25" @@ -46132,7 +46576,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.111.1" + sources."flow-parser-0.111.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -46473,7 +46917,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.6.0" + sources."object-inspect-1.7.0" sources."object-keys-1.1.1" sources."object-path-0.11.4" sources."object-visit-1.0.1" @@ -46546,7 +46990,7 @@ in sources."proto-list-1.2.4" (sources."protobufjs-6.8.8" // { dependencies = [ - sources."@types/node-10.17.3" + sources."@types/node-10.17.5" ]; }) sources."proxy-addr-2.0.5" @@ -46805,14 +47249,14 @@ in sources."treeify-1.1.0" sources."trim-repeated-1.0.0" sources."ts-invariant-0.4.4" - sources."ts-node-8.4.1" + sources."ts-node-8.5.0" sources."tslib-1.10.0" sources."tty-1.0.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" sources."type-is-1.6.18" - sources."typescript-3.6.4" + sources."typescript-3.7.2" sources."unbzip2-stream-1.3.3" (sources."undefsafe-2.0.2" // { dependencies = [ @@ -46868,7 +47312,7 @@ in dependencies = [ sources."cross-spawn-7.0.1" sources."deepmerge-4.2.2" - sources."execa-3.2.0" + sources."execa-3.3.0" sources."fs-extra-8.1.0" sources."get-stream-5.1.0" sources."is-stream-2.0.0" @@ -47053,11 +47497,11 @@ in }; dependencies = [ sources."@babel/code-frame-7.5.5" - sources."@babel/generator-7.6.4" + sources."@babel/generator-7.7.2" sources."@babel/highlight-7.5.0" - sources."@babel/parser-7.6.4" - sources."@babel/template-7.6.0" - sources."@babel/types-7.6.3" + sources."@babel/parser-7.7.3" + sources."@babel/template-7.7.0" + sources."@babel/types-7.7.2" sources."@webassemblyjs/ast-1.8.5" sources."@webassemblyjs/floating-point-hex-parser-1.8.5" sources."@webassemblyjs/helper-api-error-1.8.5" @@ -47131,32 +47575,32 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.14.1"; + version = "1.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.14.1.tgz"; - sha512 = "AbKwsUIrmy4jj6QbQr9QZcDRtmEw1vp+cx9BoX+0KHi+pDu9ZoFFYN1hIkojlnGWzd1R2xZshB/p8LsMyZ1ndw=="; + url = "https://registry.npmjs.org/alloy/-/alloy-1.14.2.tgz"; + sha512 = "Mrx+RXcXYUgI/Di5Rx7NFMsvbkhqp7To6SA4LzWgwokyvGnDeGbosXsOE0cl0Uel0P5GuRuiAk/a+KwNJhM5NQ=="; }; dependencies = [ sources."@babel/code-frame-7.5.5" - (sources."@babel/core-7.6.4" // { + (sources."@babel/core-7.7.2" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.6.4" // { + (sources."@babel/generator-7.7.2" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-function-name-7.1.0" - sources."@babel/helper-get-function-arity-7.0.0" - sources."@babel/helper-split-export-declaration-7.4.4" - sources."@babel/helpers-7.6.2" + sources."@babel/helper-function-name-7.7.0" + sources."@babel/helper-get-function-arity-7.7.0" + sources."@babel/helper-split-export-declaration-7.7.0" + sources."@babel/helpers-7.7.0" sources."@babel/highlight-7.5.0" - sources."@babel/parser-7.6.4" - sources."@babel/template-7.6.0" - sources."@babel/traverse-7.6.3" - sources."@babel/types-7.6.3" + sources."@babel/parser-7.7.3" + sources."@babel/template-7.7.0" + sources."@babel/traverse-7.7.2" + sources."@babel/types-7.7.2" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -47170,7 +47614,7 @@ in sources."colors-1.4.0" sources."commander-2.20.3" sources."concat-map-0.0.1" - sources."convert-source-map-1.6.0" + sources."convert-source-map-1.7.0" sources."debug-4.1.1" sources."ejs-2.5.7" sources."ensure-posix-path-1.1.1" @@ -47261,7 +47705,7 @@ in sources."concat-map-0.0.1" sources."cuint-0.2.2" sources."fs.realpath-1.0.0" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."minimatch-3.0.4" @@ -47342,7 +47786,7 @@ in sources."form-data-2.3.3" sources."fs.realpath-1.0.0" sources."getpass-0.1.7" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."html-encoding-sniffer-1.0.2" @@ -47368,7 +47812,7 @@ in sources."nwsapi-2.2.0" sources."oauth-sign-0.9.0" sources."once-1.4.0" - sources."optionator-0.8.2" + sources."optionator-0.8.3" sources."parse5-4.0.0" sources."path-is-absolute-1.0.1" sources."performance-now-2.1.0" @@ -47412,7 +47856,7 @@ in sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" sources."whatwg-url-6.5.0" - sources."wordwrap-1.0.0" + sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."ws-5.2.2" sources."xml-name-validator-3.0.0" @@ -47547,7 +47991,7 @@ in sources."resolve-1.12.0" (sources."rimraf-2.7.1" // { dependencies = [ - sources."glob-7.1.5" + sources."glob-7.1.6" ]; }) sources."semver-5.7.1" @@ -47653,7 +48097,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-assigned-identifiers-1.2.0" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."has-1.0.3" sources."hash-base-3.0.4" sources."hash.js-1.1.7" @@ -47782,7 +48226,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.0" - sources."@types/node-10.17.3" + sources."@types/node-10.17.5" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.10.2" @@ -47843,7 +48287,7 @@ in sources."co-3.1.0" sources."codepage-1.4.0" sources."combined-stream-1.0.8" - sources."commander-4.0.0" + sources."commander-4.0.1" sources."compact2string-1.4.1" sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { @@ -47877,7 +48321,7 @@ in }) sources."error-ex-1.3.2" sources."es-abstract-1.16.0" - sources."es-to-primitive-1.2.0" + sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."exit-on-epipe-1.0.1" sources."extend-3.0.2" @@ -47906,7 +48350,7 @@ in sources."get-browser-rtc-1.0.2" sources."get-stdin-4.0.1" sources."getpass-0.1.7" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."got-1.2.2" sources."graceful-fs-4.2.3" sources."har-schema-2.0.0" @@ -47986,7 +48430,7 @@ in sources."numeral-1.5.6" sources."oauth-sign-0.9.0" sources."object-assign-1.0.0" - sources."object-inspect-1.6.0" + sources."object-inspect-1.7.0" sources."object-keys-1.1.1" sources."object.getownpropertydescriptors-2.0.3" sources."once-1.4.0" @@ -48202,6 +48646,771 @@ in bypassCache = true; reconstructLock = true; }; + "texlab-citeproc-build-deps-../tools/misc/texlab/citeproc" = nodeEnv.buildNodePackage { + name = "citeproc"; + packageName = "citeproc"; + version = "0.1.0"; + src = ../tools/misc/texlab/citeproc; + dependencies = [ + sources."@babel/code-frame-7.5.5" + sources."@babel/core-7.7.2" + sources."@babel/generator-7.7.2" + sources."@babel/helper-annotate-as-pure-7.7.0" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.7.0" + sources."@babel/helper-call-delegate-7.7.0" + sources."@babel/helper-create-regexp-features-plugin-7.7.2" + sources."@babel/helper-define-map-7.7.0" + sources."@babel/helper-explode-assignable-expression-7.7.0" + sources."@babel/helper-function-name-7.7.0" + sources."@babel/helper-get-function-arity-7.7.0" + sources."@babel/helper-hoist-variables-7.7.0" + sources."@babel/helper-member-expression-to-functions-7.7.0" + sources."@babel/helper-module-imports-7.7.0" + sources."@babel/helper-module-transforms-7.7.0" + sources."@babel/helper-optimise-call-expression-7.7.0" + sources."@babel/helper-plugin-utils-7.0.0" + sources."@babel/helper-regex-7.5.5" + sources."@babel/helper-remap-async-to-generator-7.7.0" + sources."@babel/helper-replace-supers-7.7.0" + sources."@babel/helper-simple-access-7.7.0" + sources."@babel/helper-split-export-declaration-7.7.0" + sources."@babel/helper-wrap-function-7.7.0" + sources."@babel/helpers-7.7.0" + sources."@babel/highlight-7.5.0" + sources."@babel/parser-7.7.3" + sources."@babel/plugin-proposal-async-generator-functions-7.7.0" + sources."@babel/plugin-proposal-dynamic-import-7.7.0" + sources."@babel/plugin-proposal-json-strings-7.2.0" + sources."@babel/plugin-proposal-object-rest-spread-7.6.2" + sources."@babel/plugin-proposal-optional-catch-binding-7.2.0" + sources."@babel/plugin-proposal-unicode-property-regex-7.7.0" + sources."@babel/plugin-syntax-async-generators-7.2.0" + sources."@babel/plugin-syntax-dynamic-import-7.2.0" + sources."@babel/plugin-syntax-json-strings-7.2.0" + sources."@babel/plugin-syntax-object-rest-spread-7.2.0" + sources."@babel/plugin-syntax-optional-catch-binding-7.2.0" + sources."@babel/plugin-syntax-top-level-await-7.7.0" + sources."@babel/plugin-transform-arrow-functions-7.2.0" + sources."@babel/plugin-transform-async-to-generator-7.7.0" + sources."@babel/plugin-transform-block-scoped-functions-7.2.0" + sources."@babel/plugin-transform-block-scoping-7.6.3" + sources."@babel/plugin-transform-classes-7.7.0" + sources."@babel/plugin-transform-computed-properties-7.2.0" + sources."@babel/plugin-transform-destructuring-7.6.0" + sources."@babel/plugin-transform-dotall-regex-7.7.0" + sources."@babel/plugin-transform-duplicate-keys-7.5.0" + sources."@babel/plugin-transform-exponentiation-operator-7.2.0" + sources."@babel/plugin-transform-for-of-7.4.4" + sources."@babel/plugin-transform-function-name-7.7.0" + sources."@babel/plugin-transform-literals-7.2.0" + sources."@babel/plugin-transform-member-expression-literals-7.2.0" + sources."@babel/plugin-transform-modules-amd-7.5.0" + sources."@babel/plugin-transform-modules-commonjs-7.7.0" + sources."@babel/plugin-transform-modules-systemjs-7.7.0" + sources."@babel/plugin-transform-modules-umd-7.7.0" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.7.0" + sources."@babel/plugin-transform-new-target-7.4.4" + sources."@babel/plugin-transform-object-super-7.5.5" + sources."@babel/plugin-transform-parameters-7.4.4" + sources."@babel/plugin-transform-property-literals-7.2.0" + sources."@babel/plugin-transform-regenerator-7.7.0" + sources."@babel/plugin-transform-reserved-words-7.2.0" + sources."@babel/plugin-transform-shorthand-properties-7.2.0" + sources."@babel/plugin-transform-spread-7.6.2" + sources."@babel/plugin-transform-sticky-regex-7.2.0" + sources."@babel/plugin-transform-template-literals-7.4.4" + sources."@babel/plugin-transform-typeof-symbol-7.2.0" + sources."@babel/plugin-transform-unicode-regex-7.7.0" + sources."@babel/preset-env-7.7.1" + sources."@babel/template-7.7.0" + sources."@babel/traverse-7.7.2" + sources."@babel/types-7.7.2" + sources."@citation-js/core-0.4.9" + sources."@citation-js/date-0.4.4" + sources."@citation-js/name-0.4.2" + sources."@citation-js/plugin-bibtex-0.4.9" + sources."@citation-js/plugin-csl-0.4.10" + sources."@types/anymatch-1.3.1" + sources."@types/concat-stream-1.6.0" + sources."@types/form-data-0.0.33" + sources."@types/node-11.15.2" + sources."@types/qs-6.9.0" + sources."@types/source-list-map-0.1.2" + sources."@types/tapable-1.0.4" + (sources."@types/uglify-js-3.0.4" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + (sources."@types/webpack-4.39.8" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + (sources."@types/webpack-sources-0.1.5" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."@webassemblyjs/ast-1.8.5" + sources."@webassemblyjs/floating-point-hex-parser-1.8.5" + sources."@webassemblyjs/helper-api-error-1.8.5" + sources."@webassemblyjs/helper-buffer-1.8.5" + sources."@webassemblyjs/helper-code-frame-1.8.5" + sources."@webassemblyjs/helper-fsm-1.8.5" + sources."@webassemblyjs/helper-module-context-1.8.5" + sources."@webassemblyjs/helper-wasm-bytecode-1.8.5" + sources."@webassemblyjs/helper-wasm-section-1.8.5" + sources."@webassemblyjs/ieee754-1.8.5" + sources."@webassemblyjs/leb128-1.8.5" + sources."@webassemblyjs/utf8-1.8.5" + sources."@webassemblyjs/wasm-edit-1.8.5" + sources."@webassemblyjs/wasm-gen-1.8.5" + sources."@webassemblyjs/wasm-opt-1.8.5" + sources."@webassemblyjs/wasm-parser-1.8.5" + sources."@webassemblyjs/wast-parser-1.8.5" + sources."@webassemblyjs/wast-printer-1.8.5" + sources."@xtuc/ieee754-1.2.0" + sources."@xtuc/long-4.2.2" + sources."acorn-6.3.0" + sources."ajv-6.10.2" + sources."ajv-errors-1.0.1" + sources."ajv-keywords-3.4.1" + sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + (sources."anymatch-2.0.0" // { + dependencies = [ + sources."normalize-path-2.1.1" + ]; + }) + sources."aproba-1.2.0" + sources."arg-4.1.1" + sources."argparse-1.0.10" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-unique-0.3.2" + sources."asap-2.0.6" + sources."asn1.js-4.10.1" + (sources."assert-1.5.0" // { + dependencies = [ + sources."inherits-2.0.1" + sources."util-0.10.3" + ]; + }) + sources."assign-symbols-1.0.0" + sources."async-each-1.0.3" + sources."asynckit-0.4.0" + sources."atob-2.1.2" + sources."babel-loader-8.0.6" + sources."babel-plugin-dynamic-import-node-2.3.0" + sources."babel-polyfill-6.26.0" + (sources."babel-runtime-6.26.0" // { + dependencies = [ + sources."regenerator-runtime-0.11.1" + ]; + }) + sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + sources."base64-js-1.3.1" + sources."big.js-5.2.2" + sources."binary-extensions-1.13.1" + sources."bluebird-3.7.1" + sources."bn.js-4.11.8" + sources."brace-expansion-1.1.11" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."brorand-1.1.0" + sources."browserify-aes-1.2.0" + sources."browserify-cipher-1.0.1" + sources."browserify-des-1.0.2" + sources."browserify-rsa-4.0.1" + sources."browserify-sign-4.0.4" + sources."browserify-zlib-0.2.0" + sources."browserslist-4.7.2" + sources."buffer-4.9.2" + sources."buffer-from-1.1.1" + sources."buffer-xor-1.0.3" + sources."builtin-modules-1.1.1" + sources."builtin-status-codes-3.0.0" + sources."cacache-12.0.3" + sources."cache-base-1.0.1" + sources."camelcase-5.3.1" + sources."caniuse-lite-1.0.30001008" + sources."caseless-0.12.0" + sources."chalk-2.4.2" + sources."chokidar-2.1.8" + sources."chownr-1.1.3" + sources."chrome-trace-event-1.0.2" + sources."cipher-base-1.0.4" + sources."citeproc-2.2.27" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."cliui-5.0.0" + sources."collection-visit-1.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."combined-stream-1.0.8" + sources."commander-2.20.3" + sources."commondir-1.0.1" + sources."component-emitter-1.3.0" + sources."concat-map-0.0.1" + sources."concat-stream-1.6.2" + sources."console-browserify-1.2.0" + sources."constants-browserify-1.0.0" + sources."convert-source-map-1.7.0" + sources."copy-concurrently-1.0.5" + sources."copy-descriptor-0.1.1" + sources."core-js-2.6.10" + (sources."core-js-compat-3.4.1" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."core-util-is-1.0.2" + sources."create-ecdh-4.0.3" + sources."create-hash-1.2.0" + sources."create-hmac-1.1.7" + sources."cross-spawn-6.0.5" + sources."crypto-browserify-3.12.0" + sources."cyclist-1.0.1" + sources."debug-4.1.1" + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + sources."define-properties-1.1.3" + sources."define-property-2.0.2" + sources."delayed-stream-1.0.0" + sources."des.js-1.0.0" + sources."detect-file-1.0.0" + sources."diff-4.0.1" + sources."diffie-hellman-5.0.3" + sources."domain-browser-1.2.0" + sources."duplexify-3.7.1" + sources."electron-to-chromium-1.3.306" + sources."elliptic-6.5.1" + sources."emoji-regex-7.0.3" + sources."emojis-list-2.1.0" + sources."encoding-0.1.12" + sources."end-of-stream-1.4.4" + sources."enhanced-resolve-4.1.1" + sources."errno-0.1.7" + sources."escape-string-regexp-1.0.5" + sources."eslint-scope-4.0.3" + sources."esprima-4.0.1" + sources."esrecurse-4.2.1" + sources."estraverse-4.3.0" + sources."esutils-2.0.3" + sources."events-3.0.0" + sources."evp_bytestokey-1.0.3" + sources."execa-1.0.0" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) + sources."expand-tilde-2.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + sources."fast-deep-equal-2.0.1" + sources."fast-json-stable-stringify-2.0.0" + sources."figgy-pudding-3.5.1" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."find-cache-dir-2.1.0" + sources."find-up-3.0.0" + sources."findup-sync-3.0.0" + sources."flush-write-stream-1.1.1" + sources."for-in-1.0.2" + sources."form-data-2.5.1" + sources."fragment-cache-0.2.1" + sources."from2-2.3.0" + sources."fs-write-stream-atomic-1.0.10" + sources."fs.realpath-1.0.0" + sources."fsevents-1.2.9" + sources."function-bind-1.1.1" + sources."get-caller-file-2.0.5" + sources."get-port-3.2.0" + sources."get-stream-4.1.0" + sources."get-value-2.0.6" + sources."glob-7.1.6" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + (sources."global-modules-2.0.0" // { + dependencies = [ + sources."global-prefix-3.0.0" + ]; + }) + sources."global-prefix-1.0.2" + sources."globals-11.12.0" + sources."graceful-fs-4.2.3" + sources."has-flag-3.0.0" + sources."has-symbols-1.0.0" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."hash-base-3.0.4" + sources."hash.js-1.1.7" + sources."hmac-drbg-1.0.1" + sources."homedir-polyfill-1.0.3" + (sources."http-basic-6.0.0" // { + dependencies = [ + sources."@types/node-7.10.9" + ]; + }) + (sources."http-response-object-3.0.2" // { + dependencies = [ + sources."@types/node-10.17.5" + ]; + }) + sources."https-browserify-1.0.0" + sources."iconv-lite-0.4.24" + sources."ieee754-1.1.13" + sources."iferr-0.1.5" + sources."import-local-2.0.0" + sources."imurmurhash-0.1.4" + sources."infer-owner-1.0.4" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.5" + sources."interpret-1.2.0" + sources."invariant-2.2.4" + sources."invert-kv-2.0.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-binary-path-1.0.1" + sources."is-buffer-1.1.6" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-4.0.1" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-plain-object-2.0.4" + sources."is-stream-1.1.0" + sources."is-windows-1.0.2" + sources."is-wsl-1.1.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."isomorphic-fetch-2.2.1" + sources."js-levenshtein-1.1.6" + sources."js-tokens-4.0.0" + sources."js-yaml-3.13.1" + sources."jsesc-2.5.2" + sources."json-parse-better-errors-1.0.2" + sources."json-schema-traverse-0.4.1" + sources."json5-2.1.1" + sources."kind-of-6.0.2" + sources."lcid-2.0.0" + sources."loader-runner-2.4.0" + (sources."loader-utils-1.2.3" // { + dependencies = [ + sources."json5-1.0.1" + ]; + }) + sources."locate-path-3.0.0" + sources."lodash-4.17.15" + sources."loose-envify-1.4.0" + sources."lru-cache-5.1.1" + sources."make-dir-2.1.0" + sources."make-error-1.3.5" + sources."mamacro-0.0.3" + sources."map-age-cleaner-0.1.3" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."md5.js-1.3.5" + sources."mem-4.3.0" + sources."memory-fs-0.5.0" + sources."micromatch-3.1.10" + sources."miller-rabin-4.0.1" + sources."mime-db-1.40.0" + sources."mime-types-2.1.24" + sources."mimic-fn-2.1.0" + sources."minimalistic-assert-1.0.1" + sources."minimalistic-crypto-utils-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.0" + sources."mississippi-3.0.0" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."move-concurrently-1.0.1" + sources."ms-2.1.2" + sources."nan-2.14.0" + sources."nanomatch-1.2.13" + sources."neo-async-2.6.1" + sources."nice-try-1.0.5" + sources."node-fetch-1.7.3" + (sources."node-libs-browser-2.2.1" // { + dependencies = [ + sources."punycode-1.4.1" + ]; + }) + (sources."node-releases-1.1.39" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."normalize-path-3.0.0" + sources."npm-run-path-2.0.2" + sources."null-loader-0.1.1" + sources."object-assign-4.1.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-keys-1.1.1" + sources."object-visit-1.0.1" + sources."object.assign-4.1.0" + sources."object.pick-1.3.0" + sources."once-1.4.0" + sources."os-browserify-0.3.0" + sources."os-locale-3.1.0" + sources."p-defer-1.0.0" + sources."p-finally-1.0.0" + sources."p-is-promise-2.1.0" + sources."p-limit-2.2.1" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."pako-1.0.10" + sources."parallel-transform-1.2.0" + sources."parse-asn1-5.1.5" + sources."parse-cache-control-1.0.1" + sources."parse-passwd-1.0.0" + sources."pascalcase-0.1.1" + sources."path-browserify-0.0.1" + sources."path-dirname-1.0.2" + sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."path-parse-1.0.6" + sources."pbkdf2-3.0.17" + sources."pify-4.0.1" + sources."pkg-dir-3.0.0" + sources."posix-character-classes-0.1.1" + sources."prettier-1.19.1" + sources."private-0.1.8" + sources."process-0.11.10" + sources."process-nextick-args-2.0.1" + sources."promise-8.0.3" + sources."promise-inflight-1.0.1" + sources."prr-1.0.1" + sources."public-encrypt-4.0.3" + sources."pump-3.0.0" + (sources."pumpify-1.5.1" // { + dependencies = [ + sources."pump-2.0.1" + ]; + }) + sources."punycode-2.1.1" + sources."qs-6.9.1" + sources."querystring-0.2.0" + sources."querystring-es3-0.2.1" + sources."randombytes-2.1.0" + sources."randomfill-1.0.4" + sources."readable-stream-2.3.6" + sources."readdirp-2.2.1" + sources."regenerate-1.4.0" + sources."regenerate-unicode-properties-8.1.0" + sources."regenerator-runtime-0.10.5" + sources."regenerator-transform-0.14.1" + sources."regex-not-1.0.2" + sources."regexpu-core-4.6.0" + sources."regjsgen-0.5.1" + (sources."regjsparser-0.6.0" // { + dependencies = [ + sources."jsesc-0.5.0" + ]; + }) + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" + sources."resolve-1.12.0" + sources."resolve-cwd-2.0.0" + (sources."resolve-dir-1.0.1" // { + dependencies = [ + sources."global-modules-1.0.0" + ]; + }) + sources."resolve-from-3.0.0" + sources."resolve-url-0.2.1" + sources."ret-0.1.15" + sources."rimraf-2.7.1" + sources."ripemd160-2.0.2" + sources."run-queue-1.0.3" + sources."safe-buffer-5.1.2" + sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + sources."schema-utils-1.0.0" + sources."semver-5.7.1" + sources."serialize-javascript-1.9.1" + sources."set-blocking-2.0.0" + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."setimmediate-1.0.5" + sources."sha.js-2.4.11" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.2" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."source-list-map-2.0.1" + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.2" + (sources."source-map-support-0.5.16" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."source-map-url-0.4.0" + sources."split-string-3.1.0" + sources."sprintf-js-1.0.3" + sources."ssri-6.0.1" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."stream-browserify-2.0.2" + sources."stream-each-1.2.3" + sources."stream-http-2.8.3" + sources."stream-shift-1.0.0" + sources."string-width-3.1.0" + sources."string_decoder-1.1.1" + sources."strip-ansi-5.2.0" + sources."strip-eof-1.0.0" + sources."supports-color-5.5.0" + sources."sync-request-5.0.0" + sources."sync-rpc-1.3.4" + sources."tapable-1.1.3" + (sources."terser-4.4.0" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + (sources."terser-webpack-plugin-1.4.1" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + (sources."then-request-5.0.0" // { + dependencies = [ + sources."@types/node-8.10.59" + ]; + }) + sources."through2-2.0.5" + sources."timers-browserify-2.0.11" + sources."to-arraybuffer-1.0.1" + sources."to-fast-properties-2.0.0" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + sources."ts-loader-5.4.5" + sources."ts-node-8.5.0" + sources."tslib-1.10.0" + sources."tslint-5.20.1" + sources."tslint-config-prettier-1.18.0" + sources."tsutils-2.29.0" + sources."tty-browserify-0.0.0" + sources."typedarray-0.0.6" + sources."unicode-canonical-property-names-ecmascript-1.0.4" + sources."unicode-match-property-ecmascript-1.0.4" + sources."unicode-match-property-value-ecmascript-1.1.0" + sources."unicode-property-aliases-ecmascript-1.0.5" + sources."union-value-1.0.1" + sources."unique-filename-1.1.1" + sources."unique-slug-2.0.2" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) + sources."upath-1.2.0" + sources."uri-js-4.2.2" + sources."urix-0.1.0" + (sources."url-0.11.0" // { + dependencies = [ + sources."punycode-1.3.2" + ]; + }) + sources."use-3.1.1" + (sources."util-0.11.1" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."util-deprecate-1.0.2" + sources."v8-compile-cache-2.0.3" + sources."vm-browserify-1.1.2" + sources."watchpack-1.6.0" + (sources."webpack-4.41.2" // { + dependencies = [ + sources."memory-fs-0.4.1" + ]; + }) + (sources."webpack-cli-3.3.10" // { + dependencies = [ + sources."enhanced-resolve-4.1.0" + sources."memory-fs-0.4.1" + sources."supports-color-6.1.0" + ]; + }) + (sources."webpack-sources-1.4.3" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."whatwg-fetch-3.0.0" + sources."which-1.3.1" + sources."which-module-2.0.0" + sources."worker-farm-1.7.0" + sources."wrap-ansi-5.1.0" + sources."wrappy-1.0.2" + sources."xtend-4.0.2" + sources."y18n-4.0.0" + sources."yallist-3.1.1" + sources."yargs-13.2.4" + sources."yargs-parser-13.1.1" + sources."yn-3.1.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Render BibTeX citations"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; clean-css = nodeEnv.buildNodePackage { name = "clean-css"; packageName = "clean-css"; @@ -48376,7 +49585,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.12.5" + sources."@types/node-12.12.7" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ajv-6.10.2" @@ -48409,7 +49618,7 @@ in }) sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" - sources."big-integer-1.6.47" + sources."big-integer-1.6.48" (sources."body-parser-1.19.0" // { dependencies = [ sources."bytes-3.1.0" @@ -48470,7 +49679,7 @@ in sources."cookie-signature-1.0.6" sources."copy-descriptor-0.1.1" sources."cordova-app-hello-world-4.0.0" - sources."cordova-common-3.2.0" + sources."cordova-common-3.2.1" (sources."cordova-create-2.0.0" // { dependencies = [ sources."fs-extra-7.0.1" @@ -48523,7 +49732,7 @@ in sources."endent-1.3.0" sources."env-paths-1.0.0" sources."es-abstract-1.16.0" - sources."es-to-primitive-1.2.0" + sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" @@ -48586,7 +49795,7 @@ in sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."glob-7.1.5" + sources."glob-7.1.6" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -48974,7 +50183,7 @@ in sources."which-1.3.1" sources."widest-line-2.0.1" sources."windows-release-3.2.0" - (sources."with-open-file-0.1.6" // { + (sources."with-open-file-0.1.7" // { dependencies = [ sources."pify-4.0.1" ]; @@ -49010,7 +50219,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.12.5" + sources."@types/node-12.12.7" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" @@ -49112,7 +50321,7 @@ in sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" sources."get-value-2.0.6" - sources."glob-7.1.5" + sources."glob-7.1.6" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -49338,7 +50547,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-12.12.5" + sources."@types/node-12.12.7" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -49378,7 +50587,7 @@ in sources."es6-symbol-3.1.3" sources."escape-string-regexp-1.0.5" sources."event-emitter-0.3.5" - (sources."ext-1.1.2" // { + (sources."ext-1.2.0" // { dependencies = [ sources."type-2.0.0" ]; @@ -49426,7 +50635,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" - sources."qs-6.9.0" + sources."qs-6.9.1" sources."quicktask-1.1.0" sources."raf-3.3.2" sources."readable-stream-2.3.6" @@ -49518,7 +50727,7 @@ in sources."fs.realpath-1.0.0" sources."fstream-1.0.12" sources."fstream-ignore-1.0.5" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."graceful-fs-4.2.3" sources."has-flag-3.0.0" sources."hyperquest-2.1.3" @@ -49851,7 +51060,7 @@ in sources."ecc-jsbn-0.1.2" sources."end-of-stream-1.4.4" sources."es-abstract-1.16.0" - sources."es-to-primitive-1.2.0" + sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."execa-0.7.0" (sources."expand-brackets-2.1.4" // { @@ -49911,7 +51120,7 @@ in sources."get-stream-3.0.0" sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."global-4.3.2" sources."global-dirs-0.1.1" sources."got-6.7.1" @@ -50049,7 +51258,7 @@ in sources."nan-2.14.0" sources."nanoassert-1.1.0" sources."nanobus-4.4.0" - sources."nanoguard-1.2.1" + sources."nanoguard-1.2.2" sources."nanomatch-1.2.13" sources."nanoscheduler-1.0.3" sources."nanotiming-7.3.1" @@ -50078,7 +51287,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.6.0" + sources."object-inspect-1.7.0" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.pick-1.3.0" @@ -50566,12 +51775,12 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.563.0" + sources."aws-sdk-2.569.0" sources."aws-sign2-0.7.0" sources."aws4-1.8.0" sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" - sources."buffer-4.9.1" + sources."buffer-4.9.2" sources."buffer-queue-1.0.0" sources."bytes-3.1.0" sources."caseless-0.12.0" @@ -50579,10 +51788,13 @@ in sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."decimal.js-10.2.0" + sources."define-properties-1.1.3" sources."delay-4.3.0" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" sources."end-of-stream-1.4.4" + sources."es-abstract-1.16.0" + sources."es-to-primitive-1.2.1" sources."eventemitter3-4.0.0" sources."events-1.1.1" sources."extend-3.0.2" @@ -50591,9 +51803,12 @@ in sources."fast-json-stable-stringify-2.0.0" sources."forever-agent-0.6.1" sources."form-data-2.3.3" + sources."function-bind-1.1.1" sources."getpass-0.1.7" sources."har-schema-2.0.0" sources."har-validator-5.1.3" + sources."has-1.0.3" + sources."has-symbols-1.0.0" sources."http-signature-1.2.0" sources."ieee754-1.1.13" sources."inherits-2.0.4" @@ -50603,6 +51818,10 @@ in sources."jsbn-1.1.0" ]; }) + sources."is-callable-1.1.4" + sources."is-date-object-1.0.1" + sources."is-regex-1.0.4" + sources."is-symbol-1.0.2" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" sources."isstream-0.1.2" @@ -50619,10 +51838,13 @@ in sources."mime-types-2.1.24" sources."minimist-0.0.10" sources."oauth-sign-0.9.0" + sources."object-inspect-1.7.0" + sources."object-keys-1.1.1" + sources."object.getownpropertydescriptors-2.0.3" sources."once-1.4.0" sources."optimist-0.6.1" sources."p-finally-1.0.0" - sources."p-queue-6.2.0" + sources."p-queue-6.2.1" sources."p-timeout-3.2.0" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" @@ -50647,12 +51869,14 @@ in }) sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" - sources."sax-1.2.1" + sources."sax-1.2.4" sources."socks5-client-1.2.8" sources."socks5-http-client-1.0.4" sources."socks5-https-client-1.2.1" sources."sprintf-js-1.1.2" sources."sshpk-1.16.1" + sources."string.prototype.trimleft-2.1.0" + sources."string.prototype.trimright-2.1.0" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -50673,13 +51897,14 @@ in }) sources."url-0.10.3" sources."util-deprecate-1.0.2" - sources."uuid-3.3.2" + sources."util.promisify-1.0.0" + sources."uuid-3.3.3" sources."verror-1.10.0" sources."when-3.7.8" sources."wordwrap-0.0.3" sources."wrappy-1.0.2" - sources."xml2js-0.4.19" - sources."xmlbuilder-9.0.7" + sources."xml2js-0.4.22" + sources."xmlbuilder-11.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -50761,7 +51986,7 @@ in sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."conf-1.4.0" - (sources."convert-source-map-1.6.0" // { + (sources."convert-source-map-1.7.0" // { dependencies = [ sources."safe-buffer-5.1.2" ]; @@ -50983,7 +52208,7 @@ in sources."acorn-jsx-5.1.0" sources."ajv-6.10.2" sources."ansi-escapes-4.2.1" - sources."ansi-regex-4.1.0" + sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."astral-regex-1.0.0" @@ -51026,7 +52251,7 @@ in sources."flatted-2.0.1" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."glob-parent-5.1.0" sources."globals-11.12.0" sources."has-flag-3.0.0" @@ -51058,7 +52283,7 @@ in sources."nice-try-1.0.5" sources."once-1.4.0" sources."onetime-5.1.0" - sources."optionator-0.8.2" + sources."optionator-0.8.3" sources."os-tmpdir-1.0.2" sources."parent-module-1.0.1" sources."path-is-absolute-1.0.1" @@ -51083,8 +52308,16 @@ in ]; }) sources."sprintf-js-1.0.3" - sources."string-width-4.1.0" - sources."strip-ansi-5.2.0" + (sources."string-width-4.2.0" // { + dependencies = [ + sources."strip-ansi-6.0.0" + ]; + }) + (sources."strip-ansi-5.2.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + ]; + }) sources."strip-json-comments-3.0.1" sources."supports-color-5.5.0" (sources."table-5.4.6" // { @@ -51103,7 +52336,7 @@ in sources."uri-js-4.2.2" sources."v8-compile-cache-2.1.0" sources."which-1.3.1" - sources."wordwrap-1.0.0" + sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."write-1.0.3" ]; @@ -51132,7 +52365,7 @@ in sources."acorn-jsx-5.1.0" sources."ajv-6.10.2" sources."ansi-escapes-4.2.1" - sources."ansi-regex-4.1.0" + sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."astral-regex-1.0.0" @@ -51177,7 +52410,7 @@ in sources."flatted-2.0.1" sources."fs.realpath-1.0.0" sources."functional-red-black-tree-1.0.1" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."glob-parent-5.1.0" sources."globals-11.12.0" sources."has-flag-3.0.0" @@ -51210,7 +52443,7 @@ in sources."nice-try-1.0.5" sources."once-1.4.0" sources."onetime-5.1.0" - sources."optionator-0.8.2" + sources."optionator-0.8.3" sources."os-tmpdir-1.0.2" sources."parent-module-1.0.1" sources."path-is-absolute-1.0.1" @@ -51237,8 +52470,16 @@ in ]; }) sources."sprintf-js-1.0.3" - sources."string-width-4.1.0" - sources."strip-ansi-5.2.0" + (sources."string-width-4.2.0" // { + dependencies = [ + sources."strip-ansi-6.0.0" + ]; + }) + (sources."strip-ansi-5.2.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + ]; + }) sources."strip-json-comments-3.0.1" sources."supports-color-5.5.0" (sources."table-5.4.6" // { @@ -51257,7 +52498,7 @@ in sources."uri-js-4.2.2" sources."v8-compile-cache-2.1.0" sources."which-1.3.1" - sources."wordwrap-1.0.0" + sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."write-1.0.3" ]; @@ -51767,7 +53008,7 @@ in sources."fsevents-1.2.9" sources."function-bind-1.1.1" sources."get-value-2.0.6" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" sources."graceful-fs-4.2.3" @@ -52247,8 +53488,8 @@ in sources."semver-5.7.1" sources."separator-escape-0.0.0" sources."sha.js-2.4.5" - sources."smart-buffer-4.0.2" - sources."socks-2.3.2" + sources."smart-buffer-4.1.0" + sources."socks-2.3.3" sources."sodium-browserify-1.3.0" (sources."sodium-browserify-tweetnacl-0.2.6" // { dependencies = [ @@ -52329,151 +53570,219 @@ in gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; - version = "2.2.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-2.2.0.tgz"; - sha512 = "1eYIuRcKtKtnktW/4D0043qMW2Q1iIv90q+gWsStW3i9Uo6hEC8wWjmHu9047pNvcmYEeK7XuPrYzFvq+FfVyw=="; + url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.0.0.tgz"; + sha512 = "eRb/bUvC5E5TXSD0/A6DJffPP+g7gcpn572XhC/sQnWW0B3fopeegldE++pM2bfKuUGGsObRThsbuU5NqR8P9Q=="; }; dependencies = [ - sources."ansi-align-2.0.0" - sources."ansi-escapes-3.2.0" - sources."ansi-regex-3.0.0" + sources."@sindresorhus/is-0.14.0" + sources."@szmarczak/http-timer-1.1.2" + sources."ajv-6.10.2" + (sources."ansi-align-3.0.0" // { + dependencies = [ + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-3.1.0" + ]; + }) + sources."ansi-escapes-4.2.1" + sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."array-find-index-1.0.2" sources."arrify-1.0.1" - sources."axios-0.18.1" - sources."boxen-1.3.0" + (sources."boxen-3.2.0" // { + dependencies = [ + sources."camelcase-5.3.1" + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-3.1.0" + sources."type-fest-0.3.1" + ]; + }) + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."lowercase-keys-2.0.0" + ]; + }) sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."capture-stack-trace-1.0.1" sources."chalk-2.4.2" sources."chardet-0.7.0" - sources."ci-info-1.6.0" - sources."cli-boxes-1.0.0" - sources."cli-cursor-2.1.0" + sources."ci-info-2.0.0" + sources."cli-boxes-2.2.0" + sources."cli-cursor-3.1.0" + sources."cli-spinners-2.2.0" sources."cli-width-2.2.0" + sources."clone-1.0.4" + sources."clone-response-1.0.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."conf-2.2.0" - sources."configstore-3.1.2" - sources."create-error-class-3.0.2" - sources."cross-spawn-6.0.5" + sources."conf-6.2.0" + (sources."configstore-4.0.0" // { + dependencies = [ + sources."dot-prop-4.2.0" + sources."is-obj-1.0.1" + sources."make-dir-1.3.0" + sources."write-file-atomic-2.4.3" + ]; + }) + sources."cross-spawn-7.0.1" sources."crypto-random-string-1.0.0" sources."currently-unhandled-0.4.1" - sources."debug-3.1.0" + sources."debounce-fn-3.0.1" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ sources."map-obj-1.0.1" ]; }) + sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" - sources."dot-prop-4.2.0" + sources."defaults-1.0.3" + sources."defer-to-connect-1.1.0" + sources."dot-prop-5.2.0" sources."duplexer3-0.1.4" + sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - sources."env-paths-1.0.0" + sources."env-paths-2.2.0" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" - sources."execa-1.0.0" + sources."execa-3.3.0" sources."external-editor-3.1.0" - sources."figures-2.0.0" - sources."find-up-2.1.0" - sources."follow-redirects-1.5.10" - sources."get-stream-4.1.0" + sources."fast-deep-equal-2.0.1" + sources."fast-json-stable-stringify-2.0.0" + sources."figures-3.1.0" + sources."find-up-3.0.0" + sources."get-stream-5.1.0" sources."global-dirs-0.1.1" - (sources."got-6.7.1" // { + (sources."got-9.6.0" // { dependencies = [ - sources."get-stream-3.0.0" + sources."get-stream-4.1.0" ]; }) sources."graceful-fs-4.2.3" sources."has-flag-3.0.0" + sources."has-yarn-2.1.0" sources."hosted-git-info-2.8.5" + sources."http-cache-semantics-4.0.3" + sources."human-signals-1.1.1" sources."iconv-lite-0.4.24" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."indent-string-3.2.0" sources."ini-1.3.5" - sources."inquirer-6.5.2" - sources."inquirer-autocomplete-prompt-1.0.1" + sources."inquirer-7.0.0" + (sources."inquirer-autocomplete-prompt-1.0.1" // { + dependencies = [ + sources."ansi-escapes-3.2.0" + sources."figures-2.0.0" + ]; + }) sources."is-arrayish-0.2.1" - sources."is-buffer-2.0.4" - sources."is-ci-1.2.1" - sources."is-fullwidth-code-point-2.0.0" + sources."is-ci-2.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-installed-globally-0.1.0" - sources."is-npm-1.0.0" - sources."is-obj-1.0.1" + sources."is-interactive-1.0.0" + sources."is-npm-3.0.0" + sources."is-obj-2.0.0" sources."is-path-inside-1.0.1" sources."is-plain-obj-1.1.0" sources."is-promise-2.1.0" - sources."is-redirect-1.0.0" - sources."is-retry-allowed-1.2.0" - sources."is-stream-1.1.0" + sources."is-stream-2.0.0" + sources."is-typedarray-1.0.0" + sources."is-yarn-global-0.3.0" sources."isexe-2.0.0" + sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" - sources."latest-version-3.1.0" + sources."json-schema-traverse-0.4.1" + sources."json-schema-typed-7.0.2" + sources."keyv-3.1.0" + sources."latest-version-5.1.0" sources."load-json-file-4.0.0" - sources."locate-path-2.0.0" + sources."locate-path-3.0.0" sources."lodash-4.17.15" + sources."log-symbols-3.0.0" sources."loud-rejection-1.6.0" sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.5" - sources."make-dir-1.3.0" + sources."make-dir-3.0.0" sources."map-obj-2.0.0" sources."meow-5.0.0" - sources."mimic-fn-1.2.0" + sources."merge-stream-2.0.0" + sources."mimic-fn-2.1.0" + sources."mimic-response-1.0.1" sources."minimist-1.2.0" sources."minimist-options-3.0.2" - sources."ms-2.0.0" - sources."mute-stream-0.0.7" - sources."nice-try-1.0.5" - sources."normalize-package-data-2.5.0" - sources."npm-run-path-2.0.2" + sources."mute-stream-0.0.8" + sources."node-fetch-2.6.0" + (sources."normalize-package-data-2.5.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."normalize-url-4.5.0" + sources."npm-run-path-4.0.0" sources."once-1.4.0" - sources."onetime-2.0.1" + sources."onetime-5.1.0" + sources."ora-4.0.2" sources."os-tmpdir-1.0.2" - sources."p-finally-1.0.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" - sources."p-try-1.0.0" - sources."package-json-4.0.1" - sources."parent-dirs-1.0.0" + sources."p-cancelable-1.1.0" + sources."p-finally-2.0.1" + sources."p-limit-2.2.1" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" + sources."package-json-6.5.0" sources."parse-json-4.0.0" sources."path-exists-3.0.0" sources."path-is-inside-1.0.2" - sources."path-key-2.0.1" + sources."path-key-3.1.0" sources."path-parse-1.0.6" sources."path-type-3.0.0" sources."pify-3.0.0" - sources."pkg-up-2.0.0" - sources."prepend-http-1.0.4" + sources."pkg-up-3.1.0" + sources."prepend-http-2.0.0" sources."pseudomap-1.0.2" sources."pump-3.0.0" + sources."punycode-2.1.1" sources."quick-lru-1.1.0" sources."rc-1.2.8" sources."read-pkg-3.0.0" - sources."read-pkg-up-3.0.0" + (sources."read-pkg-up-3.0.0" // { + dependencies = [ + sources."find-up-2.1.0" + sources."locate-path-2.0.0" + sources."p-limit-1.3.0" + sources."p-locate-2.0.0" + sources."p-try-1.0.0" + ]; + }) sources."redent-2.0.0" - sources."registry-auth-token-3.4.0" - sources."registry-url-3.1.0" + sources."registry-auth-token-4.0.0" + sources."registry-url-5.1.0" sources."resolve-1.12.0" - sources."restore-cursor-2.0.0" + sources."responselike-1.0.2" + sources."restore-cursor-3.1.0" sources."run-async-2.3.0" sources."rxjs-6.5.3" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" - sources."semver-5.7.1" - sources."semver-diff-2.1.0" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" + sources."semver-6.3.0" + (sources."semver-diff-2.1.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" sources."signal-exit-3.0.2" sources."spdx-correct-3.1.0" sources."spdx-exceptions-2.2.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" - (sources."string-width-2.1.1" // { + (sources."string-width-4.2.0" // { dependencies = [ - sources."strip-ansi-4.0.0" + sources."strip-ansi-6.0.0" ]; }) (sources."strip-ansi-5.2.0" // { @@ -52483,6 +53792,7 @@ in }) sources."strip-bom-3.0.0" sources."strip-eof-1.0.0" + sources."strip-final-newline-2.0.0" sources."strip-indent-2.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" @@ -52491,22 +53801,39 @@ in sources."cross-spawn-5.1.0" sources."execa-0.7.0" sources."get-stream-3.0.0" + sources."is-stream-1.1.0" + sources."npm-run-path-2.0.2" + sources."p-finally-1.0.0" + sources."path-key-2.0.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."which-1.3.1" ]; }) sources."through-2.3.8" - sources."timed-out-4.0.1" sources."tmp-0.0.33" + sources."to-readable-stream-1.0.0" sources."trim-newlines-2.0.0" sources."tslib-1.10.0" + sources."type-fest-0.5.2" + sources."typedarray-to-buffer-3.1.5" sources."unique-string-1.0.0" - sources."unzip-response-2.0.1" - sources."update-notifier-2.5.0" - sources."url-parse-lax-1.0.0" + sources."update-notifier-3.0.1" + sources."uri-js-4.2.2" + sources."url-parse-lax-3.0.0" sources."validate-npm-package-license-3.0.4" - sources."which-1.3.1" - sources."widest-line-2.0.1" + sources."wcwidth-1.0.1" + sources."which-2.0.1" + (sources."widest-line-2.0.1" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) sources."wrappy-1.0.2" - sources."write-file-atomic-2.4.3" + sources."write-file-atomic-3.0.1" sources."xdg-basedir-3.0.0" sources."yallist-2.1.2" sources."yargs-parser-10.1.0" @@ -52662,12 +53989,20 @@ in sources."create-error-class-3.0.2" (sources."creato-1.1.0" // { dependencies = [ - sources."ansi-regex-4.1.0" + sources."ansi-regex-5.0.0" sources."inquirer-7.0.0" sources."is-fullwidth-code-point-3.0.0" sources."ora-4.0.2" - sources."string-width-4.1.0" - sources."strip-ansi-5.2.0" + (sources."string-width-4.2.0" // { + dependencies = [ + sources."strip-ansi-6.0.0" + ]; + }) + (sources."strip-ansi-5.2.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + ]; + }) sources."update-notifier-3.0.1" ]; }) @@ -52740,7 +54075,7 @@ in dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" - sources."path-to-regexp-1.7.0" + sources."path-to-regexp-1.8.0" ]; }) sources."extend-3.0.2" @@ -52767,7 +54102,7 @@ in sources."get-caller-file-1.0.3" sources."get-stream-3.0.0" sources."getpass-0.1.7" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."global-dirs-0.1.1" sources."global-modules-1.0.0" sources."global-prefix-1.0.2" @@ -53554,7 +54889,7 @@ in sources."drawille-blessed-contrib-1.0.0" sources."drawille-canvas-blessed-contrib-0.1.3" sources."es-abstract-1.16.0" - sources."es-to-primitive-1.2.0" + sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."esprima-3.0.0" (sources."event-stream-0.9.8" // { @@ -53584,7 +54919,7 @@ in sources."memorystream-0.3.1" sources."node-emoji-1.10.0" sources."nopt-2.1.2" - sources."object-inspect-1.6.0" + sources."object-inspect-1.7.0" sources."object-keys-1.1.1" sources."object.getownpropertydescriptors-2.0.3" sources."optimist-0.3.7" @@ -53599,7 +54934,7 @@ in sources."string_decoder-0.10.31" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" - sources."systeminformation-4.14.17" + sources."systeminformation-4.15.3" sources."term-canvas-0.0.5" sources."util.promisify-1.0.0" sources."wordwrap-0.0.3" @@ -53713,7 +55048,7 @@ in sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" - sources."convert-source-map-1.6.0" + sources."convert-source-map-1.7.0" sources."copy-descriptor-0.1.1" sources."copy-props-2.0.4" sources."core-util-is-1.0.2" @@ -53757,7 +55092,7 @@ in ]; }) sources."expand-tilde-2.0.2" - (sources."ext-1.1.2" // { + (sources."ext-1.2.0" // { dependencies = [ sources."type-2.0.0" ]; @@ -53794,7 +55129,7 @@ in sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" sources."get-value-2.0.6" - sources."glob-7.1.5" + sources."glob-7.1.6" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -54152,7 +55487,7 @@ in ]; }) sources."expand-tilde-2.0.2" - (sources."ext-1.1.2" // { + (sources."ext-1.2.0" // { dependencies = [ sources."type-2.0.0" ]; @@ -54438,7 +55773,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.6.7" + sources."uglify-js-3.6.8" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -54483,7 +55818,7 @@ in sources."dashdash-1.14.1" sources."date-now-0.1.4" sources."delayed-stream-1.0.0" - (sources."dom-serializer-0.2.1" // { + (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.0.1" sources."entities-2.0.0" @@ -54519,7 +55854,7 @@ in sources."isarray-0.0.1" sources."isstream-0.1.2" sources."jsbn-0.1.1" - (sources."jshint-2.10.2" // { + (sources."jshint-2.10.3" // { dependencies = [ sources."strip-json-comments-1.0.4" ]; @@ -54648,7 +55983,7 @@ in sources."extsprintf-1.4.0" sources."fs.realpath-1.0.0" sources."fuzzyset.js-0.0.1" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."hue-sdk-0.1.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -54789,9 +56124,10 @@ in sources."@ionic/utils-stream-2.0.4" sources."@ionic/utils-subprocess-1.0.9" sources."@ionic/utils-terminal-1.0.5" + sources."@types/color-name-1.1.1" sources."agent-base-4.3.0" sources."ansi-escapes-3.2.0" - sources."ansi-regex-4.1.0" + sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."ast-types-0.13.2" sources."astral-regex-1.0.0" @@ -54875,7 +56211,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."glob-7.1.5" + sources."glob-7.1.6" sources."graceful-fs-4.2.3" sources."has-flag-3.0.0" sources."http-errors-1.7.3" @@ -54965,7 +56301,7 @@ in sources."once-1.4.0" sources."onetime-2.0.1" sources."open-7.0.0" - sources."optionator-0.8.2" + sources."optionator-0.8.3" sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" sources."p-finally-1.0.0" @@ -54978,7 +56314,7 @@ in sources."proxy-agent-3.1.1" sources."proxy-from-env-1.0.0" sources."pump-3.0.0" - sources."qs-6.9.0" + sources."qs-6.9.1" sources."raw-body-2.4.1" sources."readable-stream-3.4.0" sources."restore-cursor-2.0.0" @@ -54995,8 +56331,8 @@ in sources."shebang-regex-3.0.0" sources."signal-exit-3.0.2" sources."slice-ansi-2.1.0" - sources."smart-buffer-4.0.2" - sources."socks-2.3.2" + sources."smart-buffer-4.1.0" + sources."socks-2.3.3" (sources."socks-proxy-agent-4.0.2" // { dependencies = [ sources."agent-base-4.2.1" @@ -55013,14 +56349,19 @@ in sources."string_decoder-1.1.1" ]; }) - (sources."string-width-4.1.0" // { + (sources."string-width-4.2.0" // { dependencies = [ sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" + sources."strip-ansi-6.0.0" ]; }) sources."string_decoder-1.3.0" - sources."strip-ansi-5.2.0" + (sources."strip-ansi-5.2.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + ]; + }) sources."strip-eof-1.0.0" sources."superagent-4.1.0" (sources."superagent-proxy-2.0.0" // { @@ -55047,12 +56388,13 @@ in sources."uuid-3.3.3" sources."which-2.0.1" sources."windows-release-3.2.0" - sources."wordwrap-1.0.0" - (sources."wrap-ansi-6.1.0" // { + sources."word-wrap-1.2.3" + (sources."wrap-ansi-6.2.0" // { dependencies = [ - sources."ansi-styles-4.1.0" + sources."ansi-styles-4.2.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" + sources."strip-ansi-6.0.0" ]; }) sources."wrappy-1.0.2" @@ -55173,7 +56515,6 @@ in sources."levn-0.2.5" sources."optionator-0.3.0" sources."source-map-0.1.43" - sources."wordwrap-0.0.3" ]; }) sources."esprima-3.1.3" @@ -55211,7 +56552,7 @@ in sources."get-caller-file-1.0.3" sources."get-stream-3.0.0" sources."getpass-0.1.7" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."graceful-fs-4.2.3" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -55273,7 +56614,7 @@ in sources."object-assign-4.1.1" sources."once-1.4.0" sources."onetime-2.0.1" - sources."optionator-0.8.2" + sources."optionator-0.8.3" sources."os-homedir-1.0.2" sources."os-locale-2.1.0" sources."os-tmpdir-1.0.2" @@ -55429,7 +56770,8 @@ in sources."which-1.3.1" sources."which-module-2.0.0" sources."wide-align-1.1.3" - sources."wordwrap-1.0.0" + sources."word-wrap-1.2.3" + sources."wordwrap-0.0.3" (sources."wrap-ansi-2.1.0" // { dependencies = [ sources."string-width-1.0.2" @@ -55472,10 +56814,10 @@ in jake = nodeEnv.buildNodePackage { name = "jake"; packageName = "jake"; - version = "10.1.6"; + version = "10.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/jake/-/jake-10.1.6.tgz"; - sha512 = "gGnRHch3G461ryAnrBEeepuoyBHtqOfskwTWJntwF9hfzhe5kfcYbIpZKqFDniBWkyoUqktigvoTn+tysnjJdg=="; + url = "https://registry.npmjs.org/jake/-/jake-10.3.1.tgz"; + sha512 = "//GIzuTPZOAyvwf8U+/xjbzkNu+QMXoW0k3p1bPlbq43kGZD0WDJO9uhTDQ0mX6I+Sct4Is7TdvmSAqX2mrR/g=="; }; dependencies = [ sources."ansi-styles-3.2.1" @@ -55538,7 +56880,7 @@ in sources."fast-json-patch-2.2.1" sources."fs.realpath-1.0.0" sources."get-func-name-2.0.0" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."has-flag-3.0.0" sources."hexer-1.5.0" sources."inflight-1.0.6" @@ -55596,10 +56938,10 @@ in joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "1.0.149"; + version = "1.0.150"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-1.0.149.tgz"; - sha512 = "DDMvPmNgsp3yQtwsIvxeCrE5MByDaUojKGfFH4vYTAbboO7jB34rwknwW3efVoOjQVtLmMH6OpBajArci9q8tQ=="; + url = "https://registry.npmjs.org/joplin/-/joplin-1.0.150.tgz"; + sha512 = "CVQp6OFc3pJOnjjQHcRwQZ5HMh25xtVZTgLvzW+UyamtlkRVCqvw1tp7yitSxIC9AjhTIS4kBPzsC32XWm7lew=="; }; dependencies = [ sources."@cronvel/get-pixels-3.3.1" @@ -55699,7 +57041,7 @@ in sources."detect-libc-1.0.3" sources."diacritics-1.3.0" sources."diff-match-patch-1.0.4" - (sources."dom-serializer-0.2.1" // { + (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.0.1" sources."entities-2.0.0" @@ -55722,7 +57064,7 @@ in sources."end-of-stream-1.4.4" sources."entities-1.1.2" sources."es-abstract-1.16.0" - sources."es-to-primitive-1.2.0" + sources."es-to-primitive-1.2.1" sources."es6-promise-pool-2.5.0" sources."escape-string-regexp-1.0.5" sources."escodegen-1.12.0" @@ -55747,9 +57089,8 @@ in sources."form-data-2.5.1" sources."format-0.2.2" sources."fs-constants-1.0.0" - sources."fs-copy-file-sync-1.1.1" sources."fs-extra-5.0.0" - sources."fs-minipass-1.2.7" + sources."fs-minipass-2.0.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" (sources."gauge-2.7.4" // { @@ -55761,7 +57102,7 @@ in sources."get-stdin-5.0.1" sources."getpass-0.1.7" sources."github-from-package-0.0.0" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."graceful-fs-4.2.3" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -55838,7 +57179,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isstream-0.1.2" - sources."joplin-turndown-4.0.18" + sources."joplin-turndown-4.0.19" sources."joplin-turndown-plugin-gfm-1.0.11" sources."jpeg-js-0.1.2" sources."js-tokens-4.0.0" @@ -55875,8 +57216,8 @@ in sources."mimic-response-2.0.0" sources."minimatch-3.0.4" sources."minimist-1.2.0" - sources."minipass-2.9.0" - sources."minizlib-1.3.3" + sources."minipass-3.1.1" + sources."minizlib-2.1.0" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -55919,7 +57260,7 @@ in sources."nwsapi-2.2.0" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" - sources."object-inspect-1.6.0" + sources."object-inspect-1.7.0" sources."object-keys-1.1.1" (sources."object-to-arguments-0.0.8" // { dependencies = [ @@ -55930,7 +57271,7 @@ in sources."object.getownpropertydescriptors-2.0.3" sources."omggif-1.0.10" sources."once-1.4.0" - sources."optionator-0.8.2" + sources."optionator-0.8.3" sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" @@ -55989,7 +57330,11 @@ in sources."setimmediate-1.0.5" sources."setprototypeof-1.1.1" sources."seventh-0.7.30" - sources."sharp-0.22.1" + (sources."sharp-0.23.2" // { + dependencies = [ + sources."tar-5.0.5" + ]; + }) sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.2" @@ -56011,7 +57356,7 @@ in sources."statuses-1.5.0" sources."stealthy-require-1.1.1" sources."strict-uri-encode-1.1.0" - sources."string-kit-0.10.1" + sources."string-kit-0.10.3" sources."string-padding-1.0.2" (sources."string-to-stream-1.1.1" // { dependencies = [ @@ -56044,7 +57389,14 @@ in sources."symbol-tree-3.2.4" sources."syswide-cas-5.3.0" sources."table-layout-0.4.5" - sources."tar-4.4.13" + (sources."tar-4.4.13" // { + dependencies = [ + sources."fs-minipass-1.2.7" + sources."minipass-2.9.0" + sources."minizlib-1.3.3" + sources."yallist-3.1.1" + ]; + }) sources."tar-fs-2.0.0" sources."tar-stream-2.1.0" (sources."tcp-port-used-0.1.2" // { @@ -56053,7 +57405,7 @@ in sources."q-0.9.7" ]; }) - sources."terminal-kit-1.31.4" + sources."terminal-kit-1.31.7" (sources."tkwidgets-0.5.26" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" @@ -56098,7 +57450,6 @@ in sources."which-pm-runs-1.0.0" sources."wide-align-1.1.3" sources."word-wrap-1.2.3" - sources."wordwrap-1.0.0" sources."wordwrapjs-3.0.0" (sources."wrap-ansi-3.0.1" // { dependencies = [ @@ -56111,7 +57462,7 @@ in sources."xml-name-validator-3.0.0" sources."xml2js-0.4.22" sources."xmlbuilder-11.0.1" - sources."yallist-3.1.1" + sources."yallist-4.0.0" sources."yargs-parser-7.0.0" ]; buildInputs = globalBuildInputs; @@ -56141,7 +57492,7 @@ in sources."config-chain-1.1.12" sources."editorconfig-0.15.3" sources."fs.realpath-1.0.0" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" @@ -56204,7 +57555,7 @@ in sha512 = "Yf1ZKA3r9nvtMWHO1kEuMZTlHOF8uoQ0vyo5eH7SQy5YeIiHM+B0DgKnn+X6y6KDYZcF7G2SPkKF+JORCXWE/A=="; }; dependencies = [ - sources."@babel/parser-7.6.4" + sources."@babel/parser-7.7.3" sources."argparse-1.0.10" sources."bluebird-3.7.1" sources."catharsis-0.8.11" @@ -56242,10 +57593,10 @@ in jshint = nodeEnv.buildNodePackage { name = "jshint"; packageName = "jshint"; - version = "2.10.2"; + version = "2.10.3"; src = fetchurl { - url = "https://registry.npmjs.org/jshint/-/jshint-2.10.2.tgz"; - sha512 = "e7KZgCSXMJxznE/4WULzybCMNXNAd/bf5TSrvVEq78Q/K8ZwFpmBqQeDtNiHc3l49nV4E/+YeHU/JZjSUIrLAA=="; + url = "https://registry.npmjs.org/jshint/-/jshint-2.10.3.tgz"; + sha512 = "d8AoXcNNYzmm7cdmulQ3dQApbrPYArtVBO6n4xOICe4QsXGNHCAKDcFORzqP52LhK61KX0VhY39yYzCsNq+bxQ=="; }; dependencies = [ sources."balanced-match-1.0.0" @@ -56255,7 +57606,7 @@ in sources."console-browserify-1.1.0" sources."core-util-is-1.0.2" sources."date-now-0.1.4" - (sources."dom-serializer-0.2.1" // { + (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.0.1" sources."entities-2.0.0" @@ -56267,7 +57618,7 @@ in sources."entities-1.0.0" sources."exit-0.1.2" sources."fs.realpath-1.0.0" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."htmlparser2-3.8.3" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -56370,7 +57721,7 @@ in sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" - sources."qs-6.9.0" + sources."qs-6.9.1" sources."readable-stream-2.3.6" sources."safe-buffer-5.1.2" sources."slash-2.0.0" @@ -56473,7 +57824,7 @@ in sources."express-4.17.1" (sources."express-urlrewrite-1.2.0" // { dependencies = [ - sources."path-to-regexp-1.7.0" + sources."path-to-regexp-1.8.0" ]; }) sources."extend-3.0.2" @@ -56776,8 +58127,8 @@ in }) sources."fs-extra-7.0.1" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.1" - sources."glob-7.1.5" + sources."fsevents-2.1.2" + sources."glob-7.1.6" sources."glob-parent-5.1.0" sources."graceful-fs-4.2.3" sources."has-binary2-1.0.3" @@ -56821,7 +58172,7 @@ in sources."parseuri-0.0.5" sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" - sources."picomatch-2.1.0" + sources."picomatch-2.1.1" sources."pseudomap-1.0.2" sources."qjobs-1.2.0" sources."qs-6.7.0" @@ -56908,7 +58259,7 @@ in sources."clone-stats-1.0.0" sources."cloneable-readable-1.1.3" sources."concat-map-0.0.1" - sources."convert-source-map-1.6.0" + sources."convert-source-map-1.7.0" sources."core-util-is-1.0.2" sources."define-properties-1.1.3" sources."duplexify-3.7.1" @@ -56918,7 +58269,7 @@ in sources."fs-mkdirp-stream-1.0.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."glob-parent-3.1.0" sources."glob-stream-6.1.0" sources."graceful-fs-4.2.3" @@ -57062,7 +58413,7 @@ in sources."get-caller-file-1.0.3" sources."get-stream-4.1.0" sources."getpass-0.1.7" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-3.0.0" @@ -57123,7 +58474,7 @@ in sources."oauth-sign-0.9.0" sources."once-1.4.0" sources."onetime-2.0.1" - sources."optionator-0.8.2" + sources."optionator-0.8.3" (sources."ora-3.0.0" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -57207,6 +58558,7 @@ in sources."pkginfo-0.3.1" ]; }) + sources."word-wrap-1.2.3" sources."wordwrap-1.0.0" sources."wrap-ansi-2.1.0" sources."wrappy-1.0.2" @@ -57243,10 +58595,10 @@ in lerna = nodeEnv.buildNodePackage { name = "lerna"; packageName = "lerna"; - version = "3.18.3"; + version = "3.18.4"; src = fetchurl { - url = "https://registry.npmjs.org/lerna/-/lerna-3.18.3.tgz"; - sha512 = "Bnr/RjyDSVA2Vu+NArK7do4UIpyy+EShOON7tignfAekPbi7cNDnMMGgSmbCQdKITkqPACMfCMdyq0hJlg6n3g=="; + url = "https://registry.npmjs.org/lerna/-/lerna-3.18.4.tgz"; + sha512 = "DiU53cvMxaU07Bj2HwBwUQ2O3c/ORNq/QwKj1vGJH4vSkZSTUxPryp2baSNlt8PmnLNXOVpw0vOTRkEF+6n/cA=="; }; dependencies = [ (sources."@evocateur/libnpmaccess-3.1.2" // { @@ -57266,12 +58618,12 @@ in sources."semver-5.7.1" ]; }) - sources."@lerna/add-3.18.0" - sources."@lerna/bootstrap-3.18.0" - sources."@lerna/changed-3.18.3" + sources."@lerna/add-3.18.4" + sources."@lerna/bootstrap-3.18.4" + sources."@lerna/changed-3.18.4" sources."@lerna/check-working-tree-3.16.5" sources."@lerna/child-process-3.16.5" - sources."@lerna/clean-3.18.0" + sources."@lerna/clean-3.18.4" sources."@lerna/cli-3.18.0" sources."@lerna/collect-uncommitted-3.16.5" sources."@lerna/collect-updates-3.18.0" @@ -57289,8 +58641,8 @@ in sources."@lerna/create-symlink-3.16.2" sources."@lerna/describe-ref-3.16.5" sources."@lerna/diff-3.18.0" - sources."@lerna/exec-3.18.0" - sources."@lerna/filter-options-3.18.0" + sources."@lerna/exec-3.18.4" + sources."@lerna/filter-options-3.18.4" sources."@lerna/filter-packages-3.18.0" sources."@lerna/get-npm-exec-opts-3.13.0" sources."@lerna/get-packed-3.16.0" @@ -57301,8 +58653,8 @@ in sources."@lerna/import-3.18.0" sources."@lerna/init-3.18.0" sources."@lerna/link-3.18.0" - sources."@lerna/list-3.18.0" - sources."@lerna/listable-3.18.0" + sources."@lerna/list-3.18.4" + sources."@lerna/listable-3.18.4" sources."@lerna/log-packed-3.16.0" (sources."@lerna/npm-conf-3.16.0" // { dependencies = [ @@ -57325,19 +58677,19 @@ in sources."@lerna/prerelease-id-from-version-3.16.0" sources."@lerna/project-3.18.0" sources."@lerna/prompt-3.13.0" - sources."@lerna/publish-3.18.3" + sources."@lerna/publish-3.18.4" sources."@lerna/pulse-till-done-3.13.0" sources."@lerna/query-graph-3.18.0" sources."@lerna/resolve-symlink-3.16.0" sources."@lerna/rimraf-dir-3.16.5" - sources."@lerna/run-3.18.0" + sources."@lerna/run-3.18.4" sources."@lerna/run-lifecycle-3.16.2" sources."@lerna/run-topologically-3.18.0" sources."@lerna/symlink-binary-3.17.0" sources."@lerna/symlink-dependencies-3.17.0" sources."@lerna/timer-3.13.0" sources."@lerna/validation-error-3.13.0" - sources."@lerna/version-3.18.3" + sources."@lerna/version-3.18.4" sources."@lerna/write-log-file-3.13.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -57354,13 +58706,13 @@ in sources."isobject-4.0.0" ]; }) - sources."@octokit/request-error-1.1.0" - sources."@octokit/rest-16.34.1" + sources."@octokit/request-error-1.2.0" + sources."@octokit/rest-16.35.0" sources."@octokit/types-2.0.1" sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.12.5" + sources."@types/node-12.12.7" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" @@ -57474,7 +58826,7 @@ in sources."concat-stream-1.6.2" sources."config-chain-1.1.12" sources."console-control-strings-1.1.0" - sources."conventional-changelog-angular-5.0.5" + sources."conventional-changelog-angular-5.0.6" (sources."conventional-changelog-core-3.2.3" // { dependencies = [ sources."through2-3.0.1" @@ -57487,7 +58839,7 @@ in ]; }) sources."conventional-commits-filter-2.0.2" - (sources."conventional-commits-parser-3.0.6" // { + (sources."conventional-commits-parser-3.0.7" // { dependencies = [ sources."through2-3.0.1" ]; @@ -57546,7 +58898,7 @@ in sources."err-code-1.1.2" sources."error-ex-1.3.2" sources."es-abstract-1.16.0" - sources."es-to-primitive-1.2.0" + sources."es-to-primitive-1.2.1" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" @@ -57662,7 +59014,7 @@ in sources."git-up-4.0.1" sources."git-url-parse-11.1.2" sources."gitconfiglocal-1.0.0" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."glob-parent-5.1.0" sources."glob-to-regexp-0.3.0" (sources."globby-9.2.0" // { @@ -57868,7 +59220,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.6.0" + sources."object-inspect-1.7.0" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.getownpropertydescriptors-2.0.3" @@ -57928,7 +59280,7 @@ in sources."qs-6.5.2" sources."quick-lru-1.1.0" sources."read-1.0.7" - sources."read-cmd-shim-1.0.4" + sources."read-cmd-shim-1.0.5" (sources."read-package-json-2.1.0" // { dependencies = [ sources."slash-1.0.0" @@ -57993,7 +59345,7 @@ in sources."signal-exit-3.0.2" sources."slash-2.0.0" sources."slide-1.1.6" - sources."smart-buffer-4.0.2" + sources."smart-buffer-4.1.0" (sources."snapdragon-0.8.2" // { dependencies = [ sources."debug-2.6.9" @@ -58024,7 +59376,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."socks-2.3.2" + sources."socks-2.3.3" (sources."socks-proxy-agent-4.0.2" // { dependencies = [ sources."agent-base-4.2.1" @@ -58115,7 +59467,7 @@ in sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - (sources."uglify-js-3.6.7" // { + (sources."uglify-js-3.6.8" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -59146,68 +60498,70 @@ in src = ../interpreters/clojurescript/lumo; dependencies = [ sources."@babel/code-frame-7.5.5" - sources."@babel/core-7.6.4" - sources."@babel/generator-7.6.4" - sources."@babel/helper-annotate-as-pure-7.0.0" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.1.0" - sources."@babel/helper-call-delegate-7.4.4" - sources."@babel/helper-create-class-features-plugin-7.6.0" - sources."@babel/helper-define-map-7.5.5" - sources."@babel/helper-explode-assignable-expression-7.1.0" - sources."@babel/helper-function-name-7.1.0" - sources."@babel/helper-get-function-arity-7.0.0" - sources."@babel/helper-hoist-variables-7.4.4" - sources."@babel/helper-member-expression-to-functions-7.5.5" - sources."@babel/helper-module-imports-7.0.0" - sources."@babel/helper-module-transforms-7.5.5" - sources."@babel/helper-optimise-call-expression-7.0.0" + sources."@babel/core-7.7.2" + sources."@babel/generator-7.7.2" + sources."@babel/helper-annotate-as-pure-7.7.0" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.7.0" + sources."@babel/helper-call-delegate-7.7.0" + sources."@babel/helper-create-class-features-plugin-7.7.0" + sources."@babel/helper-create-regexp-features-plugin-7.7.2" + sources."@babel/helper-define-map-7.7.0" + sources."@babel/helper-explode-assignable-expression-7.7.0" + sources."@babel/helper-function-name-7.7.0" + sources."@babel/helper-get-function-arity-7.7.0" + sources."@babel/helper-hoist-variables-7.7.0" + sources."@babel/helper-member-expression-to-functions-7.7.0" + sources."@babel/helper-module-imports-7.7.0" + sources."@babel/helper-module-transforms-7.7.0" + sources."@babel/helper-optimise-call-expression-7.7.0" sources."@babel/helper-plugin-utils-7.0.0" sources."@babel/helper-regex-7.5.5" - sources."@babel/helper-remap-async-to-generator-7.1.0" - sources."@babel/helper-replace-supers-7.5.5" - sources."@babel/helper-simple-access-7.1.0" - sources."@babel/helper-split-export-declaration-7.4.4" - sources."@babel/helper-wrap-function-7.2.0" - sources."@babel/helpers-7.6.2" + sources."@babel/helper-remap-async-to-generator-7.7.0" + sources."@babel/helper-replace-supers-7.7.0" + sources."@babel/helper-simple-access-7.7.0" + sources."@babel/helper-split-export-declaration-7.7.0" + sources."@babel/helper-wrap-function-7.7.0" + sources."@babel/helpers-7.7.0" sources."@babel/highlight-7.5.0" - sources."@babel/parser-7.6.4" + sources."@babel/parser-7.7.3" sources."@babel/plugin-external-helpers-7.0.0" - sources."@babel/plugin-proposal-async-generator-functions-7.2.0" - sources."@babel/plugin-proposal-class-properties-7.5.5" - sources."@babel/plugin-proposal-dynamic-import-7.5.0" + sources."@babel/plugin-proposal-async-generator-functions-7.7.0" + sources."@babel/plugin-proposal-class-properties-7.7.0" + sources."@babel/plugin-proposal-dynamic-import-7.7.0" sources."@babel/plugin-proposal-json-strings-7.2.0" sources."@babel/plugin-proposal-object-rest-spread-7.6.2" sources."@babel/plugin-proposal-optional-catch-binding-7.2.0" - sources."@babel/plugin-proposal-unicode-property-regex-7.6.2" + sources."@babel/plugin-proposal-unicode-property-regex-7.7.0" sources."@babel/plugin-syntax-async-generators-7.2.0" sources."@babel/plugin-syntax-dynamic-import-7.2.0" sources."@babel/plugin-syntax-json-strings-7.2.0" sources."@babel/plugin-syntax-object-rest-spread-7.2.0" sources."@babel/plugin-syntax-optional-catch-binding-7.2.0" + sources."@babel/plugin-syntax-top-level-await-7.7.0" sources."@babel/plugin-transform-arrow-functions-7.2.0" - sources."@babel/plugin-transform-async-to-generator-7.5.0" + sources."@babel/plugin-transform-async-to-generator-7.7.0" sources."@babel/plugin-transform-block-scoped-functions-7.2.0" sources."@babel/plugin-transform-block-scoping-7.6.3" - sources."@babel/plugin-transform-classes-7.5.5" + sources."@babel/plugin-transform-classes-7.7.0" sources."@babel/plugin-transform-computed-properties-7.2.0" sources."@babel/plugin-transform-destructuring-7.6.0" - sources."@babel/plugin-transform-dotall-regex-7.6.2" + sources."@babel/plugin-transform-dotall-regex-7.7.0" sources."@babel/plugin-transform-duplicate-keys-7.5.0" sources."@babel/plugin-transform-exponentiation-operator-7.2.0" sources."@babel/plugin-transform-for-of-7.4.4" - sources."@babel/plugin-transform-function-name-7.4.4" + sources."@babel/plugin-transform-function-name-7.7.0" sources."@babel/plugin-transform-literals-7.2.0" sources."@babel/plugin-transform-member-expression-literals-7.2.0" sources."@babel/plugin-transform-modules-amd-7.5.0" - sources."@babel/plugin-transform-modules-commonjs-7.6.0" - sources."@babel/plugin-transform-modules-systemjs-7.5.0" - sources."@babel/plugin-transform-modules-umd-7.2.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.6.3" + sources."@babel/plugin-transform-modules-commonjs-7.7.0" + sources."@babel/plugin-transform-modules-systemjs-7.7.0" + sources."@babel/plugin-transform-modules-umd-7.7.0" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.7.0" sources."@babel/plugin-transform-new-target-7.4.4" sources."@babel/plugin-transform-object-super-7.5.5" sources."@babel/plugin-transform-parameters-7.4.4" sources."@babel/plugin-transform-property-literals-7.2.0" - sources."@babel/plugin-transform-regenerator-7.4.5" + sources."@babel/plugin-transform-regenerator-7.7.0" sources."@babel/plugin-transform-reserved-words-7.2.0" sources."@babel/plugin-transform-runtime-7.6.2" sources."@babel/plugin-transform-shorthand-properties-7.2.0" @@ -59215,13 +60569,13 @@ in sources."@babel/plugin-transform-sticky-regex-7.2.0" sources."@babel/plugin-transform-template-literals-7.4.4" sources."@babel/plugin-transform-typeof-symbol-7.2.0" - sources."@babel/plugin-transform-unicode-regex-7.6.2" - sources."@babel/preset-env-7.6.3" + sources."@babel/plugin-transform-unicode-regex-7.7.0" + sources."@babel/preset-env-7.7.1" sources."@babel/preset-stage-2-7.0.0" - sources."@babel/runtime-7.6.3" - sources."@babel/template-7.6.0" - sources."@babel/traverse-7.6.3" - sources."@babel/types-7.6.3" + sources."@babel/runtime-7.7.2" + sources."@babel/template-7.7.0" + sources."@babel/traverse-7.7.2" + sources."@babel/types-7.7.2" sources."@calebboyd/semaphore-1.3.1" sources."@comandeer/babel-plugin-banner-4.1.0" sources."@mrmlnc/readdir-enhanced-2.2.1" @@ -59232,7 +60586,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-12.12.5" + sources."@types/node-12.12.7" sources."@webassemblyjs/ast-1.8.5" sources."@webassemblyjs/floating-point-hex-parser-1.8.5" sources."@webassemblyjs/helper-api-error-1.8.5" @@ -59521,11 +60875,11 @@ in sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" sources."content-disposition-0.5.3" - sources."convert-source-map-1.6.0" + sources."convert-source-map-1.7.0" sources."copy-concurrently-1.0.5" sources."copy-descriptor-0.1.1" sources."core-js-2.6.10" - (sources."core-js-compat-3.3.6" // { + (sources."core-js-compat-3.4.1" // { dependencies = [ sources."semver-6.3.0" ]; @@ -59605,7 +60959,7 @@ in }) sources."duplexer3-0.1.4" sources."duplexify-3.7.1" - sources."electron-to-chromium-1.3.302" + sources."electron-to-chromium-1.3.306" sources."elliptic-6.5.1" sources."emoji-regex-7.0.3" sources."emojis-list-2.1.0" @@ -59767,7 +61121,7 @@ in sources."get-proxy-2.1.0" sources."get-stream-3.0.0" sources."get-value-2.0.6" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" sources."glob-to-regexp-0.3.0" @@ -59975,7 +61329,7 @@ in sources."node-fetch-2.6.0" (sources."node-libs-browser-2.2.1" // { dependencies = [ - sources."buffer-4.9.1" + sources."buffer-4.9.2" sources."punycode-1.4.1" ]; }) @@ -60319,7 +61673,7 @@ in sources."supports-color-2.0.0" sources."tapable-1.1.3" sources."tar-stream-1.6.2" - (sources."terser-4.3.9" // { + (sources."terser-4.4.0" // { dependencies = [ sources."commander-2.20.3" sources."source-map-0.6.1" @@ -60616,7 +61970,7 @@ in sha512 = "z4uLbDHNbs/aRuR6zCcnzwFQuMixkHCcWqgVaommfK/3cA1Ahq7OXemn+m8JwTYcBApSHgcrSbPr9sm3sZFL+A=="; }; dependencies = [ - sources."commander-4.0.0" + sources."commander-4.0.1" sources."esm-3.2.25" sources."mathjax-full-git://github.com/mathjax/MathJax-src.git" sources."mj-context-menu-0.2.0" @@ -60697,7 +62051,7 @@ in }) (sources."accord-0.28.0" // { dependencies = [ - sources."glob-7.1.5" + sources."glob-7.1.6" sources."minimatch-3.0.4" sources."semver-5.7.1" sources."uglify-js-2.8.29" @@ -60796,7 +62150,7 @@ in sources."commander-2.20.3" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" - sources."convert-source-map-1.6.0" + sources."convert-source-map-1.7.0" sources."copy-descriptor-0.1.1" sources."core-util-is-1.0.2" sources."cryptiles-2.0.5" @@ -60870,7 +62224,7 @@ in ]; }) sources."expand-tilde-2.0.2" - (sources."ext-1.1.2" // { + (sources."ext-1.2.0" // { dependencies = [ sources."type-2.0.0" ]; @@ -60982,7 +62336,7 @@ in sources."clone-2.1.2" sources."clone-stats-1.0.0" sources."extend-shallow-1.1.4" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."glob-stream-6.1.0" sources."graceful-fs-4.2.3" sources."kind-of-1.1.0" @@ -61329,8 +62683,8 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-1.2.0" - sources."typescript-3.6.4" - (sources."uglify-js-3.6.7" // { + sources."typescript-3.7.2" + (sources."uglify-js-3.6.8" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -61432,7 +62786,7 @@ in sources."diff-3.5.0" sources."emoji-regex-7.0.3" sources."es-abstract-1.16.0" - sources."es-to-primitive-1.2.0" + sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."find-up-3.0.0" @@ -61464,7 +62818,7 @@ in sources."mkdirp-0.5.1" sources."ms-2.1.1" sources."node-environment-flags-1.0.5" - sources."object-inspect-1.6.0" + sources."object-inspect-1.7.0" sources."object-keys-1.1.1" sources."object.assign-4.1.0" sources."object.getownpropertydescriptors-2.0.3" @@ -61558,7 +62912,7 @@ in sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" - sources."qs-6.9.0" + sources."qs-6.9.1" sources."readable-stream-2.3.6" sources."safe-buffer-5.1.2" sources."slash-2.0.0" @@ -61680,7 +63034,7 @@ in sources."fs.realpath-1.0.0" sources."gauge-2.7.4" sources."getpass-0.1.7" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."graceful-fs-4.2.3" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -61805,7 +63159,7 @@ in sources."base64-js-0.0.8" sources."bcrypt-pbkdf-1.0.2" sources."biased-opener-0.2.8" - sources."big-integer-1.6.47" + sources."big-integer-1.6.48" sources."block-stream-0.0.9" sources."body-parser-1.19.0" sources."boom-2.10.1" @@ -61928,7 +63282,7 @@ in sources."negotiator-0.6.2" (sources."node-pre-gyp-0.6.39" // { dependencies = [ - sources."glob-7.1.5" + sources."glob-7.1.6" sources."rimraf-2.7.1" sources."semver-5.7.1" ]; @@ -62017,7 +63371,7 @@ in sources."tar-2.2.2" (sources."tar-pack-3.4.1" // { dependencies = [ - sources."glob-7.1.5" + sources."glob-7.1.6" sources."rimraf-2.7.1" ]; }) @@ -62103,7 +63457,7 @@ in sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."gauge-2.7.4" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."has-unicode-2.0.1" sources."iconv-lite-0.4.24" sources."ignore-walk-3.0.3" @@ -62173,7 +63527,7 @@ in sha512 = "QSyPpAGGVFgVlKyumWFd8j2hd420+sh8DSxlvAtatDVaIG3+MaAD3eDLg49HIwRyAhiROVS1XNWkqyq/H1/cBA=="; }; dependencies = [ - sources."@babel/runtime-7.6.3" + sources."@babel/runtime-7.7.2" sources."@node-red/editor-api-1.0.2" sources."@node-red/editor-client-1.0.2" (sources."@node-red/nodes-1.0.2" // { @@ -62327,7 +63681,7 @@ in sources."depd-2.0.0" ]; }) - (sources."ext-1.1.2" // { + (sources."ext-1.2.0" // { dependencies = [ sources."type-2.0.0" ]; @@ -62347,7 +63701,7 @@ in sources."fs.realpath-1.0.0" sources."gauge-2.7.4" sources."getpass-0.1.7" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."glob-parent-3.1.0" (sources."glob-stream-6.1.0" // { dependencies = [ @@ -62677,7 +64031,7 @@ in sources."fs.realpath-1.0.0" sources."gauge-2.7.4" sources."getpass-0.1.7" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."graceful-fs-4.2.3" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -63162,10 +64516,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.12.1"; + version = "6.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.12.1.tgz"; - sha512 = "+pMvUpgSXVBythrv//64j4i6DaLLJ1O0y8kwjNgjAE7atBNGzX4rcOEWvmsuiei6J+mA38O0nUZ/P35GuCD/jg=="; + url = "https://registry.npmjs.org/npm/-/npm-6.13.0.tgz"; + sha512 = "zjSJ8zjk0cDBZXqTWbQ6+qOdm1m2k489YDFP60RQRUhOxT5LOBhl+cDtFlEXEIblcNjofmsZ/qQ/wzmn5frimQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -63180,10 +64534,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-3.2.0.tgz"; - sha512 = "Gqxd6Fv+EoGNKg2thclx3LPs9dHa1Tp/R+/59iYAgbliJ5NsDd/D6j6kjhnLtKh+7XMX7co3gTrVzsSqTPNRAg=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-3.2.1.tgz"; + sha512 = "gYXHGc9mAncGrEMjs2uRJgOdWRP5CR9iZ+HyUNf4eqjtdDV6jLvi2e19G5BEpdvc8fU73J+B5m8ALYB49du/EA=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -63270,7 +64624,7 @@ in sources."genfun-5.0.0" sources."get-stdin-7.0.0" sources."get-stream-4.1.0" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."global-dirs-0.1.1" sources."got-9.6.0" sources."graceful-fs-4.2.3" @@ -63397,7 +64751,7 @@ in sources."progress-2.0.3" sources."promise-inflight-1.0.1" sources."promise-retry-1.1.1" - sources."prompts-2.2.1" + sources."prompts-2.3.0" sources."protoduck-5.0.1" sources."pseudomap-1.0.2" sources."pump-3.0.0" @@ -63447,9 +64801,9 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" - sources."sisteransi-1.0.3" - sources."smart-buffer-4.0.2" - sources."socks-2.3.2" + sources."sisteransi-1.0.4" + sources."smart-buffer-4.1.0" + sources."socks-2.3.3" (sources."socks-proxy-agent-4.0.2" // { dependencies = [ sources."agent-base-4.2.1" @@ -63585,7 +64939,7 @@ in }) sources."gauge-2.7.4" sources."getpass-0.1.7" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."graceful-fs-2.0.3" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -63748,91 +65102,93 @@ in }; dependencies = [ sources."@babel/code-frame-7.5.5" - (sources."@babel/core-7.6.4" // { + (sources."@babel/core-7.7.2" // { dependencies = [ sources."json5-2.1.1" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.6.4" // { + (sources."@babel/generator-7.7.2" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-annotate-as-pure-7.0.0" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.1.0" - sources."@babel/helper-builder-react-jsx-7.3.0" - sources."@babel/helper-call-delegate-7.4.4" - sources."@babel/helper-define-map-7.5.5" - sources."@babel/helper-explode-assignable-expression-7.1.0" - sources."@babel/helper-function-name-7.1.0" - sources."@babel/helper-get-function-arity-7.0.0" - sources."@babel/helper-hoist-variables-7.4.4" - sources."@babel/helper-member-expression-to-functions-7.5.5" - sources."@babel/helper-module-imports-7.0.0" - sources."@babel/helper-module-transforms-7.5.5" - sources."@babel/helper-optimise-call-expression-7.0.0" + sources."@babel/helper-annotate-as-pure-7.7.0" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.7.0" + sources."@babel/helper-builder-react-jsx-7.7.0" + sources."@babel/helper-call-delegate-7.7.0" + sources."@babel/helper-create-regexp-features-plugin-7.7.2" + sources."@babel/helper-define-map-7.7.0" + sources."@babel/helper-explode-assignable-expression-7.7.0" + sources."@babel/helper-function-name-7.7.0" + sources."@babel/helper-get-function-arity-7.7.0" + sources."@babel/helper-hoist-variables-7.7.0" + sources."@babel/helper-member-expression-to-functions-7.7.0" + sources."@babel/helper-module-imports-7.7.0" + sources."@babel/helper-module-transforms-7.7.0" + sources."@babel/helper-optimise-call-expression-7.7.0" sources."@babel/helper-plugin-utils-7.0.0" sources."@babel/helper-regex-7.5.5" - sources."@babel/helper-remap-async-to-generator-7.1.0" - sources."@babel/helper-replace-supers-7.5.5" - sources."@babel/helper-simple-access-7.1.0" - sources."@babel/helper-split-export-declaration-7.4.4" - sources."@babel/helper-wrap-function-7.2.0" - sources."@babel/helpers-7.6.2" + sources."@babel/helper-remap-async-to-generator-7.7.0" + sources."@babel/helper-replace-supers-7.7.0" + sources."@babel/helper-simple-access-7.7.0" + sources."@babel/helper-split-export-declaration-7.7.0" + sources."@babel/helper-wrap-function-7.7.0" + sources."@babel/helpers-7.7.0" sources."@babel/highlight-7.5.0" - sources."@babel/parser-7.6.4" - sources."@babel/plugin-proposal-async-generator-functions-7.2.0" - sources."@babel/plugin-proposal-dynamic-import-7.5.0" + sources."@babel/parser-7.7.3" + sources."@babel/plugin-proposal-async-generator-functions-7.7.0" + sources."@babel/plugin-proposal-dynamic-import-7.7.0" sources."@babel/plugin-proposal-json-strings-7.2.0" sources."@babel/plugin-proposal-object-rest-spread-7.6.2" sources."@babel/plugin-proposal-optional-catch-binding-7.2.0" - sources."@babel/plugin-proposal-unicode-property-regex-7.6.2" + sources."@babel/plugin-proposal-unicode-property-regex-7.7.0" sources."@babel/plugin-syntax-async-generators-7.2.0" sources."@babel/plugin-syntax-dynamic-import-7.2.0" - sources."@babel/plugin-syntax-flow-7.2.0" + sources."@babel/plugin-syntax-flow-7.7.0" sources."@babel/plugin-syntax-json-strings-7.2.0" sources."@babel/plugin-syntax-jsx-7.2.0" sources."@babel/plugin-syntax-object-rest-spread-7.2.0" sources."@babel/plugin-syntax-optional-catch-binding-7.2.0" + sources."@babel/plugin-syntax-top-level-await-7.7.0" sources."@babel/plugin-transform-arrow-functions-7.2.0" - sources."@babel/plugin-transform-async-to-generator-7.5.0" + sources."@babel/plugin-transform-async-to-generator-7.7.0" sources."@babel/plugin-transform-block-scoped-functions-7.2.0" sources."@babel/plugin-transform-block-scoping-7.6.3" - sources."@babel/plugin-transform-classes-7.5.5" + sources."@babel/plugin-transform-classes-7.7.0" sources."@babel/plugin-transform-computed-properties-7.2.0" sources."@babel/plugin-transform-destructuring-7.6.0" - sources."@babel/plugin-transform-dotall-regex-7.6.2" + sources."@babel/plugin-transform-dotall-regex-7.7.0" sources."@babel/plugin-transform-duplicate-keys-7.5.0" sources."@babel/plugin-transform-exponentiation-operator-7.2.0" sources."@babel/plugin-transform-flow-strip-types-7.6.3" sources."@babel/plugin-transform-for-of-7.4.4" - sources."@babel/plugin-transform-function-name-7.4.4" + sources."@babel/plugin-transform-function-name-7.7.0" sources."@babel/plugin-transform-literals-7.2.0" sources."@babel/plugin-transform-member-expression-literals-7.2.0" sources."@babel/plugin-transform-modules-amd-7.5.0" - sources."@babel/plugin-transform-modules-commonjs-7.6.0" - sources."@babel/plugin-transform-modules-systemjs-7.5.0" - sources."@babel/plugin-transform-modules-umd-7.2.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.6.3" + sources."@babel/plugin-transform-modules-commonjs-7.7.0" + sources."@babel/plugin-transform-modules-systemjs-7.7.0" + sources."@babel/plugin-transform-modules-umd-7.7.0" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.7.0" sources."@babel/plugin-transform-new-target-7.4.4" sources."@babel/plugin-transform-object-super-7.5.5" sources."@babel/plugin-transform-parameters-7.4.4" sources."@babel/plugin-transform-property-literals-7.2.0" - sources."@babel/plugin-transform-react-jsx-7.3.0" - sources."@babel/plugin-transform-regenerator-7.4.5" + sources."@babel/plugin-transform-react-jsx-7.7.0" + sources."@babel/plugin-transform-regenerator-7.7.0" sources."@babel/plugin-transform-reserved-words-7.2.0" sources."@babel/plugin-transform-shorthand-properties-7.2.0" sources."@babel/plugin-transform-spread-7.6.2" sources."@babel/plugin-transform-sticky-regex-7.2.0" sources."@babel/plugin-transform-template-literals-7.4.4" sources."@babel/plugin-transform-typeof-symbol-7.2.0" - sources."@babel/plugin-transform-unicode-regex-7.6.2" - sources."@babel/preset-env-7.6.3" - sources."@babel/runtime-7.6.3" - sources."@babel/template-7.6.0" - sources."@babel/traverse-7.6.3" - sources."@babel/types-7.6.3" + sources."@babel/plugin-transform-unicode-regex-7.7.0" + sources."@babel/preset-env-7.7.1" + sources."@babel/runtime-7.7.2" + sources."@babel/template-7.7.0" + sources."@babel/traverse-7.7.2" + sources."@babel/types-7.7.2" sources."@iarna/toml-2.2.3" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -63854,7 +65210,7 @@ in sources."alphanum-sort-1.0.2" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" - sources."ansi-to-html-0.6.12" + sources."ansi-to-html-0.6.13" (sources."anymatch-2.0.0" // { dependencies = [ sources."normalize-path-2.1.1" @@ -63922,7 +65278,7 @@ in ]; }) sources."browserslist-4.7.2" - (sources."buffer-4.9.1" // { + (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" ]; @@ -63936,6 +65292,7 @@ in sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" sources."callsites-2.0.0" + sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" sources."caniuse-lite-1.0.30001008" sources."caseless-0.12.0" @@ -63945,6 +65302,12 @@ in sources."class-utils-0.3.6" sources."cli-cursor-2.1.0" sources."cli-spinners-1.3.1" + (sources."cliui-5.0.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" + ]; + }) sources."clone-2.1.2" sources."coa-2.0.2" sources."collection-visit-1.0.0" @@ -63960,10 +65323,10 @@ in sources."concat-stream-1.6.2" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" - sources."convert-source-map-1.6.0" + sources."convert-source-map-1.7.0" sources."copy-descriptor-0.1.1" sources."core-js-2.6.10" - (sources."core-js-compat-3.3.6" // { + (sources."core-js-compat-3.4.1" // { dependencies = [ sources."semver-6.3.0" ]; @@ -63993,7 +65356,7 @@ in sources."supports-color-3.2.3" ]; }) - sources."css-select-2.0.2" + sources."css-select-2.1.0" sources."css-select-base-adapter-0.1.1" (sources."css-selector-tokenizer-0.7.1" // { dependencies = [ @@ -64005,7 +65368,7 @@ in }) sources."css-tree-1.0.0-alpha.37" sources."css-unit-converter-1.1.1" - sources."css-what-2.1.3" + sources."css-what-3.2.1" sources."cssesc-0.1.0" sources."cssnano-4.1.10" sources."cssnano-preset-default-4.0.7" @@ -64020,6 +65383,7 @@ in sources."data-urls-1.1.0" sources."deasync-0.1.15" sources."debug-4.1.1" + sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" sources."deep-is-0.1.3" (sources."defaults-1.0.3" // { @@ -64049,7 +65413,7 @@ in sources."des.js-1.0.0" sources."destroy-1.0.4" sources."diffie-hellman-5.0.3" - (sources."dom-serializer-0.2.1" // { + (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.0.1" sources."entities-2.0.0" @@ -64066,18 +65430,19 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.302" + sources."electron-to-chromium-1.3.306" sources."elliptic-6.5.1" + sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."entities-1.1.2" sources."envinfo-7.4.0" sources."error-ex-1.3.2" (sources."es-abstract-1.16.0" // { dependencies = [ - sources."object-inspect-1.6.0" + sources."object-inspect-1.7.0" ]; }) - sources."es-to-primitive-1.2.0" + sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."escodegen-1.9.1" @@ -64109,6 +65474,7 @@ in sources."fastparse-1.1.2" sources."filesize-3.6.1" sources."fill-range-4.0.0" + sources."find-up-3.0.0" sources."for-in-1.0.2" sources."foreach-2.0.5" sources."forever-agent-0.6.1" @@ -64118,10 +65484,11 @@ in sources."fs.realpath-1.0.0" sources."fsevents-1.2.9" sources."function-bind-1.1.1" + sources."get-caller-file-2.0.5" sources."get-port-3.2.0" sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."glob-7.1.5" + sources."glob-7.1.6" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -64156,9 +65523,10 @@ in sources."html-comment-regex-1.1.2" sources."html-encoding-sniffer-1.0.2" sources."html-tags-1.2.0" - (sources."htmlnano-0.2.4" // { + (sources."htmlnano-0.2.5" // { dependencies = [ - sources."terser-4.3.9" + sources."posthtml-0.12.0" + sources."terser-4.4.0" ]; }) (sources."htmlparser2-3.10.1" // { @@ -64202,6 +65570,7 @@ in sources."is-directory-0.3.1" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" sources."is-html-1.1.0" sources."is-number-3.0.0" @@ -64243,6 +65612,7 @@ in sources."jsprim-1.4.1" sources."kind-of-3.2.2" sources."levn-0.3.0" + sources."locate-path-3.0.0" sources."lodash-4.17.15" sources."lodash.clone-4.5.0" sources."lodash.memoize-4.1.2" @@ -64330,9 +65700,12 @@ in sources."once-1.4.0" sources."onetime-2.0.1" sources."opn-5.5.0" - sources."optionator-0.8.2" + sources."optionator-0.8.3" sources."ora-2.1.0" sources."os-browserify-0.3.0" + sources."p-limit-2.2.1" + sources."p-locate-3.0.0" + sources."p-try-2.2.0" sources."pako-0.2.9" sources."parse-asn1-5.1.5" sources."parse-json-4.0.0" @@ -64341,6 +65714,7 @@ in sources."pascalcase-0.1.1" sources."path-browserify-0.0.1" sources."path-dirname-1.0.2" + sources."path-exists-3.0.0" sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."path-parse-1.0.6" @@ -64416,7 +65790,7 @@ in sources."postcss-unique-selectors-4.0.1" sources."postcss-value-parser-3.3.1" sources."posthtml-0.11.6" - sources."posthtml-parser-0.4.1" + sources."posthtml-parser-0.4.2" sources."posthtml-render-1.1.5" sources."prelude-ls-1.1.2" sources."private-0.1.8" @@ -64425,6 +65799,12 @@ in sources."psl-1.4.0" sources."public-encrypt-4.0.3" sources."punycode-2.1.1" + (sources."purgecss-1.4.1" // { + dependencies = [ + sources."cssesc-3.0.0" + sources."postcss-selector-parser-6.0.2" + ]; + }) sources."q-1.5.1" sources."qs-6.5.2" sources."querystring-0.2.0" @@ -64467,6 +65847,8 @@ in }) sources."request-promise-core-1.1.3" sources."request-promise-native-1.0.8" + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" sources."resolve-1.12.0" sources."resolve-from-3.0.0" sources."resolve-url-0.2.1" @@ -64494,6 +65876,7 @@ in }) sources."serialize-to-js-3.0.0" sources."serve-static-1.14.1" + sources."set-blocking-2.0.0" sources."set-value-2.0.1" sources."setimmediate-1.0.5" sources."setprototypeof-1.1.1" @@ -64540,6 +65923,12 @@ in sources."stealthy-require-1.1.1" sources."stream-browserify-2.0.2" sources."stream-http-2.8.3" + (sources."string-width-3.1.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" + ]; + }) sources."string.prototype.trimleft-2.1.0" sources."string.prototype.trimright-2.1.0" sources."string_decoder-1.1.1" @@ -64633,12 +66022,22 @@ in sources."whatwg-mimetype-2.3.0" sources."whatwg-url-7.1.0" sources."which-1.3.1" - sources."wordwrap-1.0.0" + sources."which-module-2.0.0" + sources."word-wrap-1.2.3" + (sources."wrap-ansi-5.1.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."strip-ansi-5.2.0" + ]; + }) sources."wrappy-1.0.2" sources."ws-5.2.2" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."xtend-4.0.2" + sources."y18n-4.0.0" + sources."yargs-14.2.1" + sources."yargs-parser-15.0.0" ]; buildInputs = globalBuildInputs; meta = { @@ -64675,7 +66074,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bencode-2.0.1" - sources."big-integer-1.6.47" + sources."big-integer-1.6.48" sources."bitfield-0.1.0" (sources."bittorrent-dht-6.4.2" // { dependencies = [ @@ -64749,7 +66148,7 @@ in sources."function-bind-1.1.1" sources."get-browser-rtc-1.0.2" sources."get-stdin-4.0.1" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."graceful-fs-4.2.3" sources."has-1.0.3" sources."has-ansi-2.0.0" @@ -65100,7 +66499,7 @@ in sources."fs.realpath-1.0.0" sources."get-browser-rtc-1.0.2" sources."getpass-0.1.7" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."graceful-fs-4.2.3" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -65337,10 +66736,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "4.1.7"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-4.1.7.tgz"; - sha512 = "0JfrmMLsy5x5nwUULUnXmKz6IbRXLc1r04STPDje6SIwcnyDwiRC5gR4LkC+AgVe2HuIhOSQm/MM1ypC63JDnQ=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-4.2.2.tgz"; + sha512 = "cgIti3UV6PlZnuLd1Il78vxjbAo+UfeTvdDxdneZphjGwmJqFbmWxw5jQK/JiiNTLn2Tnj3Oy3+/hRxhVHFQug=="; }; buildInputs = globalBuildInputs; meta = { @@ -65355,10 +66754,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "1.18.2"; + version = "1.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-1.18.2.tgz"; - sha512 = "OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw=="; + url = "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz"; + sha512 = "s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew=="; }; buildInputs = globalBuildInputs; meta = { @@ -65464,7 +66863,7 @@ in sources."function-bind-1.1.1" sources."gaze-1.1.3" sources."get-assigned-identifiers-1.2.0" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."globule-1.2.1" sources."graceful-fs-4.2.3" sources."has-1.0.3" @@ -65639,7 +67038,7 @@ in sources."eyes-0.1.8" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."i-0.3.6" @@ -66025,10 +67424,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "1.56.1"; + version = "1.57.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-1.56.1.tgz"; - sha512 = "yLEQbyHdrgM8MG64J7o1jrjaaCaGOoNThRl9PGzBGZmibtDBDzRBlclVcjcWIWDItw35t6OtMRlwQrXYPtgoqw=="; + url = "https://registry.npmjs.org/serverless/-/serverless-1.57.0.tgz"; + sha512 = "pb+6Jo3/oRdo4BNYTz8wbnqhetC0epFfezzEbUsOCHGPUoHgxnZmo22rceBXL9P7Npd4JA8qwtTu7GYmrTZSSA=="; }; dependencies = [ sources."@serverless/cli-1.4.0" @@ -66043,7 +67442,7 @@ in sources."semver-6.3.0" ]; }) - (sources."@serverless/enterprise-plugin-3.2.1" // { + (sources."@serverless/enterprise-plugin-3.2.3" // { dependencies = [ sources."fs-extra-7.0.1" sources."node-fetch-2.6.0" @@ -66051,7 +67450,7 @@ in ]; }) sources."@serverless/event-mocks-1.1.1" - (sources."@serverless/platform-sdk-2.2.0" // { + (sources."@serverless/platform-sdk-2.2.1" // { dependencies = [ sources."ramda-0.25.0" sources."uuid-3.3.3" @@ -66060,7 +67459,7 @@ in sources."@serverless/template-1.1.3" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/lodash-4.14.144" + sources."@types/lodash-4.14.146" sources."agent-base-4.3.0" sources."ansi-align-2.0.0" sources."ansi-escapes-4.2.1" @@ -66088,10 +67487,10 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.563.0" // { + (sources."aws-sdk-2.569.0" // { dependencies = [ - sources."buffer-4.9.1" - sources."uuid-3.3.2" + sources."buffer-4.9.2" + sources."uuid-3.3.3" ]; }) sources."balanced-match-1.0.0" @@ -66200,6 +67599,7 @@ in sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.0" sources."deferred-0.7.11" + sources."define-properties-1.1.3" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."dot-prop-4.2.0" @@ -66215,6 +67615,8 @@ in sources."duplexer3-0.1.4" sources."encoding-0.1.12" sources."end-of-stream-1.4.4" + sources."es-abstract-1.16.0" + sources."es-to-primitive-1.2.1" sources."es5-ext-0.10.52" sources."es6-iterator-2.0.3" sources."es6-promise-4.2.8" @@ -66236,7 +67638,7 @@ in sources."get-stream-3.0.0" ]; }) - sources."ext-1.1.2" + sources."ext-1.2.0" sources."extend-3.0.2" sources."extend-shallow-3.0.2" sources."external-editor-3.1.0" @@ -66261,17 +67663,18 @@ in ]; }) sources."fs.realpath-1.0.0" - (sources."fs2-0.3.6" // { + (sources."fs2-0.3.7" // { dependencies = [ sources."type-1.2.0" ]; }) - sources."fsevents-2.1.1" + sources."fsevents-2.1.2" + sources."function-bind-1.1.1" sources."get-proxy-2.1.0" sources."get-stdin-5.0.1" sources."get-stream-4.1.0" sources."get-value-2.0.6" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."glob-parent-5.1.0" sources."global-dirs-0.1.1" sources."globby-6.1.0" @@ -66279,8 +67682,10 @@ in sources."graceful-fs-4.2.1" sources."graceful-readlink-1.0.1" sources."graphlib-2.1.7" + sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbol-support-x-1.4.2" + sources."has-symbols-1.0.0" sources."has-to-string-tag-x-1.4.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -66318,8 +67723,10 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-binary-path-2.1.0" sources."is-buffer-2.0.4" + sources."is-callable-1.1.4" sources."is-ci-1.2.1" sources."is-data-descriptor-1.0.0" + sources."is-date-object-1.0.1" sources."is-descriptor-1.0.2" sources."is-docker-1.1.0" sources."is-extendable-1.0.1" @@ -66336,8 +67743,10 @@ in sources."is-plain-object-2.0.4" sources."is-promise-2.1.0" sources."is-redirect-1.0.0" + sources."is-regex-1.0.4" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" + sources."is-symbol-1.0.2" sources."is-windows-1.0.2" sources."is-wsl-2.1.1" sources."isarray-1.0.0" @@ -66433,7 +67842,10 @@ in ]; }) sources."object-hash-1.3.1" + sources."object-inspect-1.7.0" + sources."object-keys-1.1.1" sources."object-visit-1.0.1" + sources."object.getownpropertydescriptors-2.0.3" sources."object.pick-1.3.0" sources."once-1.4.0" sources."onetime-2.0.1" @@ -66459,7 +67871,7 @@ in sources."path-key-2.0.1" sources."path-loader-1.0.10" sources."pend-1.2.0" - sources."picomatch-2.1.0" + sources."picomatch-2.1.1" sources."pify-2.3.0" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" @@ -66471,7 +67883,7 @@ in sources."pseudomap-1.0.2" sources."pump-3.0.0" sources."punycode-1.3.2" - sources."qs-6.9.0" + sources."qs-6.9.1" sources."querystring-0.2.0" sources."ramda-0.26.1" (sources."raven-1.2.1" // { @@ -66502,7 +67914,7 @@ in sources."safe-buffer-5.2.0" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sax-1.2.1" + sources."sax-1.2.4" (sources."seek-bzip-1.0.5" // { dependencies = [ sources."commander-2.8.1" @@ -66578,6 +67990,8 @@ in sources."strip-ansi-4.0.0" ]; }) + sources."string.prototype.trimleft-2.1.0" + sources."string.prototype.trimright-2.1.0" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -66653,6 +68067,7 @@ in sources."url-to-options-1.0.1" sources."use-3.1.1" sources."util-deprecate-1.0.2" + sources."util.promisify-1.0.0" sources."uuid-2.0.3" sources."walkdir-0.0.11" sources."whatwg-fetch-3.0.0" @@ -66662,8 +68077,8 @@ in sources."write-file-atomic-2.4.3" sources."ws-6.2.1" sources."xdg-basedir-3.0.0" - sources."xml2js-0.4.19" - sources."xmlbuilder-9.0.7" + sources."xml2js-0.4.22" + sources."xmlbuilder-11.0.1" sources."xtend-4.0.2" sources."yallist-2.1.2" sources."yaml-ast-parser-0.0.43" @@ -67171,6 +68586,7 @@ in sources."assert-plus-0.1.5" sources."backoff-2.5.0" sources."balanced-match-1.0.0" + sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" sources."bunyan-1.5.1" sources."clone-0.1.6" @@ -67184,10 +68600,15 @@ in sources."ctype-0.5.3" sources."dashdash-1.7.3" sources."dtrace-provider-0.6.0" - sources."ecc-jsbn-0.2.0" + sources."ecc-jsbn-0.1.2" sources."escape-regexp-component-1.0.2" sources."extsprintf-1.2.0" sources."formidable-1.2.1" + (sources."getpass-0.1.7" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) sources."glob-6.0.4" sources."http-signature-0.11.0" sources."inflight-1.0.6" @@ -67237,13 +68658,16 @@ in sources."semver-4.3.6" (sources."smartdc-auth-2.3.1" // { dependencies = [ + sources."asn1-0.2.4" sources."assert-plus-0.1.2" sources."clone-0.1.5" sources."dashdash-1.10.1" sources."extsprintf-1.0.0" - (sources."http-signature-1.2.0" // { + (sources."http-signature-1.3.1" // { dependencies = [ sources."assert-plus-1.0.0" + sources."dashdash-1.14.1" + sources."sshpk-1.16.1" ]; }) sources."json-schema-0.2.2" @@ -67303,22 +68727,21 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.242.0"; + version = "1.244.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.242.0.tgz"; - sha512 = "/FYu3vnv0XWA3bu6yVWpAXDYRVaC3xFf09KfekyYYXXZKPwBeYD7eu3iT+aXYua+DNuIfMJ6mWUbxjLp7LCi3Q=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.244.0.tgz"; + sha512 = "w94dZS2w23XKunecST979nBaYAMFp/YjIPjS0aDK1vL4tEVu1l0qDBlwJGsd5Ijv5cyuO0m2/U0JMPUA1FqKlQ=="; }; dependencies = [ sources."@snyk/cli-interface-2.2.0" - sources."@snyk/cocoapods-lockfile-parser-2.0.4" - sources."@snyk/composer-lockfile-parser-1.0.3" + sources."@snyk/cocoapods-lockfile-parser-3.0.0" + sources."@snyk/composer-lockfile-parser-1.2.0" sources."@snyk/dep-graph-1.13.1" sources."@snyk/gemfile-1.2.0" sources."@snyk/ruby-semver-2.0.4" - (sources."@snyk/snyk-cocoapods-plugin-1.0.3" // { + (sources."@snyk/snyk-cocoapods-plugin-2.0.1" // { dependencies = [ sources."@snyk/cli-interface-1.5.0" - sources."@snyk/dep-graph-1.13.0" ]; }) sources."@types/agent-base-4.2.0" @@ -67326,7 +68749,7 @@ in sources."@types/debug-4.1.5" sources."@types/events-3.0.0" sources."@types/js-yaml-3.12.1" - sources."@types/node-12.12.5" + sources."@types/node-12.12.7" sources."@types/restify-4.3.6" sources."@types/semver-5.5.0" sources."@types/xml2js-0.4.3" @@ -67384,7 +68807,7 @@ in sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."configstore-3.1.2" - sources."core-js-3.3.6" + sources."core-js-3.4.1" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" (sources."cross-spawn-6.0.5" // { @@ -67418,7 +68841,7 @@ in sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" sources."es-abstract-1.16.0" - sources."es-to-primitive-1.2.0" + sources."es-to-primitive-1.2.1" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" @@ -67455,7 +68878,7 @@ in }) sources."git-up-4.0.1" sources."git-url-parse-11.1.2" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."global-dirs-0.1.1" (sources."got-6.7.1" // { dependencies = [ @@ -67546,13 +68969,13 @@ in sources."npm-run-path-2.0.2" sources."number-is-nan-1.0.1" sources."object-hash-1.3.1" - sources."object-inspect-1.6.0" + sources."object-inspect-1.7.0" sources."object-keys-1.1.1" sources."object.getownpropertydescriptors-2.0.3" sources."once-1.4.0" sources."onetime-2.0.1" sources."opn-5.5.0" - sources."optionator-0.8.2" + sources."optionator-0.8.3" sources."os-locale-1.4.0" sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" @@ -67622,7 +69045,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."signal-exit-3.0.2" - sources."smart-buffer-4.0.2" + sources."smart-buffer-4.1.0" sources."snyk-config-2.2.3" (sources."snyk-docker-plugin-1.33.1" // { dependencies = [ @@ -67649,7 +69072,7 @@ in sources."snyk-nodejs-lockfile-parser-1.16.1" sources."snyk-nuget-plugin-1.13.1" sources."snyk-paket-parser-1.5.0" - (sources."snyk-php-plugin-1.6.4" // { + (sources."snyk-php-plugin-1.7.0" // { dependencies = [ sources."tslib-1.9.3" ]; @@ -67677,7 +69100,7 @@ in sources."yallist-2.1.2" ]; }) - sources."socks-2.3.2" + sources."socks-2.3.3" (sources."socks-proxy-agent-4.0.2" // { dependencies = [ sources."agent-base-4.2.1" @@ -67744,7 +69167,7 @@ in sources."widest-line-2.0.1" sources."window-size-0.1.4" sources."windows-release-3.2.0" - sources."wordwrap-1.0.0" + sources."word-wrap-1.2.3" (sources."wrap-ansi-5.1.0" // { dependencies = [ sources."string-width-3.1.0" @@ -67898,7 +69321,7 @@ in sources."duplexer3-0.1.4" sources."error-ex-1.3.2" sources."es-abstract-1.16.0" - sources."es-to-primitive-1.2.0" + sources."es-to-primitive-1.2.1" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" @@ -67953,7 +69376,7 @@ in sources."ms-2.0.0" sources."normalize-package-data-2.5.0" sources."npm-run-path-2.0.2" - sources."object-inspect-1.6.0" + sources."object-inspect-1.7.0" sources."object-keys-1.1.1" sources."object.getownpropertydescriptors-2.0.3" sources."onetime-2.0.1" @@ -68186,7 +69609,7 @@ in sources."epidemic-broadcast-trees-7.0.0" sources."errno-0.1.7" sources."es-abstract-1.16.0" - sources."es-to-primitive-1.2.0" + sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."exit-hook-1.1.1" sources."expand-brackets-0.1.5" @@ -68628,7 +70051,7 @@ in sources."right-pad-1.0.1" (sources."rimraf-2.7.1" // { dependencies = [ - sources."glob-7.1.5" + sources."glob-7.1.6" ]; }) sources."rng-0.2.2" @@ -68648,7 +70071,7 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shellsubstitute-1.2.0" - sources."smart-buffer-4.0.2" + sources."smart-buffer-4.1.0" (sources."snapdragon-0.8.2" // { dependencies = [ sources."debug-2.6.9" @@ -68676,7 +70099,7 @@ in ]; }) sources."snapdragon-util-3.0.1" - sources."socks-2.3.2" + sources."socks-2.3.3" sources."sodium-browserify-1.3.0" (sources."sodium-browserify-tweetnacl-0.2.6" // { dependencies = [ @@ -68762,7 +70185,7 @@ in (sources."tape-4.11.0" // { dependencies = [ sources."deep-equal-1.0.1" - sources."glob-7.1.5" + sources."glob-7.1.6" ]; }) sources."text-table-0.2.0" @@ -68922,11 +70345,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.563.0" // { - dependencies = [ - sources."uuid-3.3.2" - ]; - }) + sources."aws-sdk-2.569.0" sources."aws-sign2-0.6.0" sources."aws4-1.8.0" sources."babel-runtime-6.26.0" @@ -68957,7 +70376,7 @@ in }) sources."boom-2.10.1" sources."brace-expansion-1.1.11" - sources."buffer-4.9.1" + sources."buffer-4.9.2" sources."buffer-crc32-0.2.13" sources."buffer-equal-constant-time-1.0.1" sources."buffer-from-1.1.1" @@ -69028,6 +70447,7 @@ in sources."debug-2.6.9" sources."decamelize-1.2.0" sources."deep-extend-0.4.2" + sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" sources."depd-1.1.2" sources."deref-0.6.4" @@ -69062,6 +70482,8 @@ in }) sources."engine.io-parser-2.2.0" sources."error-ex-1.3.2" + sources."es-abstract-1.16.0" + sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."esprima-2.0.0" @@ -69137,6 +70559,7 @@ in ]; }) sources."has-cors-1.1.0" + sources."has-symbols-1.0.0" sources."hawk-3.1.3" sources."highlight.js-8.2.0" (sources."hipchatter-0.3.2" // { @@ -69168,6 +70591,8 @@ in sources."ipaddr.js-1.9.0" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" + sources."is-callable-1.1.4" + sources."is-date-object-1.0.1" (sources."is-expression-3.0.0" // { dependencies = [ sources."acorn-4.0.13" @@ -69180,6 +70605,7 @@ in sources."is-property-1.0.2" sources."is-regex-1.0.4" sources."is-stream-1.1.0" + sources."is-symbol-1.0.2" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."isarray-1.0.0" @@ -69305,6 +70731,9 @@ in sources."object-assign-4.1.1" sources."object-component-0.0.3" sources."object-hash-0.3.0" + sources."object-inspect-1.7.0" + sources."object-keys-1.1.1" + sources."object.getownpropertydescriptors-2.0.3" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -69426,7 +70855,7 @@ in sources."safe-buffer-5.1.2" sources."safe-json-stringify-1.2.0" sources."safer-buffer-2.1.2" - sources."sax-1.2.1" + sources."sax-1.2.4" sources."semver-5.7.1" (sources."send-0.17.1" // { dependencies = [ @@ -69506,6 +70935,8 @@ in sources."strip-ansi-4.0.0" ]; }) + sources."string.prototype.trimleft-2.1.0" + sources."string.prototype.trimright-2.1.0" sources."string_decoder-0.10.31" sources."stringstream-0.0.6" sources."strip-ansi-3.0.1" @@ -69516,7 +70947,7 @@ in sources."debug-3.2.6" sources."form-data-2.5.1" sources."ms-2.1.2" - sources."qs-6.9.0" + sources."qs-6.9.1" sources."readable-stream-2.3.6" sources."string_decoder-1.1.1" ]; @@ -69529,7 +70960,7 @@ in sources."esprima-4.0.1" sources."js-yaml-3.13.1" sources."lodash-3.10.1" - sources."qs-6.9.0" + sources."qs-6.9.1" ]; }) sources."swagger-schema-official-2.0.0-bab6bed" @@ -69538,13 +70969,13 @@ in sources."esprima-4.0.1" sources."isarray-0.0.1" sources."js-yaml-3.13.1" - sources."path-to-regexp-1.7.0" + sources."path-to-regexp-1.8.0" ]; }) sources."switchback-2.0.5" (sources."temp-0.8.4" // { dependencies = [ - sources."glob-7.1.5" + sources."glob-7.1.6" sources."rimraf-2.6.3" ]; }) @@ -69592,6 +71023,7 @@ in sources."url-join-1.1.0" sources."utf-8-validate-1.2.2" sources."util-deprecate-1.0.2" + sources."util.promisify-1.0.0" sources."utils-merge-1.0.1" sources."uuid-3.3.3" sources."validate-npm-package-license-3.0.4" @@ -69641,8 +71073,8 @@ in sources."node-forge-0.2.24" ]; }) - sources."xml2js-0.4.19" - sources."xmlbuilder-9.0.7" + sources."xml2js-0.4.22" + sources."xmlbuilder-11.0.1" sources."xmldom-0.1.27" sources."xmlhttprequest-ssl-1.5.5" sources."xpath-0.0.5" @@ -69708,13 +71140,13 @@ in sources."coa-2.0.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."css-select-2.0.2" + sources."css-select-2.1.0" sources."css-select-base-adapter-0.1.1" sources."css-tree-1.0.0-alpha.37" - sources."css-what-2.1.3" + sources."css-what-3.2.1" sources."csso-4.0.2" sources."define-properties-1.1.3" - (sources."dom-serializer-0.2.1" // { + (sources."dom-serializer-0.2.2" // { dependencies = [ sources."domelementtype-2.0.1" ]; @@ -69723,7 +71155,7 @@ in sources."domutils-1.7.0" sources."entities-2.0.0" sources."es-abstract-1.16.0" - sources."es-to-primitive-1.2.0" + sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."function-bind-1.1.1" @@ -69739,7 +71171,7 @@ in sources."minimist-0.0.8" sources."mkdirp-0.5.1" sources."nth-check-1.0.2" - sources."object-inspect-1.6.0" + sources."object-inspect-1.7.0" sources."object-keys-1.1.1" sources."object.getownpropertydescriptors-2.0.3" sources."object.values-1.1.0" @@ -69959,7 +71391,7 @@ in sources."fsevents-1.2.9" sources."get-stream-3.0.0" sources."get-value-2.0.6" - sources."glob-7.1.5" + sources."glob-7.1.6" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -70157,11 +71589,11 @@ in dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" - sources."qs-6.9.0" + sources."qs-6.9.1" sources."superagent-3.8.3" ]; }) - (sources."path-to-regexp-1.7.0" // { + (sources."path-to-regexp-1.8.0" // { dependencies = [ sources."isarray-0.0.1" ]; @@ -70334,7 +71766,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - (sources."uglify-js-3.6.7" // { + (sources."uglify-js-3.6.8" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -70405,7 +71837,7 @@ in sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b"; }; dependencies = [ - sources."@types/node-12.12.5" + sources."@types/node-12.12.7" sources."ajv-6.10.2" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" @@ -70540,7 +71972,7 @@ in sources."enhanced-resolve-2.3.0" sources."errno-0.1.7" sources."fs.realpath-1.0.0" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."graceful-fs-4.2.3" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -70594,7 +72026,7 @@ in sources."@textlint/textlint-plugin-text-4.1.10" sources."@textlint/types-1.2.3" sources."@textlint/utils-1.0.3" - sources."@types/bluebird-3.5.28" + sources."@types/bluebird-3.5.29" sources."ajv-4.11.8" sources."ajv-keywords-1.5.1" sources."ansi-regex-2.1.1" @@ -70625,7 +72057,7 @@ in sources."diff-4.0.1" sources."error-ex-1.3.2" sources."es-abstract-1.16.0" - sources."es-to-primitive-1.2.0" + sources."es-to-primitive-1.2.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."extend-3.0.2" @@ -70639,7 +72071,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-stdin-5.0.1" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."graceful-fs-4.2.3" sources."has-1.0.3" sources."has-ansi-2.0.0" @@ -70688,11 +72120,11 @@ in sources."ms-2.1.2" sources."normalize-package-data-2.5.0" sources."number-is-nan-1.0.1" - sources."object-inspect-1.6.0" + sources."object-inspect-1.7.0" sources."object-is-1.0.1" sources."object-keys-1.1.1" sources."once-1.4.0" - sources."optionator-0.8.2" + sources."optionator-0.8.3" sources."p-limit-1.3.0" sources."p-locate-2.0.0" sources."p-try-1.0.0" @@ -70768,16 +72200,16 @@ in sources."unified-6.2.0" sources."unique-concat-0.2.2" sources."unist-util-is-3.0.0" - sources."unist-util-remove-position-1.1.3" + sources."unist-util-remove-position-1.1.4" sources."unist-util-stringify-position-1.1.2" sources."unist-util-visit-1.4.1" sources."unist-util-visit-parents-2.1.2" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" sources."vfile-2.3.0" - sources."vfile-location-2.0.5" + sources."vfile-location-2.0.6" sources."vfile-message-1.1.1" - sources."wordwrap-1.0.0" + sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."write-1.0.3" sources."x-is-string-0.1.0" @@ -70920,7 +72352,7 @@ in sources."get-stream-3.0.0" sources."git-diff-tree-1.0.0" sources."git-spawned-stream-0.1.1" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."global-dirs-0.1.1" sources."got-6.7.1" sources."graceful-fs-4.2.3" @@ -71033,7 +72465,7 @@ in sources."replace-ext-1.0.0" sources."resolve-1.12.0" sources."resolve-from-5.0.0" - sources."retext-english-3.0.3" + sources."retext-english-3.0.4" sources."retext-equality-3.2.0" sources."retext-profanities-4.4.0" sources."safe-buffer-5.1.2" @@ -71104,9 +72536,9 @@ in sources."unified-message-control-1.0.4" sources."unique-string-1.0.0" sources."unist-util-is-3.0.0" - sources."unist-util-modify-children-1.1.4" - sources."unist-util-position-3.0.3" - sources."unist-util-remove-position-1.1.3" + sources."unist-util-modify-children-1.1.5" + sources."unist-util-position-3.0.4" + sources."unist-util-remove-position-1.1.4" sources."unist-util-stringify-position-1.1.2" sources."unist-util-visit-1.4.1" sources."unist-util-visit-children-1.1.3" @@ -71119,7 +72551,7 @@ in sources."validate-npm-package-license-3.0.4" sources."vfile-2.3.0" sources."vfile-find-up-2.0.2" - sources."vfile-location-2.0.5" + sources."vfile-location-2.0.6" sources."vfile-message-1.1.1" (sources."vfile-reporter-4.0.0" // { dependencies = [ @@ -71291,7 +72723,7 @@ in sources."core-util-is-1.0.2" sources."define-properties-1.1.3" sources."es-abstract-1.16.0" - sources."es-to-primitive-1.2.0" + sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."has-1.0.3" sources."has-symbols-1.0.0" @@ -71302,7 +72734,7 @@ in sources."is-symbol-1.0.2" sources."isarray-1.0.0" sources."object-assign-4.1.1" - sources."object-inspect-1.6.0" + sources."object-inspect-1.7.0" sources."object-keys-1.1.1" sources."object.values-1.1.0" sources."process-nextick-args-2.0.1" @@ -71345,7 +72777,7 @@ in sources."emoji-regex-6.5.1" sources."end-with-1.0.2" sources."es-abstract-1.16.0" - sources."es-to-primitive-1.2.0" + sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."has-1.0.3" sources."has-symbols-1.0.0" @@ -71353,7 +72785,7 @@ in sources."is-date-object-1.0.1" sources."is-regex-1.0.4" sources."is-symbol-1.0.2" - sources."object-inspect-1.6.0" + sources."object-inspect-1.7.0" sources."object-keys-1.1.1" sources."string.prototype.trimleft-2.1.0" sources."string.prototype.trimright-2.1.0" @@ -71440,7 +72872,7 @@ in sources."array-includes-3.0.3" sources."define-properties-1.1.3" sources."es-abstract-1.16.0" - sources."es-to-primitive-1.2.0" + sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" sources."has-1.0.3" sources."has-symbols-1.0.0" @@ -71449,7 +72881,7 @@ in sources."is-date-object-1.0.1" sources."is-regex-1.0.4" sources."is-symbol-1.0.2" - sources."object-inspect-1.6.0" + sources."object-inspect-1.7.0" sources."object-keys-1.1.1" sources."string.prototype.trimleft-2.1.0" sources."string.prototype.trimright-2.1.0" @@ -71587,7 +73019,7 @@ in sources."content-type-1.0.4" sources."cookie-0.4.0" sources."cookie-signature-1.0.6" - sources."core-js-3.3.6" + sources."core-js-3.4.1" sources."core-util-is-1.0.2" sources."css-select-1.2.0" sources."css-what-2.1.3" @@ -71658,7 +73090,7 @@ in sources."gauge-2.7.4" sources."get-stream-4.1.0" sources."getpass-0.1.7" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."got-9.6.0" sources."graceful-fs-4.2.3" sources."grapheme-splitter-1.0.4" @@ -71893,7 +73325,7 @@ in sources."verror-1.10.0" sources."web-push-3.4.1" sources."wide-align-1.1.3" - sources."with-open-file-0.1.6" + sources."with-open-file-0.1.7" sources."wrappy-1.0.2" sources."ws-7.2.0" sources."xmlhttprequest-ssl-1.5.5" @@ -71993,7 +73425,7 @@ in sources."fs-extra-7.0.1" sources."fs.realpath-1.0.0" sources."getpass-0.1.7" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."graceful-fs-4.2.3" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -72114,7 +73546,7 @@ in ]; }) sources."glob-5.0.15" - (sources."http-signature-1.2.0" // { + (sources."http-signature-1.3.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; @@ -72285,7 +73717,7 @@ in sources."diff-2.2.3" sources."escape-string-regexp-1.0.5" sources."fs.realpath-1.0.0" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."has-ansi-2.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -72339,10 +73771,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "3.6.4"; + version = "3.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.6.4.tgz"; - sha512 = "unoCll1+l+YK4i4F8f22TaNVPRHcD9PA3yCuZ8g5e0qGqlVlJ/8FSateOLLSagn+Yg5+ZwuPkL8LFUc0Jcvksg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-3.7.2.tgz"; + sha512 = "ml7V7JfiN2Xwvcer+XAf2csGO1bPBdRbFCkYBczNZggrBZ9c7G3riSUeJmqEU5uOtXNPMhE3n+R4FA/3YOAWOQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -72374,10 +73806,10 @@ in sources."tempy-0.2.1" sources."unique-string-1.0.0" sources."universalify-0.1.2" - sources."vscode-jsonrpc-5.0.0-next.2" + sources."vscode-jsonrpc-5.0.0-next.4" sources."vscode-languageserver-5.3.0-next.10" - sources."vscode-languageserver-protocol-3.15.0-next.10" - sources."vscode-languageserver-types-3.15.0-next.6" + sources."vscode-languageserver-protocol-3.15.0-next.11" + sources."vscode-languageserver-types-3.15.0-next.8" sources."vscode-textbuffer-1.0.0" sources."vscode-uri-1.0.8" ]; @@ -72393,10 +73825,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.6.7"; + version = "3.6.8"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.7.tgz"; - sha512 = "4sXQDzmdnoXiO+xvmTzQsfIiwrjUCSA95rSP4SEd8tDb51W2TiDOlL76Hl+Kw0Ie42PSItCW8/t6pBNCF2R48A=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.8.tgz"; + sha512 = "XhHJ3S3ZyMwP8kY1Gkugqx3CJh2C3O0y8NPiSxtm1tyD/pktLAkFZsFGpuNfTZddKDQ/bbDBLAd2YyA1pbi8HQ=="; }; dependencies = [ sources."commander-2.20.3" @@ -72415,12 +73847,13 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.4.48"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.4.48.tgz"; - sha512 = "OnChT88XpseexbxagMAL5wqM9dIZxb5oHCwUXaEZ8ERy77GDzhFKko1DZLWZg6uljrOx1yryBGe7ft8eJ5/O9g=="; + url = "https://registry.npmjs.org/ungit/-/ungit-1.5.0.tgz"; + sha512 = "/z1T7PRc2c3AlXK1IQCzpZ1ft07MLxi/WmZlBBdqZiVV9pf3tOa7uWILs9bHaHUAlWMxix1F0ZATCNqb38e1dA=="; }; dependencies = [ + sources."@primer/octicons-9.2.0" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" @@ -72579,7 +74012,7 @@ in sources."get-stream-4.1.0" sources."getmac-1.4.6" sources."getpass-0.1.7" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."graceful-fs-4.2.3" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -72623,7 +74056,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."just-detect-adblock-1.0.0" - sources."knockout-3.5.0" + sources."knockout-3.5.1" sources."lcid-2.0.0" sources."locate-path-3.0.0" sources."locks-0.2.2" @@ -72658,7 +74091,7 @@ in sources."semver-5.7.1" ]; }) - sources."npm-6.9.2" + sources."npm-6.12.1" (sources."npm-package-arg-6.1.1" // { dependencies = [ sources."semver-5.7.1" @@ -72676,7 +74109,6 @@ in sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."object-component-0.0.3" - sources."octicons-3.5.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -72803,7 +74235,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."typechecker-4.7.0" + sources."typechecker-4.8.0" sources."typedarray-0.0.6" sources."uid-safe-2.1.5" sources."unpipe-1.0.0" @@ -73026,7 +74458,7 @@ in sources."get-stream-3.0.0" sources."getpass-0.1.7" sources."git-clone-0.1.0" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."got-6.7.1" sources."graceful-fs-4.2.3" sources."graceful-readlink-1.0.1" @@ -73184,7 +74616,7 @@ in sources."tslib-1.10.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.6.7" + sources."uglify-js-3.6.8" sources."uid-0.0.2" sources."unbzip2-stream-1.3.3" sources."unyield-0.0.1" @@ -73240,10 +74672,10 @@ in sources."@starptech/rehype-minify-whitespace-0.9.0" sources."@starptech/rehype-webparser-0.9.0" sources."@starptech/webparser-0.9.0" - sources."@types/node-12.12.5" + sources."@types/node-12.12.7" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" - sources."@types/vfile-message-1.0.1" + sources."@types/vfile-message-2.0.0" sources."abbrev-1.1.1" sources."acorn-6.3.0" sources."acorn-jsx-5.1.0" @@ -73514,7 +74946,7 @@ in sources."get-caller-file-1.0.3" sources."get-stream-3.0.0" sources."get-value-2.0.6" - sources."glob-7.1.5" + sources."glob-7.1.6" (sources."glob-base-0.3.0" // { dependencies = [ sources."glob-parent-2.0.0" @@ -73552,7 +74984,7 @@ in sources."hast-util-has-property-1.0.3" sources."hast-util-is-body-ok-link-1.0.2" sources."hast-util-is-element-1.0.3" - sources."hast-util-parse-selector-2.2.2" + sources."hast-util-parse-selector-2.2.3" sources."hast-util-to-string-1.0.2" sources."hast-util-whitespace-1.0.3" sources."hosted-git-info-2.8.5" @@ -73645,7 +75077,7 @@ in sources."lodash.merge-4.6.2" sources."lodash.rest-4.0.5" sources."lodash.unescape-4.0.1" - sources."loglevel-1.6.4" + sources."loglevel-1.6.6" (sources."loglevel-colored-level-prefix-1.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -73726,7 +75158,7 @@ in sources."object.pick-1.3.0" sources."once-1.4.0" sources."onetime-2.0.1" - sources."optionator-0.8.2" + sources."optionator-0.8.3" sources."os-homedir-1.0.2" (sources."os-locale-3.1.0" // { dependencies = [ @@ -73780,7 +75212,7 @@ in sources."prelude-ls-1.1.2" sources."prepend-http-1.0.4" sources."preserve-0.2.0" - sources."prettier-1.18.2" + sources."prettier-1.19.1" (sources."prettier-eslint-8.8.2" // { dependencies = [ sources."acorn-5.7.3" @@ -74038,11 +75470,11 @@ in sources."trim-trailing-lines-1.1.2" sources."trough-1.0.4" sources."tslib-1.10.0" - sources."tslint-5.20.0" + sources."tslint-5.20.1" sources."tsutils-2.29.0" sources."type-check-0.3.2" sources."typedarray-0.0.6" - sources."typescript-3.6.4" + sources."typescript-3.7.2" (sources."typescript-eslint-parser-16.0.1" // { dependencies = [ sources."semver-5.5.0" @@ -74065,8 +75497,8 @@ in sources."unist-util-find-1.0.1" sources."unist-util-inspect-4.1.4" sources."unist-util-is-2.1.3" - sources."unist-util-modify-children-1.1.4" - sources."unist-util-remove-position-1.1.3" + sources."unist-util-modify-children-1.1.5" + sources."unist-util-remove-position-1.1.4" sources."unist-util-stringify-position-1.1.2" sources."unist-util-visit-1.4.1" (sources."unist-util-visit-parents-2.1.2" // { @@ -74094,17 +75526,17 @@ in sources."user-home-2.0.0" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" - (sources."vfile-4.0.1" // { + (sources."vfile-4.0.2" // { dependencies = [ - sources."unist-util-stringify-position-2.0.1" - sources."vfile-message-2.0.1" + sources."unist-util-stringify-position-2.0.2" + sources."vfile-message-2.0.2" ]; }) - sources."vfile-location-2.0.5" + sources."vfile-location-2.0.6" sources."vfile-message-1.1.1" (sources."vfile-reporter-5.1.2" // { dependencies = [ - sources."unist-util-stringify-position-2.0.1" + sources."unist-util-stringify-position-2.0.2" ]; }) sources."vfile-sort-2.2.1" @@ -74115,14 +75547,14 @@ in sources."vscode-languageserver-types-3.14.0" ]; }) - sources."vscode-jsonrpc-5.0.0-next.2" + sources."vscode-jsonrpc-5.0.0-next.4" sources."vscode-languageserver-5.3.0-next.10" - sources."vscode-languageserver-protocol-3.15.0-next.10" - sources."vscode-languageserver-types-3.15.0-next.6" + sources."vscode-languageserver-protocol-3.15.0-next.11" + sources."vscode-languageserver-types-3.15.0-next.8" sources."vscode-nls-4.1.1" sources."vscode-textbuffer-1.0.0" sources."vscode-uri-1.0.8" - (sources."vue-eslint-parser-6.0.4" // { + (sources."vue-eslint-parser-6.0.5" // { dependencies = [ sources."debug-4.1.1" ]; @@ -74133,7 +75565,7 @@ in sources."which-module-2.0.0" sources."widest-line-2.0.1" sources."window-size-0.2.0" - sources."wordwrap-1.0.0" + sources."word-wrap-1.2.3" (sources."wrap-ansi-2.1.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -74171,23 +75603,23 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "3.2.0"; + version = "3.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-3.2.0.tgz"; - sha512 = "UM2ucXzEKs6tD+YT6FjmfIeQtLy4t9CwdwyQl8Nthn2BbGgDLht+wBWsU8VYnNXtrObxX24Co8oaF7Id06JbgA=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-3.2.1.tgz"; + sha512 = "WzZbCDIjIUshZRVaiYFbaMp/1/xPjW7qeTQ0F7Xx1MYkamZ4RN5dnhxWFz+Hzg6GzhFdny+zucNDKOwYfAV3LA=="; }; dependencies = [ sources."@babel/code-frame-7.5.5" sources."@babel/highlight-7.5.0" sources."@babel/polyfill-7.6.0" sources."@babel/runtime-7.6.2" - sources."@babel/runtime-corejs2-7.6.3" + sources."@babel/runtime-corejs2-7.7.2" sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.3" - sources."@types/node-12.12.5" + sources."@types/node-12.12.7" sources."JSONSelect-0.2.1" sources."acorn-6.3.0" sources."acorn-jsx-5.1.0" @@ -74443,7 +75875,7 @@ in sources."entities-1.1.2" sources."error-ex-1.3.2" sources."es-abstract-1.16.0" - sources."es-to-primitive-1.2.0" + sources."es-to-primitive-1.2.1" sources."es5-ext-0.10.52" sources."es6-error-4.1.1" sources."es6-iterator-2.0.3" @@ -74549,7 +75981,7 @@ in sources."kind-of-5.1.0" ]; }) - (sources."ext-1.1.2" // { + (sources."ext-1.2.0" // { dependencies = [ sources."type-2.0.0" ]; @@ -74852,7 +76284,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.6.0" + sources."object-inspect-1.7.0" sources."object-is-1.0.1" sources."object-keys-1.1.1" sources."object-visit-1.0.1" @@ -74865,7 +76297,7 @@ in sources."is-wsl-1.1.0" ]; }) - sources."optionator-0.8.2" + sources."optionator-0.8.3" sources."os-homedir-1.0.2" sources."os-locale-4.0.0" sources."os-shim-0.1.3" @@ -75174,7 +76606,7 @@ in ]; }) sources."winreg-0.0.12" - sources."wordwrap-1.0.0" + sources."word-wrap-1.2.3" (sources."wrap-ansi-5.1.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -75299,7 +76731,7 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."buffer-4.9.1" + sources."buffer-4.9.2" sources."buffer-from-1.1.1" sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" @@ -75410,7 +76842,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-1.2.9" sources."get-value-2.0.6" - sources."glob-7.1.5" + sources."glob-7.1.6" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -75627,7 +77059,7 @@ in sources."stream-shift-1.0.0" sources."string_decoder-1.1.1" sources."tapable-1.1.3" - (sources."terser-4.3.9" // { + (sources."terser-4.4.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -76050,7 +77482,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.0" - sources."@types/node-10.17.3" + sources."@types/node-10.17.5" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."async-limiter-1.0.1" @@ -76136,7 +77568,7 @@ in sources."elementtree-0.1.7" sources."end-of-stream-1.4.4" sources."es-abstract-1.16.0" - sources."es-to-primitive-1.2.0" + sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."executable-4.1.1" sources."filestream-5.0.0" @@ -76150,7 +77582,7 @@ in sources."function-bind-1.1.1" sources."get-browser-rtc-1.0.2" sources."get-stdin-7.0.0" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."has-1.0.3" sources."has-symbols-1.0.0" sources."he-1.2.0" @@ -76215,7 +77647,7 @@ in sources."node-gyp-build-3.7.0" sources."node-ssdp-2.9.1" sources."nodebmc-0.0.7" - sources."object-inspect-1.6.0" + sources."object-inspect-1.7.0" sources."object-keys-1.1.1" sources."object.getownpropertydescriptors-2.0.3" sources."on-finished-2.3.0" @@ -76268,14 +77700,14 @@ in sources."semver-5.1.1" sources."simple-concat-1.0.0" sources."simple-get-2.8.1" - (sources."simple-peer-9.6.0" // { + (sources."simple-peer-9.6.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" ]; }) sources."simple-sha1-3.0.1" - (sources."simple-websocket-8.0.1" // { + (sources."simple-websocket-8.1.0" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" @@ -76525,7 +77957,7 @@ in sources."config-chain-1.1.12" sources."configstore-3.1.2" sources."copy-descriptor-0.1.1" - sources."core-js-3.3.6" + sources."core-js-3.4.1" sources."core-util-is-1.0.2" sources."create-error-class-3.0.2" sources."cross-spawn-6.0.5" @@ -76627,14 +78059,14 @@ in sources."get-stream-3.0.0" sources."get-value-2.0.6" sources."getpass-0.1.7" - sources."glob-7.1.5" + sources."glob-7.1.6" (sources."glob-parent-3.1.0" // { dependencies = [ sources."is-glob-3.1.0" ]; }) sources."glob-to-regexp-0.3.0" - (sources."global-agent-2.1.5" // { + (sources."global-agent-2.1.6" // { dependencies = [ sources."semver-6.3.0" ]; @@ -76926,7 +78358,7 @@ in sources."responselike-1.0.2" sources."restore-cursor-2.0.0" sources."ret-0.1.15" - sources."roarr-2.14.3" + sources."roarr-2.14.4" sources."root-check-1.0.0" sources."run-async-2.3.0" sources."rx-4.1.0" diff --git a/pkgs/development/node-packages/node-packages-v12.nix b/pkgs/development/node-packages/node-packages-v12.nix index 3ee042958fc..79ff0993092 100644 --- a/pkgs/development/node-packages/node-packages-v12.nix +++ b/pkgs/development/node-packages/node-packages-v12.nix @@ -697,13 +697,13 @@ let sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; - "glob-7.1.5" = { + "glob-7.1.6" = { name = "glob"; packageName = "glob"; - version = "7.1.5"; + version = "7.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.5.tgz"; - sha512 = "J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ=="; + url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; + sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; }; }; "global-modules-1.0.0" = { @@ -2651,7 +2651,7 @@ in sources."fs.realpath-1.0.0" sources."gauge-2.7.4" sources."getpass-0.1.7" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."graceful-fs-4.2.3" sources."har-schema-2.0.0" sources."har-validator-5.1.3" diff --git a/pkgs/development/node-packages/node-packages-v13.nix b/pkgs/development/node-packages/node-packages-v13.nix index b4cb67b020e..5858875a41a 100644 --- a/pkgs/development/node-packages/node-packages-v13.nix +++ b/pkgs/development/node-packages/node-packages-v13.nix @@ -391,13 +391,13 @@ let sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; }; - "glob-7.1.5" = { + "glob-7.1.6" = { name = "glob"; packageName = "glob"; - version = "7.1.5"; + version = "7.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.5.tgz"; - sha512 = "J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ=="; + url = "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz"; + sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; }; }; "graceful-fs-4.2.3" = { @@ -1319,7 +1319,7 @@ in sources."fs.realpath-1.0.0" sources."gauge-2.7.4" sources."getpass-0.1.7" - sources."glob-7.1.5" + sources."glob-7.1.6" sources."graceful-fs-4.2.3" sources."har-schema-2.0.0" sources."har-validator-5.1.3" diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index 0766e6e8a8c..a988582ce6c 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { createFindlibDestdir = true; setupHook = writeText "setupHook.sh" '' - export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/" - export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}-llvm-plugins/" + export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/" + export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}-llvm-plugins/" ''; nativeBuildInputs = [ which makeWrapper ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { installPhase = '' export OCAMLPATH=$OCAMLPATH:$OCAMLFIND_DESTDIR; export PATH=$PATH:$out/bin - export CAML_LD_LIBRARY_PATH=$CAML_LD_LIBRARY_PATH:$OCAMLFIND_DESTDIR/bap-plugin-llvm/:$OCAMLFIND_DESTDIR/bap/ + export CAML_LD_LIBRARY_PATH=''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}$OCAMLFIND_DESTDIR/bap-plugin-llvm/:$OCAMLFIND_DESTDIR/bap/ mkdir -p $out/lib/bap make install rm $out/bin/baptop diff --git a/pkgs/development/ocaml-modules/ocsigen-server/default.nix b/pkgs/development/ocaml-modules/ocsigen-server/default.nix index 426fecf3915..9b0b8c433c2 100644 --- a/pkgs/development/ocaml-modules/ocsigen-server/default.nix +++ b/pkgs/development/ocaml-modules/ocsigen-server/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { '' rm -rf $out/var/run wrapProgram $out/bin/ocsigenserver \ - --prefix CAML_LD_LIBRARY_PATH : "$CAML_LD_LIBRARY_PATH:${mkpath ssl "ssl"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath ocaml_sqlite3 "sqlite3"}" + --suffix CAML_LD_LIBRARY_PATH : "${mkpath ssl "ssl"}:${mkpath ocamlnet "netsys"}:${mkpath ocamlnet "netstring"}:${mkpath ocaml_pcre "pcre"}:${mkpath ocaml_sqlite3 "sqlite3"}" ''; dontPatchShebangs = true; diff --git a/pkgs/development/python-modules/Babel/default.nix b/pkgs/development/python-modules/Babel/default.nix index 96226518800..97b35257820 100644 --- a/pkgs/development/python-modules/Babel/default.nix +++ b/pkgs/development/python-modules/Babel/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pytz, pytest, freezegun, glibcLocales }: +{ stdenv, lib, buildPythonPackage, fetchPypi, pytz, pytest, freezegun, glibcLocales }: buildPythonPackage rec { pname = "Babel"; @@ -13,6 +13,8 @@ buildPythonPackage rec { checkInputs = [ pytest freezegun glibcLocales ]; + doCheck = !stdenv.isDarwin; + preCheck = '' export LC_ALL="en_US.UTF-8" ''; diff --git a/pkgs/development/python-modules/ROPGadget/default.nix b/pkgs/development/python-modules/ROPGadget/default.nix index c9398d96fce..4daf76219ad 100644 --- a/pkgs/development/python-modules/ROPGadget/default.nix +++ b/pkgs/development/python-modules/ROPGadget/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "ROPGadget"; - version = "5.8"; + version = "5.9"; src = fetchPypi { inherit pname version; - sha256 = "184qncm2ss474prphw0xnf7ifkpgj955dzlb2vqq94z6xvf3xyd9"; + sha256 = "0lggiqws4dzq6k6c20l515pmjajl19gymsxfggkv771dv5kr1gbs"; }; propagatedBuildInputs = [ capstone ]; diff --git a/pkgs/development/python-modules/authlib/default.nix b/pkgs/development/python-modules/authlib/default.nix new file mode 100644 index 00000000000..579652c3f95 --- /dev/null +++ b/pkgs/development/python-modules/authlib/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, pytest +, mock +, cryptography +, requests +}: + +buildPythonPackage rec { + version = "0.13"; + pname = "authlib"; + + src = fetchFromGitHub { + owner = "lepture"; + repo = "authlib"; + rev = "v${version}"; + sha256 = "1nv0jbsaqr9qjn7nnl55s42iyx655k7fsj8hs69652lqnfn5y3d5"; + }; + + propagatedBuildInputs = [ cryptography requests ]; + + checkInputs = [ mock pytest ]; + + checkPhase = '' + PYTHONPATH=$PWD:$PYTHONPATH pytest tests/{core,files} + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/lepture/authlib; + description = "The ultimate Python library in building OAuth and OpenID Connect servers. JWS,JWE,JWK,JWA,JWT included."; + maintainers = with maintainers; [ flokli ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 00678ca420d..315e891030e 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -22,8 +22,10 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; # Don't know why these tests fails + # Disable test_expression_diff, because it fails on darwin checkPhase = '' LC_ALL="en_US.UTF-8" pytest \ + --deselect tests/test_black.py::BlackTestCase::test_expression_diff \ --deselect tests/test_black.py::BlackTestCase::test_cache_multiple_files \ --deselect tests/test_black.py::BlackTestCase::test_failed_formatting_does_not_get_cached ''; diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index 828976f0e9f..7210aa6b1e3 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -20,16 +20,16 @@ buildPythonPackage rec { pname = "datasette"; - version = "0.29.3"; + version = "0.30.2"; src = fetchFromGitHub { owner = "simonw"; repo = "datasette"; rev = version; - sha256 = "0cib7pd4z240ncck0pskzvizblhwkr42fsjpd719wdxy4scs7yqa"; + sha256 = "07swnpz4c7vzlc69vavs1xvbhr5fa8g63kyfj1hf3zafskgjnzwy"; }; - buildInputs = [ pytestrunner ]; + nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ click @@ -57,15 +57,19 @@ buildPythonPackage rec { --replace "Sanic==0.7.0" "Sanic" \ --replace "hupper==1.0" "hupper" \ --replace "pint~=0.8.1" "pint" \ + --replace "pluggy~=0.12.0" "pint" \ --replace "Jinja2==2.10.1" "Jinja2" \ --replace "uvicorn~=0.8.4" "uvicorn" ''; # many tests require network access + # test_black fails on darwin checkPhase = '' pytest --ignore tests/test_api.py \ --ignore tests/test_csv.py \ - --ignore tests/test_html.py + --ignore tests/test_html.py \ + --ignore tests/test_black.py \ + -k 'not facet' ''; meta = with lib; { diff --git a/pkgs/development/python-modules/git-revise/default.nix b/pkgs/development/python-modules/git-revise/default.nix index 905f38739b2..dfc0b4afb8a 100644 --- a/pkgs/development/python-modules/git-revise/default.nix +++ b/pkgs/development/python-modules/git-revise/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "git-revise"; - version = "0.5.0"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "16sxmxksb5gjj6zfh1wy2czqj9nm4sd3j4fbrsphs8l065dzzikj"; + sha256 = "0l3xhg00106p7ysg4gl9dna2zcrax58mzmm0ajjaxw58jfn8wsf1"; }; disabled = pythonOlder "3.6"; diff --git a/pkgs/development/python-modules/google_cloud_vision/default.nix b/pkgs/development/python-modules/google_cloud_vision/default.nix index a8d748db126..10c8792b9c8 100644 --- a/pkgs/development/python-modules/google_cloud_vision/default.nix +++ b/pkgs/development/python-modules/google_cloud_vision/default.nix @@ -3,7 +3,6 @@ , fetchPypi , enum34 , google_api_core -, pytest , mock }: @@ -16,11 +15,13 @@ buildPythonPackage rec { sha256 = "f33aea6721d453901ded268dee61a01ab77d4cd215a76edc3cc61b6028299d3e"; }; - checkInputs = [ pytest mock ]; + checkInputs = [ mock ]; propagatedBuildInputs = [ enum34 google_api_core ]; + # pytest seems to pick up some file which overrides PYTHONPATH checkPhase = '' - pytest tests/unit + cd tests/unit + python -m unittest discover ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 4566e43c0bd..e716a185a80 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -7,6 +7,7 @@ , scikitlearn , fetchPypi , joblib +, six }: buildPythonPackage rec { @@ -21,7 +22,7 @@ buildPythonPackage rec { checkInputs = [ nose ]; nativeBuildInputs = [ cython ]; - propagatedBuildInputs = [ numpy scipy scikitlearn joblib ]; + propagatedBuildInputs = [ numpy scipy scikitlearn joblib six ]; meta = with lib; { description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API"; diff --git a/pkgs/development/python-modules/itanium_demangler/default.nix b/pkgs/development/python-modules/itanium_demangler/default.nix new file mode 100644 index 00000000000..c67259eee0f --- /dev/null +++ b/pkgs/development/python-modules/itanium_demangler/default.nix @@ -0,0 +1,30 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, pytest +}: + +buildPythonPackage rec { + pname = "itanium_demangler"; + version = "1.0"; # pulled from pypi version + + src = fetchFromGitHub { + owner = "whitequark"; + repo = "python-${pname}"; + rev = "29c77860be48e6dafe3496e4d9d0963ce414e366"; + sha256 = "0qm95l6542nk63986w9lgzkxg824l31714i584s02rh9xwfg1xfx"; + }; + + checkInputs = [ pytest ]; + + checkPhase = '' + pytest tests/test.py + ''; + + meta = with lib; { + description = "A pure Python parser for the Itanium C++ ABI symbol mangling language"; + homepage = "https://github.com/whitequark/python-itanium_demangler"; + license = licenses.bsd0; + maintainers = [ maintainers.pamplemousse ]; + }; +} diff --git a/pkgs/development/python-modules/jsonlines/default.nix b/pkgs/development/python-modules/jsonlines/default.nix new file mode 100644 index 00000000000..eec4c6b3846 --- /dev/null +++ b/pkgs/development/python-modules/jsonlines/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchFromGitHub, buildPythonPackage, six +, flake8, pep8-naming, pytest, pytestcov, pytestpep8 }: + +buildPythonPackage rec { + pname = "jsonlines"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "wbolster"; + repo = pname; + rev = version; + sha256 = "1f8zsqy8p9a41gqg2a5x7sppc5qhhq7gw58id2aigb270yxzs7jw"; + }; + + propagatedBuildInputs = [ six ]; + + checkInputs = [ flake8 pep8-naming pytest pytestcov pytestpep8 ]; + checkPhase = '' + pytest + ''; + + meta = with lib; { + description = "Python library to simplify working with jsonlines and ndjson data"; + homepage = https://github.com/wbolster/jsonlines; + maintainers = with maintainers; [ sondr3 ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index db8c5b774e4..1b16ff9b47c 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -4,17 +4,16 @@ , jupyterlab_server , notebook , pythonOlder -, fetchpatch }: buildPythonPackage rec { pname = "jupyterlab"; - version = "0.35.6"; + version = "1.2.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "2ec845845d51221e39d0d753884a19342c953f39febf3148a68631bf57ecb774"; + sha256 = "96d3146eb09ffa0a198f31b36706859dadd4a59ed184aa9329a9c12733e6af0b"; }; propagatedBuildInputs = [ jupyterlab_server notebook ]; @@ -23,14 +22,6 @@ buildPythonPackage rec { "--set" "JUPYTERLAB_DIR" "$out/share/jupyter/lab" ]; - patches = [ - (fetchpatch { - name = "bump-jupyterlab_server-version"; - url = https://github.com/jupyterlab/jupyterlab/commit/3b8d451e6f9a4c609e60cde5fbb3cc84aae79951.patch; - sha256 = "08vv6rp1k5fbmvj4v9x1d9zb6ymm9pv8ml80j7p45r9fay34rndf"; - }) - ]; - # Depends on npm doCheck = false; diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index 6d0da2925cc..edfe01728a4 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -6,6 +6,7 @@ , pythonOlder , requests , pytest +, pyjson5 }: buildPythonPackage rec { @@ -19,7 +20,7 @@ buildPythonPackage rec { }; checkInputs = [ requests pytest ]; - propagatedBuildInputs = [ notebook jsonschema ]; + propagatedBuildInputs = [ notebook jsonschema pyjson5 ]; # test_listing test fails # this is a new package and not all tests pass diff --git a/pkgs/development/python-modules/keepkey_agent/default.nix b/pkgs/development/python-modules/keepkey_agent/default.nix new file mode 100644 index 00000000000..c2361043e41 --- /dev/null +++ b/pkgs/development/python-modules/keepkey_agent/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, keepkey +, setuptools +, libagent +, wheel +}: + +buildPythonPackage rec { + pname = "keepkey_agent"; + version = "0.9.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "03779gvlx70i0nnry98i4pl1d92604ix5x6jgdfkrdgzqbh5vj27"; + }; + + propagatedBuildInputs = [ + keepkey libagent setuptools wheel + ]; + + meta = with stdenv.lib; { + description = "Using KeepKey as hardware-based SSH/PGP agent"; + homepage = https://github.com/romanz/trezor-agent; + license = licenses.gpl3; + maintainers = with maintainers; [ hkjn np mmahut ]; + }; +} diff --git a/pkgs/development/python-modules/ledger_agent/default.nix b/pkgs/development/python-modules/ledger_agent/default.nix new file mode 100644 index 00000000000..4aaecf6bc76 --- /dev/null +++ b/pkgs/development/python-modules/ledger_agent/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, ledgerblue +, setuptools +, libagent +, wheel +}: + +buildPythonPackage rec { + pname = "ledger_agent"; + version = "0.9.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "03zj602m2rln9yvr08dswy56vzkbldp8b074ixwzz525dafblr92"; + }; + + propagatedBuildInputs = [ + ledgerblue libagent setuptools wheel + ]; + + meta = with stdenv.lib; { + description = "Using Ledger as hardware-based SSH/PGP agent"; + homepage = https://github.com/romanz/trezor-agent; + license = licenses.gpl3; + maintainers = with maintainers; [ hkjn np mmahut ]; + }; +} diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index 6e878a851bb..8920fecf3da 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -8,6 +8,7 @@ , decorator , audioread , resampy +, soundfile }: buildPythonPackage rec { @@ -19,7 +20,7 @@ buildPythonPackage rec { sha256 = "cca58a2d9a47e35be63a3ce36482d241453bfe9b14bde2005430f969bd7d013a"; }; - propagatedBuildInputs = [ joblib matplotlib six scikitlearn decorator audioread resampy ]; + propagatedBuildInputs = [ joblib matplotlib six scikitlearn decorator audioread resampy soundfile ]; # No tests doCheck = false; diff --git a/pkgs/development/python-modules/monkeyhex/default.nix b/pkgs/development/python-modules/monkeyhex/default.nix new file mode 100644 index 00000000000..715665f1b1b --- /dev/null +++ b/pkgs/development/python-modules/monkeyhex/default.nix @@ -0,0 +1,30 @@ +{ buildPythonPackage +, fetchPypi +, future +, lib +}: + +buildPythonPackage rec { + pname = "monkeyhex"; + version = "1.7.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "5ba913df664c34f3ce53916c83872fddf750adc78a0b0ecdd316ac3e728bb019"; + }; + + propagatedBuildInputs = [ future ]; + + # No tests in repo. + doCheck = false; + + # Verify import still works. + pythonImportsCheck = [ "monkeyhex" ]; + + meta = with lib; { + description = "A small library to assist users of the python shell who work in contexts where printed numbers are more usefully viewed in hexadecimal"; + homepage = "https://github.com/rhelmot/monkeyhex"; + license = licenses.mit; + maintainers = [ maintainers.pamplemousse ]; + }; +} diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index e2028d9332b..8cd639e520c 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "mpi4py"; - version = "3.0.2"; + version = "3.0.3"; src = fetchPypi { inherit pname version; - sha256 = "1q28xl36difma1wq0acq111cqxjya32kn3lxp6fbidz3wg8jkmpq"; + sha256 = "012d716c8b9ed1e513fcc4b18e5af16a8791f51e6d1716baccf988ad355c5a1f"; }; passthru = { diff --git a/pkgs/development/python-modules/mwoauth/default.nix b/pkgs/development/python-modules/mwoauth/default.nix index d643e71f258..778a081992c 100644 --- a/pkgs/development/python-modules/mwoauth/default.nix +++ b/pkgs/development/python-modules/mwoauth/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "mwoauth"; - version = "0.3.5"; + version = "0.3.7"; src = fetchPypi { inherit pname version; - sha256 = "c7e4c56561a280e14ca4cc20b79ba4a9dd4ec752ff4c797cf29dad4460fb7832"; + sha256 = "9e0d70a1fa6f452584de1cb853ae6c11f41233549f7839cfb879f99410f6ad46"; }; # package has no tests diff --git a/pkgs/development/python-modules/myfitnesspal/default.nix b/pkgs/development/python-modules/myfitnesspal/default.nix index b839fd2633e..570d0c3e749 100644 --- a/pkgs/development/python-modules/myfitnesspal/default.nix +++ b/pkgs/development/python-modules/myfitnesspal/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "myfitnesspal"; - version = "1.13.3"; + version = "1.13.4"; src = fetchPypi { inherit pname version; - sha256 = "4f785341f0499bad8d3400cfcfffd99b7fcf8aac3971390f8ec3dfaed8361b20"; + sha256 = "552cc696e170f12f75fd12b1447be01fa2d0bfd85e14da5928afd9aab2277b98"; }; # Remove overly restrictive version constraints on keyring and keyrings.alt diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index b37f191286e..b2af7bded1c 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "mysqlclient"; - version = "1.4.4"; + version = "1.4.5"; nativeBuildInputs = [ libmysqlclient @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1379hab7spjp9v5fypqgy0b8vr8vnalxahm9hcsxvj2xbb2pqwww"; + sha256 = "e80109b0ae8d952b900b31b623181532e5e89376d707dcbeb63f99e69cefe559"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 965d3df0e91..b0357c16165 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "nbconvert"; - version = "5.6.0"; + version = "5.6.1"; src = fetchPypi { inherit pname version; - sha256 = "427a468ec26e7d68a529b95f578d5cbf018cb4c1f889e897681c2b6d11897695"; + sha256 = "21fb48e700b43e82ba0e3142421a659d7739b65568cc832a13976a77be16b523"; }; checkInputs = [ nose pytest glibcLocales ]; diff --git a/pkgs/development/python-modules/nbdime/default.nix b/pkgs/development/python-modules/nbdime/default.nix index 25605a21727..5bff17ee895 100644 --- a/pkgs/development/python-modules/nbdime/default.nix +++ b/pkgs/development/python-modules/nbdime/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "nbdime"; - version = "1.0.6"; + version = "1.0.7"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "00nywb69kp9i0wl5mczgwqc5db8v70ihr9cjbwqppd2jkx4vf34j"; + sha256 = "28615cb92d59e0511026bac4c916f16dc15981bcad4ddc3f7fdd6a289ea01242"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index d196b6a6947..3c174288b82 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "notebook"; - version = "6.0.1"; + version = "6.0.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "660976fe4fe45c7aa55e04bf4bccb9f9566749ff637e9020af3422f9921f9a5d"; + sha256 = "399a4411e171170173344761e7fd4491a3625659881f76ce47c50231ed714d9b"; }; LC_ALL = "en_US.utf8"; diff --git a/pkgs/development/python-modules/numcodecs/default.nix b/pkgs/development/python-modules/numcodecs/default.nix index 775cfeded8b..e49e6e19239 100644 --- a/pkgs/development/python-modules/numcodecs/default.nix +++ b/pkgs/development/python-modules/numcodecs/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "numcodecs"; - version = "0.6.3"; + version = "0.6.4"; src = fetchPypi { inherit pname version; - sha256 = "086qwlyi01rpgyyyy8bmhh9i7hpksyz33ldci3wdwmhiblyl362y"; + sha256 = "ef4843d5db4d074e607e9b85156835c10d006afc10e175bda62ff5412fca6e4d"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index f5ce093cb49..fdc5e9b8f13 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -16,12 +16,12 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.17.3"; + version = "1.17.4"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "a0678793096205a4d784bd99f32803ba8100f639cf3b932dc63b21621390ea7e"; + sha256 = "f58913e9227400f1395c7b800503ebfdb0772f1c33ff8cb4d6451c06cabdf316"; }; nativeBuildInputs = [ gfortran pytest ]; diff --git a/pkgs/development/python-modules/pandas/2.nix b/pkgs/development/python-modules/pandas/2.nix index 0ea27b04dcb..42e6fe845e0 100644 --- a/pkgs/development/python-modules/pandas/2.nix +++ b/pkgs/development/python-modules/pandas/2.nix @@ -32,11 +32,11 @@ let in buildPythonPackage rec { pname = "pandas"; - version = "0.25.2"; + version = "0.25.3"; src = fetchPypi { inherit pname version; - sha256 = "ca91a19d1f0a280874a24dca44aadce42da7f3a7edb7e9ab7c7baad8febee2be"; + sha256 = "52da74df8a9c9a103af0a72c9d5fdc8e0183a90884278db7f386b5692a2220a4"; }; checkInputs = [ pytest glibcLocales moto hypothesis ]; diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix index b3dcec637fe..218194812b8 100644 --- a/pkgs/development/python-modules/pandas/default.nix +++ b/pkgs/development/python-modules/pandas/default.nix @@ -30,11 +30,11 @@ let in buildPythonPackage rec { pname = "pandas"; - version = "0.25.2"; + version = "0.25.3"; src = fetchPypi { inherit pname version; - sha256 = "ca91a19d1f0a280874a24dca44aadce42da7f3a7edb7e9ab7c7baad8febee2be"; + sha256 = "52da74df8a9c9a103af0a72c9d5fdc8e0183a90884278db7f386b5692a2220a4"; }; checkInputs = [ pytest glibcLocales moto hypothesis ]; diff --git a/pkgs/development/python-modules/pefile/default.nix b/pkgs/development/python-modules/pefile/default.nix new file mode 100644 index 00000000000..92a0d064f49 --- /dev/null +++ b/pkgs/development/python-modules/pefile/default.nix @@ -0,0 +1,30 @@ +{ buildPythonPackage +, future +, fetchPypi +, lib +}: + +buildPythonPackage rec { + pname = "pefile"; + version = "2019.4.18"; + + propagatedBuildInputs = [ future ]; + + src = fetchPypi { + inherit pname version; + sha256 = "a5d6e8305c6b210849b47a6174ddf9c452b2888340b8177874b862ba6c207645"; + }; + + # Test data encrypted. + doCheck = false; + + # Verify import still works. + pythonImportsCheck = [ "pefile" ]; + + meta = with lib; { + description = "Multi-platform Python module to parse and work with Portable Executable (aka PE) files"; + homepage = "https://github.com/erocarrera/pefile"; + license = licenses.mit; + maintainers = [ maintainers.pamplemousse ]; + }; +} diff --git a/pkgs/development/python-modules/persistent/default.nix b/pkgs/development/python-modules/persistent/default.nix index 88008cd9530..76d5441c048 100644 --- a/pkgs/development/python-modules/persistent/default.nix +++ b/pkgs/development/python-modules/persistent/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "persistent"; - version = "4.5.0"; + version = "4.5.1"; nativeBuildInputs = [ sphinx manuel ]; propagatedBuildInputs = [ zope_interface cffi ]; src = fetchPypi { inherit pname version; - sha256 = "0slbvq1m3rilgyhj6i522rsyv592xv9pmvm61mrmgkgf40kfnz69"; + sha256 = "73862779577cb8637f2b68e7edee9a9b95cf33d0b83cb6e762f0f3fc12897aa6"; }; meta = { diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index 288e33e0506..d37be90099c 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.10.21"; + version = "8.10.22"; src = fetchPypi { inherit pname version; - sha256 = "162301aa2ce7c1a7196d7b5b084e3263a0a5f55e3129fe2429f2a115c3ef16c3"; + sha256 = "705dc7bbaa0d5932e9c010437c718bb3c0d7c93ab25b9710b4d9ae7370cc0121"; }; meta = { diff --git a/pkgs/development/python-modules/pipdate/default.nix b/pkgs/development/python-modules/pipdate/default.nix index 8628705ed4d..08ed0c43a22 100644 --- a/pkgs/development/python-modules/pipdate/default.nix +++ b/pkgs/development/python-modules/pipdate/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pipdate"; - version = "0.3.2"; + version = "0.3.4"; src = fetchPypi { inherit pname version; - sha256 = "a27f64d13269adfd8594582f5a62c9f2151b426e701afdfc3b4f4019527b4121"; + sha256 = "26bd12075e63ef7f8094da36c27bf5539d298f4ef2af6acba20e98b502439d6d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plac/default.nix b/pkgs/development/python-modules/plac/default.nix index 0622e41fa7e..77bcf6cf4fc 100644 --- a/pkgs/development/python-modules/plac/default.nix +++ b/pkgs/development/python-modules/plac/default.nix @@ -5,11 +5,11 @@ }: buildPythonPackage rec { pname = "plac"; - version = "1.1.0"; + version = "1.1.3"; src = fetchPypi { inherit pname version; - sha256 = "10f0blwxn7k2qvd0vs4300jxb8n9r7jhngf9bx9bfxia8akwy5kw"; + sha256 = "398cb947c60c4c25e275e1f1dadf027e7096858fb260b8ece3b33bcff90d985f"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 37c19f5c14b..a3d909bb3d4 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "psutil"; - version = "5.6.3"; + version = "5.6.5"; src = fetchPypi { inherit pname version; - sha256 = "863a85c1c0a5103a12c05a35e59d336e1d665747e531256e061213e2e90f63f3"; + sha256 = "d051532ac944f1be0179e0506f6889833cf96e466262523e57a871de65a15147"; }; # No tests in archive diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index da7ddbc7dcb..72ab1b5c405 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -5,28 +5,18 @@ , requests, tox, unicorn, intervaltree, fetchpatch }: buildPythonPackage rec { - version = "3.12.0"; + version = "4.0.0b0"; pname = "pwntools"; src = fetchPypi { inherit pname version; - sha256 = "09a7yhsyqxb4xf2r6mbn3p5zx1wp89lxq7lj34y4zbin6ns5929s"; + sha256 = "11f7x7rjad1nawn3r524lzxgz3nk89c6s3xycrscn3n86hh0zgid"; }; propagatedBuildInputs = [ Mako packaging pysocks pygments ROPGadget capstone paramiko pip psutil pyelftools pyserial dateutil requests tox unicorn intervaltree ]; - disabled = isPy3k; doCheck = false; # no setuptools tests for the package - # Can be removed when 3.13.0 is released - patches = [ - (fetchpatch { - url = "https://github.com/Gallopsled/pwntools/commit/9859f54a21404174dd17efee02f91521a2dd09c5.patch"; - sha256 = "0p0h87npn1mwsd8ciab7lg74bk3ahlk5r0mjbvx4jhihl2gjc3z2"; - }) - ]; - - meta = with stdenv.lib; { homepage = "http://pwntools.com"; description = "CTF framework and exploit development library"; diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index 56467d1e4a5..795f623ba53 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "2.3.2"; + version = "2.3.3"; src = fetchPypi { inherit pname version; - sha256 = "2c76740e5adbf8b14d8f41d4f84ce23c0e8e738b18b926dc60858c35bf2fa8f2"; + sha256 = "b884402c62d589a38444e8f4b3892b18312e8f9442cd8d12e7ec01c698328f54"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/pybase64/default.nix b/pkgs/development/python-modules/pybase64/default.nix index 544ce1826f3..6c32de593c1 100644 --- a/pkgs/development/python-modules/pybase64/default.nix +++ b/pkgs/development/python-modules/pybase64/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pybase64"; - version = "1.0.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "71a729b10232b38cba001e621dbaa6dbba2302dc44a93706295f1ff760f40876"; + sha256 = "6ced40531bffc81bafc790d5c0d2f752e281b3b00fd6ff4e79385c625e5dbab1"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix index 38108e6e659..84f5a41c45b 100644 --- a/pkgs/development/python-modules/pybids/default.nix +++ b/pkgs/development/python-modules/pybids/default.nix @@ -15,12 +15,12 @@ }: buildPythonPackage rec { - version = "0.9.4"; + version = "0.9.5"; pname = "pybids"; src = fetchPypi { inherit pname version; - sha256 = "08abd3573e823e536990caf54405ffef573a88ef9d019c2d94e0be995e21885f"; + sha256 = "0e8f8466067ff3023f53661c390c02702fcd5fe712bdd5bf167ffb0c2b920430"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pybullet/default.nix b/pkgs/development/python-modules/pybullet/default.nix index 93be1fe4a03..f72f09a3328 100644 --- a/pkgs/development/python-modules/pybullet/default.nix +++ b/pkgs/development/python-modules/pybullet/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pybullet"; - version = "2.5.6"; + version = "2.5.7"; src = fetchPypi { inherit pname version; - sha256 = "ffeb00f393dcddc11d195a72623e3b06767a37e4fdfa06ef88fbd74c8d326adb"; + sha256 = "82a235a8fe3c8dee753d765c295ff0da92bcb5096209d26a0cfc3f5c6054e374"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index ca6f7284715..c38366894dc 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pycairo"; - version = "1.18.1"; + version = "1.18.2"; format = "other"; @@ -12,7 +12,7 @@ buildPythonPackage rec { owner = "pygobject"; repo = "pycairo"; rev = "v${version}"; - sha256 = "0f4l7d1ibkk8xdspyv5zx8fah9z3x775bd91zirnp37vlgqds7xj"; + sha256 = "142145a2whvlk92jijrbf3i2bqrzmspwpysj0bfypw0krzi0aa6j"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pycryptodome/default.nix b/pkgs/development/python-modules/pycryptodome/default.nix index f07b33cf477..c3b807ce43c 100644 --- a/pkgs/development/python-modules/pycryptodome/default.nix +++ b/pkgs/development/python-modules/pycryptodome/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchPypi, buildPythonPackage }: buildPythonPackage rec { - version = "3.9.0"; + version = "3.9.2"; pname = "pycryptodome"; src = fetchPypi { inherit pname version; - sha256 = "dbeb08ad850056747aa7d5f33273b7ce0b9a77910604a1be7b7a6f2ef076213f"; + sha256 = "e1e007d072d50844188c067c325af8b3ad31e4b87792381469b821e95bf14cd8"; }; meta = { diff --git a/pkgs/development/python-modules/pycryptodomex/default.nix b/pkgs/development/python-modules/pycryptodomex/default.nix index 1ec636f9f32..7d3204e021a 100644 --- a/pkgs/development/python-modules/pycryptodomex/default.nix +++ b/pkgs/development/python-modules/pycryptodomex/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pycryptodomex"; - version = "3.9.0"; + version = "3.9.2"; meta = { description = "A self-contained cryptographic library for Python"; @@ -12,6 +12,6 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "8b604f4fa1de456d6d19771b01c2823675a75a2c60e51a6b738f71fdfe865370"; + sha256 = "137e8e2c7438184dae0b940cdf5d0d4f639b1df564a95dadbb7c4ec188850921"; }; } diff --git a/pkgs/development/python-modules/pyjson5/default.nix b/pkgs/development/python-modules/pyjson5/default.nix new file mode 100644 index 00000000000..232bafd3ba7 --- /dev/null +++ b/pkgs/development/python-modules/pyjson5/default.nix @@ -0,0 +1,26 @@ +{ buildPythonPackage, lib, nose, fetchFromGitHub }: + +buildPythonPackage rec { + pname = "pyjson5"; + version = "0.8.5"; + + src = fetchFromGitHub { + owner = "dpranke"; + repo = pname; + rev = "v${version}"; + sha256 = "0nyngj18jlkgvm1177lc3cj47wm4yh3dqigygvcvw7xkyryafsqn"; + }; + + doCheck = true; + checkInputs = [ nose ]; + checkPhase = '' + nosetests + ''; + + meta = with lib; { + description = "Python implementation of the JSON5 data format"; + license = licenses.asl20; + homepage = "https://github.com/dpranke/pyjson5"; + maintainers = with maintainers; [ isgy ]; + }; +} diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index f6c1cc61ebb..dc9b38eec9b 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, mupdf, swig }: buildPythonPackage rec { pname = "PyMuPDF"; - version = "1.16.5"; + version = "1.16.7"; src = fetchPypi { inherit pname version; - sha256 = "9909b1db81952abb09a2c17cca8ffa17f4a05a864653d6e702ce86bfa70c6a23"; + sha256 = "b16c85b2f89cc89e36b59fe734f14e5c939c8b24697bf33ff7a19584e8334976"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix index cbe9b111a2c..0fd6253e5fd 100644 --- a/pkgs/development/python-modules/pyopencl/default.nix +++ b/pkgs/development/python-modules/pyopencl/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pyopencl"; - version = "2019.1.1"; + version = "2019.1.2"; checkInputs = [ pytest ]; buildInputs = [ opencl-headers ocl-icd pybind11 ]; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0g5n1c8gfqhfrfpzdypzwfj1q1nlqzcfjrx397cs6qqw67mg095k"; + sha256 = "7803f3128dbd28ae6f5b851a80ef586a35b9575406ea7bb068b8e1516f8043f0"; }; # py.test is not needed during runtime, so remove it from `install_requires` diff --git a/pkgs/development/python-modules/pyparsing/default.nix b/pkgs/development/python-modules/pyparsing/default.nix index 2fd3ca60ad8..854ca4d90ee 100644 --- a/pkgs/development/python-modules/pyparsing/default.nix +++ b/pkgs/development/python-modules/pyparsing/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi }: buildPythonPackage rec { pname = "pyparsing"; - version = "2.4.2"; + version = "2.4.5"; src = fetchPypi { inherit pname version; - sha256 = "6f98a7b9397e206d78cc01df10131398f1c8b8510a2f4d97d9abd82e1aacdd80"; + sha256 = "4ca62001be367f01bd3e92ecbb79070272a9d4964dce6a48a82ff0b8bc7e683a"; }; # Not everything necessary to run the tests is included in the distribution diff --git a/pkgs/development/python-modules/pyrsistent/default.nix b/pkgs/development/python-modules/pyrsistent/default.nix index c8310c39441..b4edb02258a 100644 --- a/pkgs/development/python-modules/pyrsistent/default.nix +++ b/pkgs/development/python-modules/pyrsistent/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyrsistent"; - version = "0.15.4"; + version = "0.15.5"; src = fetchPypi { inherit pname version; - sha256 = "0cv5xvhfhlj88pb0ghdwivkfcmgi6503qjwxx4r6n06nd6hpzd1l"; + sha256 = "eb6545dbeb1aa69ab1fb4809bfbf5a8705e44d92ef8fc7c2361682a47c46c778"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/pytest-mypy/default.nix b/pkgs/development/python-modules/pytest-mypy/default.nix index bca04ab7b36..4fb2146d7a7 100644 --- a/pkgs/development/python-modules/pytest-mypy/default.nix +++ b/pkgs/development/python-modules/pytest-mypy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-mypy"; - version = "0.4.1"; + version = "0.4.2"; src = fetchPypi { inherit pname version; - sha256 = "f6348a3aa08d7b38b05c12ed0965415e1b60d402d7ceb353f5116f6eaf7dac28"; + sha256 = "5a5338cecff17f005b181546a13e282761754b481225df37f33d37f86ac5b304"; }; propagatedBuildInputs = [ pytest mypy ]; diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 6088d78bba5..39eed4f13c6 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -3,7 +3,7 @@ , atomicwrites, mock, writeText, pathlib2, wcwidth, packaging, isPyPy, python }: buildPythonPackage rec { - version = "5.2.1"; + version = "5.2.2"; pname = "pytest"; disabled = !isPy3k; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "ca563435f4941d0cb34767301c27bc65c510cb82e90b9ecf9cb52dc2c63caaa0"; + sha256 = "27abc3fef618a01bebb1f0d6d303d2816a99aa87a5968ebc32fe971be91eb1e6"; }; checkInputs = [ hypothesis mock ]; diff --git a/pkgs/development/python-modules/python-daemon/default.nix b/pkgs/development/python-modules/python-daemon/default.nix index 93c05106404..41b7aa78bab 100644 --- a/pkgs/development/python-modules/python-daemon/default.nix +++ b/pkgs/development/python-modules/python-daemon/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-daemon"; - version = "2.2.3"; + version = "2.2.4"; src = fetchPypi { inherit pname version; - sha256 = "affeca9e5adfce2666a63890af9d6aff79f670f7511899edaddca7f96593cc25"; + sha256 = "57c84f50a04d7825515e4dbf3a31c70cc44414394a71608dee6cfde469e81766"; }; # A test fail within chroot builds. diff --git a/pkgs/development/python-modules/rbtools/default.nix b/pkgs/development/python-modules/rbtools/default.nix index 2bd42172917..99f1df09bbf 100644 --- a/pkgs/development/python-modules/rbtools/default.nix +++ b/pkgs/development/python-modules/rbtools/default.nix @@ -3,6 +3,7 @@ , fetchurl , nose , six +, setuptools , isPy3k }: @@ -17,7 +18,7 @@ buildPythonPackage { }; checkInputs = [ nose ]; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ six setuptools ]; checkPhase = "LC_ALL=C nosetests"; diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index eaa691a6b75..2286ebbc4cc 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -11,11 +11,11 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.5.31"; + version = "3.5.32"; src = fetchPypi { inherit pname version; - sha256 = "3e2d2ea8ac3d63c918a2b40476c2745704d0364abe2b9c844c75992132a5eac7"; + sha256 = "83ef44936ef4e9c432d62bc2b72ec8d772b87af319d123e827a72e9b6884c851"; }; checkInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/requests-oauthlib/default.nix b/pkgs/development/python-modules/requests-oauthlib/default.nix index be37a48f00c..dd802abdb55 100644 --- a/pkgs/development/python-modules/requests-oauthlib/default.nix +++ b/pkgs/development/python-modules/requests-oauthlib/default.nix @@ -2,12 +2,12 @@ , oauthlib, requests }: buildPythonPackage rec { - version = "1.2.0"; + version = "1.3.0"; pname = "requests-oauthlib"; src = fetchPypi { inherit pname version; - sha256 = "bd6533330e8748e94bf0b214775fed487d309b8b8fe823dc45641ebcd9a32f57"; + sha256 = "0smaxs5ixng4z0k6dsgmm6s972ka3p6a2ykdpnl23mqzlw0ic9ml"; }; doCheck = false; # Internet tests fail when building in chroot diff --git a/pkgs/development/python-modules/rethinkdb/default.nix b/pkgs/development/python-modules/rethinkdb/default.nix index a6087c9859c..7eea5d2c39f 100644 --- a/pkgs/development/python-modules/rethinkdb/default.nix +++ b/pkgs/development/python-modules/rethinkdb/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "rethinkdb"; - version = "2.4.4"; + version = "2.4.4.post1"; src = fetchPypi { inherit pname version; - sha256 = "d01b39c1921498e22e3c9cae1adb39c37b68e4438ef77218abc0166fdfd2ea7a"; + sha256 = "e1c1f8ad93bc1c6f2aaa73afc333c57d505d8cc08c437d78a5c1eb8dc4b7e8c2"; }; doCheck = false; diff --git a/pkgs/development/python-modules/runway-python/default.nix b/pkgs/development/python-modules/runway-python/default.nix index f46a35004ab..62e0d2f0beb 100644 --- a/pkgs/development/python-modules/runway-python/default.nix +++ b/pkgs/development/python-modules/runway-python/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "runway-python"; - version = "0.5.0"; + version = "0.5.1"; src = fetchPypi { inherit pname version; - sha256 = "d3573a003899eb33c0edbc1d59c16c8c19c092512da0c75ceb1f46063a18c7e9"; + sha256 = "00cf6fa9ea3b6a195e9eca96216a9d206b6884624d0214bd776f8654cd5e8fea"; }; propagatedBuildInputs = [ flask flask-cors numpy pillow gevent wget six colorcet ]; diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index 93488917017..dd561c54853 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "scipy"; - version = "1.3.1"; + version = "1.3.2"; src = fetchPypi { inherit pname version; - sha256 = "2643cfb46d97b7797d1dbdb6f3c23fe3402904e3c90e6facfe6a9b98d808c1b5"; + sha256 = "a03939b431994289f39373c57bbe452974a7da724ae7f9620a1beee575434da4"; }; checkInputs = [ nose pytest ]; diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 0705ed4bc83..da729f5ab0b 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "0.13.0"; + version = "0.13.2"; src = fetchPypi { inherit pname version; - sha256 = "ff14935cc3053de0650128f124c36f34a4be120b8cc522c149f5cba342c1fd05"; + sha256 = "ff1fa7fb85703ae9414c8b427ee73f8363232767c9cd19158f08f6e4f0b58fc7"; }; checkInputs = [ django flask tornado bottle rq falcon ] diff --git a/pkgs/development/python-modules/soupsieve/default.nix b/pkgs/development/python-modules/soupsieve/default.nix index 737e9e0803a..8995e98ca78 100644 --- a/pkgs/development/python-modules/soupsieve/default.nix +++ b/pkgs/development/python-modules/soupsieve/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "soupsieve"; - version = "1.9.4"; + version = "1.9.5"; src = fetchPypi { inherit pname version; - sha256 = "605f89ad5fdbfefe30cdc293303665eff2d188865d4dbe4eb510bba1edfbfce3"; + sha256 = "e2c1c5dee4a1c36bcb790e0fabd5492d874b8ebd4617622c4f6a731701060dda"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 74d73638b1e..56d2c6799b4 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.3.10"; + version = "1.3.11"; src = fetchPypi { inherit pname version; - sha256 = "3f045e8e9ee1293e2d0ab4396950deed71f095a7762f063f3e5f54a839b8d5b4"; + sha256 = "27ef900b1116776128d0d09bff21f8d2f6bb2ea887cd59fe1a32aec5563aacb0"; }; # No tests in archive diff --git a/pkgs/development/python-modules/starlette/default.nix b/pkgs/development/python-modules/starlette/default.nix index 1ccb8bcaf70..6580a87b2fe 100644 --- a/pkgs/development/python-modules/starlette/default.nix +++ b/pkgs/development/python-modules/starlette/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "starlette"; - version = "0.12.10"; + version = "0.12.13"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "e41ef52e711a82ef95c195674e5d8d41c75c6b1d6f5a275637eedd4cc2150a7f"; + sha256 = "9597bc28e3c4659107c1c4a45ec32dc45e947d78fe56230222be673b2c36454a"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/strictyaml/default.nix b/pkgs/development/python-modules/strictyaml/default.nix index 496ed66c1ac..bb4824b5c02 100644 --- a/pkgs/development/python-modules/strictyaml/default.nix +++ b/pkgs/development/python-modules/strictyaml/default.nix @@ -6,12 +6,12 @@ }: buildPythonPackage rec { - version = "1.0.5"; + version = "1.0.6"; pname = "strictyaml"; src = fetchPypi { inherit pname version; - sha256 = "aad8d90c4d300c5bfa7678b9680ce456406319859c7279e98110548b596b5ae7"; + sha256 = "dd687a32577e0b832619ce0552eac86d6afad5fa7b61ab041bb765881c6a1f36"; }; propagatedBuildInputs = [ ruamel_yaml python-dateutil ]; diff --git a/pkgs/development/python-modules/tables/3.5.nix b/pkgs/development/python-modules/tables/3.5.nix index 1123d4626c9..b27584d25d0 100644 --- a/pkgs/development/python-modules/tables/3.5.nix +++ b/pkgs/development/python-modules/tables/3.5.nix @@ -4,12 +4,12 @@ with stdenv.lib; buildPythonPackage rec { - version = "3.6.0"; + version = "3.6.1"; pname = "tables"; src = fetchPypi { inherit pname version; - sha256 = "db3488214864fb313a611fca68bf1c9019afe4e7877be54d0e61c84416603d4d"; + sha256 = "49a972b8a7c27a8a173aeb05f67acb45fe608b64cd8e9fa667c0962a60b71b49"; }; buildInputs = [ hdf5 cython bzip2 lzo c-blosc ]; diff --git a/pkgs/development/python-modules/tenacity/default.nix b/pkgs/development/python-modules/tenacity/default.nix index c03c2e1a30d..254b91891c7 100644 --- a/pkgs/development/python-modules/tenacity/default.nix +++ b/pkgs/development/python-modules/tenacity/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "tenacity"; - version = "5.1.1"; + version = "5.1.5"; src = fetchPypi { inherit pname version; - sha256 = "a4eb168dbf55ed2cae27e7c6b2bd48ab54dabaf294177d998330cf59f294c112"; + sha256 = "e664bd94f088b17f46da33255ae33911ca6a0fe04b156d334b601a4ef66d3c5f"; }; nativeBuildInputs = [ pbr setuptools_scm ]; diff --git a/pkgs/development/python-modules/tensorflow-estimator/default.nix b/pkgs/development/python-modules/tensorflow-estimator/default.nix index 127e7560679..9f6be4d1dda 100644 --- a/pkgs/development/python-modules/tensorflow-estimator/default.nix +++ b/pkgs/development/python-modules/tensorflow-estimator/default.nix @@ -6,13 +6,14 @@ buildPythonPackage rec { pname = "tensorflow-estimator"; - version = "1.14.0"; + # This is effectively 1.15.0. Upstream tagged 1.15.0 by mistake before actually updating the version in setup.py, which is why this tag is called 1.15.1. + version = "1.15.1"; format = "wheel"; src = fetchPypi { pname = "tensorflow_estimator"; inherit version format; - sha256 = "14irpsyj14vn2dpwr601f54058wywci1pv0hss8s01rl0rk3y1ya"; + sha256 = "1fc61wmc0w22frs79j2x4g6wnv5g21xc6rix1g4bsvy9qfvvylw8"; }; propagatedBuildInputs = [ mock numpy absl-py ]; diff --git a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix index fa1759119c9..baefd635566 100644 --- a/pkgs/development/python-modules/tensorflow-tensorboard/default.nix +++ b/pkgs/development/python-modules/tensorflow-tensorboard/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "tensorflow-tensorboard"; - version = "1.14.0"; + version = "1.15.0"; format = "wheel"; src = fetchPypi ({ @@ -23,10 +23,10 @@ buildPythonPackage rec { format = "wheel"; } // (if isPy3k then { python = "py3"; - sha256 = "1z631614jk5zgasgmwfr33gz8bwv11p9f5llzlwvx3a8rnyv3q2h"; + sha256 = "1g62i3nrgp8q9wfsyqqjkkfnsz7x2k018c26kdh527h1yrjjrbac"; } else { python = "py2"; - sha256 = "1clv29yy942l3mfar2z6wkkk6l18fz7j6mi2dfz24j9dln0scny3"; + sha256 = "0l3zc8j2sh7h1z4qpy8kfvclv3kzndri55p10i42q6xahs9phav1"; })); propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index e180c9d70e9..79be6a60c42 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -5,12 +5,18 @@ # Python libraries , numpy, tensorflow-tensorboard, backports_weakref, mock, enum34, absl-py , future, setuptools, wheel, keras-preprocessing, keras-applications, google-pasta +, functools32 +, opt-einsum , termcolor, grpcio, six, wrapt, protobuf, tensorflow-estimator # Common deps , git, swig, which, binutils, glibcLocales, cython # Common libraries , jemalloc, openmpi, astor, gast, grpc, sqlite, openssl, jsoncpp, re2 , curl, snappy, flatbuffers, icu, double-conversion, libpng, libjpeg, giflib +# Upsteam by default includes cuda support since tensorflow 1.15. We could do +# that in nix as well. It would make some things easier and less confusing, but +# it would also make the default tensorflow package unfree. See +# https://groups.google.com/a/tensorflow.org/forum/#!topic/developers/iRCt5m4qUz0 , cudaSupport ? false, nvidia_x11 ? null, cudatoolkit ? null, cudnn ? null, nccl ? null # XLA without CUDA is broken , xlaSupport ? cudaSupport @@ -33,7 +39,13 @@ let cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-merged"; - paths = [ cudatoolkit.out cudatoolkit.lib ]; + paths = [ + cudatoolkit.lib + cudatoolkit.out + # for some reason some of the required libs are in the targets/x86_64-linux + # directory; not sure why but this works around it + "${cudatoolkit}/targets/${stdenv.system}" + ]; }; cudatoolkit_cc_joined = symlinkJoin { @@ -55,12 +67,12 @@ let tfFeature = x: if x then "1" else "0"; - version = "1.14.0"; + version = "1.15.0"; variant = if cudaSupport then "-gpu" else ""; pname = "tensorflow${variant}"; pythonEnv = python.withPackages (_: - [ # python deps needed during wheel build time + [ # python deps needed during wheel build time (not runtime, see the buildPythonPackage part for that) numpy keras-preprocessing protobuf @@ -74,6 +86,7 @@ let wheel ] ++ lib.optionals (!isPy3k) [ future + functools32 mock ]); @@ -84,7 +97,7 @@ let owner = "tensorflow"; repo = "tensorflow"; rev = "v${version}"; - sha256 = "06jvwlsm14b8rqwd8q8796r0vmn0wk64s4ps2zg0sapkmp9vvcmi"; + sha256 = "1j8vysfblkyydrr67qr3i7kvaq5ygnjlx8hw9a9pc95ac462jq7i"; }; patches = [ @@ -100,12 +113,15 @@ let sha256 = "1m2qmwv1ysqa61z6255xggwbq6mnxbig749bdvrhnch4zydxb4di"; }) - # https://github.com/tensorflow/tensorflow/issues/29220 + ./tf-1.15-bazel-1.0.patch + (fetchpatch { - name = "bazel-0.27.patch"; - url = "https://github.com/tensorflow/tensorflow/commit/cfccbdb8c4a92dd26382419dceb4d934c2380391.patch"; - sha256 = "1l56wjia2c4685flsfkkgy471wx3c66wyv8khspv06zchj0k0liw"; + # be compatible with gast >0.2 instead of only gast 0.2.2 + name = "gast-update.patch"; + url = "https://github.com/tensorflow/tensorflow/commit/85751ad6c7f5fd12c6c79545d96896cba92fa8b4.patch"; + sha256 = "077cpj0kzyqxzdya1dwh8df17zfzhqn7c685hx6iskvw2979zg2n"; }) + ./lift-gast-restriction.patch ]; # On update, it can be useful to steal the changes from gentoo @@ -157,7 +173,6 @@ let # "com_github_googleapis_googleapis" # "com_github_googlecloudplatform_google_cloud_cpp" "com_google_protobuf" - "com_google_protobuf_cc" "com_googlesource_code_re2" "curl" "cython" @@ -175,11 +190,11 @@ let "lmdb" "nasm" # "nsync" # not packaged in nixpkgs + "opt_einsum_archive" "org_sqlite" "pasta" "pcre" "png_archive" - "protobuf_archive" "six_archive" "snappy" "swig" @@ -253,6 +268,7 @@ let bazelFlags = [ # temporary fixes to make the build work with bazel 0.27 "--incompatible_no_support_tools_in_action_inputs=false" + "--incompatible_use_native_patch=false" ]; bazelBuildFlags = [ "--config=opt" # optimize using the flags set in the configure phase @@ -266,9 +282,9 @@ let # cudaSupport causes fetch of ncclArchive, resulting in different hashes sha256 = if cudaSupport then - "196pm3ynfafqlcxah07hkvphf536hpix1ydgsynr1yg08aynlvvx" + "1rbg8w8pjf15hpvzrclsi19lhsrwdns6f8psb1wz35ay0ggdw8c0" else - "138r85n27ijzwxfwb5pcfyb79v14368jpckw0vmciz6pwf11bd9g"; + "0d8wq89iz9vrzvr971mgdclxxjcjr32r7aj817h019x3pc53qnwx"; }; buildAttrs = { @@ -311,7 +327,9 @@ let license = licenses.asl20; maintainers = with maintainers; [ jyp abbradar ]; platforms = platforms.linux; - broken = !(xlaSupport -> cudaSupport); + # The py2 build fails due to some issue importing protobuf. Possibly related to the fix in + # https://github.com/akesandgren/easybuild-easyblocks/commit/1f2e517ddfd1b00a342c6abb55aef3fd93671a2b + broken = !(xlaSupport -> cudaSupport) || !isPy3k; }; }; @@ -345,9 +363,11 @@ in buildPythonPackage { termcolor wrapt grpcio + opt-einsum ] ++ lib.optionals (!isPy3k) [ mock - future # FIXME + future + functools32 ] ++ lib.optionals (pythonOlder "3.4") [ backports_weakref enum34 ] ++ lib.optionals withTensorboard [ @@ -366,7 +386,26 @@ in buildPythonPackage { # TODO try to run them anyway # TODO better test (files in tensorflow/tools/ci_build/builds/*test) checkPhase = '' - ${python.interpreter} -c "import tensorflow" + ${python.interpreter} <<EOF + # A simple "Hello world" + import tensorflow as tf + hello = tf.constant("Hello, world!") + sess = tf.Session() + sess.run(hello) + + # Fit a simple model to random data + import numpy as np + np.random.seed(0) + tf.random.set_random_seed(0) + model = tf.keras.models.Sequential([ + tf.keras.layers.Dense(1, activation="linear") + ]) + model.compile(optimizer="sgd", loss="mse") + + x = np.random.uniform(size=(1,1)) + y = np.random.uniform(size=(1,)) + model.fit(x, y, epochs=1) + EOF ''; passthru.libtensorflow = bazel-build.out; diff --git a/pkgs/development/python-modules/tensorflow/lift-gast-restriction.patch b/pkgs/development/python-modules/tensorflow/lift-gast-restriction.patch new file mode 100644 index 00000000000..24cc118d8f3 --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/lift-gast-restriction.patch @@ -0,0 +1,13 @@ +diff --git a/tensorflow/tools/pip_package/setup.py b/tensorflow/tools/pip_package/setup.py +index 992f2eae22..d9386f9b13 100644 +--- a/tensorflow/tools/pip_package/setup.py ++++ b/tensorflow/tools/pip_package/setup.py +@@ -54,7 +54,7 @@ REQUIRED_PACKAGES = [ + 'astor >= 0.6.0', + 'backports.weakref >= 1.0rc1;python_version<"3.4"', + 'enum34 >= 1.1.6;python_version<"3.4"', +- 'gast == 0.2.2', ++ 'gast >= 0.2.2', + 'google_pasta >= 0.1.6', + 'keras_applications >= 1.0.8', + 'keras_preprocessing >= 1.0.5', diff --git a/pkgs/development/python-modules/tensorflow/tf-1.15-bazel-1.0.patch b/pkgs/development/python-modules/tensorflow/tf-1.15-bazel-1.0.patch new file mode 100644 index 00000000000..4d70e99108b --- /dev/null +++ b/pkgs/development/python-modules/tensorflow/tf-1.15-bazel-1.0.patch @@ -0,0 +1,213 @@ +diff --git a/tensorflow/c/BUILD b/tensorflow/c/BUILD +index f740ba66b5..6cc9003787 100644 +--- a/tensorflow/c/BUILD ++++ b/tensorflow/c/BUILD +@@ -270,6 +270,7 @@ tf_cuda_library( + "//tensorflow/core/platform", + "@com_google_absl//absl/strings", + ], ++ alwayslink = 1, + ) + + exports_files( +diff --git a/tensorflow/c/eager/BUILD b/tensorflow/c/eager/BUILD +index 5c42e508f7..16b421862c 100644 +--- a/tensorflow/c/eager/BUILD ++++ b/tensorflow/c/eager/BUILD +@@ -79,6 +79,7 @@ tf_cuda_library( + "//tensorflow/core/profiler/lib:profiler_session", + "//tensorflow/core:gpu_runtime", + ], ++ alwayslink = 1, + ) + + tf_cuda_library( +@@ -226,6 +227,7 @@ tf_cuda_library( + "//tensorflow/core/profiler/rpc/client:capture_profile", + "//tensorflow/core:gpu_runtime", + ], ++ alwayslink = 1, + ) + + tf_cuda_cc_test( +diff --git a/tensorflow/cc/saved_model/BUILD b/tensorflow/cc/saved_model/BUILD +index 39b84922d1..b2affdd999 100644 +--- a/tensorflow/cc/saved_model/BUILD ++++ b/tensorflow/cc/saved_model/BUILD +@@ -123,6 +123,7 @@ cc_library( + "//tensorflow/core/util/tensor_bundle:naming", + # mobile not supported yet + ]), ++ alwayslink = 1, + ) + + tf_cc_test( +diff --git a/tensorflow/core/BUILD b/tensorflow/core/BUILD +index c23c1f9b39..805643b217 100644 +--- a/tensorflow/core/BUILD ++++ b/tensorflow/core/BUILD +@@ -777,6 +777,7 @@ cc_library( + ":lib_proto_parsing", + ":protos_all_cc", + ], ++ alwayslink = 1, + ) + + # DEPRECATED: use platform:stringpiece instead. +@@ -2496,6 +2497,7 @@ cc_library( + "@com_google_protobuf//:protobuf", + ] + tf_protos_all_impl() + tf_protos_grappler_impl() + + tf_additional_numa_deps(), ++ alwayslink = 1, + ) + + # File compiled with extra flags to get cpu-specific acceleration. +diff --git a/tensorflow/core/lib/random/BUILD b/tensorflow/core/lib/random/BUILD +index 3bd933261b..e1e589e76d 100644 +--- a/tensorflow/core/lib/random/BUILD ++++ b/tensorflow/core/lib/random/BUILD +@@ -50,6 +50,7 @@ cc_library( + "//tensorflow/core/platform:types", + "//third_party/eigen3", + ], ++ alwayslink = 1, + ) + + filegroup( +diff --git a/tensorflow/core/platform/default/build_config.bzl b/tensorflow/core/platform/default/build_config.bzl +index 5459d8d428..feba3a5686 100644 +--- a/tensorflow/core/platform/default/build_config.bzl ++++ b/tensorflow/core/platform/default/build_config.bzl +@@ -228,6 +228,7 @@ def cc_proto_library( + hdrs = gen_hdrs, + deps = cc_libs + deps, + includes = includes, ++ alwayslink = 1, + **kargs + ) + native.cc_library( +diff --git a/tensorflow/lite/java/src/test/native/BUILD b/tensorflow/lite/java/src/test/native/BUILD +index 6dcdab2aee..32bb0a8d85 100644 +--- a/tensorflow/lite/java/src/test/native/BUILD ++++ b/tensorflow/lite/java/src/test/native/BUILD +@@ -19,6 +19,7 @@ cc_library( + "//tensorflow/lite/java/jni", + "//tensorflow/lite/kernels:kernel_util", + ], ++ alwayslink = 1, + ) + + tflite_jni_binary( +diff --git a/tensorflow/lite/python/testdata/BUILD b/tensorflow/lite/python/testdata/BUILD +index 7bda81358f..ac1188d844 100644 +--- a/tensorflow/lite/python/testdata/BUILD ++++ b/tensorflow/lite/python/testdata/BUILD +@@ -60,6 +60,7 @@ cc_library( + deps = [ + "//tensorflow/lite/c:c_api_internal", + ], ++ alwayslink = 1, + ) + + cc_binary( +diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD +index 6fd9b4f273..29df3a3dff 100644 +--- a/tensorflow/python/BUILD ++++ b/tensorflow/python/BUILD +@@ -375,6 +375,7 @@ cc_library( + "//tensorflow/core:lib", + "//tensorflow/core:protos_all_cc", + ], ++ alwayslink = 1, + ) + + cc_library( +@@ -411,6 +412,7 @@ cc_library( + "//third_party/py/numpy:headers", + "//third_party/python_runtime:headers", + ], ++ alwayslink = 1, + ) + + cc_library( +@@ -617,6 +619,7 @@ cc_library( + "//tensorflow/core:op_gen_lib", + "//tensorflow/core:protos_all_cc", + ], ++ alwayslink = 1, + ) + + py_library( +diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl +index a3956322fe..32752f59ad 100644 +--- a/tensorflow/tensorflow.bzl ++++ b/tensorflow/tensorflow.bzl +@@ -2331,6 +2331,7 @@ def tf_generate_proto_text_sources(name, srcs_relative_dir, srcs, protodeps = [] + hdrs = out_hdrs, + visibility = visibility, + deps = deps, ++ alwayslink = 1, + ) + + def tf_genrule_cmd_append_to_srcs(to_append): +diff --git a/tensorflow/tools/graph_transforms/BUILD b/tensorflow/tools/graph_transforms/BUILD +index adafe2aca1..8965316b12 100644 +--- a/tensorflow/tools/graph_transforms/BUILD ++++ b/tensorflow/tools/graph_transforms/BUILD +@@ -223,6 +223,7 @@ cc_library( + "//tensorflow/core:lib_internal", + "//tensorflow/core:protos_all_cc", + ], ++ alwayslink = 1, + ) + + # This library includes a main function, to make it easy to create other +diff --git a/third_party/icu/data/BUILD.bazel b/third_party/icu/data/BUILD.bazel +index 7db21566e4..8e18c7cc3a 100644 +--- a/third_party/icu/data/BUILD.bazel ++++ b/third_party/icu/data/BUILD.bazel +@@ -43,4 +43,5 @@ cc_library( + name = "conversion_data", + srcs = [":conversion_data.c"], + deps = ["@icu//:headers"], ++ alwayslink = 1, + ) +diff --git a/third_party/protobuf/protobuf.patch b/third_party/protobuf/protobuf.patch +index df0648563d..18fc6cdf35 100644 +--- a/third_party/protobuf/protobuf.patch ++++ b/third_party/protobuf/protobuf.patch +@@ -11,7 +11,15 @@ index 2fb26050..c2744d5b 100644 + + ################################################################################ + # Protobuf Runtime Library +-@@ -218,7 +218,7 @@ cc_library( ++@@ -209,6 +209,7 @@ cc_library( ++ copts = COPTS, ++ includes = ["src/"], ++ linkopts = LINK_OPTS, +++ alwayslink = 1, ++ visibility = ["//visibility:public"], ++ deps = [":protobuf_lite"] + PROTOBUF_DEPS, ++ ) ++@@ -219,7 +220,7 @@ cc_library( + # TODO(keveman): Remove this target once the support gets added to Bazel. + cc_library( + name = "protobuf_headers", +@@ -20,3 +28,4 @@ index 2fb26050..c2744d5b 100644 + includes = ["src/"], + visibility = ["//visibility:public"], + ) ++ +\ No newline at end of file +diff --git a/third_party/systemlibs/protobuf.bzl b/third_party/systemlibs/protobuf.bzl +index 774514f3fd..1c415b018b 100644 +--- a/third_party/systemlibs/protobuf.bzl ++++ b/third_party/systemlibs/protobuf.bzl +@@ -262,6 +262,7 @@ def cc_proto_library( + hdrs = gen_hdrs, + deps = cc_libs + deps, + includes = includes, ++ alwayslink = 1, + **kargs + ) + diff --git a/pkgs/development/python-modules/testfixtures/default.nix b/pkgs/development/python-modules/testfixtures/default.nix index a08241332dc..f429f72cc01 100644 --- a/pkgs/development/python-modules/testfixtures/default.nix +++ b/pkgs/development/python-modules/testfixtures/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "6.10.0"; + version = "6.10.1"; src = fetchPypi { inherit pname version; - sha256 = "1kiv60i0s67v34x28j6cshby7n7mbhd7a7val639yvvlh1f0q8wx"; + sha256 = "abbca7ed381d34a77699c6cb68be67919a1e7f5cf8728b57396145417fa34110"; }; checkInputs = [ pytest mock sybil zope_component twisted ]; diff --git a/pkgs/development/python-modules/testpath/default.nix b/pkgs/development/python-modules/testpath/default.nix index 8bdd50f52d2..c9d0e8f0ad2 100644 --- a/pkgs/development/python-modules/testpath/default.nix +++ b/pkgs/development/python-modules/testpath/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "testpath"; - version = "0.4.2"; + version = "0.4.4"; format = "wheel"; src = fetchPypi { inherit pname version format; - sha256 = "46c89ebb683f473ffe2aab0ed9f12581d4d078308a3cb3765d79c6b2317b0109"; + sha256 = "bfcf9411ef4bf3db7579063e0546938b1edda3d69f4e1fb8756991f5951f85d4"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/tld/default.nix b/pkgs/development/python-modules/tld/default.nix index 470a4bb40dd..95c3756dade 100644 --- a/pkgs/development/python-modules/tld/default.nix +++ b/pkgs/development/python-modules/tld/default.nix @@ -2,11 +2,11 @@ python.pkgs.buildPythonPackage rec { pname = "tld"; - version = "0.9.6"; + version = "0.9.7"; src = fetchPypi { inherit pname version; - sha256 = "0figmf80y715zv6viqan2nyzpg9aia5dyl25nskirpm5lh1s99w9"; + sha256 = "cef15360ec42547a583d49ef5246936b3ace424a95c00b59c09dcbe44b289961"; }; propagatedBuildInputs = with python.pkgs; [ six ]; diff --git a/pkgs/development/python-modules/trezor_agent/default.nix b/pkgs/development/python-modules/trezor_agent/default.nix index ea941f0e7ca..ad4a30d97c5 100644 --- a/pkgs/development/python-modules/trezor_agent/default.nix +++ b/pkgs/development/python-modules/trezor_agent/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec{ description = "Using Trezor as hardware SSH agent"; homepage = "https://github.com/romanz/trezor-agent"; license = licenses.gpl3; - maintainers = with maintainers; [ np mmahut ]; + maintainers = with maintainers; [ hkjn np mmahut ]; }; } diff --git a/pkgs/development/python-modules/trustme/default.nix b/pkgs/development/python-modules/trustme/default.nix index 601e49759fd..8784dad7ad1 100644 --- a/pkgs/development/python-modules/trustme/default.nix +++ b/pkgs/development/python-modules/trustme/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "trustme"; - version = "0.5.2"; + version = "0.5.3"; src = fetchPypi { inherit pname version; - sha256 = "103f8n0c60593r0z8hh1zvk1bagxwnhrv3203xpiiddwqxalr04b"; + sha256 = "f0f96a21b430cc29661644d3569a1112a397ca9cc8595b964d4ae71e5e957529"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix index ef5fed68912..6c1e85eb93c 100644 --- a/pkgs/development/python-modules/typing-extensions/default.nix +++ b/pkgs/development/python-modules/typing-extensions/default.nix @@ -4,11 +4,11 @@ let in buildPythonPackage rec { pname = "typing_extensions"; - version = "3.7.4"; + version = "3.7.4.1"; src = fetchPypi { inherit pname version; - sha256 = "15bx773a5zkk4hkwjl8nb5f8y5741vyyqb9q3jac6kxm1frk5mif"; + sha256 = "091ecc894d5e908ac75209f10d5b4f118fbdb2eb1ede6a63544054bb1edb41f2"; }; checkInputs = lib.optional (pythonOlder "3.5") typing; diff --git a/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/pkgs/development/python-modules/unittest-xml-reporting/default.nix index 624ff585c36..8d815833a40 100644 --- a/pkgs/development/python-modules/unittest-xml-reporting/default.nix +++ b/pkgs/development/python-modules/unittest-xml-reporting/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "unittest-xml-reporting"; - version = "2.5.1"; + version = "2.5.2"; propagatedBuildInputs = [six]; @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0v6xcs8nx82yw037h296zk0vz5ka4idm4xdpxkcm4h4fnpj8428l"; + sha256 = "9d28ddf6524cf0ff9293f61bd12e792de298f8561a5c945acea63fb437789e0e"; }; meta = with lib; { homepage = https://github.com/xmlrunner/unittest-xml-reporting/tree/master/; diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index ff0e5d61482..6fd90fc3a18 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "uproot"; - version = "3.10.8"; + version = "3.10.10"; src = fetchPypi { inherit pname version; - sha256 = "cf9b9a6824e82f2e45d44e2c9d8a230ce9f83972e74427543862fdff462fb121"; + sha256 = "2c780472c5c328d2e34508db1da399038653142572fc3d0b5777b2311edabd83"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/uvicorn/default.nix b/pkgs/development/python-modules/uvicorn/default.nix index a525846be76..73d797bc43e 100644 --- a/pkgs/development/python-modules/uvicorn/default.nix +++ b/pkgs/development/python-modules/uvicorn/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "uvicorn"; - version = "0.9.0"; + version = "0.10.4"; disabled = isPy27; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix index 171f6d6ed32..b1fbf26e43b 100644 --- a/pkgs/development/python-modules/uvloop/default.nix +++ b/pkgs/development/python-modules/uvloop/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "uvloop"; - version = "0.13.0"; + version = "0.14.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0blcnrd5vky2k1m1p1skx4516dr1jx76yyb0c6fi82si6mqd0b4l"; + sha256 = "07j678z9gf41j98w72ysrnb5sa41pl5yxd7ib17lcwfxqz0cjfhj"; }; patches = lib.optional stdenv.isDarwin ./darwin_sandbox.patch; diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index 507a082f9a0..ef3e92f01a7 100644 --- a/pkgs/development/python-modules/vcrpy/default.nix +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "vcrpy"; - version = "2.1.0"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "0e79239441fb4c731da9f05aecbd062223ef1f4ab668d2400c63c347a7071414"; + sha256 = "27cc696df66d77703eab5cdfa041b2f9877bbf2b54bcd390de89a4be964ca536"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix index 9202d02ad5b..1e1e1ef58a8 100644 --- a/pkgs/development/python-modules/websockets/default.nix +++ b/pkgs/development/python-modules/websockets/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "websockets"; - version = "8.0.2"; + version = "8.1"; src = fetchFromGitHub { owner = "aaugustin"; repo = pname; rev = version; - sha256 = "02fgb8gib4z5fqv30brz3mhxmblw9bw0978fhpjdrkj7wvqrz5h8"; + sha256 = "05jbqcbjg50ydwl0fijhdlqcq7fl6v99kjva66kmmzzza7vwa872"; }; disabled = pythonOlder "3.3"; diff --git a/pkgs/development/python-modules/whisper/default.nix b/pkgs/development/python-modules/whisper/default.nix index 407bb88fa2a..134d797ecf8 100644 --- a/pkgs/development/python-modules/whisper/default.nix +++ b/pkgs/development/python-modules/whisper/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "whisper"; - version = "1.1.5"; + version = "1.1.6"; src = fetchPypi { inherit pname version; - sha256 = "14013e7563102d808aae0cb5b3b2326979236d4bcd54c343ea636761629920cd"; + sha256 = "8dbb3b7cf4a02a080162467fff5cd38bf77940c3e2b25f7c4f78529427ca9cfe"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/wurlitzer/default.nix b/pkgs/development/python-modules/wurlitzer/default.nix index 8a4d96515d7..b946d23acf6 100644 --- a/pkgs/development/python-modules/wurlitzer/default.nix +++ b/pkgs/development/python-modules/wurlitzer/default.nix @@ -1,8 +1,10 @@ { lib , buildPythonPackage , fetchPypi +, isPy27 , mock , pytest +, selectors2 }: buildPythonPackage rec { @@ -14,6 +16,8 @@ buildPythonPackage rec { sha256 = "0xndv47iwc9k8cp5r9r1z3r0xww0r5x5b7qsmn39gk2gsg0119c6"; }; + propagatedBuildInputs = lib.optionals isPy27 [ selectors2 ]; + checkInputs = [ mock pytest ]; checkPhase = '' @@ -25,4 +29,4 @@ buildPythonPackage rec { homepage = https://github.com/minrk/wurlitzer; license = lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/pkgs/development/python-modules/wxPython/4.0.nix index f03d1fb1e87..bac478561f7 100644 --- a/pkgs/development/python-modules/wxPython/4.0.nix +++ b/pkgs/development/python-modules/wxPython/4.0.nix @@ -28,11 +28,11 @@ buildPythonPackage rec { pname = "wxPython"; - version = "4.0.7"; + version = "4.0.7.post1"; src = fetchPypi { inherit pname version; - sha256 = "0cq2iyqm08ihazh5xzdsha5h22mba0w4a0y7iikn6c6yvszhiriv"; + sha256 = "da43eaa2eea32c34a52531331b0a69bd791c237803a7c5df451509624766f7ca"; }; doCheck = false; diff --git a/pkgs/development/python-modules/zstd/default.nix b/pkgs/development/python-modules/zstd/default.nix index 3f9dac6d42c..6c1b9c2bb5b 100644 --- a/pkgs/development/python-modules/zstd/default.nix +++ b/pkgs/development/python-modules/zstd/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "zstd"; - version = "1.4.3.2"; + version = "1.4.4.0"; src = fetchPypi { inherit pname version; - sha256 = "1h4wvzikar4ryhawm7clh29bvhbpy0ix1rlxhg9x195fpq56vsh7"; + sha256 = "33f2c1fd8d3f9ac8e35fb3e199896afc54cceb68878570c6d4b72985dc6584a5"; }; postPatch = '' diff --git a/pkgs/development/tools/analysis/cpplint/default.nix b/pkgs/development/tools/analysis/cpplint/default.nix index 10ed99e3ffe..8b4a68adba3 100644 --- a/pkgs/development/tools/analysis/cpplint/default.nix +++ b/pkgs/development/tools/analysis/cpplint/default.nix @@ -1,6 +1,6 @@ -{ lib, pythonPackages, fetchFromGitHub }: +{ lib, python3Packages, fetchFromGitHub }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "cpplint"; version = "1.3.0"; diff --git a/pkgs/development/tools/analysis/hotspot/default.nix b/pkgs/development/tools/analysis/hotspot/default.nix index 89ffbff3db7..fc7cd2ffe19 100644 --- a/pkgs/development/tools/analysis/hotspot/default.nix +++ b/pkgs/development/tools/analysis/hotspot/default.nix @@ -1,4 +1,5 @@ { stdenv, + mkDerivation, cmake, elfutils, extra-cmake-modules, @@ -14,7 +15,7 @@ threadweaver, }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "hotspot"; version = "1.2.0"; diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix index c05d47e396c..424d83822e8 100644 --- a/pkgs/development/tools/analysis/include-what-you-use/default.nix +++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { pname = "include-what-you-use"; # Also bump llvmPackages in all-packages.nix to the supported version! - version = "0.12"; + version = "0.13"; src = fetchurl { - sha256 = "09b0h704fh7r4f5h92p5997cj3zk1v04bqp4jk1j1f6cmfq2z2d5"; + sha256 = "1jav4qf7d303by9iy6v08w73wfwzj76i54inh90w1s34m9q44aa9"; url = "${meta.homepage}/downloads/${pname}-${version}.src.tar.gz"; }; diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index fad5bc9e630..93c5e39bd23 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,4 +1,11 @@ -{ lib, python3Packages, stdenv, writeTextDir, substituteAll, targetPackages }: +{ lib +, python3Packages +, fetchpatch +, stdenv +, writeTextDir +, substituteAll +, targetPackages +}: let # See https://mesonbuild.com/Reference-tables.html#cpu-families @@ -54,6 +61,14 @@ python3Packages.buildPythonApplication rec { src = ./fix-rpath.patch; inherit (builtins) storeDir; }) + + # Fix detecting incorrect compiler in the store path hash. + # https://github.com/NixOS/nixpkgs/issues/73417#issuecomment-554077964 + # https://github.com/mesonbuild/meson/pull/6185 + (fetchpatch { + url = "https://github.com/mesonbuild/meson/commit/972ede1d14fdf17fe5bb8fb99be220f9395c2392.patch"; + sha256 = "19bfsylhpy0b2xv3ks8ac9x3q6vvvyj1wjcy971v9d5f1455xhbb"; + }) ] ++ lib.optionals stdenv.isDarwin [ # We use custom Clang, which makes Meson think *not Apple*, while still # relying on system linker. When it detects standard Clang, Meson will @@ -62,6 +77,15 @@ python3Packages.buildPythonApplication rec { # https://github.com/mesonbuild/meson/issues/4784 # Should be fixed in 0.52 ./fix-objc-linking.patch + + # Fixes error finding some frameworks + # https://github.com/NixOS/nixpkgs/pull/70690#issuecomment-553704175 + # https://github.com/mesonbuild/meson/pull/5980 + # Should be fixed in 0.52 + (fetchpatch { + url = "https://github.com/mesonbuild/meson/commit/8d3fcb3dc4d7204a4646807f8b5191d79fb291e5.patch"; + sha256 = "0g95gl662mribnnz5jcyn1jaaw8w7r1vgbg2jbm91dcrr5zji5ng"; + }) ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index ace42560db8..bc723152178 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -4,13 +4,13 @@ buildGoPackage rec { pname = "buildah"; - version = "1.11.4"; + version = "1.11.5"; src = fetchFromGitHub { owner = "containers"; repo = "buildah"; rev = "v${version}"; - sha256 = "11jdjrmyafy3fnnp4cdxh3fncjbcy7gggpzwp4n857ij7k2581hl"; + sha256 = "09bfv2pypd66dnqvrhgcg35fsahi2k0kn5dnnbfqc39g0vfz29r7"; }; outputs = [ "bin" "man" "out" ]; @@ -35,6 +35,6 @@ buildGoPackage rec { description = "A tool which facilitates building OCI images"; homepage = "https://github.com/containers/buildah"; license = licenses.asl20; - maintainers = with maintainers; [ Profpatsch vdemeester ]; + maintainers = with maintainers; [ Profpatsch vdemeester saschagrunert ]; }; } diff --git a/pkgs/development/tools/jazzy/Gemfile.lock b/pkgs/development/tools/jazzy/Gemfile.lock index 65716e824f9..2b27f9eaa96 100644 --- a/pkgs/development/tools/jazzy/Gemfile.lock +++ b/pkgs/development/tools/jazzy/Gemfile.lock @@ -12,10 +12,10 @@ GEM json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.8.0) + cocoapods (1.8.4) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.8.0) + cocoapods-core (= 1.8.4) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -31,10 +31,10 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.11.1, < 2.0) - cocoapods-core (1.8.0) + cocoapods-core (1.8.4) activesupport (>= 4.0.2, < 6) algoliasearch (~> 1.0) - concurrent-ruby (~> 1.0) + concurrent-ruby (~> 1.1) fuzzy_match (~> 2.0.4) nap (~> 1.0) cocoapods-deintegrate (1.0.4) @@ -50,14 +50,14 @@ GEM colored2 (3.1.2) concurrent-ruby (1.1.5) escape (0.0.4) - ffi (1.11.1) + ffi (1.11.2) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) i18n (0.9.5) concurrent-ruby (~> 1.0) - jazzy (0.11.2) + jazzy (0.12.0) cocoapods (~> 1.5) mustache (~> 1.1) open4 @@ -68,7 +68,7 @@ GEM xcinvoke (~> 0.3.0) json (2.2.0) liferaft (0.0.6) - minitest (5.12.0) + minitest (5.13.0) molinillo (0.6.6) mustache (1.1.0) nanaimo (0.2.6) @@ -76,7 +76,7 @@ GEM netrc (0.11.0) open4 (1.3.4) redcarpet (3.5.0) - rouge (3.11.0) + rouge (3.13.0) ruby-macho (1.4.0) sassc (2.2.1) ffi (~> 1.9) @@ -86,7 +86,7 @@ GEM thread_safe (~> 0.1) xcinvoke (0.3.0) liferaft (~> 0.0.6) - xcodeproj (1.12.0) + xcodeproj (1.13.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) @@ -100,4 +100,4 @@ DEPENDENCIES jazzy BUNDLED WITH - 1.17.2 + 1.17.3 diff --git a/pkgs/development/tools/jazzy/gemset.nix b/pkgs/development/tools/jazzy/gemset.nix index c397c2a50e2..8c1a65d62fb 100644 --- a/pkgs/development/tools/jazzy/gemset.nix +++ b/pkgs/development/tools/jazzy/gemset.nix @@ -57,10 +57,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07kwhlf8s5by0bwl07f8nyz0k1szgi801cb51n8wbargwhqk1xa4"; + sha256 = "007ssx75588ji2d8l8s6c95dng1c7b6yacng8nngpy7maijzjgzc"; type = "gem"; }; - version = "1.8.0"; + version = "1.8.4"; }; cocoapods-core = { dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap"]; @@ -68,10 +68,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1clmsmc7407namv0b6d0zssjzamwvvb2k8hxggwmrcbs2gmd20ad"; + sha256 = "0zcisqb404828n5d3lbk9y2yyx8v2yr6rk1l8y9a4i1hp743fiad"; type = "gem"; }; - version = "1.8.0"; + version = "1.8.4"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -170,10 +170,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06mvxpjply8qh4j3fj9wh08kdzwkbnvsiysh0vrhlk5cwxzjmblh"; + sha256 = "0cbads5da12lb3j0mg2hjrd57s5qkkairxh2y6r9bqyblb5b8xbw"; type = "gem"; }; - version = "1.11.1"; + version = "1.11.2"; }; fourflusher = { groups = ["default"]; @@ -230,10 +230,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dw29rsdijr4dhpvn89m3934qrr80a4jyg3v813iy7jbkb6kspj4"; + sha256 = "0a2pc4qlf531k85lp7kbwz4rqvs4lgdndmvv676x3qvm181p8blc"; type = "gem"; }; - version = "0.11.2"; + version = "0.12.0"; }; json = { groups = ["default"]; @@ -258,10 +258,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kj5m8gg643w8jh8nsdy15bpddmnnafhyzhjx7gp28l1acb4fik7"; + sha256 = "0w16p7cvslh3hxd3cia8jg4pd85z7rz7xqb16vh42gj4rijn8rmi"; type = "gem"; }; - version = "5.12.0"; + version = "5.13.0"; }; molinillo = { groups = ["default"]; @@ -332,10 +332,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zsyv6abqrk7lpql5f1ja4m88bfy9qndi8xykpss6cpvjdmi3ydb"; + sha256 = "1y90nx9ph9adnrpcsvs2adca2l3dyz8am2d2kzxkwd3a086ji7aw"; type = "gem"; }; - version = "3.11.0"; + version = "3.13.0"; }; ruby-macho = { groups = ["default"]; @@ -402,9 +402,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "162gwhrl7ppj6hlmnpp1scvy1ylcv5xqk51826v075sckdqjp8c8"; + sha256 = "1c69yrhqd92q6nnpyhvnqyw9l7axnc91gnbd2gai8f5njdisd8wx"; type = "gem"; }; - version = "1.12.0"; + version = "1.13.0"; }; } \ No newline at end of file diff --git a/pkgs/development/tools/jo/default.nix b/pkgs/development/tools/jo/default.nix index 2417f4cbfd1..9e5d29a6bb2 100644 --- a/pkgs/development/tools/jo/default.nix +++ b/pkgs/development/tools/jo/default.nix @@ -1,19 +1,19 @@ -{stdenv, fetchFromGitHub, autoreconfHook}: +{stdenv, fetchFromGitHub, autoreconfHook, pandoc, pkgconfig}: stdenv.mkDerivation rec { pname = "jo"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "jpmens"; repo = "jo"; rev = version; - sha256 ="03b22zb5034ccqyp4ynfzknxagb3jz2dppl0kqz2nv4a08aglpmy"; + sha256 ="11miqg0i83drwkn66b4333vhfdw62al11dyfgp30alg6pcab3icl"; }; enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook pandoc pkgconfig ]; meta = with stdenv.lib; { description = "A small utility to create JSON objects"; diff --git a/pkgs/development/tools/misc/gputils/default.nix b/pkgs/development/tools/misc/gputils/default.nix index 37a7a8c931c..2ad496bfb88 100644 --- a/pkgs/development/tools/misc/gputils/default.nix +++ b/pkgs/development/tools/misc/gputils/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = https://gputils.sourceforge.io/; + homepage = "https://gputils.sourceforge.io"; + description = "A collection of tools for the Microchip (TM) PIC microcontrollers. It includes gpasm, gplink, and gplib"; license = licenses.gpl2; maintainers = with maintainers; [ yorickvp ]; platforms = platforms.linux; diff --git a/pkgs/development/tools/misc/texlab/citeproc/package.json b/pkgs/development/tools/misc/texlab/citeproc/package.json new file mode 100644 index 00000000000..87e7ccc1c92 --- /dev/null +++ b/pkgs/development/tools/misc/texlab/citeproc/package.json @@ -0,0 +1,31 @@ +{ + "name": "citeproc", + "version": "0.1.0", + "description": "Render BibTeX citations", + "repository": "https://github.com/latex-lsp/citeproc.git", + "author": "Eric Förster <efoerster@users.noreply.github.com>", + "license": "MIT", + "scripts": { + "dist": "webpack", + "format": "prettier --write \"src/**/*.{js,json}\" \"*.{js,json,yml,md}\" \".vscode/**/*.{json}\"" + }, + "dependencies": { + "@babel/core": "^7.5.5", + "@babel/preset-env": "^7.5.5", + "@citation-js/core": "^0.4.8", + "@citation-js/plugin-bibtex": "^0.4.8", + "@citation-js/plugin-csl": "^0.4.8", + "@types/node": "^11.13.17", + "@types/webpack": "^4.4.35", + "babel-loader": "^8.0.6", + "babel-polyfill": "^6.26.0", + "null-loader": "^0.1.1", + "prettier": "^1.18.2", + "ts-loader": "^5.4.5", + "ts-node": "^8.3.0", + "tslint": "^5.18.0", + "tslint-config-prettier": "^1.15.0", + "webpack": "^4.35.3", + "webpack-cli": "^3.3.6" + } +} diff --git a/pkgs/development/tools/misc/texlab/citeproc/update-package.json.sh b/pkgs/development/tools/misc/texlab/citeproc/update-package.json.sh new file mode 100755 index 00000000000..b57e48e10bc --- /dev/null +++ b/pkgs/development/tools/misc/texlab/citeproc/update-package.json.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p jq + +set -eu -o pipefail + +if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then + echo "Usage: $0 <git release tag>" + exit 1 +fi + +TEXLAB_WEB_SRC="https://raw.githubusercontent.com/latex-lsp/texlab/$1" + +curl --silent "$TEXLAB_WEB_SRC/src/citeproc/js/package.json" | \ + jq '. + {"dependencies": .devDependencies} | del(.devDependencies)' > package.json diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix new file mode 100644 index 00000000000..f55f1154b07 --- /dev/null +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, rustPlatform +, fetchFromGitHub +, nodejs +, Security +, texlab-citeproc-build-deps +}: + +rustPlatform.buildRustPackage rec { + pname = "texlab"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "latex-lsp"; + repo = pname; + rev = "v${version}"; + sha256 = "115f63fij0lxcccf7ba9p0lzg1hlfp9i2g7gvvnx0il426h4ynnm"; + }; + + cargoSha256 = "0cp8q3qags01s6v3kbghxyzz1hc5rhq6jf15fzz10d1l8mrmw4cy"; + + nativeBuildInputs = [ nodejs ]; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + preBuild = '' + rm build.rs + ln -s ${texlab-citeproc-build-deps}/lib/node_modules/citeproc/node_modules src/citeproc/js + (cd src/citeproc/js && npm run dist) + ''; + + meta = with stdenv.lib; { + description = "An implementation of the Language Server Protocol for LaTeX"; + homepage = https://texlab.netlify.com/; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar metadark ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/misc/tokei/Cargo.lock.patch b/pkgs/development/tools/misc/tokei/Cargo.lock.patch deleted file mode 100644 index 46bd80a218d..00000000000 --- a/pkgs/development/tools/misc/tokei/Cargo.lock.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index db09bc4..1e4892d 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -961,7 +961,7 @@ dependencies = [ - - [[package]] - name = "tokei" --version = "10.0.0" -+version = "10.0.1" - dependencies = [ - "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "dirs 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index 104aa4691ab..e3e8e2c046c 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -2,19 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tokei"; - version = "10.0.1"; + version = "10.1.0"; src = fetchFromGitHub { owner = "XAMPPRocky"; repo = pname; rev = "v${version}"; - sha256 = "0g8p4f8g9zb1fqzzb1qi28idskahi5nldsma6rydjyrgi9gynpa0"; + sha256 = "0l7vqmdagfhi4hnp50ng253zy4g48qjhs5kmnk2xh5v3c59ys4zs"; }; - cargoSha256 = "0pwq1scll5ga8rw4lx97s915zvp7v171b6316cin54f2zzpbrxx5"; - - # Patch for v10.0.1 Cargo.lock issue - patches = [ ./Cargo.lock.patch ]; + cargoSha256 = "140nm0nswmgdp549gqp71dbn99rc5g7cagl9s5m5qirl9mbpys8x"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix index 09de5b02737..309c44d6d46 100644 --- a/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/pkgs/development/tools/ocaml/camlidl/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; setupHook = writeText "setupHook.sh" '' - export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/" + export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/${name}/" export NIX_CFLAGS_COMPILE+=" -isystem $1/lib/ocaml/${ocaml.version}/site-lib/camlidl" export NIX_LDFLAGS+=" -L $1/lib/ocaml/${ocaml.version}/site-lib/camlidl" ''; diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix index 6bf34a6e958..9db5ed10c84 100644 --- a/pkgs/development/tools/ocaml/findlib/default.nix +++ b/pkgs/development/tools/ocaml/findlib/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { export OCAMLPATH="''${OCAMLPATH-}''${OCAMLPATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/" fi if test -d "''$1/lib/ocaml/${ocaml.version}/site-lib/stublibs"; then - export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/stublibs" + export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/stublibs" fi export OCAMLFIND_DESTDIR="''$out/lib/ocaml/${ocaml.version}/site-lib/" if test -n "''${createFindlibDestdir-}"; then diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 7662041a488..f154b94ae33 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { version = "2.4.2"; src = fetchurl { - url = "https://github.com/diml/utop/archive/${version}.tar.gz"; - sha256 = "0fl8524vmxb9yxjwrh5varvfp0ff3sgfp627knwbxxr69w45ad8h"; + url = "https://github.com/ocaml-community/utop/releases/download/${version}/utop-${version}.tbz"; + sha256 = "0y2v8rkfz19nlz8gh0lkh5wx5hyvw5gl4nw1kg8j2pw9jnilq5nb"; }; nativeBuildInputs = [ makeWrapper ]; @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p "$out"/${path} for e in OCAMLPATH CAML_LD_LIBRARY_PATH; do + [[ -v "$e" ]] || continue printf %s "''${!e}" > "$out"/${path}/$e done ''; diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix new file mode 100644 index 00000000000..d1ecdd1efd9 --- /dev/null +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "open-policy-agent"; + version = "0.15.0"; + + goPackagePath = "github.com/open-policy-agent/opa"; + src = fetchFromGitHub { + owner = "open-policy-agent"; + repo = "opa"; + rev = "v${version}"; + sha256 = "0i9735v73a7wfq02p4hsy61g7d7bip6zmb8bnsiz2ma84g2g533w"; + }; + goDeps = ./deps.nix; + + meta = with lib; { + description = "General-purpose policy engine"; + homepage = "https://www.openpolicyagent.org"; + license = licenses.asl20; + maintainers = with maintainers; [ lewo ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/open-policy-agent/deps.nix b/pkgs/development/tools/open-policy-agent/deps.nix new file mode 100644 index 00000000000..ba9eed180d5 --- /dev/null +++ b/pkgs/development/tools/open-policy-agent/deps.nix @@ -0,0 +1,408 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/OneOfOne/xxhash"; + fetch = { + type = "git"; + url = "https://github.com/OneOfOne/xxhash"; + rev = "v1.2.3"; + sha256 = "0hxyvv77ghja6vim210s7fa1n2zlvykvjak8s3k3nkj85h611kwb"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "3a771d992973"; + sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; + }; + } + { + goPackagePath = "github.com/cespare/xxhash"; + fetch = { + type = "git"; + url = "https://github.com/cespare/xxhash"; + rev = "v1.1.0"; + sha256 = "1qyzlcdcayavfazvi03izx83fvip8h36kis44zr2sg7xf6sx6l4x"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "c7ce16629ff4"; + sha256 = "10cyv1gy3zwwkr04kk8cvhifb7xddakyvnk5s13yfcqj9hcjz8d1"; + }; + } + { + goPackagePath = "github.com/gobwas/glob"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/glob"; + rev = "v0.2.3"; + sha256 = "0jxk1x806zn5x86342s72dq2qy64ksb3zrvrlgir2avjhwb18n6z"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "v1.3.0"; + sha256 = "0slfyrmbpdcppf0z3waar90bpszdhi2gv705ys1b0zx5x6ax8f1a"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "d3de96c4c28e"; + sha256 = "0k41z9dybs3fvgb1jzgnxr91qad9rnf9a269l95jics58m3kn7f5"; + }; + } + { + goPackagePath = "github.com/gorilla/mux"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/mux"; + rev = "521ea7b17d02"; + sha256 = "0bd83nd6jc2vsddwnb8w6gpw6qpfg449n6wb4dmk12ybmdhkwrvf"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "v1.0.0"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + { + goPackagePath = "github.com/kisielk/errcheck"; + fetch = { + type = "git"; + url = "https://github.com/kisielk/errcheck"; + rev = "v1.2.0"; + sha256 = "0am6g10ipdxw84byscm7shda654882wjcbinq5c4696m6mhi2qrd"; + }; + } + { + goPackagePath = "github.com/kisielk/gotool"; + fetch = { + type = "git"; + url = "https://github.com/kisielk/gotool"; + rev = "v1.0.0"; + sha256 = "14af2pa0ssyp8bp2mvdw184s5wcysk6akil3wzxmr05wwy951iwn"; + }; + } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.2"; + sha256 = "09mn209ika7ciy87xf2x31dq5fnqw39jidgaljvmqxwk7ff1hnx7"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "b20a3daf6a39"; + sha256 = "0crivpncmh22696d5cy7k15ll5yqfjcigk0xy73wb6g1q6vnfxs7"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "v1.0.1"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/mna/pigeon"; + fetch = { + type = "git"; + url = "https://github.com/mna/pigeon"; + rev = "bb0192cfc2ae"; + sha256 = "1yid3pm46hjszikbap2wbfh97vpnha0qncywlnm1mk1pzglfgdy9"; + }; + } + { + goPackagePath = "github.com/olekukonko/tablewriter"; + fetch = { + type = "git"; + url = "https://github.com/olekukonko/tablewriter"; + rev = "v0.0.1"; + sha256 = "0hh95glg7d2md185r03wn52j2r33jc4zil0qvcrs66ka7bdxi7vj"; + }; + } + { + goPackagePath = "github.com/peterh/liner"; + fetch = { + type = "git"; + url = "https://github.com/peterh/liner"; + rev = "bf27d3ba8e1d"; + sha256 = "0xx9923l4a46kjd1wpscqw31p4am28xrhd17xgw1cnx06bznb36v"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "059132a15dd0"; + sha256 = "0bxkbh2rq40kdk8i05am5np77cnskx3571v2k300j5mmj1rl1ijg"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "f30f42803563"; + sha256 = "0d3a9igvpdx516wpvj3b1ki1c4n2lvp5ghvzpqk95j2fxzyyzcxg"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "5c3871d89910"; + sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "7e9e6cabbd39"; + sha256 = "00nmyp6k6x53gl7csca6bja010wnxf2p2pxfph3y0l2ap44qb38w"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "185b4288413d"; + sha256 = "0d85429kdw5dgj5zhyiz1sq3i5691vj2gjnda93nnxxzx9acg8cv"; + }; + } + { + goPackagePath = "github.com/rcrowley/go-metrics"; + fetch = { + type = "git"; + url = "https://github.com/rcrowley/go-metrics"; + rev = "3113b8401b8a"; + sha256 = "1m5q5dsvkqz809aag6dyan74wdrp69g2mb9killbv7z4ls2mlfr3"; + }; + } + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.4.1"; + sha256 = "1m7ny9jkb98cxqhsp13xa5hnqh1s9f25x04q6arsala4zswsw33c"; + }; + } + { + goPackagePath = "github.com/spaolacci/murmur3"; + fetch = { + type = "git"; + url = "https://github.com/spaolacci/murmur3"; + rev = "f09979ecbc72"; + sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "fe5e611709b0"; + sha256 = "1pn7g9jmhqc9yg6x02dgp4phiggnnxz8a11pv5y4vxhrvkjm6h71"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "082b515c9490"; + sha256 = "03jil8szw5hsp0x4pgzdxas2njqij2466p20q1ag18lmgncjl50m"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.2.2"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + }; + } + { + goPackagePath = "github.com/yashtewari/glob-intersection"; + fetch = { + type = "git"; + url = "https://github.com/yashtewari/glob-intersection"; + rev = "5c77d914dd0b"; + sha256 = "1mfdk6iwqbhikcccds81knqlrj1phf9pad39fs2y8bzr6n7nqfzz"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "c2843e01d9a2"; + sha256 = "01xgxbj5r79nmisdvpq48zfy8pzaaj90bn6ngd4nf33j9ar1dp8r"; + }; + } + { + goPackagePath = "golang.org/x/lint"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/lint"; + rev = "1baf3a9d7d67"; + sha256 = "0aql4lb9cf2kcb9jx90bvpp9chrmic2y3fwfvdq76hq2qvr4818d"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "3b0461eec859"; + sha256 = "0l00c8l0a8xnv6qdpwfzxxsr58jggacgzdrwiprrfx2xqm37b6d5"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "112230192c58"; + sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "d0b11bdaac8a"; + sha256 = "18yfsmw622l7gc5sqriv5qmck6903vvhivpzp8i3xfy3z33dybdl"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "5eefd052ad72"; + sha256 = "1bgpq8j3a1mwsd9cbp9hqmb5ms6vp4b0a2xsrlpwrfpyswnyagi0"; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "a985d3407aa7"; + sha256 = "00wzr5w8aadipgc3rkk8f11i41znskfj9ix5nhhaxyg7isrslgcj"; + }; + } + { + goPackagePath = "google.golang.org/genproto"; + fetch = { + type = "git"; + url = "https://github.com/google/go-genproto"; + rev = "11092d34479b"; + sha256 = "12qcrjq658zga5fj4n0wgm11pzpr3gafwg25cinl5qcq4p9cnl0r"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + }; + } + { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify.v1"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.1"; + sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + }; + } +] diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index de9e02de3f7..37d5c8a7890 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -39,7 +39,12 @@ in buildPythonApplication rec { propagatedBuildInputs = runtimeDeps; - doCheck = false; + doCheck = true; + checkPhase = '' + export HOME=$(mktemp -d) + cp -r --no-preserve=mode ${wheel.src} $HOME/wheel-src + $out/bin/pipenv install $HOME/wheel-src + ''; meta = with lib; { description = "Python Development Workflow for Humans"; diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix new file mode 100644 index 00000000000..829f9aa3740 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -0,0 +1,28 @@ +{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, openssl, CoreServices, Security, libiconv }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-udeps"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "est31"; + repo = pname; + rev = "v${version}"; + sha256 = "0lrfnrxqmpp06fargb5s5fc9y4w4h0ahbd7rgibqqx1la23l9r5q"; + }; + + cargoSha256 = "18rwzcsrlwds3nx90y03dkqm1hl4dpvclm32i9zy9bhpm9hkypwr"; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security libiconv ]; + + meta = with stdenv.lib; { + description = "Find unused dependencies in Cargo.toml"; + homepage = "https://github.com/est31/cargo-udeps"; + license = licenses.mit; + maintainers = with maintainers; [ b4dm4n ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix index 27296edfac0..8eccdb6c285 100644 --- a/pkgs/development/tools/vim-vint/default.nix +++ b/pkgs/development/tools/vim-vint/default.nix @@ -21,7 +21,7 @@ buildPythonApplication rec { substituteInPlace setup.py --replace "return requires" "return []" ''; checkInputs = [ pytest ]; - propagatedBuildInputs = [ ansicolor chardet pyyaml ] ; + propagatedBuildInputs = [ ansicolor chardet pyyaml setuptools] ; # The acceptance tests check for stdout and location of binary files, which fails in nix-build. checkPhase = '' diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index d546ff8481e..1dbb14c9497 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -5,27 +5,27 @@ let name = "openrct2-${version}"; - version = "0.2.3"; + version = "0.2.4"; openrct2-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${version}"; - sha256 = "01mj6jlbl2cn3wpk6sy34ldzdl0qykpn7fncznjykklj2nqzr4ig"; + sha256 = "1rlw3w20llg36sj3bk50g661qw766ng8ma3p42sdkj8br9dw800h"; }; objects-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "objects"; - rev = "v1.0.11"; - sha256 = "1bh7mngpqnhzwnhhawq5y3a6hbvwxis2yagk4dcmc4w1fifq2y66"; + rev = "v1.0.12"; + sha256 = "0vfhyldc8nfvkg4d9kry669haxz2165walbxzgza7pqpnd7aqgrf"; }; title-sequences-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "title-sequences"; - rev = "v0.1.2"; - sha256 = "1yb1ynkfmiankii3fngr9km5wbc07rp30nh0apkj6wryrhy7imgm"; + rev = "v0.1.2c"; + sha256 = "1qdrm4q75bznmgdrpjdaiqvbf3q4vwbkkmls45izxvyg1djrpsdf"; }; in stdenv.mkDerivation { @@ -33,9 +33,13 @@ stdenv.mkDerivation { src = openrct2-src; + nativeBuildInputs = [ + cmake + pkgconfig + ]; + buildInputs = [ SDL2 - cmake curl fontconfig freetype @@ -47,7 +51,6 @@ stdenv.mkDerivation { libzip libGLU openssl - pkgconfig speexdsp zlib ]; diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index b2bca7ca7b9..0de961e6d49 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -75,6 +75,7 @@ in buildFHSUserEnv rec { xorg.libX11 xorg.libXfixes libGL + libva # Not formally in runtime but needed by some games at-spi2-atk diff --git a/pkgs/misc/drivers/hplip/3.16.11.nix b/pkgs/misc/drivers/hplip/3.16.11.nix index 779325c99b0..993a5144a9d 100644 --- a/pkgs/misc/drivers/hplip/3.16.11.nix +++ b/pkgs/misc/drivers/hplip/3.16.11.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, substituteAll , pkgconfig -, cups, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils +, cups, libjpeg, libusb1, python2Packages, sane-backends, dbus, usbutils , net_snmp, openssl, nettools , bash, coreutils, utillinux , qtSupport ? true @@ -45,7 +45,7 @@ in assert withPlugin -> builtins.elem hplipArch pluginArches || throw "HPLIP plugin not supported on ${stdenv.hostPlatform.system}"; -pythonPackages.buildPythonApplication { +python2Packages.buildPythonApplication { inherit name src; format = "other"; @@ -63,7 +63,7 @@ pythonPackages.buildPythonApplication { pkgconfig ]; - pythonPath = with pythonPackages; [ + pythonPath = with python2Packages; [ dbus pillow pygobject2 diff --git a/pkgs/misc/drivers/hplip/3.18.5.nix b/pkgs/misc/drivers/hplip/3.18.5.nix index d95eb85168e..3b78f015f7d 100644 --- a/pkgs/misc/drivers/hplip/3.18.5.nix +++ b/pkgs/misc/drivers/hplip/3.18.5.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, substituteAll , pkgconfig -, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends +, cups, zlib, libjpeg, libusb1, python2Packages, sane-backends , dbus, file, ghostscript, usbutils , net_snmp, openssl, perl, nettools , bash, coreutils, utillinux @@ -47,7 +47,7 @@ in assert withPlugin -> builtins.elem hplipArch pluginArches || throw "HPLIP plugin not supported on ${stdenv.hostPlatform.system}"; -pythonPackages.buildPythonApplication { +python2Packages.buildPythonApplication { inherit name src; format = "other"; @@ -69,7 +69,7 @@ pythonPackages.buildPythonApplication { pkgconfig ]; - pythonPath = with pythonPackages; [ + pythonPath = with python2Packages; [ dbus pillow pygobject2 diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 978fd9b9e03..fe890f3dce2 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, substituteAll , pkgconfig -, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends +, cups, zlib, libjpeg, libusb1, python2Packages, sane-backends , dbus, file, ghostscript, usbutils , net_snmp, openssl, perl, nettools , bash, coreutils, utillinux @@ -46,7 +46,7 @@ in assert withPlugin -> builtins.elem hplipArch pluginArches || throw "HPLIP plugin not supported on ${stdenv.hostPlatform.system}"; -pythonPackages.buildPythonApplication { +python2Packages.buildPythonApplication { inherit name src; format = "other"; @@ -68,7 +68,7 @@ pythonPackages.buildPythonApplication { pkgconfig ]; - pythonPath = with pythonPackages; [ + pythonPath = with python2Packages; [ dbus pillow pygobject2 diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index 619938ba5c6..1e75230a139 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, qtbase, qtmultimedia +{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, qtmultimedia , glew, libzip, snappy, zlib, withGamepads ? true, SDL2 }: assert withGamepads -> (SDL2 != null); with stdenv.lib; -stdenv.mkDerivation rec { +mkDerivation rec { pname = "ppsspp"; version = "1.4.2"; diff --git a/pkgs/misc/sndio/default.nix b/pkgs/misc/sndio/default.nix index 0f09483a857..c415714f573 100644 --- a/pkgs/misc/sndio/default.nix +++ b/pkgs/misc/sndio/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { }; postFixup = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -id $out/lib/libsndio.7.0.dylib $out/lib/libsndio.7.0.dylib for file in $out/bin/*; do install_name_tool -change libsndio.7.0.dylib $out/lib/libsndio.dylib $file done diff --git a/pkgs/misc/themes/numix-solarized/default.nix b/pkgs/misc/themes/numix-solarized/default.nix index 4fd06fae61b..0596141da80 100644 --- a/pkgs/misc/themes/numix-solarized/default.nix +++ b/pkgs/misc/themes/numix-solarized/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "20170810"; + version = "20180913"; pname = "numix-solarized-gtk-theme"; src = fetchFromGitHub { owner = "Ferdi265"; repo = "numix-solarized-gtk-theme"; rev = version; - sha256 = "0l4xvsiyg15kp6xwpvm3jckxyhr1lxd678lkhrcyf40n7rd4xinl"; + sha256 = "1kda0lyqi3cxh163fbj8yyi6jj6pf0y980k4s0cmyi3hkh4cqyd5"; }; nativeBuildInputs = [ python3 sass glib gdk-pixbuf libxml2 inkscape optipng ]; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 30a3e7ed843..9bcc6c008b8 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -314,12 +314,12 @@ let coc-eslint = buildVimPluginFrom2Nix { pname = "coc-eslint"; - version = "2019-11-01"; + version = "2019-11-11"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-eslint"; - rev = "a74369ed64ed1fc7f85cec785e8ca05c6c8c7369"; - sha256 = "12apx97iinadjlzvgdnhfjlwwnpa7f844qw17qwfv7xcrvgg9qgv"; + rev = "ba55d386f296cc3ef3da4b14147dfb7c3ef18ecb"; + sha256 = "1jxw4h3vwbv6and90bwrgcp4cvd7af547x270lc2085nkna3hdk9"; }; }; @@ -402,12 +402,12 @@ let coc-json = buildVimPluginFrom2Nix { pname = "coc-json"; - version = "2019-10-26"; + version = "2019-11-11"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-json"; - rev = "82f2cbcbc9e29aec315357428cedee8614d15a70"; - sha256 = "0vp735ibzifpz7mi8mcm02a1pdarjn7ax6bsi54wxclr4kniqil7"; + rev = "13c8b482662f964af89e167a438f06493f347617"; + sha256 = "19sqv2bflr4aw8hkq9rh8r2b9llx4dbirp5755jbvd62bvizab2d"; }; }; @@ -567,23 +567,23 @@ let coc-tsserver = buildVimPluginFrom2Nix { pname = "coc-tsserver"; - version = "2019-11-07"; + version = "2019-11-13"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tsserver"; - rev = "c7c4eea74cf28d22ff5373828fda411588065c30"; - sha256 = "0dckx6p72llkp31gvfs4qp2jpc658av0xjpqbqqy7vi0y487jxq4"; + rev = "3d537937a6ce74cdf08d3109dc14af9baeff9af7"; + sha256 = "1nfnlirdb91x835hk2h30vnjc940mnw94p2wgp28p80mcbrk4s4v"; }; }; coc-vetur = buildVimPluginFrom2Nix { pname = "coc-vetur"; - version = "2019-10-12"; + version = "2019-11-13"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-vetur"; - rev = "b26cda8472205bf28522f06f16a39166a0b78d2a"; - sha256 = "0d8x4l5jk1na0a08xxq65drhcisxm5s8llsymiv9mgnqv3w43yyj"; + rev = "8c55c4b867cf2210810133fab6c9382a6f0a14e0"; + sha256 = "1da97d4s2qnysqk21qdm0sgxn03c2cg8vjsajccx538dwiq9f8lb"; }; }; @@ -843,12 +843,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-11-07"; + version = "2019-11-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "8962d57791f6c373053ee3e6175659c5158ecd47"; - sha256 = "004w7dp7shbgicqkzs8v2x0dapf0kx4h0g55q0si3rrsha2gmw10"; + rev = "671da21f020445cf86836b5387000e0826f1b16e"; + sha256 = "166kkkpvbrlyyn70vr0n5vrwrnk4rvwfvqfcw1hy0lx2wx7jal10"; }; }; @@ -865,12 +865,12 @@ let deoplete-clang = buildVimPluginFrom2Nix { pname = "deoplete-clang"; - version = "2019-06-22"; + version = "2019-11-10"; src = fetchFromGitHub { owner = "zchee"; repo = "deoplete-clang"; - rev = "30f17cb58b7838492fbe6b9d62b70b52c8ceedf7"; - sha256 = "0rdr8hxmlbf633ffr217l5vzqdxjxihp4vi2iq3k1491b0pwnzi0"; + rev = "2ea262e98edcb66e828f9077fcc844100320eb63"; + sha256 = "1wvk61f8ph2vpl6llzmir3qs3zwaw3lrphs16d1j7ljkdl3bk49k"; fetchSubmodules = true; }; }; @@ -899,24 +899,24 @@ let deoplete-go = buildVimPluginFrom2Nix { pname = "deoplete-go"; - version = "2019-07-04"; + version = "2019-11-10"; src = fetchFromGitHub { owner = "zchee"; repo = "deoplete-go"; - rev = "fa73f06f2e62ca58093eb02edc6134f002f27df4"; - sha256 = "02d3h5mnvzqlhq17qadyzfh4570r7gpv0bimapff0nvbyjk4qgkc"; + rev = "b82273104b3383ce8fc239243007865f308034ca"; + sha256 = "1mnx20paalb4aa1h79fp3q99djcj4qkswkdl1qvzkpj1wxdqwxix"; fetchSubmodules = true; }; }; deoplete-jedi = buildVimPluginFrom2Nix { pname = "deoplete-jedi"; - version = "2019-07-22"; + version = "2019-11-10"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-jedi"; - rev = "46121d9ca7688c148764d7ee488bb3572d1434c4"; - sha256 = "1hiw42dm12xyhmvg180mrbjv3bbbvrgl4p2abll0lv5l2zmsbf12"; + rev = "f442e98c6c81649985f1cfc735fb4d25f3e27010"; + sha256 = "04g5vfzxyjddr6dhpm48jki0llxvb9smj1qxvk9d7j8n005bdlcx"; fetchSubmodules = true; }; }; @@ -978,12 +978,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-10-27"; + version = "2019-11-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "ff09a7ab58e5271053c59825895d607316657023"; - sha256 = "183wx20p3mmbxwbdyd5z9gxzhfrgjjl2swymmdw00bw5ys7j5w0r"; + rev = "22db8b273c746bb228a8728f4dd3a5b934d709af"; + sha256 = "0ajmpz2ibdb8jlg5z6vsb06fr2vahf8alzdrxw7kns4f7hs14ib7"; }; }; @@ -1631,12 +1631,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2019-10-31"; + version = "2019-11-10"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "53bd3279da783cd5c1b1fafb4ff31077e81b6333"; - sha256 = "0yd9z6lb0b7spwacrb5x1qpvab720y70blmr7ai9gswi55vpfkls"; + rev = "e6f282f5e9ae931f0b404dd15aab2e5e249ae092"; + sha256 = "0ymb55gln97xzq94slghrmyrvn10jnh6547ci44gw1lq655c7wvb"; }; }; @@ -1708,12 +1708,12 @@ let ncm2 = buildVimPluginFrom2Nix { pname = "ncm2"; - version = "2019-07-22"; + version = "2019-07-29"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2"; - rev = "53b6531769e43c7e3c9051e3a12ab31e3e06a422"; - sha256 = "1kf2gfcw0wmyib72na3j2dsw6q4qff1r9lvdbk7cm7iclhwylhma"; + rev = "160e2e33d515f67154840844d8304722b679df90"; + sha256 = "1jyssh84n3rv8lmmjligf5f6jjzmgjv1gc78fv5x2z79j9cg98jc"; }; }; @@ -1796,23 +1796,23 @@ let neco-syntax = buildVimPluginFrom2Nix { pname = "neco-syntax"; - version = "2017-10-01"; + version = "2019-11-10"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-syntax"; - rev = "98cba4a98a4f44dcff80216d0b4aa6f41c2ce3e3"; - sha256 = "1cjcbgx3h00g91ifgw30q5n97x4nprsr4kwirydws79fcs4vkgip"; + rev = "6c3862ac82d2c917fa8b4126832de7d3a909f1fe"; + sha256 = "1kmzlz6c5bs7f4dxgrdn4azwh55k6ghhyzy8jjdgj0wsb309y92k"; }; }; neco-vim = buildVimPluginFrom2Nix { pname = "neco-vim"; - version = "2018-10-30"; + version = "2019-11-10"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-vim"; - rev = "4c0203b44f8daa7e2f72e2514488d637e8a766a4"; - sha256 = "03v3h2ks6y9pl960lnvzxlfhnn6l2pcn6d6012znw2wqpralrjq2"; + rev = "db12271232fdc29dbbd10edd0c45affa58d30ab8"; + sha256 = "1gvl2kr05b4fp67y9df15xnkv3vxjg9pb7b9rbk3lg4cw6ky80hy"; }; }; @@ -1917,12 +1917,12 @@ let neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2019-11-07"; + version = "2019-11-11"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "d13859a24612d1577f04a1eb62efccfc6b5825b8"; - sha256 = "0mq0bn4sdb1q1wyz458qqqzvf3vw2srjn6hzj5cp4zmdy4954ibj"; + rev = "18e7924ac96fb59a2a88c5a5a9ac1a7ec2fda297"; + sha256 = "0cn158gngglll23vfyk2bpcvw606xg0lj39yzn8pnl2gfg3476fs"; }; }; @@ -2113,6 +2113,17 @@ let }; }; + palenight-vim = buildVimPluginFrom2Nix { + pname = "palenight-vim"; + version = "2019-08-21"; + src = fetchFromGitHub { + owner = "drewtempelmeyer"; + repo = "palenight.vim"; + rev = "139f5b929a8be2530c7386a5b4610d4459941199"; + sha256 = "061iqgw9kzpsni9159bd8hllpkdmnrjbzpi9phy91l9klnja2cam"; + }; + }; + papercolor-theme = buildVimPluginFrom2Nix { pname = "papercolor-theme"; version = "2019-11-06"; @@ -2687,12 +2698,12 @@ let tmux-complete-vim = buildVimPluginFrom2Nix { pname = "tmux-complete-vim"; - version = "2019-05-13"; + version = "2019-11-10"; src = fetchFromGitHub { owner = "wellle"; repo = "tmux-complete.vim"; - rev = "897aaecdffd0133548ea7f8b5d76472236322ab6"; - sha256 = "0iazphx5708hwpzyys7mx7hilkrarh7g5251j18m1pg5smbbfjvr"; + rev = "7237d8d8d60af7916e3b546a9f4f396df95a1b21"; + sha256 = "05ypjahaf7gk4vjc8hhglmw7y8vyjxyhxq8sm0s3np05aw0gdbsc"; }; }; @@ -2754,12 +2765,12 @@ let ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2019-11-07"; + version = "2019-11-12"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "74dae03d02183b4416e2a3f8a80b69fefc2e5aee"; - sha256 = "0iyj84k8gygz7ybxlw04yk81z7bs9ridisi1yak3iphwqxh5nj1z"; + rev = "298f4c255dd7048a99d968d91fc001b6e2203e65"; + sha256 = "0kdld6w8ic1skl37kl7hxlgr8xrcmgspmcvrq5k1c9c6z1pmra5m"; }; }; @@ -2853,12 +2864,12 @@ let vim-abolish = buildVimPluginFrom2Nix { pname = "vim-abolish"; - version = "2019-10-01"; + version = "2019-11-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-abolish"; - rev = "3c7f939bbc99a30d1c5013bc9fa0fe967398c9ac"; - sha256 = "0i8i912lvs281n0wn4wvqykx0aj0f1ply6pd9pbk5k0whlgf6r1v"; + rev = "7e4da6e78002344d499af9b6d8d5d6fcd7c92125"; + sha256 = "1n35igng3a6d5y4nh5pyb09s6khgcwbr3v0lnh33qb51cv4cnjh4"; }; }; @@ -3073,12 +3084,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2019-11-05"; + version = "2019-11-10"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "f2241b61b2aded65d76a59be400b2cc6c3efa4d8"; - sha256 = "0nyarjf5sjpfpdiz1y305d1f9swlgd27v9qa8blympr8b1inn8fb"; + rev = "e4e4ba3c7b6f510ae10be2dfcac83e12afbd26e9"; + sha256 = "0rwp8rwgb72wblrh3l6k7166da6pknvmyvx03fz53qmpxhsvhyhl"; }; }; @@ -3139,12 +3150,12 @@ let vim-autoformat = buildVimPluginFrom2Nix { pname = "vim-autoformat"; - version = "2019-10-09"; + version = "2019-11-11"; src = fetchFromGitHub { owner = "Chiel92"; repo = "vim-autoformat"; - rev = "a350538f8a5a8f08cf64a520d456282080c3968f"; - sha256 = "0abz5asjgawz7zx5gy7q5nnrkmzijwpn0ay93913l78dnsal0408"; + rev = "4fb3ecc473093720f35d8d26ae8a8e46a445f116"; + sha256 = "199fpvfqbd1d4brxyy506j4nrp64wj6av2xh51a5q10dm84pddp9"; }; }; @@ -3326,12 +3337,12 @@ let vim-commentary = buildVimPluginFrom2Nix { pname = "vim-commentary"; - version = "2019-09-28"; + version = "2019-11-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-commentary"; - rev = "62b68aecec2de531bc3978bfb9c07d3b6759ce0e"; - sha256 = "1fbcdrrhn4l8266zr6rm0f3zbhpql9is6rx4rkim5wxcwmnpkr77"; + rev = "3e5d04ddbc156288fd4c114f4a802da117fd0f26"; + sha256 = "0f2q20699a0jiq3rm3jrsshjg3k3l0g115501iyn57d2yw60cggn"; }; }; @@ -3392,12 +3403,12 @@ let vim-devicons = buildVimPluginFrom2Nix { pname = "vim-devicons"; - version = "2019-11-03"; + version = "2019-11-10"; src = fetchFromGitHub { owner = "ryanoasis"; repo = "vim-devicons"; - rev = "707fa649f764c5b78fae88505a905d59eb429205"; - sha256 = "1g4p6kp01dgasabcfjqj20d4mj66j7dqf2wikhiamqiygxb7rp5y"; + rev = "e3e6aa16bfce255e9bca3d117c11f18f36f5c1b3"; + sha256 = "1p7k20nfxm6jrrlx6dp9cm9bq8jkssh7fyr2y49wnwp652s191gm"; }; }; @@ -3436,12 +3447,12 @@ let vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2019-09-27"; + version = "2019-11-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "4bd1ecd7f38206ef26c37d7d142df58c4237d9dc"; - sha256 = "0wz8p8fm48dbpzd00h9qw0q2s3r7nm8qa5kcligcrzh1kv139026"; + rev = "1206e1474fc613caeb1ba56d36b71d7f9f7760ac"; + sha256 = "15mdn8s9isnscsaggkz552f8hi2yqq9wksymrxkihihv0nwwdgi6"; }; }; @@ -3535,12 +3546,12 @@ let vim-eunuch = buildVimPluginFrom2Nix { pname = "vim-eunuch"; - version = "2019-10-26"; + version = "2019-11-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-eunuch"; - rev = "a35d8ffe59e1ff7408bce67ce3301d3b04c7f7b6"; - sha256 = "03if3ckai0ppgv1f5mxpbfvc7ns13k0m4f923k98hinnm04qbr9v"; + rev = "75efe06ccc63b7cd50b193b99cce83e3ad3e60cb"; + sha256 = "0yjsk6amlbgdbp95h8fp4x1hf9gmrfgrvz9gizyh08xdrb7pbpdw"; }; }; @@ -3590,12 +3601,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2019-09-01"; + version = "2019-11-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "ea9fa306a731a105511cc5faecbaf7d58c94dfcf"; - sha256 = "1l1wzgr4ly25yablz299pfrgl47ys51hljhhzcfdivvkrrzjpdd5"; + rev = "a74887f679916d428001dc48900b095f8720106a"; + sha256 = "0818wlnr5hphhp1bswd7k7fq344bhj9khf5v5c8ywi04m8p37v3p"; }; }; @@ -3612,12 +3623,12 @@ let vim-flagship = buildVimPluginFrom2Nix { pname = "vim-flagship"; - version = "2018-08-15"; + version = "2019-11-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-flagship"; - rev = "66abd2fc519f4339ec751874279c14da7833dd99"; - sha256 = "0ijfa076a5jr6gi11j2zcgh5c7kj0vlwipzk1myjc1a77pss7nlg"; + rev = "d3e1b07a426b44cdf068d3fc4b7549cba2eb3358"; + sha256 = "095dz37qspjjg7sx22mmxnda6p592bp3bmnc59n0nan9g3zy8yk2"; }; }; @@ -3678,11 +3689,11 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2019-10-27"; + version = "2019-11-08"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "f6acae50ea4d8ec1bb1497cb886d80298b54831b"; + rev = "1e57d678bad1ffb7468e7dccc45401d1b096249a"; sha256 = "04k9bmqzlrx9pvkjs51znbbrqxy416k6jl7ffdp892hacgvr8cnj"; }; }; @@ -3755,12 +3766,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-11-08"; + version = "2019-11-12"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "21d2e8e0b4ad4feea12c9b9e1404fc979bad6bf8"; - sha256 = "1ygqwan4pacqk5z0q6ajaicxf2z4hqnkqnbr8llqbb4lg13a4d5b"; + rev = "32f87164ba90fd011e9d751f4e9f57436c94139d"; + sha256 = "0d52s8qankvc8kfy7sidv6ifws7nfiaph22hj27ysdfdg6ra5m7k"; }; }; @@ -4030,23 +4041,23 @@ let vim-javacomplete2 = buildVimPluginFrom2Nix { pname = "vim-javacomplete2"; - version = "2019-09-16"; + version = "2019-11-09"; src = fetchFromGitHub { owner = "artur-shaik"; repo = "vim-javacomplete2"; - rev = "24e7908bae33df5851f7085f5ec3af0ca81f060c"; - sha256 = "1bqrhkxk6f5ha7xlkgqrp96a1pfk9258x5b4iz3kbk2gqp6mcrmb"; + rev = "251f324609d65ef291faacf9ad302a6bdee9beed"; + sha256 = "0vr9r3pwbs6d0d3cmz1y3qsbci1kq6vh87ciyp5haisf4ramz5wm"; }; }; vim-javascript = buildVimPluginFrom2Nix { pname = "vim-javascript"; - version = "2019-08-14"; + version = "2019-11-11"; src = fetchFromGitHub { owner = "pangloss"; repo = "vim-javascript"; - rev = "b6c8c8419240bdd29b5eb51a47d488fd390deed5"; - sha256 = "0p56av0zmig4rpsq4w4armnccyd713xdm5lwrck3cip55c39382f"; + rev = "2e4a8c485cdf601bb2f2761ea68c09750a0b82e0"; + sha256 = "1zvqpk8qvkhglfdi6ma7ads54w0i8v8vy4k3gcrrjydmwwa2v34l"; }; }; @@ -4119,12 +4130,12 @@ let vim-jsx-pretty = buildVimPluginFrom2Nix { pname = "vim-jsx-pretty"; - version = "2019-11-04"; + version = "2019-11-10"; src = fetchFromGitHub { owner = "MaxMEllon"; repo = "vim-jsx-pretty"; - rev = "7c09c5a4caf3993238ccd79a99c8bae9ff30aa94"; - sha256 = "0qb81r2545gsjjhx9dshxlrr666g17pc4c4vdafa65a4bziaicdg"; + rev = "b71fa1f62e4bd727eb603db1182a859088210225"; + sha256 = "10p5b4shlcjc231ln8fz1qlwbsqmkpxyvdz8jf6j5nnp6k5drwym"; }; }; @@ -4185,12 +4196,12 @@ let vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2019-11-04"; + version = "2019-11-11"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "c64f22ff539894496674a844094147f98d8ff3bb"; - sha256 = "0cflphpng0g74v7vdly9kxvmbx3ldw7sy28hjqsbxr88ka6c72vp"; + rev = "fba44d7bab381b2107f9c6db0322282910e98267"; + sha256 = "1scv9zscvywr40rw6z1v4vsgq8j8mfvp1hxs6ana22wbm0qdwkrf"; }; }; @@ -4207,12 +4218,12 @@ let vim-liquid = buildVimPluginFrom2Nix { pname = "vim-liquid"; - version = "2016-02-11"; + version = "2019-11-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-liquid"; - rev = "209f77c9550a90b0b88492c93852195c171f6ebd"; - sha256 = "1ghspgjr6r0csmqacmsmkvrqvfgplx033yb3qwzddby991fpvfaa"; + rev = "9ebc192daec70e620c22d574b5a1c1e16f89a48c"; + sha256 = "0cvcjiii5wv55n695284k520rrwi0l4gqpyiqnrpnhmsaqks0n0f"; }; }; @@ -4240,12 +4251,12 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2019-11-06"; + version = "2019-11-13"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "44307620170d66b6e050cd02ac171143cc35ad2e"; - sha256 = "0bndxb4dyr4av5ivm06gnm9647lsd4zma9dzc8cjihbvagpayllq"; + rev = "83bfdee86d1c5a6ba6e4ebdcfcca286bfd6c38f1"; + sha256 = "1m38j7mdzh3r602462v0vq1mbfcyyc98g82zmc354hcm8nmyjn2g"; }; }; @@ -4339,12 +4350,12 @@ let vim-multiple-cursors = buildVimPluginFrom2Nix { pname = "vim-multiple-cursors"; - version = "2019-07-11"; + version = "2019-11-09"; src = fetchFromGitHub { owner = "terryma"; repo = "vim-multiple-cursors"; - rev = "2609c9b054b562b6bf46936f3e80a25042c5d572"; - sha256 = "1vd7rcns8r52vaaamfz5p23vmrz6j2b3z3yqjlc46s4pmzxdvpgh"; + rev = "6ab4dc7dd012e23adee74ef4596ad3e9659a20c7"; + sha256 = "149cg1fwsrd1swvd0ivn1p8j8gpj3gk08mx6dim4fkshknwxs5l0"; }; }; @@ -4405,12 +4416,12 @@ let vim-obsession = buildVimPluginFrom2Nix { pname = "vim-obsession"; - version = "2019-05-31"; + version = "2019-11-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-obsession"; - rev = "60f0ef80fd74b8c58fd0cc7a55b81846e06c04f3"; - sha256 = "0gbb4ici66965v449bm5gn3cyyjw81n5z4db9cfy9aca2rdapjha"; + rev = "a794bba99644b959c47fe46f82d0b9e676386b2f"; + sha256 = "11ds45kj3ckx67n5065vygc40bnwvamj9dyfpq9ir6a600xvv23i"; }; }; @@ -4537,12 +4548,12 @@ let vim-pathogen = buildVimPluginFrom2Nix { pname = "vim-pathogen"; - version = "2018-12-13"; + version = "2019-11-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-pathogen"; - rev = "e9fb0914dba5bdfe2feaa364dda2e9495c5620a2"; - sha256 = "1hqfmk6xpkldhs8n5hmnvx0qn955fnzf19pp2gh4c2kvrq1y6sm8"; + rev = "a553410f1bdb9000fbc764069f3a5ec3454a02bc"; + sha256 = "1klnfqdb1v5zba8rm1ldga6wjhywgx870svyd4z2j3hqlrrvdfrb"; }; }; @@ -4592,12 +4603,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2019-11-04"; + version = "2019-11-12"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "4e95df7c7e12cb76e781f2dacf1c07f8984cce58"; - sha256 = "0jq65a56crvbhgn3gvq3p4b5gni27wrpqachshbdjka6hf4gn2xv"; + rev = "0c79dd3e73e8e09b73d4a5d20bf470a3f6f715f2"; + sha256 = "161j5mdcxqnib82dcvg4gmaxdh0f8zn621yssj0vjhfz8jl8lnrf"; }; }; @@ -4614,12 +4625,12 @@ let vim-projectionist = buildVimPluginFrom2Nix { pname = "vim-projectionist"; - version = "2019-10-31"; + version = "2019-11-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-projectionist"; - rev = "c09a1d354d9c9b427c83e3909d3fa4bd78b54143"; - sha256 = "0mlxargcskjvki4kpry6v65xlrfgv0ranp08b7zi55pid94ygv2k"; + rev = "17a8b2078a9ca1410d2080419e1cb9c9bb2e4492"; + sha256 = "1vf3jdcfiq27k9mdwlvsm2hn1xgxr79ckq3jqq00avj50bpdzs1z"; }; }; @@ -4691,23 +4702,23 @@ let vim-repeat = buildVimPluginFrom2Nix { pname = "vim-repeat"; - version = "2019-07-29"; + version = "2019-11-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-repeat"; - rev = "ae361bea990e27d5beade3a8d9fa22e25cec3100"; - sha256 = "0myqas20r81gfvfrph4ww38db1nz32qlph7syr6ym8zl7c1fcjd4"; + rev = "c947ad2b6a16983724a0153bdf7f66d7a80a32ca"; + sha256 = "00hhbqcx21j0738ad5xh92lsykpa0qxhdy1s7wnwc8d3jndmyjwb"; }; }; vim-rhubarb = buildVimPluginFrom2Nix { pname = "vim-rhubarb"; - version = "2019-09-02"; + version = "2019-11-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rhubarb"; - rev = "75ad917e4978b4620c3b0eff1722880d2d53a9f4"; - sha256 = "1qxlaqbfliv2w4r7bw04h3m19g8f89v9070f59k9zbz3gv8g3hzv"; + rev = "5130596a65330a4e8523d3ac1582f6c31ea6bc63"; + sha256 = "1hpyxcmwrjxhkgkb0w2qpg8gh9bgiqwddyj4zx8hy2g8qnx7z5yj"; }; }; @@ -4724,12 +4735,12 @@ let vim-rsi = buildVimPluginFrom2Nix { pname = "vim-rsi"; - version = "2019-03-15"; + version = "2019-11-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rsi"; - rev = "8b7abe2d470b7fffac6562818468e14594735564"; - sha256 = "1fvswbqd51gs4qhcabnz3zdmmlhcijs3pnbp3f2zgfi7lqvjc6s5"; + rev = "5e1453274011d2280f4ae357259b69eb9cba0b9f"; + sha256 = "0jkyrlbm8z4v8s7zchn6ig61pdhrqdpd7cqfcf0ipff07fsws3qr"; }; }; @@ -4746,12 +4757,12 @@ let vim-salve = buildVimPluginFrom2Nix { pname = "vim-salve"; - version = "2019-08-02"; + version = "2019-11-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-salve"; - rev = "7a3d9e7aa674bb72b46e75372320363b962f4457"; - sha256 = "0793zirb9bi81rwmp6cls5c57yn8cv9qf265nyqc51j40hhw7kcw"; + rev = "876104d364420a7a11a2d97729dd4ab0a2f8a72e"; + sha256 = "1hj0qg182jv3cwg85rg4z0f8f8hr409is71z7sxhnhjq9fn1h6xj"; }; }; @@ -4790,23 +4801,23 @@ let vim-scriptease = buildVimPluginFrom2Nix { pname = "vim-scriptease"; - version = "2019-07-07"; + version = "2019-11-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-scriptease"; - rev = "71195d60792fbfcd30edb25fdfc89eadf3e400a5"; - sha256 = "084vz719af6vhlrgzv0bvl9qg53p1mz1942lqj1pfc3p99w22v47"; + rev = "76f62675a1814abcfbacb296f60dbb2d9d2b2f5f"; + sha256 = "05fmzd368d0mn141a1awhybl19bgls5j8czmyyvygx5pawjl3s6f"; }; }; vim-sensible = buildVimPluginFrom2Nix { pname = "vim-sensible"; - version = "2019-10-18"; + version = "2019-11-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sensible"; - rev = "4a7159a30061b26aec9ac367823094e7fd0f6a5b"; - sha256 = "08qlxa22kfqv4r2vdl8gfzayxir4cw78p8acah6dq3svksk2b2ib"; + rev = "bb75c2ec73f6b43346e0b159d46de3e304ac7dd6"; + sha256 = "0zxqm00c0aj5a55m35f42px4d19xbijfiqp6qs2xlqwzjw5na12m"; }; }; @@ -4823,12 +4834,12 @@ let vim-sexp-mappings-for-regular-people = buildVimPluginFrom2Nix { pname = "vim-sexp-mappings-for-regular-people"; - version = "2014-11-04"; + version = "2019-11-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sexp-mappings-for-regular-people"; - rev = "f5b66e73c81a3b4c0c8f5a8141fb09a5a213f711"; - sha256 = "1kf3bkv9wppxgifybd972avdd2563ra2387n7qc6q72b2r9mx5aa"; + rev = "f10bfacf2a20c719a3e0b6b5dfbfb2662f48b19e"; + sha256 = "08z1a5f0k2aafk7ris2w3xf0s2jcsi94bd1wh8idr4fxljjs77qb"; }; }; @@ -4845,23 +4856,23 @@ let vim-signify = buildVimPluginFrom2Nix { pname = "vim-signify"; - version = "2019-11-02"; + version = "2019-11-12"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "7ca8e00452622faf62b909d606c4500beffcff66"; - sha256 = "0sfb39qafbaa9g50k8pp228lagzx259nzg11c13rxsvpq85zxz7s"; + rev = "25f3d4b6faba8febfe67660194a966f3f27a2e9a"; + sha256 = "0szrwa2cbrvwnawgb5bwkpxms2djgz71b8ib5l2xaw7ds116wvi2"; }; }; vim-sleuth = buildVimPluginFrom2Nix { pname = "vim-sleuth"; - version = "2018-08-19"; + version = "2019-11-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sleuth"; - rev = "7a104e34c10c6f3581c6e98da7834d765d0b067c"; - sha256 = "0i147vhrrkarir36ysyaic42d22hk38cnpaqzqck7b2zdwnqrvbv"; + rev = "7b37cfd2f7eb7e96ec43d16ddb38a4ba1acbd576"; + sha256 = "1wc1cbfz99xmvs11ydsbdaii8kyi1s7kz7avxdwh19vhks8zp4ay"; }; }; @@ -4955,12 +4966,12 @@ let vim-speeddating = buildVimPluginFrom2Nix { pname = "vim-speeddating"; - version = "2019-02-27"; + version = "2019-11-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-speeddating"; - rev = "ce2f1aae9f2be128b4ca322a8e797be3ae40c30b"; - sha256 = "1fcvwq5iixh31fm9sfmlz4m765z1vx2a2mi8bgh64g2v6095lm5x"; + rev = "fe98cfaa7ea9c4b838d42a6830437c919eb55b4e"; + sha256 = "02875qswrmanr7b798ymlc7w60055q0av0qj3fh7fvpqhsqpg52k"; }; }; @@ -4999,12 +5010,12 @@ let vim-surround = buildVimPluginFrom2Nix { pname = "vim-surround"; - version = "2019-07-22"; + version = "2019-11-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-surround"; - rev = "fab8621670f71637e9960003af28365129b1dfd0"; - sha256 = "0lkc0isv1cqv34qfia9mjvnp1nzz0qqy3k47z8r3xzb7dxgymkw8"; + rev = "e4c4cc0f816515fbb7e87076a988604b2d163daa"; + sha256 = "080wwicibkzll8v6a9mkr6wkibp5cv9wqfwpgy8i8djgbafcvnbz"; }; }; @@ -5054,12 +5065,12 @@ let vim-tbone = buildVimPluginFrom2Nix { pname = "vim-tbone"; - version = "2019-04-12"; + version = "2019-11-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-tbone"; - rev = "b7f41b10db9ed5e5854fc5fe3a619bc05f2d541a"; - sha256 = "152mklqnqipzz2wwzj0i6s3fm75903flr1dff98nyw4khhm84pn2"; + rev = "82b0118772a87b659a6af49b26b0c4817ec7eccf"; + sha256 = "0pbj4v6zhlpcxm10jcq50jf2rpqiyp2x0zpxa50s6y6gm834v9wc"; }; }; @@ -5252,23 +5263,23 @@ let vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; - version = "2019-08-07"; + version = "2019-11-12"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-unimpaired"; - rev = "ab7082c0e89df594a5ba111e18af17b3377d216d"; - sha256 = "1gvzjihkxnc84kd7sdh26kmm0rqi19xmwiisfqhf307yqyqa6lkj"; + rev = "08e66532bffed445c949ae0a0501940c000553ed"; + sha256 = "0sm5rv6z0s80l9c39hijhnfggvgmi24ac6d9a1k58pzjz6i9w2vr"; }; }; vim-vinegar = buildVimPluginFrom2Nix { pname = "vim-vinegar"; - version = "2019-05-13"; + version = "2019-11-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-vinegar"; - rev = "09ac84c4d152a944caa341e913220087211c72ef"; - sha256 = "18ki85s1l4f0q40k26jvcdcbq6a73x870dnxkw20ji3pfwdaa5v3"; + rev = "fcce70f1403ba4101668a4c960c577bddbd00f06"; + sha256 = "0zxqdyla40xcp0ps362b85bqwl3mp4zfmfdggl0gwvgd5m949yk0"; }; }; @@ -5285,12 +5296,12 @@ let vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2019-11-07"; + version = "2019-11-09"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "3eb10e09315e83dcc7470e95b2fc18b3b1d71a31"; - sha256 = "0p73ccbfa4b3x4kxzys5k8rk85y4pwdbws8ngjc9axfybg0nx0iy"; + rev = "6fe86c8426b6bfa51b683ba04dbe5232820c20a9"; + sha256 = "0lahy379p2xzlv1n3v2zi2pyqxzix6dlw12z4f74v6yy4nmqjmbb"; }; }; @@ -5461,12 +5472,12 @@ let vimproc-vim = buildVimPluginFrom2Nix { pname = "vimproc-vim"; - version = "2019-07-08"; + version = "2019-11-10"; src = fetchFromGitHub { owner = "Shougo"; repo = "vimproc.vim"; - rev = "0328ac6096ac57d647bed1ee59c8b616b3ba2858"; - sha256 = "1apg6zjpqagj8m7rai64awp2n4s77grjlyr56hdk09bh9678wg31"; + rev = "47b54dd23eeb0a7fa81529d3768b27b979821b30"; + sha256 = "14nhnbds463iys8ndvyajbskwsi6hjljmmlvic3rbvym2h9mn442"; }; }; @@ -5483,12 +5494,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-11-06"; + version = "2019-11-11"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "ed84cd409a77711b5a0ac07ec2f8f2aa5b352ad2"; - sha256 = "0gnjdpirahc4axh9c8fykvk0lcffhq26457pn4agd0q3qzjiivzf"; + rev = "b31a981779d9a18e750832351acd41d0a45467ec"; + sha256 = "04lnghxid70nk518qf72rqifq6vllakvxc7acw9lndhk5kw7pgg4"; }; }; @@ -5538,12 +5549,12 @@ let wal-vim = buildVimPluginFrom2Nix { pname = "wal-vim"; - version = "2019-05-22"; + version = "2019-11-13"; src = fetchFromGitHub { owner = "dylanaraps"; repo = "wal.vim"; - rev = "c5c412fae2f72a07dff24ba8652c6d5e13924167"; - sha256 = "08rx1xb0mn6krfj3q8vrzlvzzh2dljjddn3wbkjvamihblnjbf7v"; + rev = "f0dd97bd4076c9a1410786c3e5baba7bd3028b05"; + sha256 = "0aiwsrcqnazam56cvwmck4bf7w543cr219bkmq0ngqzna72h9735"; }; }; @@ -5638,12 +5649,12 @@ let youcompleteme = buildVimPluginFrom2Nix { pname = "youcompleteme"; - version = "2019-11-05"; + version = "2019-11-11"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "036ad6e935aabd2783821c24ea7a8383bab9a5bb"; - sha256 = "0b82znd40imhvnjs1bri25l4ls5l82baaj18ddg2dagr78sxpv34"; + rev = "7efbb1da88067d8fd14a92daaa93693ef5cb6316"; + sha256 = "11z1lcr1z03akai4lsvlxvz0x9nyc0ans6vv8k04im9dkaqnvc2i"; fetchSubmodules = true; }; }; @@ -5683,12 +5694,12 @@ let zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2019-11-06"; + version = "2019-11-11"; src = fetchFromGitHub { owner = "zig-lang"; repo = "zig.vim"; - rev = "0d6b1d13ab47759be3d9e6743bc23f0df143b04e"; - sha256 = "1vhikp9cbjdgcpf5asxlnr2fvysc9vx51v2i7b94kh4kk7ps08yz"; + rev = "8c9c72cefdb2ad4e8c5d76ab3c9332d045426f9c"; + sha256 = "1lv0qc0r8f1vnq184gif753x024blnv33f9dkqvbi7mf22b3gz3f"; }; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 87cc0ec0d4f..433458b66d0 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -69,6 +69,7 @@ digitaltoad/vim-jade direnv/direnv.vim dleonard0/pony-vim-syntax dracula/vim +drewtempelmeyer/palenight.vim drmingdrmer/xptemplate dylanaraps/wal.vim eagletmt/ghcmod-vim diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 40b44514f1b..41ac6e94ab3 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -34,14 +34,14 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.30.1"; + name = "busybox-1.31.1"; # Note to whoever is updating busybox: please verify that: # nix-build pkgs/stdenv/linux/make-bootstrap-tools.nix -A test # still builds after the update. src = fetchurl { url = "https://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "1p7vbnwj60q6zkzrzq3pa8ybb7mviv2aa5a8g7s4hh6kvfj0879x"; + sha256 = "1659aabzp8w4hayr4z8kcpbk2z1q2wqhw7i1yb0l72b45ykl1yfh"; }; hardeningDisable = [ "format" "pie" ] diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix index 7ce5535313c..3f6c6524175 100644 --- a/pkgs/os-specific/linux/displaylink/default.nix +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -11,22 +11,22 @@ let in stdenv.mkDerivation rec { pname = "displaylink"; - version = "4.4.24"; + version = "5.2.14"; src = requireFile rec { name = "displaylink.zip"; - sha256 = "0c02mg7vbijpfpk9imh0hmls1yiglc216zfllw5ar86r1slhd5y0"; + sha256 = "03b176y95f04rg3lcnjps9llsjbvd8yksh1fpvjwaciz48mnxh2i"; message = '' In order to install the DisplayLink drivers, you must first comply with DisplayLink's EULA and download the binaries and sources from here: - http://www.displaylink.com/downloads/file?id=1261 + http://www.displaylink.com/downloads/file?id=1369 Once you have downloaded the file, please use the following commands and re-run the installation: - mv \$PWD/"DisplayLink USB Graphics Software for Ubuntu ${version}.zip" \$PWD/${name} + mv \$PWD/"DisplayLink USB Graphics Software for Ubuntu ${lib.versions.majorMinor version}.zip" \$PWD/${name} nix-prefetch-url file://\$PWD/${name} ''; }; @@ -67,8 +67,9 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "DisplayLink DL-5xxx, DL-41xx and DL-3x00 Driver for Linux"; + maintainers = with maintainers; [ nshalman abbradar peterhoeg ]; platforms = [ "x86_64-linux" "i686-linux" ]; license = licenses.unfree; - homepage = https://www.displaylink.com/; + homepage = "https://www.displaylink.com/"; }; } diff --git a/pkgs/os-specific/linux/displaylink/udev-installer.patch b/pkgs/os-specific/linux/displaylink/udev-installer.patch index 3e62e20c315..bd7d9d145c9 100644 --- a/pkgs/os-specific/linux/displaylink/udev-installer.patch +++ b/pkgs/os-specific/linux/displaylink/udev-installer.patch @@ -4,13 +4,13 @@ cat <<'EOF' start_service() { -- systemctl start dlm +- systemctl start displaylink-driver + @systemd@/bin/systemctl start --no-block dlm } stop_service() { -- systemctl stop dlm +- systemctl stop displaylink-driver + @systemd@/bin/systemctl stop dlm } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 4c718549817..ab15502fb78 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.153"; + version = "4.14.154"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "08bsyawda0yjy4sgr817ich1xihm8c7dicns8bzk1pcpb884pfai"; + sha256 = "00q662s8mgnzqfgk5gkzqfv9ws3vryf28blbq1zxcy4s6wj4mpl6"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index a7b79f1cd0f..7cc597bef4a 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.83"; + version = "4.19.84"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1pahsqsjf2ylbx3nqf5a74n7a4cwmsqxdplqb7k23lkivw4lifh2"; + sha256 = "0q06mhz170x1lkx6c6qdh82rcnsj03q6f2m28aqhmc4wc694m2w6"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 3fa457bdc5c..a6d9dbe1abe 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.200"; + version = "4.4.201"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "02g8h62nq0xrfkxfxxwamdnmkw19p2x5lnrmqszlvgx1ymhfsnfm"; + sha256 = "120kci4kmc48zcw16lhxmh71kaxm9ac5qxik36q3a20czg28b2m7"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 4768005a421..3dc15168517 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.200"; + version = "4.9.201"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1z7gf36mh022nihdg4dlkdscr01jvbwikkm6jsbwcvdbv0s5qq2b"; + sha256 = "125xmh5h1zmfniidpjljny53qkl4phpxaali69i66lajscxx8grq"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.2.nix b/pkgs/os-specific/linux/kernel/linux-5.2.nix deleted file mode 100644 index d3794616d8c..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-5.2.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: - -with stdenv.lib; - -buildLinux (args // rec { - version = "5.2.21"; - - # modDirVersion needs to be x.y.z, will automatically add .0 if needed - modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; - - # branchVersion needs to be x.y - extraMeta.branch = versions.majorMinor version; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0f1mick15d0m7yhhhdwai03wmczvkm9cg38w2ivgmgysfpzy73ls"; - }; -} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.3.nix b/pkgs/os-specific/linux/kernel/linux-5.3.nix index 1eac7ad05f2..c3312c250a5 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.3.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.3.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.3.10"; + version = "5.3.11"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "08ls1nb0yw6apbx219wj4ax8mw57fjcp0496k2sz5sxhiywf0ql1"; + sha256 = "1dxfh0l4inpjd17pyxfsskjsphs43r8lg6nhhr3y4whxdna5cwbf"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 8096684b137..63a9c47a516 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4-rc6"; + version = "5.4-rc7"; extraMeta.branch = "5.4"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0ypazqr6z0n8fwaawxca0i56bwd4g4q2bw5qwayf0f4402m34xdh"; + sha256 = "1ii3klfb9yi0wbql2zss3pbhn4bb6ij6zk3mq5lip1yl8pwsj8wd"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix index 0196718cfd0..bf76ec74b0f 100644 --- a/pkgs/os-specific/linux/microcode/intel.nix +++ b/pkgs/os-specific/linux/microcode/intel.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "microcode-intel"; - version = "20190918"; + version = "20191112"; src = fetchFromGitHub { owner = "intel"; repo = "Intel-Linux-Processor-Microcode-Data-Files"; rev = "microcode-${version}"; - sha256 = "0v668mfqxn6wzyng68aqaffh75gc215k13n6d5g7zisivvv2bgdp"; + sha256 = "059hkl172kk5gcsv87z02vh3vdayk63qa6m6yrsipi1203dmyvzw"; }; nativeBuildInputs = [ iucode-tool libarchive ]; diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index 9b4f2f1c544..c9f9a512ad8 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -1,6 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, bison, flex +{ stdenv, fetchurl, pkgconfig, bison, file, flex +, asciidoc, libxslt, findXMLCatalogs, docbook_xml_dtd_45, docbook_xsl , libmnl, libnftnl, libpcap , gmp, jansson, readline +, withDebugSymbols ? false +, withPython ? false , python3 , withXtables ? false , iptables }: @@ -15,17 +18,27 @@ stdenv.mkDerivation rec { sha256 = "1x8kalbggjq44j4916i6vyv1rb20dlh1dcsf9xvzqsry2j063djw"; }; - configureFlags = [ - "--disable-man-doc" - "--with-json" - ] ++ optional withXtables "--with-xtables"; - - nativeBuildInputs = [ pkgconfig bison flex ]; + nativeBuildInputs = [ + pkgconfig bison file flex + asciidoc docbook_xml_dtd_45 docbook_xsl findXMLCatalogs libxslt + ]; buildInputs = [ libmnl libnftnl libpcap - gmp readline jansson - ] ++ optional withXtables iptables; + gmp jansson readline + ] ++ optional withXtables iptables + ++ optional withPython python3; + + preConfigure = '' + substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file + ''; + + configureFlags = [ + "--with-json" + ] ++ optional (!withDebugSymbols) "--disable-debug" + ++ optional (!withPython) "--disable-python" + ++ optional withPython "--enable-python" + ++ optional withXtables "--with-xtables"; meta = { description = "The project that aims to replace the existing {ip,ip6,arp,eb}tables framework"; diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index c07e063caa7..5f401411074 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -48,7 +48,7 @@ let UCLIBC_HAS_FPU n ''; - version = "1.0.31"; + version = "1.0.32"; in stdenv.mkDerivation { @@ -58,7 +58,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://downloads.uclibc-ng.org/releases/${version}/uClibc-ng-${version}.tar.bz2"; # from "${url}.sha256"; - sha256 = "0ba9yh7ir1jamrgc9x9v7zw0sw144f78q4vidiz6ynpr4dwbd5qm"; + sha256 = "0cp4xf3k0ib76xaz6n6i7yybw7s92s607ak8svq1kakwk0d1jjbv"; }; # 'ftw' needed to build acl, a coreutils dependency @@ -109,6 +109,6 @@ stdenv.mkDerivation { description = "A small implementation of the C library"; maintainers = with maintainers; [ rasendubi ]; license = licenses.lgpl2; - platforms = platforms.linux; + platforms = intersectLists platforms.linux platforms.x86; # fails to build on ARM }; } diff --git a/pkgs/os-specific/windows/default.nix b/pkgs/os-specific/windows/default.nix index 4621c2da10f..7f1634d5c0b 100644 --- a/pkgs/os-specific/windows/default.nix +++ b/pkgs/os-specific/windows/default.nix @@ -1,29 +1,45 @@ -{ newScope, crossLibcStdenv }: let +{ stdenv, buildPackages +, newScope, overrideCC, crossLibcStdenv, libcCross +}: - callPackage = newScope self; +stdenv.lib.makeScope newScope (self: with self; { - self = { - cygwinSetup = callPackage ./cygwin-setup { }; + cygwinSetup = callPackage ./cygwin-setup { }; - jom = callPackage ./jom { }; + jom = callPackage ./jom { }; - w32api = callPackage ./w32api { }; + w32api = callPackage ./w32api { }; - mingwrt = callPackage ./mingwrt { }; - mingw_runtime = self.mingwrt; + mingwrt = callPackage ./mingwrt { }; + mingw_runtime = mingwrt; - mingw_w64 = callPackage ./mingw-w64 { - stdenv = crossLibcStdenv; - }; - - mingw_w64_headers = callPackage ./mingw-w64/headers.nix { }; + mingw_w64 = callPackage ./mingw-w64 { + stdenv = crossLibcStdenv; + }; - mingw_w64_pthreads = callPackage ./mingw-w64/pthreads.nix { }; + crossThreadsStdenv = overrideCC crossLibcStdenv + (if stdenv.hostPlatform.useLLVM or false + then buildPackages.llvmPackages_8.lldClangNoLibcxx + else buildPackages.gccCrossStageStatic.override (old: { + bintools = old.bintools.override { + libc = libcCross; + }; + libc = libcCross; + })); - pthreads = callPackage ./pthread-w32 { }; + mingw_w64_headers = callPackage ./mingw-w64/headers.nix { }; - wxMSW = callPackage ./wxMSW-2.8 { }; + mingw_w64_pthreads = callPackage ./mingw-w64/pthreads.nix { + stdenv = crossThreadsStdenv; + }; - libgnurx = callPackage ./libgnurx { }; + mcfgthreads = callPackage ./mcfgthreads { + stdenv = crossThreadsStdenv; }; -in self + + pthreads = callPackage ./pthread-w32 { }; + + wxMSW = callPackage ./wxMSW-2.8 { }; + + libgnurx = callPackage ./libgnurx { }; +}) diff --git a/pkgs/os-specific/windows/mcfgthreads/default.nix b/pkgs/os-specific/windows/mcfgthreads/default.nix new file mode 100644 index 00000000000..6c4cd171025 --- /dev/null +++ b/pkgs/os-specific/windows/mcfgthreads/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation { + pname = "mcfgthreads"; + version = "git"; + + src = fetchFromGitHub { + owner = "lhmouse"; + repo = "mcfgthread"; + rev = "9570e5ca7b98002d707c502c919d951bf256b9c6"; + sha256 = "10y2x3x601a7c1hkd6zlr3xpfsnlr05xl28v23clf619756a5755"; + }; + + outputs = [ "out" "dev" ]; + + # Don't want prebuilt binaries sneaking in. + postUnpack = '' + rm -r "$sourceRoot/debug" "$sourceRoot/release" + ''; + + nativeBuildInputs = [ + autoreconfHook + ]; +} diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix index 022aaffe596..7efc2e21313 100644 --- a/pkgs/os-specific/windows/mingw-w64/default.nix +++ b/pkgs/os-specific/windows/mingw-w64/default.nix @@ -11,11 +11,15 @@ in stdenv.mkDerivation { sha256 = "00zq3z1hbzd5yzmskskjg79xrzwsqx7ihyprfaxy4hb897vf29sm"; }; + outputs = [ "out" "dev" ]; + configureFlags = [ "--enable-idl" "--enable-secure-api" ]; + enableParallelBuilding = true; + buildInputs = [ windows.mingw_w64_headers ]; dontStrip = true; hardeningDisable = [ "stackprotector" "fortify" ]; diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 916c681ab16..e0c7e635d6c 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -48,7 +48,8 @@ stdenv.mkDerivation rec { "--with-zlib=${zlib}" "--sysconfdir=/etc/slurm" ] ++ (optional (gtk2 == null) "--disable-gtktest") - ++ (optional enableX11 "--with-libssh2=${libssh2.dev}"); + ++ (optional enableX11 "--with-libssh2=${libssh2.dev}") + ++ (optional (!enableX11) "--disable-x11"); preConfigure = '' diff --git a/pkgs/servers/couchpotato/default.nix b/pkgs/servers/couchpotato/default.nix index a528cd2ca26..07ff725f7c9 100644 --- a/pkgs/servers/couchpotato/default.nix +++ b/pkgs/servers/couchpotato/default.nix @@ -1,6 +1,6 @@ -{ fetchurl, pythonPackages, lib }: +{ fetchurl, python2Packages, lib }: -with pythonPackages; +with python2Packages; buildPythonApplication rec { pname = "couchpotato"; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 6e87ac5052c..26d0217254a 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { pname = "knot-dns"; - version = "2.9.0"; + version = "2.9.1"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "df7434eaefbabbf7cca2d6cba5038be48a4668e508215ca197532bac7c9b21a2"; + sha256 = "f19121956caa360c387923654f13e4c97b3fb9093d242e110d7e0916b8d8a04d"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index 356ae7fee17..1f91e318c7f 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -18,12 +18,12 @@ let in stdenv.mkDerivation rec { pname = "jellyfin"; - version = "10.4.0"; + version = "10.4.1"; # Impossible to build anything offline with dotnet src = fetchurl { url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz"; - sha256 = "0a3n2g8xcxz9syj21v3f3jbzksw22bg0dksbakkvs1kphaygk5q2"; + sha256 = "0lv1xd3bfbf9khiqlahry2im1mvgl3cj5m3zfd7mf61il5rz70f9"; }; buildInputs = [ diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix index 9b39723f843..e9ca958a95b 100644 --- a/pkgs/servers/misc/airsonic/default.nix +++ b/pkgs/servers/misc/airsonic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "airsonic"; - version = "10.4.1"; + version = "10.4.2"; src = fetchurl { url = "https://github.com/airsonic/airsonic/releases/download/v${version}/airsonic.war"; - sha256 = "18vm59x8pcgsyf3kl8ndvdszwf62df9vsqzv5jgbzayb3s0yjghx"; + sha256 = "15dxrz1vi5h26g4z9p3x9p96hm1swajsfc2i725xbllpkhnykzcx"; }; buildCommand = '' diff --git a/pkgs/servers/monitoring/consul-alerts/default.nix b/pkgs/servers/monitoring/consul-alerts/default.nix index 707d0129f70..cafccfeb8f2 100644 --- a/pkgs/servers/monitoring/consul-alerts/default.nix +++ b/pkgs/servers/monitoring/consul-alerts/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "consul-alerts"; - version = "0.5.0"; + version = "0.6.0"; rev = "v${version}"; goPackagePath = "github.com/AcalephStorage/consul-alerts"; @@ -13,7 +13,7 @@ buildGoPackage rec { inherit rev; owner = "AcalephStorage"; repo = "consul-alerts"; - sha256 = "0dff2cpk3lkgjsh97rvlrpacpka0kwm29691diyvj7lb9ydzlx3r"; + sha256 = "0836zicv76sd6ljhbbii1mrzh65pch10w3gfa128iynaviksbgn5"; }; meta = with stdenv.lib; { diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix index e15dce8ae45..b44ebd35e9a 100644 --- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "blackbox_exporter"; - version = "0.15.1"; + version = "0.16.0"; rev = version; goPackagePath = "github.com/prometheus/blackbox_exporter"; @@ -11,10 +11,11 @@ buildGoPackage rec { rev = "v${version}"; owner = "prometheus"; repo = "blackbox_exporter"; - sha256 = "14z4xkkh9jb6ylclzsyj6gyqrb67lxs5cxd7lrs70qli567gzqwc"; + sha256 = "1zbf3ljasv0r91rrmk3mj5nhimaf7xg3aih1ldz27rh5yww7gyzg"; }; - doCheck = true; + # dns-lookup is performed for the tests + doCheck = false; meta = with stdenv.lib; { description = "Blackbox probing of endpoints over HTTP, HTTPS, DNS, TCP and ICMP"; diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 86bd7f9d518..9559c9b5c37 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "prometheus"; - version = "2.13.1"; + version = "2.14.0"; goPackagePath = "github.com/prometheus/prometheus"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "prometheus"; repo = "prometheus"; - sha256 = "055qliv683b87dwj7pkprdpjgyp6s4s3cwvpbsl1gxidhlr4y69b"; + sha256 = "0zmxj78h3cnqbhsqab940hyzpim5i9r81b15a57f3dnrrd10p287"; }; buildFlagsArray = let @@ -31,6 +31,12 @@ buildGoPackage rec { cp -a $src/console_libraries $src/consoles $bin/etc/prometheus ''; + # Disable module-mode, because Go 1.13 automatically enables it if there is + # go.mod file. Remove after https://github.com/NixOS/nixpkgs/pull/73380 + preCheck = '' + export GO111MODULE=off + ''; + doCheck = true; meta = with lib; { diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter-deps.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter-deps.nix deleted file mode 100644 index dd3c1b4d4c2..00000000000 --- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter-deps.nix +++ /dev/null @@ -1,138 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/beorn7/perks"; - fetch = { - type = "git"; - url = "https://github.com/beorn7/perks"; - rev = "3a771d992973f24aa725d07868b467d1ddfceafb"; - sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "1d3f30b51784bec5aad268e59fd3c2fc1c2fe73f"; - sha256 = "1wx76776z48qd9pjnrydhj1f3k94qlbcj32ak6am7n7w2nda7sjx"; - }; - } - { - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - fetch = { - type = "git"; - url = "https://github.com/matttproud/golang_protobuf_extensions"; - rev = "c182affec369e30f25d3eb8cd8a478dee585ae7d"; - sha256 = "1xqsf9vpcrd4hp95rl6kgmjvkv1df4aicfw4l5vfcxcwxknfx2xs"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "5beb9624161b94eaf384fed4bd8dc4235e4d80af"; - sha256 = "1p9ypprs467g31v635zjqn1f2rq1y3r6xw47d29ifg9wfmrpmpc7"; - }; - } - { - goPackagePath = "github.com/prometheus/client_golang"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_golang"; - rev = "d2ead25884778582e740573999f7b07f47e171b4"; - sha256 = "1zj7x16xw94jw5l3arajwwcr2f06j2a7z87zqbd6a1jjcsbjj3a5"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "5c3871d89910bfb32f5fcab2aa4b9ec68e65a99f"; - sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0"; - }; - } - { - goPackagePath = "github.com/prometheus/common"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/common"; - rev = "2998b132700a7d019ff618c06a234b47c1f3f681"; - sha256 = "131qmx0rs1nz0ci3qzkks4i6fdmr5c69i48h5cngjizlb9xxwir2"; - }; - } - { - goPackagePath = "github.com/prometheus/procfs"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/procfs"; - rev = "b1a0a9a36d7453ba0f62578b99712f3a6c5f82d1"; - sha256 = "00jdvxvg9zy6gm5q1zp3j5kdcrrma46kqcm73pz8wpljlhbb9s8g"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "eef6b768ab01a0598a0a6db97bad2a37d31df1d1"; - sha256 = "0h3fy7i08s9wm1nrv3164g68dwdy0493px6xhyms6y3vfnbq2n6m"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "ff983b9c42bc9fbf91556e191cc8efb585c16908"; - sha256 = "1hpr06kzn8jnn3gvzp0p9zn4fz4l9h69f7x66idx142w4xdlaanz"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "37e7f081c4d4c64e13b10787722085407fe5d15f"; - sha256 = "1bb0mw6ckb1k7z8v3iil2qlqwfj408fvvp8m1cik2b46p7snyjhm"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "cb59ee3660675d463e86971646692ea3e470021c"; - sha256 = "0xnhdhwg6xca41m1204yg3qc7ki6l5xzx5fkq25gsmf5sz6ylsnl"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } -] diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix index d1cb5dcec9c..c8013e6bc15 100644 --- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix @@ -1,24 +1,22 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "dnsmasq_exporter"; - version = "0.1.0"; - - goPackagePath = "github.com/google/dnsmasq_exporter"; + version = "0.2.0"; src = fetchFromGitHub { owner = "google"; repo = "dnsmasq_exporter"; - sha256 = "0pl4jkp0kssplv32wbg8yk06x9c2hidilpix32hdvk287l3ys201"; + sha256 = "1i7imid981l0a9k8lqyr9igm3qkk92kid4xzadkwry4857k6mgpj"; rev = "v${version}"; }; - goDeps = ./dnsmasq-exporter-deps.nix; + modSha256 = "1ag1k0z35zkazaxj8hh2wxfj73xg63xdybfm1565il2vxs5986dh"; meta = with stdenv.lib; { inherit (src.meta) homepage; description = "A dnsmasq exporter for Prometheus"; license = licenses.asl20; - maintainers = with maintainers; [ willibutz globin ]; + maintainers = with maintainers; [ willibutz globin ma27 ]; }; } diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 7fcb5f94579..c16a1f6659e 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -1,148 +1,162 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, systemd, boost, darwin -, alsaSupport ? true, alsaLib -, avahiSupport ? true, avahi, dbus -, flacSupport ? true, flac -, vorbisSupport ? true, libvorbis -, madSupport ? true, libmad -, id3tagSupport ? true, libid3tag -, mikmodSupport ? true, libmikmod -, shoutSupport ? true, libshout -, sqliteSupport ? true, sqlite -, curlSupport ? true, curl -, audiofileSupport ? true, audiofile -, bzip2Support ? true, bzip2 -, ffmpegSupport ? true, ffmpeg -, fluidsynthSupport ? true, fluidsynth -, zipSupport ? true, zziplib -, samplerateSupport ? true, libsamplerate -, mmsSupport ? true, libmms -, mpg123Support ? true, mpg123 -, aacSupport ? true, faad2 -, lameSupport ? true, lame -, pulseaudioSupport ? true, libpulseaudio -, jackSupport ? true, libjack2 -, gmeSupport ? true, game-music-emu -, icuSupport ? true, icu -, clientSupport ? true, mpd_clientlib -, opusSupport ? true, libopus -, soundcloudSupport ? true, yajl -, nfsSupport ? true, libnfs -, smbSupport ? true, samba +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib, systemd, boost, darwin +# Inputs +, curl, libmms, libnfs, samba +# Archive support +, bzip2, zziplib +# Codecs +, audiofile, faad2, ffmpeg, flac, fluidsynth, game-music-emu +, libmad, libmikmod, mpg123, libopus, libvorbis, lame +# Filters +, libsamplerate +# Outputs +, alsaLib, libjack2, libpulseaudio, libshout +# Misc +, icu, sqlite, avahi, dbus, pcre, libgcrypt, expat +# Services +, yajl +# Client support +, mpd_clientlib +# Tag support +, libid3tag }: -assert avahiSupport -> avahi != null && dbus != null; - let - opt = stdenv.lib.optional; - mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; - major = "0.20"; - minor = "23"; - -in stdenv.mkDerivation rec { - pname = "mpd"; - version = "${major}${if minor == "" then "" else "." + minor}"; + lib = stdenv.lib; - src = fetchFromGitHub { - owner = "MusicPlayerDaemon"; - repo = "MPD"; - rev = "v${version}"; - sha256 = "1z1pdgiddimnmck0ardrpxkvgk1wn9zxri5wfv5ppasbb7kfm350"; + featureDependencies = { + # Storage plugins + udisks = [ dbus ]; + webdav = [ curl expat ]; + # Input plugins + curl = [ curl ]; + mms = [ libmms ]; + nfs = [ libnfs ]; + smbclient = [ samba ]; + # Archive support + bzip2 = [ bzip2 ]; + zzip = [ zziplib ]; + # Decoder plugins + audiofile = [ audiofile ]; + faad = [ faad2 ]; + ffmpeg = [ ffmpeg ]; + flac = [ flac ]; + fluidsynth = [ fluidsynth ]; + gme = [ game-music-emu ]; + mad = [ libmad ]; + mikmod = [ libmikmod ]; + mpg123 = [ mpg123 ]; + opus = [ libopus ]; + vorbis = [ libvorbis ]; + # Encoder plugins + vorbisenc = [ libvorbis ]; + lame = [ lame ]; + # Filter plugins + libsamplerate = [ libsamplerate ]; + # Output plugins + alsa = [ alsaLib ]; + jack = [ libjack2 ]; + pulse = [ libpulseaudio ]; + shout = [ libshout ]; + # Commercial services + qobuz = [ curl libgcrypt yajl ]; + soundcloud = [ curl yajl ]; + tidal = [ curl yajl ]; + # Client support + libmpdclient = [ mpd_clientlib ]; + # Tag support + id3tag = [ libid3tag ]; + # Misc + dbus = [ dbus ]; + expat = [ expat ]; + icu = [ icu ]; + pcre = [ pcre ]; + sqlite = [ sqlite ]; + syslog = [ ]; + systemd = [ systemd ]; + yajl = [ yajl ]; + zeroconf = [ avahi dbus ]; }; - patches = [ ./x86.patch ]; + run = { features ? null }: + let + # Disable platform specific features if needed + # using libmad to decode mp3 files on darwin is causing a segfault -- there + # is probably a solution, but I'm disabling it for now + platformMask = lib.optionals stdenv.isDarwin [ "mad" "pulse" "jack" "nfs" "smb" ] + ++ lib.optionals (!stdenv.isLinux) [ "alsa" "systemd" "syslog" ]; - buildInputs = [ glib boost ] - ++ opt stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudioKit - ++ opt stdenv.isLinux systemd - ++ opt (stdenv.isLinux && alsaSupport) alsaLib - ++ opt avahiSupport avahi - ++ opt avahiSupport dbus - ++ opt flacSupport flac - ++ opt vorbisSupport libvorbis - # using libmad to decode mp3 files on darwin is causing a segfault -- there - # is probably a solution, but I'm disabling it for now - ++ opt (!stdenv.isDarwin && madSupport) libmad - ++ opt id3tagSupport libid3tag - ++ opt mikmodSupport libmikmod - ++ opt shoutSupport libshout - ++ opt sqliteSupport sqlite - ++ opt curlSupport curl - ++ opt bzip2Support bzip2 - ++ opt audiofileSupport audiofile - ++ opt ffmpegSupport ffmpeg - ++ opt fluidsynthSupport fluidsynth - ++ opt samplerateSupport libsamplerate - ++ opt mmsSupport libmms - ++ opt mpg123Support mpg123 - ++ opt aacSupport faad2 - ++ opt lameSupport lame - ++ opt zipSupport zziplib - ++ opt (!stdenv.isDarwin && pulseaudioSupport) libpulseaudio - ++ opt (!stdenv.isDarwin && jackSupport) libjack2 - ++ opt gmeSupport game-music-emu - ++ opt icuSupport icu - ++ opt clientSupport mpd_clientlib - ++ opt opusSupport libopus - ++ opt soundcloudSupport yajl - ++ opt (!stdenv.isDarwin && nfsSupport) libnfs - ++ opt (!stdenv.isDarwin && smbSupport) samba; + knownFeatures = builtins.attrNames featureDependencies; + platformFeatures = lib.subtractLists platformMask knownFeatures; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + features_ = if (features == null ) + then platformFeatures + else + let unknown = lib.subtractLists knownFeatures features; in + if (unknown != []) + then throw "Unknown feature(s): ${lib.concatStringsSep " " unknown}" + else + let unsupported = lib.subtractLists platformFeatures features; in + if (unsupported != []) + then throw "Feature(s) ${lib.concatStringsSep " " unsupported} are not supported on ${stdenv.hostPlatform.system}" + else features; - enableParallelBuilding = true; + in stdenv.mkDerivation rec { + pname = "mpd"; + version = "0.21.16"; - configureFlags = - [ (mkFlag (!stdenv.isDarwin && alsaSupport) "alsa") - (mkFlag flacSupport "flac") - (mkFlag vorbisSupport "vorbis") - (mkFlag vorbisSupport "vorbis-encoder") - (mkFlag (!stdenv.isDarwin && madSupport) "mad") - (mkFlag mikmodSupport "mikmod") - (mkFlag id3tagSupport "id3") - (mkFlag shoutSupport "shout") - (mkFlag sqliteSupport "sqlite") - (mkFlag curlSupport "curl") - (mkFlag audiofileSupport "audiofile") - (mkFlag bzip2Support "bzip2") - (mkFlag ffmpegSupport "ffmpeg") - (mkFlag fluidsynthSupport "fluidsynth") - (mkFlag zipSupport "zzip") - (mkFlag samplerateSupport "lsr") - (mkFlag mmsSupport "mms") - (mkFlag mpg123Support "mpg123") - (mkFlag aacSupport "aac") - (mkFlag lameSupport "lame-encoder") - (mkFlag (!stdenv.isDarwin && pulseaudioSupport) "pulse") - (mkFlag (!stdenv.isDarwin && jackSupport) "jack") - (mkFlag stdenv.isDarwin "osx") - (mkFlag icuSupport "icu") - (mkFlag gmeSupport "gme") - (mkFlag clientSupport "libmpdclient") - (mkFlag opusSupport "opus") - (mkFlag soundcloudSupport "soundcloud") - (mkFlag (!stdenv.isDarwin && nfsSupport) "libnfs") - (mkFlag (!stdenv.isDarwin && smbSupport) "smbclient") - "--enable-debug" - "--with-zeroconf=avahi" - ] - ++ opt stdenv.isLinux - "--with-systemdsystemunitdir=$(out)/etc/systemd/system"; + src = fetchFromGitHub { + owner = "MusicPlayerDaemon"; + repo = "MPD"; + rev = "v${version}"; + sha256 = "0yfzn1hcyww8z5pp70n7iinycz097vjc6q9fzmfrc6ikvz3db8f4"; + }; - NIX_LDFLAGS = '' - ${if shoutSupport then "-lshout" else ""} - ''; + buildInputs = [ glib boost ] + ++ (lib.concatLists (lib.attrVals features_ featureDependencies)) + ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.AudioToolbox; - meta = with stdenv.lib; { - description = "A flexible, powerful daemon for playing music"; - homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki; - license = licenses.gpl2; - maintainers = with maintainers; [ astsmtl fuuzetsu ehmry fpletz ]; - platforms = platforms.unix; + nativeBuildInputs = [ meson ninja pkgconfig ]; - longDescription = '' - Music Player Daemon (MPD) is a flexible, powerful daemon for playing - music. Through plugins and libraries it can play a variety of sound - files while being controlled by its network protocol. - ''; - }; + enableParallelBuilding = true; + + mesonAutoFeatures = "disabled"; + mesonFlags = + map (x: "-D${x}=enabled") features_ + ++ map (x: "-D${x}=disabled") (lib.subtractLists features_ knownFeatures) + ++ lib.optional (builtins.elem "zeroconf" features_) + "-Dzeroconf=avahi" + ++ lib.optional (builtins.elem "systemd" features_) + "-Dsystemd_system_unit_dir=etc/systemd/system"; + + meta = with stdenv.lib; { + description = "A flexible, powerful daemon for playing music"; + homepage = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki; + license = licenses.gpl2; + maintainers = with maintainers; [ astsmtl fuuzetsu ehmry fpletz tobim ]; + platforms = platforms.unix; + + longDescription = '' + Music Player Daemon (MPD) is a flexible, powerful daemon for playing + music. Through plugins and libraries it can play a variety of sound + files while being controlled by its network protocol. + ''; + }; + }; +in +{ + mpd = run { }; + mpd-small = run { features = [ + "webdav" "curl" "mms" "bzip2" "zzip" + "audiofile" "faad" "flac" "gme" "mad" + "mpg123" "opus" "vorbis" "vorbisenc" + "lame" "libsamplerate" "shout" + "libmpdclient" "id3tag" "expat" "pcre" + "yajl" "sqlite" + "soundcloud" "qobuz" "tidal" + ] ++ lib.optionals stdenv.isLinux [ + "alsa" "systemd" "syslog" + ] ++ lib.optionals (!stdenv.isDarwin) [ + "mad" "jack" "nfs" + ]; }; + mpdWithFeatures = run; } diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index ecc36dc283d..69decb2f28d 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "neo4j"; - version = "3.5.11"; + version = "3.5.12"; src = fetchurl { url = "https://neo4j.com/artifact.php?name=neo4j-community-${version}-unix.tar.gz"; - sha256 = "0xk37rvb37rd7pwpv4ingmb2v6ad1kqka8ldmd16n89fqfvg5m2d"; + sha256 = "0v6qs3szxdqi1s8r9bfh5xpfs4hby7wlm3zicj5n46qx44mbg0iv"; }; buildInputs = [ makeWrapper jre8 which gawk ]; diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index 67d6e954f9e..de7167ca740 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -8,13 +8,13 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.18.0.1944-f2cae8d6b"; + version = "1.18.1.1973-0f4abfbcc"; pname = "plexmediaserver"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "1yq926j817aqngq5n8gjpcq5pr8lc5mi3xff1r834vkym1i5nz7q"; + sha256 = "1lmj4yal1f072w5rwxn9m09lbclzy87xnvy89iva1kmqzl3bfz2q"; }; outputs = [ "out" "basedb" ]; diff --git a/pkgs/servers/search/elasticsearch/plugins.nix b/pkgs/servers/search/elasticsearch/plugins.nix index 3a480bd7467..a40a142368a 100644 --- a/pkgs/servers/search/elasticsearch/plugins.nix +++ b/pkgs/servers/search/elasticsearch/plugins.nix @@ -1,4 +1,4 @@ -{ pkgs, lib, stdenv, fetchurl, unzip, elasticsearch }: +{ lib, stdenv, fetchurl, unzip, elasticsearch }: let esVersion = elasticsearch.version; @@ -16,27 +16,27 @@ let }: stdenv.mkDerivation (a // { inherit installPhase; + pname = "elasticsearch-${pluginName}"; dontUnpack = true; buildInputs = [ unzip ]; meta = a.meta // { platforms = elasticsearch.meta.platforms; - maintainers = (a.meta.maintainers or []) ++ (with stdenv.lib.maintainers; [ offline ]); + maintainers = (a.meta.maintainers or []) ++ (with lib.maintainers; [ offline ]); }; }); in { analysis-lemmagen = esPlugin rec { - name = "elasticsearch-analysis-lemmagen-${version}"; - pluginName = "elasticsearch-analysis-lemmagen"; + pluginName = "analysis-lemmagen"; version = esVersion; src = fetchurl { - url = "https://github.com/vhyza/${pluginName}/releases/download/v${version}/${name}-plugin.zip"; + url = "https://github.com/vhyza/${pluginName}/releases/download/v${version}/${pluginName}-${version}-plugin.zip"; sha256 = - if version == "7.0.1" then "155zj9zw81msx976c952nk926ndav1zqhmy2xih6nr82qf0p71hm" - else if version == "6.7.2" then "1r176ncjbilkmri2c5rdxh5xqsrn77m1f0p98zs47czwlqh230iq" + if version == "7.3.1" then "1nb82z6s94mzdx1srb1pwj7cpzs8w74njap0xiqn7sg5ylk6adm8" + else if version == "6.8.3" then "12bshvp01pp2lgwd0cn9l58axg8gdimsh4g9wfllxi1bdpv4cy53" else throw "unsupported version ${version} for plugin ${pluginName}"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/vhyza/elasticsearch-analysis-lemmagen; description = "LemmaGen Analysis plugin provides jLemmaGen lemmatizer as Elasticsearch token filter"; license = licenses.asl20; @@ -44,37 +44,50 @@ in { }; discovery-ec2 = esPlugin rec { - name = "elasticsearch-discovery-ec2-${version}"; pluginName = "discovery-ec2"; version = esVersion; - src = pkgs.fetchurl { + src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; sha256 = - if version == "7.0.1" then "0nrvralh4fygs0ys2ikg3x08jdyh9276d5w7yfncbbi0xrg9hk6g" - else if version == "6.7.2" then "1p0cdz3lfksfd2kvlcj0syxhbx27mimsaw8q4kgjpjjjwqayg523" - else if version == "5.6.16" then "1300pfmnlpfm1hh2jgas8j2kqjqiqkxhr8czshj9lx0wl4ciknin" + if version == "7.3.1" then "1p30by7pqnvj8dcwws51kh9s962c42qwqq07gmj4jl83zxcl8kyl" + else if version == "6.8.3" then "0pmffz761dqjpvmkl7i7xsyw1iyyspqpddxp89rjsznfc9pak5im" else throw "unsupported version ${version} for plugin ${pluginName}"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/discovery-ec2; description = "The EC2 discovery plugin uses the AWS API for unicast discovery."; license = licenses.asl20; }; }; + ingest-attachment = esPlugin rec { + pluginName = "ingest-attachment"; + version = esVersion; + src = fetchurl { + url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${version}.zip"; + sha256 = + if version == "7.3.1" then "1b9l17zv6582sdcdiabwd293xx5ckc2d3h6smiv6znk5f4dxj7km" + else if version == "6.8.3" then "0kfr4i2rcwinjn31xrc2piicasjanaqcgnbif9xc7lnak2nnzmll" + else throw "unsupported version ${version} for plugin ${pluginName}"; + }; + meta = with lib; { + homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/ingest-attachment; + description = "Ingest processor that uses Apache Tika to extract contents"; + license = licenses.asl20; + }; + }; + repository-s3 = esPlugin rec { - name = "elasticsearch-repository-s3-${version}"; pluginName = "repository-s3"; version = esVersion; - src = pkgs.fetchurl { + src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip"; sha256 = - if version == "7.0.1" then "17bf8m1q92j5yhgldckl4hlsfv6qgwwqdc1da9kzgidgky7jwkbc" - else if version == "6.7.2" then "1l353zfyv3qziz8xkann9cbzx4wj5s14wnknfw351j6vgdq26l12" - else if version == "5.6.16" then "0k3li5xv1270ygb9lqk6ji3nngngl2im3z38k08nd627vxdrzij2" + if version == "7.3.1" then "1dqd3hd8qa1bsvd1p42k5zcrdmb66d2yspfc7g8nsz89w6b1invg" + else if version == "6.8.3" then "1mm6hj2m1db68n81rzsvlw6nisflr5ikzk5zv9nmk0z641n5vh1x" else throw "unsupported version ${version} for plugin ${pluginName}"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/repository-s3; description = "The S3 repository plugin adds support for using AWS S3 as a repository for Snapshot/Restore."; license = licenses.asl20; @@ -82,18 +95,16 @@ in { }; repository-gcs = esPlugin rec { - name = "elasticsearch-repository-gcs-${version}"; pluginName = "repository-gcs"; version = esVersion; - src = pkgs.fetchurl { + src = fetchurl { url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/${pluginName}/${pluginName}-${esVersion}.zip"; sha256 = - if version == "7.0.1" then "0a3rc2gggsj7xfncil1s53dmq799lcm82h0yncs94jnb182sbmzc" - else if version == "6.7.2" then "0afccbvb7x6y3nrwmal09vpgxyz4lar6lffw4mngalcppsk8irvv" - else if version == "5.6.16" then "0hwqx4yhdn4c0ccdpvgrg30ag8hy3mgxgk7h7pibdmzvy7qw7501" + if version == "7.3.1" then "0kpb1hn2fb4lh6kn96vi7265ign9lwcd0zfc19l4n6fpp8js5lfh" + else if version == "6.8.3" then "1s2klpvnhpkrk53p64zbga3b66czi7h1a13f58kfn2cn0zfavnbk" else throw "unsupported version ${version} for plugin ${pluginName}"; }; - meta = with stdenv.lib; { + meta = with lib; { homepage = https://github.com/elastic/elasticsearch/tree/master/plugins/repository-gcs; description = "The GCS repository plugin adds support for using Google Cloud Storage as a repository for Snapshot/Restore."; license = licenses.asl20; @@ -103,23 +114,21 @@ in { search-guard = let majorVersion = lib.head (builtins.splitVersion esVersion); in esPlugin rec { - name = "elasticsearch-search-guard-${version}"; pluginName = "search-guard"; version = - if esVersion == "7.0.1" then "${esVersion}-35.0.0" - else if esVersion == "6.7.2" then "${esVersion}-25.1" - else if esVersion == "5.6.16" then "${esVersion}-19.3" + # https://docs.search-guard.com/latest/search-guard-versions + if esVersion == "7.3.1" then "${esVersion}-37.0.0" + else if esVersion == "6.8.3" then "${esVersion}-25.5" else throw "unsupported version ${esVersion} for plugin ${pluginName}"; src = fetchurl { url = "mirror://maven/com/floragunn/${pluginName}-${majorVersion}/${version}/${pluginName}-${majorVersion}-${version}.zip"; sha256 = - if version == "7.0.1-35.0.0" then "0wsiqq7j7ph9g2vhhvjmwrh5a2q1wzlysgr75gc35zcvqz6cq8ha" - else if version == "6.7.2-25.1" then "119r1zibi0z40mfxrpkx0zzay0yz6c7syqmmw8i2681wmz4nksda" - else if version == "5.6.16-19.3" then "1q70anihh89c53fnk8wlq9z5dx094j0f9a0y0v2zsqx18lz9ikmx" + if version == "7.3.1-37.0.0" then "0rb631npr6vykrhln3x6q75xwb0wndvrspwnak0rld5d7pqn1r04" + else if version == "6.8.3-25.5" then "0a7ys9qinc0fjyka03cx9rv0pm7wnvslk234zv5vrphkrj52s1cb" else throw "unsupported version ${version} for plugin ${pluginName}"; }; - meta = with stdenv.lib; { - homepage = https://github.com/floragunncom/search-guard; + meta = with lib; { + homepage = https://search-guard.com; description = "Elasticsearch plugin that offers encryption, authentication, and authorisation. "; license = licenses.asl20; }; diff --git a/pkgs/servers/sql/mariadb/connector-c/3_1.nix b/pkgs/servers/sql/mariadb/connector-c/3_1.nix index cac300cf15a..257fa93d2b5 100644 --- a/pkgs/servers/sql/mariadb/connector-c/3_1.nix +++ b/pkgs/servers/sql/mariadb/connector-c/3_1.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./. (args // { - version = "3.1.4"; - sha256 = "05jkaq151a45rqpyh0vrn6xcpawayfxyzhwn1w32hk0fw3z746ks"; + version = "3.1.5"; + sha256 = "1mfrm595kfnpjladaq6m184npa3rxff9pr1vwa35r057s7nmzpm9"; }) diff --git a/pkgs/servers/sql/mariadb/connector-c/default.nix b/pkgs/servers/sql/mariadb/connector-c/default.nix index 01cf015c825..af344d63721 100644 --- a/pkgs/servers/sql/mariadb/connector-c/default.nix +++ b/pkgs/servers/sql/mariadb/connector-c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fetchpatch +{ stdenv, fetchurl, cmake , curl, openssl, zlib , libiconv , version, sha256, ... @@ -18,13 +18,6 @@ stdenv.mkDerivation { inherit sha256; }; - patches = stdenv.lib.optionals stdenv.isDarwin [ - (fetchpatch { - url = "https://github.com/MariaDB/mariadb-connector-c/commit/ee91b2c98a63acb787114dee4f2694e154630928.patch"; - sha256 = "05mlyv20kzn9bax4byv2ph1cf42541fcl1zcqzbfwqmynnisvdah"; - }) - ]; - cmakeFlags = [ "-DMARIADB_UNIX_ADDR=/run/mysqld/mysqld.sock" "-DWITH_CURL=ON" diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 63ad6ce3b25..bb9818cf9bb 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -2,8 +2,7 @@ , libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5, linux-pam, curl , libaio, libevent, jemalloc, cracklib, systemd, numactl, perl , fixDarwinDylibNames, cctools, CoreServices -, asio, buildEnv, check, scons -, less, fetchpatch +, asio, buildEnv, check, scons, less , withoutClient ? false }: @@ -21,14 +20,14 @@ mariadb = server // { }; common = rec { # attributes common to both builds - version = "10.3.18"; + version = "10.3.20"; src = fetchurl { urls = [ "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz" "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz" ]; - sha256 = "1p6yvmahnkmsz50zjzp20ak7jzbqysly5bdl51nnrngrbfl6qib9"; + sha256 = "14n4zfpwhvafz02r95bidmkwq2bz9jj3safqni1h21jfd0nqz0ak"; name = "mariadb-${version}.tar.gz"; }; @@ -46,12 +45,7 @@ common = rec { # attributes common to both builds patches = [ ./cmake-includedir.patch ./cmake-libmariadb-includedir.patch - ] ++ optional stdenv.hostPlatform.isDarwin (fetchpatch { - url = "https://github.com/MariaDB/mariadb-connector-c/commit/ee91b2c98a63acb787114dee4f2694e154630928.patch"; - extraPrefix = "libmariadb/"; - sha256 = "06i865zwyhs9fvrgmargzn09pbg1cmably3c4wifd241bj8ig8qk"; - stripLen = 1; - }); + ]; cmakeFlags = [ "-DBUILD_CONFIG=mysql_release" diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix index 5fbe757598c..94a71cf223a 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_partman"; - version = "4.1.0"; + version = "4.2.2"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "pgpartman"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "0bzv92x492jcwzhal9x4vc3vszixscdpxc6yq5rrqld26dhmsp06"; + sha256 = "04d34b5z957imm3dndzjn474rxbgx95ha7a9x3vd0rya1pjv927r"; }; installPhase = '' diff --git a/pkgs/servers/web-apps/moodle/default.nix b/pkgs/servers/web-apps/moodle/default.nix index 77822365f9c..60dcbd8b7ef 100644 --- a/pkgs/servers/web-apps/moodle/default.nix +++ b/pkgs/servers/web-apps/moodle/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, writeText }: let - version = "3.7.2"; + version = "3.7.3"; stableVersion = builtins.substring 0 2 (builtins.replaceStrings ["."] [""] version); in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.moodle.org/stable${stableVersion}/${pname}-${version}.tgz"; - sha256 = "1mvrmpqkcz7m7yplqi0lwgnal79n747f7nwcgd2nfrvz7jv3s8ir"; + sha256 = "1n82n77lw83a5wjfjbvc74h2ny2z0zkdprxk7sai88rg6rix33ak"; }; phpConfig = writeText "config.php" '' diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix new file mode 100644 index 00000000000..91684504774 --- /dev/null +++ b/pkgs/shells/nushell/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, fetchFromGitHub +, rustPlatform +, openssl +, pkg-config +, python3 +, xorg +, libiconv +, AppKit +, Security +, withAllFeatures ? true +}: + +rustPlatform.buildRustPackage rec { + pname = "nushell"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "0_5_0"; + sha256 = "1s60w29c8sv0a4nmpggls9pkqyfrwwxjzd65p68d1xxxsdb36rzj"; + }; + + cargoSha256 = "0b8alc3si6y4xmn812izknbkfkz64kz7kcnq4xaqws6iqn7pqidp"; + + nativeBuildInputs = [ pkg-config ] + ++ stdenv.lib.optionals (withAllFeatures && stdenv.isLinux) [ python3 ]; + + buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ] + ++ stdenv.lib.optionals (withAllFeatures && stdenv.isLinux) [ xorg.libX11 ] + ++ stdenv.lib.optionals (withAllFeatures && stdenv.isDarwin) [ AppKit ]; + + cargoBuildFlags = stdenv.lib.optionals withAllFeatures [ "--features" "all" ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + meta = with stdenv.lib; { + description = "A modern shell written in Rust"; + homepage = "https://www.nushell.sh/"; + license = licenses.mit; + maintainers = [ maintainers.marsam ]; + }; + + passthru = { + shellPath = "/bin/nu"; + }; +} diff --git a/pkgs/shells/oh/default.nix b/pkgs/shells/oh/default.nix index 09a54c8a3b8..3ae8a7c600a 100644 --- a/pkgs/shells/oh/default.nix +++ b/pkgs/shells/oh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchgit }: +{ stdenv, buildGoPackage, fetchgit, lib }: buildGoPackage rec { pname = "oh"; @@ -14,4 +14,10 @@ buildGoPackage rec { }; goDeps = ./deps.nix; + + meta = with lib;{ + homepage = "https://github.com/michaelmacinnis/oh"; + description = "A Unix shell"; + license = stdenv.lib.licenses.mit; + }; } diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index d2ecf032d3e..eeb6f9ab6a9 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -2,22 +2,13 @@ stdenv.mkDerivation rec { pname = "oil"; - version = "0.7.pre5"; + version = "0.7.pre6"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "1vpk4my8lp7wik8ywspawimya2a7hb1qjkp5vpm7ypmkya5jqivc"; + sha256 = "1yhfrxrqd4jbjsf0g2fkxv8zypcndnikv9g15yp9szgp4sh1r9vv"; }; - - # TODO remove at next bump - patches = [ - (fetchpatch { - url = "https://github.com/oilshell/oil/commit/81551d76ae5a8b53179f2472492d0b44f13f84fd.patch"; - sha256 = "0v99cx13ajqmf489vvxkqhqi9pjyc8jn0dgc8wp78gsv9js2k7km"; - }) - ]; - postPatch = '' patchShebangs build ''; @@ -34,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A new unix shell"; - homepage = https://www.oilshell.org/; + homepage = "https://www.oilshell.org/"; license = with lib.licenses; [ psfl # Includes a portion of the python interpreter and standard library diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix index 0ea3c8d158d..e1bfc68dc4d 100644 --- a/pkgs/shells/zsh/antibody/default.nix +++ b/pkgs/shells/zsh/antibody/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "antibody"; - version = "4.1.2"; + version = "4.2.0"; goPackagePath = "github.com/getantibody/antibody"; @@ -10,15 +10,15 @@ buildGoModule rec { owner = "getantibody"; repo = "antibody"; rev = "v${version}"; - sha256 = "1csanmvix7b2sa7nsy8nh3jq6gmhp8i51xivsabm1lj2y30c0ly3"; + sha256 = "1vds7mxqxa7xlhvjvmnh1nr1ra3dciav0qlv45s1dmwn5qrcilci"; }; - modSha256 = "1p9cw92ivwgpkvjxvwd9anbd1vzhpicm9il4pg37z2kgr2ihhnyh"; + modSha256 = "1n9sgrm16iig600f4q1cmbwwk0822isjvbyazplylha843510b17"; meta = with lib; { description = "The fastest shell plugin manager"; homepage = https://github.com/getantibody/antibody; license = licenses.mit; - maintainers = with maintainers; [ worldofpeace ]; + maintainers = with maintainers; [ filalex77 worldofpeace ]; }; } diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix index 2d7dd4f24aa..80f51dbb763 100644 --- a/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { pname = "grml-zsh-config"; - version = "0.16.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "grml"; repo = "grml-etc-core"; rev = "v${version}"; - sha256 = "1b794c3hfhw51aqp8dg8smxqjv4x518rs1ib4pdglc4d785rlq1k"; + sha256 = "1dmhwgs5v4f1yanbi6dg1lbpzmvq1l3dq7sra811ycsf4f6g0d7f"; }; buildInputs = [ zsh coreutils txt2tags procps ] diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 730e77c20f9..5b8fdde5796 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -787,14 +787,17 @@ dumpVars() { # Utility function: echo the base name of the given path, with the # prefix `HASH-' removed, if present. stripHash() { - local strippedName + local strippedName casematchOpt=0 # On separate line for `set -e` - strippedName="$(basename "$1")" - if echo "$strippedName" | grep -q '^[a-z0-9]\{32\}-'; then - echo "$strippedName" | cut -c34- + strippedName="$(basename -- "$1")" + shopt -q nocasematch && casematchOpt=1 + shopt -u nocasematch + if [[ "$strippedName" =~ ^[a-z0-9]{32}- ]]; then + echo "${strippedName:33}" else echo "$strippedName" fi + if (( casematchOpt )); then shopt -s nocasematch; fi } diff --git a/pkgs/tools/X11/caffeine-ng/default.nix b/pkgs/tools/X11/caffeine-ng/default.nix index b54a7303ff8..c161a7c7737 100644 --- a/pkgs/tools/X11/caffeine-ng/default.nix +++ b/pkgs/tools/X11/caffeine-ng/default.nix @@ -23,10 +23,15 @@ python3Packages.buildPythonApplication rec { doCheck = false; # There are no tests. - postBuild = '' + postInstall = '' mkdir -p $out/share cp -r share $out/ + # autostart file + cp -r $out/lib/python*/site-packages/etc $out/etc/ glib-compile-schemas --strict $out/share/glib-2.0/schemas + for i in $(find $out -name "*.desktop"); do + substituteInPlace $i --replace /usr $out + done ''; meta = with lib; { diff --git a/pkgs/tools/admin/awslogs/default.nix b/pkgs/tools/admin/awslogs/default.nix index 6d590b8975b..92b6d62a8a2 100644 --- a/pkgs/tools/admin/awslogs/default.nix +++ b/pkgs/tools/admin/awslogs/default.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; propagatedBuildInputs = with python3Packages; [ - boto3 termcolor dateutil docutils + boto3 termcolor dateutil docutils setuptools ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index a07f3477012..54223dfaea8 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "eksctl"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "09pz3pf0nndfbcfyds3y4nnia25ai7f0niyfgiy9832kf1vvyj9a"; + sha256 = "09r8qyc9gcc3slfldkxp91bkiyfgd6qh4di0dbnjggsqfncg34ra"; }; modSha256 = "0y222vxxs9aw17mhif4m0z35ks9xxv90ajk9am71x85sfvkglgl0"; diff --git a/pkgs/tools/archivers/cpio/CVE-2016-2037-out-of-bounds-write.patch b/pkgs/tools/archivers/cpio/CVE-2016-2037-out-of-bounds-write.patch deleted file mode 100644 index 90ddeff9790..00000000000 --- a/pkgs/tools/archivers/cpio/CVE-2016-2037-out-of-bounds-write.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/src/copyin.c b/src/copyin.c -index cde911e..032d35f 100644 ---- a/src/copyin.c -+++ b/src/copyin.c -@@ -1385,6 +1385,8 @@ process_copy_in () - break; - } - -+ if (file_hdr.c_namesize <= 1) -+ file_hdr.c_name = xrealloc(file_hdr.c_name, 2); - cpio_safer_name_suffix (file_hdr.c_name, false, !no_abs_paths_flag, - false); - -diff --git a/src/util.c b/src/util.c -index 6ff6032..2763ac1 100644 ---- a/src/util.c -+++ b/src/util.c -@@ -1411,7 +1411,10 @@ set_file_times (int fd, - } - - /* Do we have to ignore absolute paths, and if so, does the filename -- have an absolute path? */ -+ have an absolute path? -+ Before calling this function make sure that the allocated NAME buffer has -+ capacity at least 2 bytes to allow us to store the "." string inside. */ -+ - void - cpio_safer_name_suffix (char *name, bool link_target, bool absolute_names, - bool strip_leading_dots) diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix index 44943109ee1..3f6b3ba4598 100644 --- a/pkgs/tools/archivers/cpio/default.nix +++ b/pkgs/tools/archivers/cpio/default.nix @@ -1,30 +1,16 @@ -{ stdenv, fetchurl, fetchpatch }: +{ stdenv, fetchurl }: let - version = "2.12"; + version = "2.13"; name = "cpio-${version}"; in stdenv.mkDerivation { inherit name; src = fetchurl { url = "mirror://gnu/cpio/${name}.tar.bz2"; - sha256 = "0vi9q475h1rki53100zml75vxsykzyhrn70hidy41s5c2rc8r6bh"; + sha256 = "0vbgnhkawdllgnkdn6zn1f56fczwk0518krakz2qbwhxmv2vvdga"; }; - patches = [ - (fetchpatch { - name = "CVE-2015-1197-cpio-2.12.patch"; - url = "https://gist.github.com/nckx/70b0bfa80ddfb86c2967/" - + "raw/e9b40d4d4b701f584f826775b75beb10751dc884/" - + "CVE-2015-1197-cpio-2.12.patch"; - sha256 = "0ph43m4lavwkc4gnl5h9p3da4kb1pnhwk5l2qsky70dqri8pcr8v"; - }) - - # Report: http://www.openwall.com/lists/oss-security/2016/01/19/4 - # Patch from https://lists.gnu.org/archive/html/bug-cpio/2016-01/msg00005.html - ./CVE-2016-2037-out-of-bounds-write.patch - ]; - preConfigure = if stdenv.isCygwin then '' sed -i gnu/fpending.h -e 's,include <stdio_ext.h>,,' '' else null; diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 773b09958ea..8d990f3a3a8 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2019.08.11"; + version = "2019.10.13"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "0rkqmavg7iv9080jdqs0qz80nanhizv6jk0fg9d5xvq3gnmfvnj1"; + sha256 = "1i2gpfrzi12smrlni25fcah6a8rb5l7p358r60jbysc2bpzxwd9l"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase diff --git a/pkgs/tools/backup/btrbk/default.nix b/pkgs/tools/backup/btrbk/default.nix index 963d7945b89..71e1807603c 100644 --- a/pkgs/tools/backup/btrbk/default.nix +++ b/pkgs/tools/backup/btrbk/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "btrbk"; - version = "0.28.3"; + version = "0.29.0"; src = fetchurl { url = "https://digint.ch/download/btrbk/releases/${pname}-${version}.tar.xz"; - sha256 = "0s69pcjkjxg77cgyjahwyg2w81ckgzwz1ds4ifjw7z0zhjxy7miz"; + sha256 = "1ki40jga09x361lj36hgzw3ahs0cg2w0s3rjwp209255fzyl89il"; }; nativeBuildInputs = [ asciidoc asciidoctor makeWrapper ]; diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 141d21951a8..3066be27772 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -6,9 +6,10 @@ , libxml2, zlib, lz4 , openldap, lttng-ust , babeltrace, gperf +, gtest , cunit, snappy , rocksdb, makeWrapper -, leveldb, oathToolkit, removeReferencesTo +, leveldb, oathToolkit # Optional Dependencies , yasm ? null, fcgi ? null, expat ? null @@ -108,14 +109,14 @@ in rec { nativeBuildInputs = [ cmake pkgconfig which git python3Packages.wrapPython makeWrapper + python3Packages.python # for the toPythonPath function (ensureNewerSourcesHook { year = "1980"; }) ]; buildInputs = cryptoLibsMap.${cryptoStr} ++ [ boost ceph-python-env libxml2 optYasm optLibatomic_ops optLibs3 - malloc zlib openldap lttng-ust babeltrace gperf cunit + malloc zlib openldap lttng-ust babeltrace gperf gtest cunit snappy rocksdb lz4 oathToolkit leveldb - removeReferencesTo ] ++ optionals stdenv.isLinux [ linuxHeaders utillinux libuuid udev keyutils optLibaio optLibxfs optZfs # ceph 14 @@ -124,54 +125,52 @@ in rec { optFcgi optExpat optCurl optFuse optLibedit ]; + pythonPath = [ ceph-python-env "${placeholder "out"}/${ceph-python-env.sitePackages}" ]; + preConfigure ='' substituteInPlace src/common/module.c --replace "/sbin/modinfo" "modinfo" substituteInPlace src/common/module.c --replace "/sbin/modprobe" "modprobe" - # Since Boost 1.67 this seems to have changed - substituteInPlace CMakeLists.txt --replace "list(APPEND BOOST_COMPONENTS python)" "list(APPEND BOOST_COMPONENTS python37)" - substituteInPlace src/CMakeLists.txt --replace "Boost::python " "Boost::python37 " # for pybind/rgw to find internal dep export LD_LIBRARY_PATH="$PWD/build/lib:$LD_LIBRARY_PATH" # install target needs to be in PYTHONPATH for "*.pth support" check to succeed - export PYTHONPATH=${ceph-python-env}/lib/python3.7/site-packages:$lib/lib/python3.7/site-packages/:$out/lib/python3.7/site-packages/ - patchShebangs src/spdk + patchShebangs src/script src/spdk src/test src/tools ''; cmakeFlags = [ "-DWITH_PYTHON3=ON" "-DWITH_SYSTEM_ROCKSDB=OFF" + "-DCMAKE_INSTALL_DATADIR=${placeholder "lib"}/lib" + "-DWITH_SYSTEM_BOOST=ON" + "-DWITH_SYSTEM_ROCKSDB=ON" + "-DWITH_SYSTEM_GTEST=ON" + "-DMGR_PYTHON_VERSION=${ceph-python-env.python.pythonVersion}" "-DWITH_SYSTEMD=OFF" "-DWITH_TESTS=OFF" # TODO breaks with sandbox, tries to download stuff with npm "-DWITH_MGR_DASHBOARD_FRONTEND=OFF" ]; - preFixup = '' - find $lib -type f -exec remove-references-to -t $out '{}' + - mv $out/share/ceph/mgr $lib/lib/ceph/ - ''; - postFixup = '' - export PYTHONPATH="${ceph-python-env}/lib/python3.7/site-packages:$lib/lib/ceph/mgr:$out/lib/python3.7/site-packages/" wrapPythonPrograms - wrapProgram $out/bin/ceph-mgr --prefix PYTHONPATH ":" "${ceph-python-env}/lib/python3.7/site-packages:$lib/lib/ceph/mgr:$out/lib/python3.7/site-packages/" - wrapProgram $out/bin/ceph-volume --prefix PYTHONPATH ":" "${ceph-python-env}/lib/python3.7/site-packages:$lib/lib/ceph/mgr:$out/lib/python3.7/site-packages/" + wrapProgram $out/bin/ceph-mgr --prefix PYTHONPATH ":" "$(toPythonPath ${placeholder "out"}):$(toPythonPath ${ceph-python-env})" ''; enableParallelBuilding = true; outputs = [ "out" "lib" "dev" "doc" "man" ]; + doCheck = false; # uses pip to install things from the internet + meta = { homepage = https://ceph.com/; description = "Distributed storage system"; license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ]; maintainers = with maintainers; [ adev ak krav johanot ]; - platforms = platforms.unix; + platforms = [ "x86_64-linux" ]; }; passthru.version = version; @@ -183,7 +182,7 @@ in rec { description = "Tools needed to mount Ceph's RADOS Block Devices"; license = with licenses; [ lgpl21 gpl2 bsd3 mit publicDomain ]; maintainers = with maintainers; [ adev ak johanot krav ]; - platforms = platforms.unix; + platforms = [ "x86_64-linux" ]; }; } '' mkdir -p $out/{bin,etc,lib/python3.7/site-packages} diff --git a/pkgs/tools/graphics/jpegexiforient/default.nix b/pkgs/tools/graphics/jpegexiforient/default.nix new file mode 100644 index 00000000000..9397f46fd2c --- /dev/null +++ b/pkgs/tools/graphics/jpegexiforient/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchurl }: +stdenv.mkDerivation { + pname = "jpegexiforient"; + version = "unstable-2002-02-17"; + src = fetchurl { + url = "http://sylvana.net/jpegcrop/jpegexiforient.c"; + sha256 = "1v0f42cvs0397g9v46p294ldgxwbp285npg6npgnlnvapk6nzh5s"; + }; + unpackPhase = '' + cp $src jpegexiforient.c + ''; + buildPhase = '' + cc -o jpegexiforient jpegexiforient.c + ''; + installPhase = '' + install -Dt $out/bin jpegexiforient + ''; + meta = with lib; { + description = "Utility program to get and set the Exif Orientation Tag"; + homepage = "http://sylvana.net/jpegcrop/exif_orientation.html"; + # Website doesn't mention any license, but I think it's safe to assume this + # to be free since it's from IJG, the current maintainers of libjpeg + license = licenses.free; + platforms = platforms.all; + maintainers = with maintainers; [ infinisil ]; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix index e10ffae4a51..ae9d8d0f53f 100644 --- a/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix +++ b/pkgs/tools/inputmethods/fcitx/fcitx-configtool.nix @@ -19,6 +19,14 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper fcitx cmake isocodes gtk3 gnome3.adwaita-icon-theme ]; + # Patch paths to `fcitx-remote` + prePatch = '' + for f in gtk{3,}/config_widget.c; do + substituteInPlace $f \ + --replace 'EXEC_PREFIX "/bin/fcitx-remote"' '"${fcitx}/bin/fcitx-remote"' + done + ''; + preFixup = '' wrapProgram $out/bin/fcitx-config-gtk3 \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS"; diff --git a/pkgs/tools/inputmethods/libinput-gestures/default.nix b/pkgs/tools/inputmethods/libinput-gestures/default.nix index f4b2f7e94e7..2764d2fee72 100644 --- a/pkgs/tools/inputmethods/libinput-gestures/default.nix +++ b/pkgs/tools/inputmethods/libinput-gestures/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, makeWrapper, libinput, wmctrl, python3, - xdotool ? null, + coreutils, xdotool ? null, extraUtilsPath ? lib.optional (xdotool != null) xdotool }: stdenv.mkDerivation rec { @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { rm "$out/bin/libinput-gestures-setup" substituteInPlace "$out/share/applications/libinput-gestures.desktop" --replace "/usr" "$out" chmod +x "$out/share/applications/libinput-gestures.desktop" - wrapProgram "$out/bin/libinput-gestures" --prefix PATH : "${lib.makeBinPath extraUtilsPath}" + wrapProgram "$out/bin/libinput-gestures" --prefix PATH : "${lib.makeBinPath ([coreutils] ++ extraUtilsPath)}" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 739137dab48..1e15d9f0fe0 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -9,11 +9,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "127"; + version = "129"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "029v3lbv281n7axl97khdh4m1p7b614p1fp838mm84v0wgz7q34i"; + sha256 = "11llxk3nwz38ildypvi3djip650a3pd7m3c74mpgvi8v00rs1ca9"; }; patches = [ diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index 19fa7e547ae..567a4eaf230 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "geekbench"; - version = "5.0.2"; + version = "5.0.3"; src = fetchurl { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "1vgq6dp22996y7llcij122idky92jgczliwm191yfc8b200xbx0p"; + sha256 = "0bdkq36b8rr8xzbhjhxia7ss24bm5i4gz4g63dxckis5qi0pfsii"; }; dontConfigure = true; diff --git a/pkgs/tools/misc/licensor/default.nix b/pkgs/tools/misc/licensor/default.nix new file mode 100644 index 00000000000..99d9fc72681 --- /dev/null +++ b/pkgs/tools/misc/licensor/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "licensor"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "raftario"; + repo = pname; + rev = "v${version}"; + sha256 = "0bb6q3jpzdygjcs3apl38zzmgkn22ya5wxlqgmlp0cybqbhpi20s"; + }; + + cargoSha256 = "1cvwyj2043vi5905n5126ikwbs3flfgzqkzjnzha0h8in8p3skv1"; + + meta = with lib; { + description = "Write licenses to stdout"; + homepage = "https://github.com/raftario/licensor"; + license = licenses.mit; + maintainers = with maintainers; [ filalex77 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/lorri/default.nix b/pkgs/tools/misc/lorri/default.nix new file mode 100644 index 00000000000..914578c47ec --- /dev/null +++ b/pkgs/tools/misc/lorri/default.nix @@ -0,0 +1,56 @@ +{ stdenv +, pkgs +, fetchFromGitHub +, rustPlatform + # Updater script +, runtimeShell +, writeScript + # Tests +, nixosTests + # Apple dependencies +, CoreServices +, Security +, cf-private +}: + +rustPlatform.buildRustPackage rec { + pname = "lorri"; + version = "unstable-2019-10-30"; + + meta = with stdenv.lib; { + description = "Your project's nix-env"; + homepage = "https://github.com/target/lorri"; + license = licenses.asl20; + maintainers = with maintainers; [ grahamc Profpatsch ]; + }; + + src = fetchFromGitHub { + owner = "target"; + repo = pname; + # Run `eval $(nix-build -A lorri.updater)` after updating the revision! + rev = "03f10395943449b1fc5026d3386ab8c94c520ee3"; + sha256 = "0fcl79ndaziwd8d74mk1lsijz34p2inn64b4b4am3wsyk184brzq"; + }; + + cargoSha256 = "1daff4plh7hwclfp21hkx4fiflh9r80y2c7k2sd3zm4lmpy0jpfz"; + doCheck = false; + + BUILD_REV_COUNT = src.revCount or 1; + RUN_TIME_CLOSURE = pkgs.callPackage ./runtime.nix {}; + + nativeBuildInputs = with pkgs; [ nix direnv which ]; + buildInputs = + stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security cf-private ]; + + passthru = { + updater = with builtins; writeScript "copy-runtime-nix.sh" '' + #!${runtimeShell} + set -euo pipefail + cp ${src}/nix/runtime.nix ${toString ./runtime.nix} + cp ${src}/nix/runtime-closure.nix.template ${toString ./runtime-closure.nix.template} + ''; + tests = { + nixos = nixosTests.lorri; + }; + }; +} diff --git a/pkgs/tools/misc/lorri/runtime-closure.nix.template b/pkgs/tools/misc/lorri/runtime-closure.nix.template new file mode 100644 index 00000000000..2cb2ec4bbb9 --- /dev/null +++ b/pkgs/tools/misc/lorri/runtime-closure.nix.template @@ -0,0 +1,37 @@ +# Nix with sandboxing requires every path used at build time be +# explicitly declared. If we simply passed in the paths, they +# would be copied in as sources. Using builtins.storePath we're +# able to tell Nix that, no, in fact, treat these not as sources +# to copy, but instead of a regular store path. +# +# Include the explicit closure, too, otherwise we'll get mysterious +# "file not found" errors due to the glibc interpreter being +# missing. +let + # Magic inspired by Nix's config.nix: + # https://github.com/NixOS/nix/blob/f9a2ea44867cd1dbb408bca4df0ced806137b7f7/corepkgs/config.nix.in#L23 + # + # If the dependency is in the Nix store we're using, refer to + # it as a literal store path. If it isn't, refer to it "normally". + # + # This makes sandboxing happy when in a nix-build, and the + # evaluation happy when in a «cargo build». + tools_build_host = @tools_build_host@; + + # Compare the stringified version of the tools_build_host Nix store + # path to the evaluator's stringified Nix store path. Otherwise, + # Nix will read the sources in to the /nix/store, and, well, + # you can only copy the /nix/store in to the /nix/store so many + # times before you run out of disk space. + dep = if ("${toString (dirOf tools_build_host)}" == "${toString builtins.storeDir}") + then (builtins.trace "using storePath" builtins.storePath) + else (builtins.trace "using toString" toString) # assume we have no sandboxing + ; + + tools = dep tools_build_host; + +in { + path = "${tools}/bin"; + builder = "${tools}/bin/bash"; + closure = import @runtime_closure_list@ { inherit dep; }; +} diff --git a/pkgs/tools/misc/lorri/runtime.nix b/pkgs/tools/misc/lorri/runtime.nix new file mode 100644 index 00000000000..71bc89b5af3 --- /dev/null +++ b/pkgs/tools/misc/lorri/runtime.nix @@ -0,0 +1,33 @@ +{ + # Plumbing tools: + closureInfo, runCommand, writeText, buildEnv, + + # Actual dependencies to propagate: + bash, coreutils }: +let + tools = buildEnv { + name = "lorri-runtime-tools"; + paths = [ coreutils bash ]; + }; + + runtimeClosureInfo = closureInfo { + rootPaths = [ tools ]; + }; + + closureToNix = runCommand "closure.nix" {} + '' + ( + echo '{ dep, ... }: [' + sed -E 's/^(.*)$/ (dep \1)/' ${runtimeClosureInfo}/store-paths + echo ']' + ) > $out + ''; + + runtimeClosureInfoAsNix = runCommand "runtime-closure.nix" { + runtime_closure_list = closureToNix; + tools_build_host = tools; + } + '' + substituteAll ${./runtime-closure.nix.template} $out + ''; +in runtimeClosureInfoAsNix diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix index 80583ea19cf..a5ce018545a 100644 --- a/pkgs/tools/misc/peruse/default.nix +++ b/pkgs/tools/misc/peruse/default.nix @@ -26,6 +26,8 @@ in mkDerivation { pathsToLink = [ "/etc/xdg/peruse.knsrc"]; meta = with lib; { + homepage = "https://peruse.kde.org"; + description = "A comic book reader"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; }; diff --git a/pkgs/tools/misc/pg_flame/default.nix b/pkgs/tools/misc/pg_flame/default.nix new file mode 100644 index 00000000000..a7b483a3f06 --- /dev/null +++ b/pkgs/tools/misc/pg_flame/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "pg_flame"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "mgartner"; + repo = pname; + rev = "v${version}"; + sha256 = "13r35n4sy9s4343l3vc896av629wqr7m225ih2bbrm8qq70fwhwv"; + }; + + modSha256 = "0j7qpvji546z0cfjijdd66l0vsl0jmny6i1n9fsjqjgjpwg26naq"; + + meta = with lib; { + description = "Flamegraph generator for Postgres EXPLAIN ANALYZE output"; + homepage = "https://github.com/mgartner/pg_flame"; + license = licenses.asl20; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/pkgs/tools/misc/shadowenv/default.nix b/pkgs/tools/misc/shadowenv/default.nix index 6638a50931d..faa4220200c 100644 --- a/pkgs/tools/misc/shadowenv/default.nix +++ b/pkgs/tools/misc/shadowenv/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowenv"; - version = "1.2.1"; + version = "1.3.1"; src = fetchFromGitHub { owner = "Shopify"; repo = pname; rev = version; - sha256 = "01hhh45h742z9mjcpmyjpbjf90a5b1m58b6nml2han149xpn5b74"; + sha256 = "1s59ra99wcyyqz8gzly4qmcq5rh22c50c75cdi2kyajm7ghgryy9"; }; - cargoSha256 = "0r8s20xgcp5d1ac07g5g4lrrnhrn2qsr1kgj13h2csly22j0ca2a"; + cargoSha256 = "0s4p4mpz1p5v9hr4flxlzqvc1b3zbqr3nxp1nxjw39ng9g3hplpg"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 16ca002d6c7..93275093086 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.25.2"; + version = "0.26.4"; src = fetchFromGitHub { owner = "starship"; repo = "starship"; rev = "v${version}"; - sha256 = "12qpfim0sqrghy41wdlqyq04yqh9mdkfgkhr01ajg0scqwbxi8ws"; + sha256 = "0r3ggy28zx94cjgf486s9qm9c8c0514k5a8fki466yghkxyjamj8"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; - cargoSha256 = "0vcyzvcdpbn27faaj0wkm0mzhmck8s4z3wlhsck1kx4hnjripn02"; + cargoSha256 = "16pdvzvn4na0yksham0kwfkk7jlk4iwrzb4qych3libbswgkaklj"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/ttygif/default.nix b/pkgs/tools/misc/ttygif/default.nix new file mode 100644 index 00000000000..2fbd4360698 --- /dev/null +++ b/pkgs/tools/misc/ttygif/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "ttygif"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "icholy"; + repo = pname; + rev = version; + sha256 = "18l26iacpfn4xqqv1ai6ncabn83mqv98c48gl265gfld66y7zbzn"; + }; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/icholy/ttygif"; + description = "Convert terminal recordings to animated gifs"; + platforms = platforms.linux; + license = licenses.mit; + maintainers = with maintainers; [ moaxcp ]; + }; +} diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index e086105e19e..0b4d77881b4 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -6,23 +6,15 @@ stdenv.mkDerivation rec { pname = "aria2"; - version = "1.34.0"; + version = "1.35.0"; src = fetchFromGitHub { owner = "aria2"; repo = "aria2"; rev = "release-${version}"; - sha256 = "0hwqnjyszasr6049vr5mn48slb48v5kw39cbpbxa68ggmhj9bw6m"; + sha256 = "195r3711ly3drf9jkygwdc2m7q99hiqlfrig3ip1127b837gzsf9"; }; - patches = [ - # Remove with 1.35.0. - (fetchpatch { - url = https://github.com/aria2/aria2/commit/e8e04d6f22a507e8374651d3d2343cd9fb986993.patch; - sha256 = "1v27nqbsdjgg3ga4n0v9daq21m3cmdpy7d08kp32200pzag87f4y"; - }) - ]; - nativeBuildInputs = [ pkgconfig autoreconfHook sphinx ]; buildInputs = [ openssl c-ares libxml2 sqlite zlib libssh2 ] ++ @@ -44,6 +36,6 @@ stdenv.mkDerivation rec { description = "A lightweight, multi-protocol, multi-source, command-line download utility"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ koral ]; + maintainers = with maintainers; [ filalex77 koral ]; }; } diff --git a/pkgs/tools/networking/bgpdump/default.nix b/pkgs/tools/networking/bgpdump/default.nix index 2f74ac713d7..3c84de29bf1 100644 --- a/pkgs/tools/networking/bgpdump/default.nix +++ b/pkgs/tools/networking/bgpdump/default.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchzip, autoreconfHook, zlib, bzip2 }: +{ stdenv, fetchurl, autoreconfHook, zlib, bzip2 }: -stdenv.mkDerivation { - name = "bgpdump-2017-09-29"; +stdenv.mkDerivation rec { + pname = "bgpdump"; + version = "1.6.0"; - src = fetchzip { - url = "https://bitbucket.org/ripencc/bgpdump/get/94a0e724b335.zip"; - sha256 = "09g9vz2zc4nyzl669w1j7fxw21ifja6dxbp0xbqh6n7w3gpx2g88"; + src = fetchurl { + url = "https://ris.ripe.net/source/bgpdump/libbgpdump-1.6.0.tgz"; + sha256 = "144369gj35mf63nz4idqwsvgsirw7fybm8kkk07yymrjp8jr3aqk"; }; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ zlib bzip2 ]; meta = { - homepage = https://bitbucket.org/ripencc/bgpdump/wiki/Home; + homepage = https://bitbucket.org/ripencc/bgpdump/; description = ''Analyze dump files produced by Zebra/Quagga or MRT''; license = stdenv.lib.licenses.hpnd; maintainers = with stdenv.lib.maintainers; [ lewo ]; diff --git a/pkgs/development/python-modules/circus/default.nix b/pkgs/tools/networking/circus/default.nix index a4f96ccaf68..10edc92a995 100644 --- a/pkgs/development/python-modules/circus/default.nix +++ b/pkgs/tools/networking/circus/default.nix @@ -1,7 +1,10 @@ -{ stdenv, buildPythonPackage, fetchPypi -, iowait, psutil, pyzmq, tornado, mock }: +{ stdenv, python3Packages }: -buildPythonPackage rec { +let + inherit (python3Packages) buildPythonApplication fetchPypi iowait psutil pyzmq tornado_4 mock; +in + +buildPythonApplication rec { pname = "circus"; version = "0.15.0"; @@ -13,15 +16,14 @@ buildPythonPackage rec { postPatch = '' # relax version restrictions to fix build substituteInPlace setup.py \ - --replace "pyzmq>=13.1.0,<17.0" "pyzmq>13.1.0" \ - --replace "tornado>=3.0,<5.0" "tornado>=3.0" + --replace "pyzmq>=13.1.0,<17.0" "pyzmq>13.1.0" ''; checkInputs = [ mock ]; doCheck = false; # weird error - propagatedBuildInputs = [ iowait psutil pyzmq tornado ]; + propagatedBuildInputs = [ iowait psutil pyzmq tornado_4 ]; meta = with stdenv.lib; { description = "A process and socket manager"; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 817f3ccf19b..24c3145c7db 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -24,14 +24,14 @@ assert brotliSupport -> brotli != null; assert gssSupport -> libkrb5 != null; stdenv.mkDerivation rec { - name = "curl-7.66.0"; + name = "curl-7.67.0"; src = fetchurl { urls = [ "https://curl.haxx.se/download/${name}.tar.bz2" "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] name}/${name}.tar.bz2" ]; - sha256 = "0hd1wwplw357hn876s4n2gk7dpmd1gfw5d2c3yi21i1m09726636"; + sha256 = "0v2qb1c82m3qzkiyglsg1745qi791i9pl1jgnks8nm0sh9b6jpyx"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 10e821fa152..971d8e69686 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -9,13 +9,13 @@ assert upnpSupport -> miniupnpc != null; stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.28.0"; + version = "2.29.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "0pkqm5h3zvpbspj0xdc8j4yb1j2kc9gkw77mihc9g3rqifr7jvsv"; + sha256 = "1issg3aidwikk4g12sa8q81zzp0hd0g8wdy2dx4899z8yrscl300"; }; buildInputs = with stdenv.lib; [ boost zlib openssl ] diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index df4ac83191d..d9cde0123aa 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "4.1.3"; + version = "4.2.0"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://central.maven.org/maven2/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "0bqdjparv12wscq4qhm9xnryyfmdnn3w77hrhnsy8mlvxk2vnk13"; + sha256 = "00c5y06b8lm6lhnnvl42yndwdgn42bwwfc7p1q7zcsga275b6jpb"; }; phases = [ "installPhase" ]; diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix index b64cf5cdd9b..83f315706ef 100644 --- a/pkgs/tools/networking/slirp4netns/default.nix +++ b/pkgs/tools/networking/slirp4netns/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, libcap, libseccomp }: stdenv.mkDerivation rec { pname = "slirp4netns"; - version = "0.3.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; rev = "v${version}"; - sha256 = "079m44l4l0p1c2sbkpzsy6zpv94glwmrc72ip2djcscnaq4b1763"; + sha256 = "0i0rhb7n2i2nmbvdqdx83vi3kw4r17p7p099sr857cr3f3c221qx"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ glib ]; + buildInputs = [ libcap libseccomp glib ]; enableParallelBuilding = true; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = https://github.com/rootless-containers/slirp4netns; description = "User-mode networking for unprivileged network namespaces"; license = licenses.gpl2; - maintainers = with maintainers; [ orivej ]; + maintainers = with maintainers; [ orivej saschagrunert ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/tdns-cli/default.nix b/pkgs/tools/networking/tdns-cli/default.nix new file mode 100644 index 00000000000..473ee8ace34 --- /dev/null +++ b/pkgs/tools/networking/tdns-cli/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + name = "tdns-cli"; + version = "0.0.5"; + + src = fetchFromGitHub { + owner = "rotty"; + repo = name; + rev = "v${version}"; + sha256 = "0nn036in5j1h0vxkwif0lf7fn900zy4f4kxlzy6qdx3jakgmxvwh"; + }; + + cargoSha256 = "0h41ws3jcxb90mhnznckfkfv0mpx6ykga7087bipbaw2fqhr7izd"; + + meta = with stdenv.lib; { + description = "DNS tool that aims to replace dig and nsupdate"; + homepage = "https://github.com/rotty/tdns-cli"; + license = licenses.gpl3; + maintainers = with maintainers; [ astro ]; + }; +} diff --git a/pkgs/tools/networking/twa/default.nix b/pkgs/tools/networking/twa/default.nix index fe75b35eea2..b15b6dcba31 100644 --- a/pkgs/tools/networking/twa/default.nix +++ b/pkgs/tools/networking/twa/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , gawk , host +, jq , lib , makeWrapper , ncurses @@ -12,18 +13,25 @@ stdenv.mkDerivation rec { pname = "twa"; - version = "1.8.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "trailofbits"; repo = "twa"; rev = version; - sha256 = "1xq35xyz5536nwrwmlp1wqa7q9jgh90ly7vdy3a5rvxnksx0b2l5"; + sha256 = "1ab3bcyhfach9y15w8ffvqqan2qk8h62n6z8nqbgygi7n1mf6jzx"; }; dontBuild = true; - buildInputs = [ makeWrapper bash gawk curl netcat host.dnsutils ]; + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ bash + curl + gawk + host.dnsutils + jq + netcat ]; installPhase = '' install -Dm 0755 twa "$out/bin/twa" @@ -32,7 +40,11 @@ stdenv.mkDerivation rec { install -Dm 0644 README.md "$out/share/doc/twa/README.md" wrapProgram "$out/bin/twa" \ - --prefix PATH : ${stdenv.lib.makeBinPath [ curl netcat ncurses host.dnsutils ]} + --prefix PATH : ${stdenv.lib.makeBinPath [ curl + host.dnsutils + jq + ncurses + netcat ]} ''; meta = with lib; { diff --git a/pkgs/tools/package-management/cargo-deb/default.nix b/pkgs/tools/package-management/cargo-deb/default.nix new file mode 100644 index 00000000000..4630ed66bd2 --- /dev/null +++ b/pkgs/tools/package-management/cargo-deb/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, fetchFromGitHub, rustPlatform, Security }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-deb"; + version = "1.21.1"; + + src = fetchFromGitHub { + owner = "mmstick"; + repo = "cargo-deb"; + rev = "v${version}"; + sha256 = "10b25a0cnrd2bhf38yqc32l06vp6sdlfcpa6n9718yipp7b60cq2"; + }; + + buildInputs = with stdenv; lib.optionals isDarwin [ Security ]; + + cargoSha256 = "182ayprs2awmz7lzqkhawrmpfjla3jcj58q8g8c908gchkh05kns"; + + meta = with stdenv.lib; { + description = "Generate Debian packages from information in Cargo.toml"; + homepage = "https://github.com/mmstick/cargo-deb"; + license = licenses.mit; + maintainers = with maintainers; [ filalex77 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix index 5f4cc58c6a2..da4bb43066c 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "home-manager"; - version = "2019-10-23"; + version = "2019-10-29"; src = fetchFromGitHub { owner = "rycee"; repo = "home-manager"; - rev = "1b987952b5f7d18f0bb66317cf18ffda43ad45aa"; - sha256 = "1jdmxdnyd6jaiqjjkzw3qr0ia4qvmwmgfn05hbph37v03p55ah5q"; + rev = "450571056552c9311fcb2894328696b535265593"; + sha256 = "1rlv234m0bqj9x2y9wnl8z3yq8mixzq8332nqlb8fw9k8mazis6s"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index 89e09a47858..3cb5c1163e5 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, dpkg, xorg , glib, libGLU_combined, libpulseaudio, zlib, dbus, fontconfig, freetype , gtk3, pango -, makeWrapper , python, pythonPackages, lib +, makeWrapper , python2Packages, lib , lsof, curl, libuuid, cups, mesa }: @@ -84,9 +84,9 @@ let name = "enpass-update-script"; SCRIPT =./update_script.py; - buildInputs = with pythonPackages; [python requests pathlib2 six attrs ]; + buildInputs = with python2Packages; [python requests pathlib2 six attrs ]; shellHook = '' - exec python $SCRIPT --target pkgs/tools/security/enpass/data.json --repo ${baseUrl} + exec python $SCRIPT --target pkgs/tools/security/enpass/data.json --repo ${baseUrl} ''; }; diff --git a/pkgs/tools/security/fierce/default.nix b/pkgs/tools/security/fierce/default.nix index 809d8e29ea3..5d12a000815 100644 --- a/pkgs/tools/security/fierce/default.nix +++ b/pkgs/tools/security/fierce/default.nix @@ -2,13 +2,13 @@ python3.pkgs.buildPythonApplication rec { pname = "fierce"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "mschwager"; repo = pname; rev = version; - sha256 = "0cdp9rpabazyfnks30rsf3qfdi40z1bkspxk4ds9bm82kpq33jxy"; + sha256 = "11yaz8ap9swx95j3wpqh0b6jhw6spqgfnsyn1liw9zqi4jwgiax7"; }; propagatedBuildInputs = [ python3.pkgs.dns ]; diff --git a/pkgs/tools/security/pass/extensions/genphrase.nix b/pkgs/tools/security/pass/extensions/genphrase.nix index c031c59e3f6..187852e8b55 100644 --- a/pkgs/tools/security/pass/extensions/genphrase.nix +++ b/pkgs/tools/security/pass/extensions/genphrase.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pass-genphrase"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "congma"; repo = "pass-genphrase"; rev = version; - sha256 = "0vcg3b79n1r949qfn8ns85bq2mfsmbf4jw2dlzif8425n8ppfsgd"; + sha256 = "1sdkmz5s6wdx4vdlgqf5kmyrm17zwzy3n52s13qpx32bnnajap1h"; }; dontBuild = true; diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix index 41faa375f83..4238fc5be33 100644 --- a/pkgs/tools/security/rng-tools/default.nix +++ b/pkgs/tools/security/rng-tools/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchFromGitHub, libtool, autoreconfHook, pkgconfig , sysfsutils +, argp-standalone # WARNING: DO NOT USE BEACON GENERATED VALUES AS SECRET CRYPTOGRAPHIC KEYS # https://www.nist.gov/programs-projects/nist-randomness-beacon , curl ? null, libxml2 ? null, openssl ? null, withNistBeacon ? false # Systems that support RDRAND but not AES-NI require libgcrypt to use RDRAND as an entropy source , libgcrypt ? null, withGcrypt ? true - # Not sure if jitterentropy is safe to use for cryptography - # and thus a default entropy source -, jitterentropy ? null, withJitterEntropy ? false +, jitterentropy ? null, withJitterEntropy ? true , libp11 ? null, opensc ? null, withPkcs11 ? true }: @@ -15,18 +14,16 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "rng-tools"; - version = "6.7"; + version = "6.8"; src = fetchFromGitHub { owner = "nhorman"; repo = "rng-tools"; rev = "v${version}"; - sha256 = "19f75m6mzg8h7b4snzg7d6ypvkz6nq32lrpi9ja95gqz4wsd18a5"; + sha256 = "1clm9i9xg3j79q0d6vinn6dx0nwh1fvzcmkqpcbay7mwsgkknvw2"; }; postPatch = '' - cp README.md README - ${optionalString withPkcs11 '' substituteInPlace rngd.c \ --replace /usr/lib64/opensc-pkcs11.so ${opensc}/lib/opensc-pkcs11.so @@ -42,25 +39,27 @@ stdenv.mkDerivation rec { (withFeature withPkcs11 "pkcs11") ]; + # argp-standalone is only used when libc lacks argp parsing (musl) buildInputs = [ sysfsutils ] + ++ optionals stdenv.hostPlatform.isx86_64 [ argp-standalone ] ++ optionals withGcrypt [ libgcrypt ] ++ optionals withJitterEntropy [ jitterentropy ] ++ optionals withNistBeacon [ curl libxml2 openssl ] ++ optionals withPkcs11 [ libp11 openssl ]; - # This shouldn't be necessary but is as of 6.7 - NIX_LDFLAGS = optionalString withPkcs11 "-lcrypto"; - enableParallelBuilding = true; # For cross-compilation makeFlags = [ "AR:=$(AR)" ]; + doCheck = true; + preCheck = "patchShebangs tests/*.sh"; + meta = { description = "A random number generator daemon"; homepage = https://github.com/nhorman/rng-tools; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ johnazoidberg ]; + maintainers = with maintainers; [ johnazoidberg c0bw3b ]; }; } diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix index 6f7fed20c89..a38c011d7a4 100644 --- a/pkgs/tools/security/trousers/default.nix +++ b/pkgs/tools/security/trousers/default.nix @@ -2,13 +2,15 @@ stdenv.mkDerivation rec { pname = "trousers"; - version = "0.3.13"; + version = "0.3.14"; src = fetchurl { url = "mirror://sourceforge/trousers/trousers/${version}/${pname}-${version}.tar.gz"; - sha256 = "1lvnla1c1ig2w3xvvrqg2w9qm7a1ygzy1j2gg8j7p8c87i58x45v"; + sha256 = "0iwgsbrbb7nfqgl61x8aailwxm8akxh9gkcwxhsvf50x4qx72l6f"; }; + sourceRoot = "."; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ]; @@ -16,21 +18,14 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-usercheck" ]; - # Attempt to remove -std=gnu89 when updating if using gcc5 - NIX_CFLAGS_COMPILE = "-std=gnu89 -DALLOW_NON_TSS_CONFIG_FILE"; - NIX_LDFLAGS = "-lgcc_s"; - - # Fix broken libtool file - preFixup = stdenv.lib.optionalString (!stdenv.isDarwin) '' - sed 's,-lcrypto,-L${openssl.out}/lib -lcrypto,' -i $out/lib/libtspi.la - ''; + NIX_CFLAGS_COMPILE = [ "-DALLOW_NON_TSS_CONFIG_FILE" ]; + enableParallelBuilding = true; meta = with stdenv.lib; { description = "Trusted computing software stack"; homepage = http://trousers.sourceforge.net/; - license = licenses.cpl10; + license = licenses.bsd3; maintainers = [ maintainers.ak ]; platforms = platforms.linux; }; } - diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index 25d3e8d105b..715c2787ef8 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -1,18 +1,18 @@ -{ stdenv, pythonPackages, nix, ronn }: +{ stdenv, python3Packages, nix, ronn }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "vulnix"; - version = "1.8.2"; + version = "1.9.1"; - src = pythonPackages.fetchPypi { + src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0zn21j15vd1z7s40s45zr5wri3r770yvazxqmm60fqpzc5sg552y"; + sha256 = "0pcg90j3g3lxrkbxlnjakrgcx5iwnhka03510zmcf0zcpwkrqakb"; }; outputs = [ "out" "doc" "man" ]; nativeBuildInputs = [ ronn ]; - checkInputs = with pythonPackages; [ + checkInputs = with python3Packages; [ freezegun pytest pytestcov @@ -21,10 +21,9 @@ pythonPackages.buildPythonApplication rec { propagatedBuildInputs = [ nix - ] ++ (with pythonPackages; [ + ] ++ (with python3Packages; [ click colorama - lxml pyyaml requests setuptools @@ -47,8 +46,8 @@ pythonPackages.buildPythonApplication rec { meta = with stdenv.lib; { description = "NixOS vulnerability scanner"; - homepage = https://github.com/flyingcircusio/vulnix; + homepage = "https://github.com/flyingcircusio/vulnix"; license = licenses.bsd3; - maintainers = with maintainers; [ ckauhaus plumps ]; + maintainers = with maintainers; [ ckauhaus ]; }; } diff --git a/pkgs/tools/security/yara/default.nix b/pkgs/tools/security/yara/default.nix index ccebb2dbab4..e09e1e69408 100644 --- a/pkgs/tools/security/yara/default.nix +++ b/pkgs/tools/security/yara/default.nix @@ -1,21 +1,30 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pcre +{ stdenv, fetchFromGitHub, fetchpatch, autoconf, automake, libtool, pcre , withCrypto ? true, openssl , enableMagic ? true, file , enableCuckoo ? true, jansson }: stdenv.mkDerivation rec { - version = "3.10.0"; + version = "3.11.0"; pname = "yara"; src = fetchFromGitHub { owner = "VirusTotal"; repo = "yara"; rev = "v${version}"; - sha256 = "1qxqk324cyvi4n09s79786ciig1gdyhs9dnsm07hf95a3kh6w5z2"; + sha256 = "0mx3xm2a70fx8vlynkavq8gfd9w5yjcix5rx85444i2s1h6kcd0j"; }; - buildInputs = [ autoconf automake libtool pcre] + # See: https://github.com/VirusTotal/yara/issues/1036 + # TODO: This patch should not be necessary in the next release + patches = [ + (fetchpatch { + url = "https://github.com/VirusTotal/yara/commit/04df811fa61fa54390b274bfcf56d7403c184404.patch"; + sha256 = "0hsbc2k7nmk2kskll971draz0an4rmcs5v0iql47mz596vqvkzmb"; + }) + ]; + + buildInputs = [ autoconf automake libtool pcre ] ++ stdenv.lib.optionals withCrypto [ openssl ] ++ stdenv.lib.optionals enableMagic [ file ] ++ stdenv.lib.optionals enableCuckoo [ jansson ] diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix index a13d29cfc7b..d070e1673c2 100644 --- a/pkgs/tools/system/syslog-ng/default.nix +++ b/pkgs/tools/system/syslog-ng/default.nix @@ -5,17 +5,13 @@ , libesmtp }: -let - pname = "syslog-ng"; -in - stdenv.mkDerivation rec { - name = "${pname}-${version}"; - version = "3.23.1"; + pname = "syslog-ng"; + version = "3.24.1"; src = fetchurl { - url = "https://github.com/balabit/${pname}/releases/download/${name}/${name}.tar.gz"; - sha256 = "0f6d19ysf2bd12fzagrbbrdp854pwx794ymp8d0zfc98k30wydpv"; + url = "https://github.com/${pname}/${pname}/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; + sha256 = "0ggsb5867mca83f5mqsi0j7hslvmj8943xynd5myjas5gcss1l6l"; }; nativeBuildInputs = [ pkgconfig which ]; @@ -59,7 +55,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = https://www.balabit.com/network-security/syslog-ng/; + homepage = https://www.syslog-ng.com; description = "Next-generation syslogd with advanced networking and filtering capabilities"; license = licenses.gpl2; maintainers = with maintainers; [ fpletz ]; diff --git a/pkgs/tools/text/recode/default.nix b/pkgs/tools/text/recode/default.nix index cb9e1a84a40..e1c3d87bdcb 100644 --- a/pkgs/tools/text/recode/default.nix +++ b/pkgs/tools/text/recode/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, python, perl, intltool, flex, texinfo, libiconv, libintl }: +{ stdenv, fetchurl, python3, perl, intltool, flex, texinfo, libiconv, libintl }: stdenv.mkDerivation rec { pname = "recode"; - version = "3.7.4"; + version = "3.7.6"; # Use official tarball, avoid need to bootstrap/generate build system src = fetchurl { url = "https://github.com/rrthomas/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0j9rjkgx4r8nah90d2vbi92k33gfmgaqlj72z1ni0vsiccpcgfc8"; + sha256 = "0m59sd1ca0zw1aydpc3m8sw03nc885knmccqryg7byzmqs585ia6"; }; - nativeBuildInputs = [ python python.pkgs.cython perl intltool flex texinfo libiconv ]; + nativeBuildInputs = [ python3 python3.pkgs.cython perl intltool flex texinfo libiconv ]; buildInputs = [ libintl ]; doCheck = true; diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix index d1858d6508d..8e937fe8518 100644 --- a/pkgs/tools/text/source-highlight/default.nix +++ b/pkgs/tools/text/source-highlight/default.nix @@ -2,14 +2,14 @@ let name = "source-highlight"; - version = "3.1.8"; + version = "3.1.9"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://gnu/src-highlite/${name}-${version}.tar.gz"; - sha256 = "18xdalxg7yzrxc1njzgw7aryq2jdm7zq2yqz41sc7k6il5z6lcq1"; + sha256 = "148w47k3zswbxvhg83z38ifi85f9dqcpg7icvvw1cm6bg21x4zrs"; }; buildInputs = [ boost ]; diff --git a/pkgs/tools/typesetting/asciidoctorj/default.nix b/pkgs/tools/typesetting/asciidoctorj/default.nix new file mode 100644 index 00000000000..8eaee977d28 --- /dev/null +++ b/pkgs/tools/typesetting/asciidoctorj/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchzip, jdk, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "asciidoctorj"; + version = "2.1.0"; + + src = fetchzip { + url = "http://dl.bintray.com/asciidoctor/maven/org/asciidoctor/${pname}/${version}/${pname}-${version}-bin.zip"; + sha256 = "19fl4y3xlkmmgf5vyyb3k9p6nyglck9l53r6x12zil01q49g0zba"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + rm bin/asciidoctorj.bat + cp -r . $out + wrapProgram $out/bin/asciidoctorj \ + --prefix JAVA_HOME : ${jdk} + ''; + + meta = with stdenv.lib; { + description = '' + AsciidoctorJ is the official library for running Asciidoctor on the JVM. + ''; + longDescription = '' + AsciidoctorJ is the official library for running Asciidoctor on the JVM. + Using AsciidoctorJ, you can convert AsciiDoc content or analyze the + structure of a parsed AsciiDoc document from Java and other JVM + languages. + ''; + homepage = https://asciidoctor.org/docs/asciidoctorj/; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ moaxcp ]; + }; +} diff --git a/pkgs/tools/typesetting/fop/default.nix b/pkgs/tools/typesetting/fop/default.nix index a72ca698077..c681eaa6ddc 100644 --- a/pkgs/tools/typesetting/fop/default.nix +++ b/pkgs/tools/typesetting/fop/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; homepage = https://xmlgraphics.apache.org/fop/; license = licenses.asl20; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ bjornfor ndowens ]; }; } diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix index c4eaf4e1df4..cc9432f6f22 100644 --- a/pkgs/tools/typesetting/tex/dblatex/default.nix +++ b/pkgs/tools/typesetting/tex/dblatex/default.nix @@ -21,11 +21,11 @@ assert enableAllFeatures -> ghostscript != null; stdenv.mkDerivation rec { - name = "dblatex-0.3.10"; + name = "dblatex-0.3.11"; src = fetchurl { url = "mirror://sourceforge/dblatex/${name}.tar.bz2"; - sha256 = "1yicd861rqz78i2khl35j7nvc0ccv4jx4hzqrbhll17082vrdmkg"; + sha256 = "0rp1bc2lgisigscq1i7zxfd2qdaxxxld6khbcxss4pq7fpi9fzkv"; }; buildInputs = [ python2 libxslt tex ] diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 324c276270b..0c05b3be18d 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -38,9 +38,6 @@ let clean = removeSelfDep (orig // { # overrides of texlive.tlpdb - dvidvi = orig.dvidvi // { - hasRunfiles = false; # only contains docs that's in bin.core.doc already - }; texlive-msg-translations = orig.texlive-msg-translations // { hasRunfiles = false; # only *.po for tlmgr }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45dc8cdf75f..d04fcbb8978 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -250,8 +250,6 @@ in cacert = buildPackages.cacert; }; - fetchgitPrivate = callPackage ../build-support/fetchgit/private.nix { }; - fetchgitLocal = callPackage ../build-support/fetchgitlocal { }; fetchmtn = callPackage ../build-support/fetchmtn (config.fetchmtn or {}); @@ -293,8 +291,10 @@ in fetchhg = callPackage ../build-support/fetchhg { }; # `fetchurl' downloads a file from the network. - fetchurl = makeOverridable (import ../build-support/fetchurl) { - inherit lib stdenvNoCC; + fetchurl = if stdenv.buildPlatform != stdenv.hostPlatform + then buildPackages.fetchurl # No need to do special overrides twice, + else makeOverridable (import ../build-support/fetchurl) { + inherit lib stdenvNoCC buildPackages; curl = buildPackages.curl.override (old: rec { # break dependency cycles fetchurl = stdenv.fetchurlBoot; @@ -535,7 +535,7 @@ in amass = callPackage ../tools/networking/amass { }; - afew = callPackage ../applications/networking/mailreaders/afew { pythonPackages = python3Packages; }; + afew = callPackage ../applications/networking/mailreaders/afew { }; afio = callPackage ../tools/archivers/afio { }; @@ -835,7 +835,7 @@ in dgsh = callPackage ../shells/dgsh { }; - dkimpy = with pythonPackages; toPythonApplication dkimpy; + dkimpy = with python3Packages; toPythonApplication dkimpy; dpt-rp1-py = callPackage ../tools/misc/dpt-rp1-py { }; @@ -1573,9 +1573,7 @@ in dokuwiki = callPackage ../servers/web-apps/dokuwiki { }; - dosage = callPackage ../applications/graphics/dosage { - pythonPackages = python3Packages; - }; + dosage = callPackage ../applications/graphics/dosage { }; dozenal = callPackage ../applications/misc/dozenal { }; @@ -1834,7 +1832,7 @@ in kisslicer = callPackage ../tools/misc/kisslicer { }; - klaus = with pythonPackages; toPythonApplication klaus; + klaus = with python3Packages; toPythonApplication klaus; lcdproc = callPackage ../servers/monitoring/lcdproc { }; @@ -1870,7 +1868,7 @@ in marlin-calc = callPackage ../tools/misc/marlin-calc {}; - mathics = pythonPackages.mathics; + mathics = with python2Packages; toPythonApplication mathics; masscan = callPackage ../tools/security/masscan { stdenv = gccStdenv; @@ -2128,6 +2126,8 @@ in epubcheck = null; }; + asciidoctorj = callPackage ../tools/typesetting/asciidoctorj { }; + asunder = callPackage ../applications/audio/asunder { }; autossh = callPackage ../tools/networking/autossh { }; @@ -2311,6 +2311,8 @@ in buildGoModule = buildGo112Module; }; + circus = callPackage ../tools/networking/circus { }; + # Cleanup before 20.03: citrix_receiver = throw "citrix_receiver has been discontinued by Citrix (https://docs.citrix.com/en-us/citrix-workspace-app.html). Please use citrix_workspace."; citrix_receiver_13_10_0 = citrix_receiver; @@ -2969,6 +2971,7 @@ in evemu = callPackage ../tools/system/evemu { }; # The latest version used by elasticsearch, logstash, kibana and the the beats from elastic. + # When updating make sure to update all plugins or they will break! elk6Version = "6.8.3"; elk7Version = "7.3.1"; @@ -3572,11 +3575,11 @@ in gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1 gnupg20 = callPackage ../tools/security/gnupg/20.nix { guiSupport = stdenv.isDarwin; - pinentry = if stdenv.isDarwin then pinentry_mac else pinentry_gtk2; + pinentry = if stdenv.isDarwin then pinentry_mac else pinentry-gtk2; }; gnupg22 = callPackage ../tools/security/gnupg/22.nix { guiSupport = stdenv.isDarwin; - pinentry = if stdenv.isDarwin then pinentry_mac else pinentry_gtk2; + pinentry = if stdenv.isDarwin then pinentry_mac else pinentry-gtk2; }; gnupg = gnupg22; @@ -3998,9 +4001,7 @@ in i2p = callPackage ../tools/networking/i2p {}; - i2pd = callPackage ../tools/networking/i2pd { - boost = boost165; - }; + i2pd = callPackage ../tools/networking/i2pd { }; i-score = libsForQt5.callPackage ../applications/audio/i-score { }; @@ -4093,7 +4094,9 @@ in intecture-auth = callPackage ../tools/admin/intecture/auth.nix { }; - intecture-cli = callPackage ../tools/admin/intecture/cli.nix { }; + intecture-cli = callPackage ../tools/admin/intecture/cli.nix { + openssl = openssl_1_0_2; + }; intel-media-sdk = callPackage ../development/libraries/intel-media-sdk { }; @@ -4223,13 +4226,15 @@ in jpeg-archive = callPackage ../applications/graphics/jpeg-archive { }; + jpegexiforient = callPackage ../tools/graphics/jpegexiforient { }; + jpeginfo = callPackage ../applications/graphics/jpeginfo { }; jpegoptim = callPackage ../applications/graphics/jpegoptim { }; jpegrescan = callPackage ../applications/graphics/jpegrescan { }; - jpylyzer = with pythonPackages; toPythonApplication jpylyzer; + jpylyzer = with python3Packages; toPythonApplication jpylyzer; jq = callPackage ../development/tools/jq { }; @@ -4284,6 +4289,8 @@ in kexectools = callPackage ../os-specific/linux/kexectools { }; + keepkey_agent = with python3Packages; toPythonApplication keepkey_agent; + kexpand = callPackage ../development/tools/kexpand { }; keybase = callPackage ../tools/security/keybase { @@ -4388,6 +4395,8 @@ in libsmi = callPackage ../development/libraries/libsmi { }; + licensor = callPackage ../tools/misc/licensor { }; + lesspipe = callPackage ../tools/misc/lesspipe { }; liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { @@ -4603,9 +4612,7 @@ in file-rename = callPackage ../tools/filesystems/file-rename { }; - kea = callPackage ../tools/networking/kea { - boost = boost165; - }; + kea = callPackage ../tools/networking/kea { }; ispell = callPackage ../tools/text/ispell {}; @@ -5605,6 +5612,8 @@ in peco = callPackage ../tools/text/peco { }; + pg_flame = callPackage ../tools/misc/pg_flame { }; + pg_top = callPackage ../tools/misc/pg_top { }; pgcenter = callPackage ../tools/misc/pgcenter { }; @@ -6575,6 +6584,8 @@ in tcpreplay = callPackage ../tools/networking/tcpreplay { }; + tdns-cli = callPackage ../tools/networking/tdns-cli { }; + ted = callPackage ../tools/typesetting/ted { }; teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { }; @@ -6725,6 +6736,8 @@ in trezord = callPackage ../servers/trezord { }; + trezor_agent = with python3Packages; toPythonApplication trezor_agent; + tthsum = callPackage ../applications/misc/tthsum { }; chaps = callPackage ../tools/security/chaps { }; @@ -6757,9 +6770,7 @@ in trilium = callPackage ../applications/office/trilium { }; - trousers = callPackage ../tools/security/trousers { - openssl = openssl_1_0_2; - }; + trousers = callPackage ../tools/security/trousers { }; trx = callPackage ../tools/audio/trx { }; @@ -6780,6 +6791,8 @@ in ttyrec = callPackage ../tools/misc/ttyrec { }; + ttygif = callPackage ../tools/misc/ttygif { }; + ttylog = callPackage ../tools/misc/ttylog { }; turses = callPackage ../applications/networking/instant-messengers/turses { }; @@ -7792,7 +7805,7 @@ in ../development/compilers/gcc/libstdc++-hook.sh; crossLibcStdenv = overrideCC stdenv - (if stdenv.targetPlatform.useLLVM or false + (if stdenv.hostPlatform.useLLVM or false then buildPackages.llvmPackages_8.lldClangNoLibc else buildPackages.gccCrossStageStatic); @@ -7825,6 +7838,7 @@ in }; bintools = binutils1; libc = libcCross1; + extraPackages = []; }; gcc48 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.8 { @@ -7834,6 +7848,7 @@ in profiledCompiler = with stdenv; (!isSunOS && !isDarwin && (isi686 || isx86_64)); libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; isl = if !stdenv.isDarwin then isl_0_14 else null; cloog = if !stdenv.isDarwin then cloog else null; @@ -7847,6 +7862,7 @@ in profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; isl = if !stdenv.isDarwin then isl_0_11 else null; @@ -7860,6 +7876,7 @@ in profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; isl = if !stdenv.isDarwin then isl_0_14 else null; })); @@ -7871,6 +7888,7 @@ in profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; isl = if !stdenv.isDarwin then isl_0_14 else null; })); @@ -7882,6 +7900,7 @@ in profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; isl = if !stdenv.isDarwin then isl_0_17 else null; })); @@ -7893,6 +7912,7 @@ in profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; isl = if !stdenv.isDarwin then isl_0_17 else null; })); @@ -7904,6 +7924,7 @@ in profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; isl = if !stdenv.isDarwin then isl_0_17 else null; })); @@ -7915,6 +7936,7 @@ in profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64)); libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then libcCross else null; + threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else null; isl = isl_0_17; })); @@ -8414,7 +8436,10 @@ in llvmPackages_latest = llvmPackages_9; - lorri = throw "lorri is not stable yet. Please go to https://github.com/target/lorri and follow the installation instructions there, for the time being."; + lorri = callPackage ../tools/misc/lorri { + inherit (darwin) cf-private; + inherit (darwin.apple_sdk.frameworks) CoreServices Security; + }; manticore = callPackage ../development/compilers/manticore { }; @@ -8575,6 +8600,9 @@ in cargo-audit = callPackage ../tools/package-management/cargo-audit { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-deb = callPackage ../tools/package-management/cargo-deb { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-deps = callPackage ../tools/package-management/cargo-deps { }; cargo-download = callPackage ../tools/package-management/cargo-download { }; cargo-edit = callPackage ../tools/package-management/cargo-edit { }; @@ -8607,6 +8635,9 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; cargo-sweep = callPackage ../development/tools/rust/cargo-sweep { }; + cargo-udeps = callPackage ../development/tools/rust/cargo-udeps { + inherit (darwin.apple_sdk.frameworks) CoreServices Security; + }; cargo-watch = callPackage ../development/tools/rust/cargo-watch { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -8752,6 +8783,7 @@ in # provide the default choice, avoiding infinite recursion. bintools ? if stdenv.targetPlatform.isDarwin then darwin.binutils else binutils , libc ? bintools.libc + , extraPackages ? stdenv.lib.optional (cc.isGNU or false && stdenv.targetPlatform.isMinGW) threadsCross , ... } @ extraArgs: callPackage ../build-support/cc-wrapper (let self = { @@ -8763,7 +8795,7 @@ in isGNU = cc.isGNU or false; isClang = cc.isClang or false; - inherit cc bintools libc; + inherit cc bintools libc extraPackages; } // extraArgs; in self); wrapCC = cc: wrapCCWith { @@ -10315,7 +10347,7 @@ in smc = callPackage ../tools/misc/smc { }; - snakemake = callPackage ../applications/science/misc/snakemake { python = python3Packages; }; + snakemake = callPackage ../applications/science/misc/snakemake { }; snore = callPackage ../tools/misc/snore { }; @@ -10398,6 +10430,11 @@ in texi2mdoc = callPackage ../tools/misc/texi2mdoc { }; + texlab = callPackage ../development/tools/misc/texlab { + inherit (darwin.apple_sdk.frameworks) Security; + texlab-citeproc-build-deps = nodePackages."texlab-citeproc-build-deps-../tools/misc/texlab/citeproc"; + }; + tflint = callPackage ../development/tools/analysis/tflint { }; todoist = callPackage ../applications/misc/todoist { }; @@ -10453,9 +10490,7 @@ in vultr = callPackage ../development/tools/vultr { }; - vulnix = callPackage ../tools/security/vulnix { - pythonPackages = python3Packages; - }; + vulnix = callPackage ../tools/security/vulnix { }; vtable-dumper = callPackage ../development/tools/misc/vtable-dumper { }; @@ -10678,7 +10713,7 @@ in boost167 = callPackage ../development/libraries/boost/1.67.nix { }; boost168 = callPackage ../development/libraries/boost/1.68.nix { }; boost169 = callPackage ../development/libraries/boost/1.69.nix { }; - boost16x = boost167; + boost16x = boost169; boost170 = callPackage ../development/libraries/boost/1.70.nix { }; boost17x = boost170; boost = boost16x; @@ -10944,7 +10979,9 @@ in easyloggingpp = callPackage ../development/libraries/easyloggingpp {}; - eccodes = callPackage ../development/libraries/eccodes { }; + eccodes = callPackage ../development/libraries/eccodes { + pythonPackages = python3Packages; + }; eclib = callPackage ../development/libraries/eclib {}; @@ -11283,6 +11320,11 @@ in libcCross = assert stdenv.targetPlatform != stdenv.buildPlatform; libcCrossChooser stdenv.targetPlatform.libc; + threadsCross = + if stdenv.targetPlatform.isMinGW && !(stdenv.targetPlatform.useLLVM or false) + then targetPackages.windows.mcfgthreads or windows.mcfgthreads + else null; + wasilibc = callPackage ../development/libraries/wasilibc { stdenv = crossLibcStdenv; }; @@ -13283,7 +13325,10 @@ in wolfssl = callPackage ../development/libraries/wolfssl { }; - openssl = openssl_1_1; + openssl = + if stdenv.hostPlatform.isMinGW # Work around broken cross build + then openssl_1_0_2 + else openssl_1_1; inherit (callPackages ../development/libraries/openssl { }) openssl_1_0_2 @@ -15090,7 +15135,8 @@ in mod_python = pkgs.apacheHttpdPackages.mod_python; mod_wsgi = pkgs.apacheHttpdPackages.mod_wsgi; - mpd = callPackage ../servers/mpd (config.mpd or {}); + inherit (callPackages ../servers/mpd { }) + mpd mpd-small mpdWithFeatures; mpd_clientlib = callPackage ../servers/mpd/clientlib.nix { }; @@ -15375,11 +15421,7 @@ in postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { }; prom2json = callPackage ../servers/monitoring/prometheus/prom2json.nix { }; - prometheus = callPackage ../servers/monitoring/prometheus { - # Version 2.12.0 fails to build with go 1.13 due to an incorrect module file - # compilation error :go: cloud.google.com/go@v0.44.1: Get https://proxy.golang.org/cloud.google.com/go/@v/v0.44.1.mod: dial tcp: lookup proxy.golang.org on [::1]:53: read udp [::1]:58980->[::1]:53: read: connection refused - buildGoPackage = buildGo112Package; - }; + prometheus = callPackage ../servers/monitoring/prometheus { }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { }; prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { }; @@ -15474,9 +15516,7 @@ in libtool = darwin.cctools; }; - rippled = callPackage ../servers/rippled { - boost = boost167; - }; + rippled = callPackage ../servers/rippled { }; rippled-validator-keys-tool = callPackage ../servers/rippled/validator-keys-tool.nix { boost = boost167.override { @@ -16157,14 +16197,6 @@ in ]; }; - linux_5_2 = callPackage ../os-specific/linux/kernel/linux-5.2.nix { - kernelPatches = - [ kernelPatches.bridge_stp_helper - kernelPatches.modinst_arg_list_too_long - kernelPatches.export_kernel_fpu_functions."4.14" - ]; - }; - linux_5_3 = callPackage ../os-specific/linux/kernel/linux-5.3.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -16383,7 +16415,6 @@ in linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); - linuxPackages_5_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_2); linuxPackages_5_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_3); # When adding to this list: @@ -16551,6 +16582,10 @@ in musl = callPackage ../os-specific/linux/musl { }; + nushell = callPackage ../shells/nushell { + inherit (darwin.apple_sdk.frameworks) AppKit Security; + }; + nettools = if stdenv.isLinux then callPackage ../os-specific/linux/net-tools { } else unixtools.nettools; @@ -19442,7 +19477,7 @@ in k3d = callPackage ../applications/graphics/k3d { inherit (pkgs.gnome2) gtkglext; stdenv = gcc6Stdenv; - boost = boost166.override { enablePython = true; }; + boost = boost.override { enablePython = true; }; }; k9copy = libsForQt5.callPackage ../applications/video/k9copy {}; @@ -19963,7 +19998,9 @@ in mpg321 = callPackage ../applications/audio/mpg321 { }; - mpc_cli = callPackage ../applications/audio/mpc { }; + mpc_cli = callPackage ../applications/audio/mpc { + inherit (python3Packages) sphinx; + }; clerk = callPackage ../applications/audio/clerk { }; @@ -20074,6 +20111,8 @@ in notion = callPackage ../applications/window-managers/notion { }; + open-policy-agent = callPackage ../development/tools/open-policy-agent { }; + openshift = callPackage ../applications/networking/cluster/openshift { buildGoPackage = buildGo112Package; }; @@ -20296,6 +20335,8 @@ in obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { }; + obs-ndi = callPackage ../applications/video/obs-studio/obs-ndi.nix { }; + octoprint = callPackage ../applications/misc/octoprint { }; octoprint-plugins = callPackage ../applications/misc/octoprint/plugins.nix { }; @@ -22279,6 +22320,8 @@ in inherit (darwin.apple_sdk.frameworks) IOKit; }; + ledger_agent = with python3Packages; toPythonApplication ledger_agent; + ledger-live-desktop = callPackage ../applications/blockchains/ledger-live-desktop { }; litecoin = callPackage ../applications/blockchains/litecoin.nix { @@ -22491,9 +22534,9 @@ in opencv3 = opencv3WithoutCuda; }; - displaycal = (newScope pythonPackages) ../applications/graphics/displaycal {}; + displaycal = callPackage ../applications/graphics/displaycal {}; - drumkv1 = callPackage ../applications/audio/drumkv1 { }; + drumkv1 = libsForQt5.callPackage ../applications/audio/drumkv1 { }; duckmarines = callPackage ../games/duckmarines { love = love_0_10; }; @@ -24221,6 +24264,8 @@ in ataripp = callPackage ../misc/emulators/atari++ { }; + atlantis = callPackage ../applications/networking/cluster/atlantis { }; + auctex = callPackage ../tools/typesetting/tex/auctex { }; areca = callPackage ../applications/backup/areca { }; @@ -25337,9 +25382,7 @@ in zimg = callPackage ../development/libraries/zimg { }; - wtf = callPackage ../applications/misc/wtf { - buildGoModule = buildGo112Module; - }; + wtf = callPackage ../applications/misc/wtf { }; zk-shell = callPackage ../applications/misc/zk-shell { }; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 2fb09981c9a..e01534f2891 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -134,14 +134,14 @@ with self; { pulseaudio = buildLuaPackage rec { pname = "pulseaudio"; - version = "0.1"; + version = "0.2"; name = "pulseaudio-${version}"; src = fetchFromGitHub { owner = "doronbehar"; repo = "lua-pulseaudio"; rev = "v${version}"; - sha256 = "0vldm34m3ysgn8gvwfdglpw4jl5680fvfay7pzs14gzkzcvgv25b"; + sha256 = "140y1m6k798c4w7xfl0zb0a4ffjz6i1722bgkdcdg8g76hr5r8ys"; }; disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); buildInputs = [ pkgs.libpulseaudio ]; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ae000026a71..468ebd0b003 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1175,6 +1175,21 @@ let }; }; + CacheKyotoTycoon = buildPerlModule { + pname = "Cache-KyotoTycoon"; + version = "0.16"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/Cache-KyotoTycoon-0.16.tar.gz"; + sha256 = "0z4lnc3jfqx8rykm998q2jy5wkhb8p5pir80g9lqpi4lb0ilic6c"; + }; + propagatedBuildInputs = [ Furl URI ]; + buildInputs = [ FileWhich TestTCP TestRequires TestSharedFork ]; + meta = { + description = "KyotoTycoon client library"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + CacheMemcached = buildPerlPackage { pname = "Cache-Memcached"; version = "1.30"; @@ -1948,6 +1963,20 @@ let }; }; + CDB_File = buildPerlPackage { + pname = "CDB_File"; + version = "0.99"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TO/TODDR/CDB_File-0.99.tar.gz"; + sha256 = "1c32b30131871e8a7b23f47d8f65d9cdeb87069fa4c221781a03416496f91f16"; + }; + meta = { + homepage = "http://github.com/toddr/CDB_File"; + description = "Perl extension for access to cdb databases"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + Catmandu = buildPerlModule { pname = "Catmandu"; version = "1.2002"; @@ -7326,6 +7355,19 @@ let buildInputs = [ TestPod ]; }; + FindLib = buildPerlPackage { + pname = "Find-Lib"; + version = "1.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/Y/YA/YANNK/Find-Lib-1.04.tar.gz"; + sha256 = "0lg88v0sqfpq4d3jwvk6c9blqnpxbz8f4s22zr3b1qb160g94wqx"; + }; + meta = with stdenv.lib; { + description = "Helper to smartly find libs to use in the filesystem tree"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + FontAFM = buildPerlPackage { pname = "Font-AFM"; version = "1.20"; @@ -7389,6 +7431,21 @@ let doCheck = false; }; + Furl = buildPerlModule { + pname = "Furl"; + version = "3.13"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/Furl-3.13.tar.gz"; + sha256 = "1wxa2v9yjzvnzp62p1jvcx8x61z5qvlvzyah853vvaywpjxwyyl8"; + }; + propagatedBuildInputs = [ HTTPParserXS ModuleBuildTiny ClassAccessorLite ]; + buildInputs = [ HTTPBody HTTPProxy NetIDNEncode Plack PlackMiddlewareDeflater Starlet TestRequires TestTCP TestSharedFork ]; + meta = { + description = "Lightning-fast URL fetcher"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + GamesSolitaireVerify = buildPerlModule { pname = "Games-Solitaire-Verify"; version = "0.2202"; @@ -10231,6 +10288,21 @@ let buildInputs = [ IPCRun3 TestFatal TestNeeds ]; }; + LogDispatchFileRotate = buildPerlPackage { + pname = "Log-Dispatch-FileRotate"; + version = "1.36"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MS/MSCHOUT/Log-Dispatch-FileRotate-1.36.tar.gz"; + sha256 = "0vlmi17p7fky3x58rs7r5mdxi6l5jla8zhlb55kvssxc1w5v2b27"; + }; + propagatedBuildInputs = [ DateManip LogDispatch PathTiny ]; + meta = { + description = "Log to Files that Archive/Rotate Themselves"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + buildInputs = [ TestFatal TestNeeds TestWarn ]; + }; + LogHandler = buildPerlModule { pname = "Log-Handler"; version = "0.88"; @@ -10341,6 +10413,24 @@ let }; }; + LogJournald = buildPerlModule rec { + pname = "Log-Journald"; + version = "0.30"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LK/LKUNDRAK/Log-Journald-${version}.tar.gz"; + sha256 = "55992cf9a1e1fb833f428300525bfa7cf7ed46b83ec414f82a091789b37d08a3"; + }; + buildInputs = [ ModuleBuild pkgs.pkgconfig pkgs.systemd ]; + postPatch = '' + substituteInPlace Build.PL \ + --replace "libsystemd-journal" "libsystemd" + ''; + meta = { + description = "Send messages to a systemd journal"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + LogLogLite = buildPerlPackage { pname = "Log-LogLite"; version = "0.82"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b1a402a6299..0069e4d0b71 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -234,6 +234,8 @@ in { atomman = callPackage ../development/python-modules/atomman { }; + authlib = callPackage ../development/python-modules/authlib { }; + # packages defined elsewhere amazon_kclpy = callPackage ../development/python-modules/amazon_kclpy { }; @@ -710,6 +712,8 @@ in { inquirer = callPackage ../development/python-modules/inquirer { }; + itanium_demangler = callPackage ../development/python-modules/itanium_demangler { }; + janus = callPackage ../development/python-modules/janus { }; jira = callPackage ../development/python-modules/jira { }; @@ -766,6 +770,8 @@ in { mkl-service = callPackage ../development/python-modules/mkl-service { }; + monkeyhex = callPackage ../development/python-modules/monkeyhex { }; + monty = callPackage ../development/python-modules/monty { }; mpi4py = callPackage ../development/python-modules/mpi4py { @@ -856,6 +862,8 @@ in { pyperf = callPackage ../development/python-modules/pyperf { }; + pefile = callPackage ../development/python-modules/pefile { }; + perfplot = callPackage ../development/python-modules/perfplot { }; phonopy = callPackage ../development/python-modules/phonopy { }; @@ -1643,8 +1651,6 @@ in { cmarkgfm = callPackage ../development/python-modules/cmarkgfm { }; - circus = callPackage ../development/python-modules/circus {}; - colorcet = callPackage ../development/python-modules/colorcet { }; coloredlogs = callPackage ../development/python-modules/coloredlogs { }; @@ -1964,6 +1970,8 @@ in { impacket = callPackage ../development/python-modules/impacket { }; + jsonlines = callPackage ../development/python-modules/jsonlines { }; + jsonrpc-async = callPackage ../development/python-modules/jsonrpc-async { }; jsonrpc-base = callPackage ../development/python-modules/jsonrpc-base { }; @@ -4689,6 +4697,8 @@ in { pyhocon = callPackage ../development/python-modules/pyhocon { }; + pyjson5 = callPackage ../development/python-modules/pyjson5 {}; + pymaging = callPackage ../development/python-modules/pymaging { }; pymaging_png = callPackage ../development/python-modules/pymaging_png { }; @@ -6002,8 +6012,12 @@ in { keepkey = callPackage ../development/python-modules/keepkey { }; + keepkey_agent = callPackage ../development/python-modules/keepkey_agent { }; + libagent = callPackage ../development/python-modules/libagent { }; + ledger_agent = callPackage ../development/python-modules/ledger_agent { }; + ledgerblue = callPackage ../development/python-modules/ledgerblue { }; ecpy = callPackage ../development/python-modules/ecpy { }; |